Changeset 0d57541 for lib/format_helper.c

Timestamp:

02/28/06 13:44:36 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

5b66921

Parents:

c26ca86

Message:

Add preliminary seek support

File:

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

lib/format_helper.c

@@ -80 +80 @@
         struct timeval stv;
 
-        if (!trace->event.packet.buffer) {
-                trace->event.packet.buffer = (void *)malloc(4096);
-                trace->event.packet.size=
-                        trace_read_packet(trace,packet);
-                event.size = trace->event.packet.size = \
-                             trace->event.packet.size;
-                if (trace->event.packet.size > 0 ) {
-                        memcpy(trace->event.packet.buffer,
-                                        packet->buffer,
-                                        trace->event.packet.size);
-                } else {
+        if (!trace->event.packet) {
+                trace->event.packet = trace_create_packet();
+                trace->event.psize=
+                        trace_read_packet(trace,trace->event.packet);
+                if (trace->event.psize<1) {
                         /* return here, the test for
                          * event.size will sort out the error
@@ -99 +93 @@
         }
 
-        ts=trace_get_seconds(packet);
+        ts=trace_get_seconds(trace->event.packet);
         if (trace->event.tdelta!=0) {
                 /* Get the adjusted current time */
@@ -108 +102 @@
                 now -= trace->event.tdelta; 
 
-                /*if the trace timestamp is still in the 
-                //future, return a SLEEP event, 
-                //otherwise fire the packet
+                /* if the trace timestamp is still in the 
+                 * future, return a SLEEP event, 
+                 * otherwise fire the packet
                  */
                 if (ts > now) {
@@ -121 +115 @@
                 gettimeofday(&stv, NULL);
                 /* work out the difference between the 
-                // start of trace replay, and the first
-                // packet in the trace
+                 * start of trace replay, and the first
+                 * packet in the trace
                  */
                 trace->event.tdelta = stv.tv_sec + 
@@ -130 +124 @@
 
         /* This is the first packet, so just fire away. */
-        memcpy(packet->buffer,
-                        trace->event.packet.buffer,
-                        trace->event.packet.size);
-        free(trace->event.packet.buffer);
-        trace->event.packet.buffer = 0;
+        /* TODO: finalise packet */
+        *packet = *trace->event.packet;
+        trace->event.packet = NULL;
+
         event.type = TRACE_EVENT_PACKET;
 
@@ -140 +133 @@
 
         return event;
-        
 }