Changeset 2a1a502 for lib

Timestamp:

12/21/06 16:30:42 (15 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

e7d66bf

Parents:

496b8e5

Message:

Fixed trace_event_trace so that it doesn't free the buffer containing the packet data before returning it. There's probably a more efficient way of doing it than what I did here, but at least it works now

File:

• lib/format_helper.c (modified) (2 diffs)

lib/format_helper.c

@@ -103 +103 @@
                          * event.size will sort out the error
                          */
+                        if (trace_is_err(trace)) {
+                                trace_perror(trace, "read packet");
+                        }
                         event.type = TRACE_EVENT_TERMINATE;
                         return event;
@@ -140 +143 @@
         /* This is the first packet, so just fire away. */
         /* TODO: finalise packet */
-        *packet = *trace->event.packet;
+        
+        /* XXX: Could we do this more efficiently? */
+        /* We do a lot of freeing and creating of packet buffers with this
+         * method, but at least it works unlike what was here previously */
+        if (packet->buf_control == TRACE_CTRL_PACKET) {
+                free(packet->buffer);
+        }
+                
+        packet->type = trace->event.packet->type;
+        packet->trace = trace->event.packet->trace;
+        packet->header = trace->event.packet->header;
+        packet->payload = trace->event.packet->payload;
+        
+        packet->buffer = trace->event.packet->buffer;
+        packet->buf_control = trace->event.packet->buf_control;
+
+        trace->event.packet->buf_control = TRACE_CTRL_EXTERNAL;
+        
         trace_destroy_packet(trace->event.packet);
         trace->event.packet = NULL;