Changeset 3cfa94a

Timestamp:

04/09/05 18:29:56 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

001fbb6

Parents:

48a6c51

Message:

bump version to 2.0.16. Not installed anywhere

Fixed the event api to work with tracefiles:

• wasn't actually copying into internal buffer
• timekeeping had second resolution, this didn't work very well
• added a TRACE_EVENT_TERMINATE event, so that we don't loose the

return condition from trace_read_packet

This still needs a bit of work.

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• libtrace.h (modified) (2 diffs)
• trace.c (modified) (7 diffs)

lib/Makefile.am

@@ -8 +8 @@
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
-libtrace_la_LDFLAGS=-version-info 2:15b:0 @ADD_LDFLAGS@
+libtrace_la_LDFLAGS=-version-info 2:16:0 @ADD_LDFLAGS@
 
 dagapi.c:

lib/libtrace.h

@@ -436 +436 @@
         TRACE_EVENT_IOWAIT,
         TRACE_EVENT_SLEEP,
-        TRACE_EVENT_PACKET
+        TRACE_EVENT_PACKET,
+        TRACE_EVENT_TERMINATE
 } libtrace_event_t;
 
@@ -444 +445 @@
         int fd;                /**< if IOWAIT, the fd to sleep on */
         double seconds;        /**< if SLEEP, the amount of time to sleep for */
+        int size;              /**< if PACKET, the value returned from trace_read_packet */
 };
 

lib/trace.c

@@ -169 +169 @@
         double last_ts;
         double start_ts;
+        struct timeval start_tv;
 };
 
@@ -1476 +1477 @@
                                 }
                                 if (data>0) {
-                                        trace_read_packet(trace,packet);
+                                        event.size = trace_read_packet(trace,packet);
+                                        if (event.size < 0) {
+                                                event.type = TRACE_EVENT_TERMINATE;
+                                                return event;
+                                        }
                                         event.type = TRACE_EVENT_PACKET;
                                         return event;
@@ -1494 +1499 @@
                                 }
                                 if (data>0) {
-                                        trace_read_packet(trace,packet);
+                                        event.size = trace_read_packet(trace,packet);
+                                        if (event.size < 0) {
+                                                event.type = TRACE_EVENT_TERMINATE;
+                                                return event;
+                                        }
                                         event.type = TRACE_EVENT_PACKET;
                                         return event;
@@ -1505 +1514 @@
                         {
                                 double ts;
+                                double now;
+                                struct timeval stv;
                                 /* "Prime" the pump */
                                 if (!trace->packet.buffer) {
@@ -1510 +1521 @@
                                         trace->packet.size=
                                                 trace_read_packet(trace,packet);
-                                }
+                                        if (trace->packet.size > 0 ) {
+                                                memcpy(trace->packet.buffer,packet->buffer,trace->packet.size);
+                                        }
+                                }
+                                event.size = trace->packet.size;
+
+                                if (event.size == 0) {
+                                        event.type = TRACE_EVENT_TERMINATE;
+                                        return event;
+                                }
+
                                 ts=trace_get_seconds(packet);
                                 if (trace->last_ts!=0) {
                                         event.seconds = ts - trace->last_ts;
-                                        if (event.seconds>time(NULL)-trace->start_ts) {
+                                        gettimeofday(&stv, NULL);
+                                        now = stv.tv_sec + ((double)stv.tv_usec / 1000000.0);
+                                        
+                                        if (event.seconds > (now - trace->start_ts)) {
                                                 event.type = TRACE_EVENT_SLEEP;
                                                 return event;
@@ -1521 +1545 @@
                                 }
                                 else {
-                                        trace->start_ts = time(NULL);
+                                        gettimeofday(&stv, NULL);
+                                        trace->start_ts = stv.tv_sec + ((double)stv.tv_usec / 1000000.0);
                                         trace->last_ts = ts;
                                 }
-
+                                
                                 packet->size = trace->packet.size;
                                 memcpy(packet->buffer,trace->packet.buffer,trace->packet.size);
@@ -1531 +1556 @@
                                 trace->packet.buffer = 0;
                                 event.type = TRACE_EVENT_PACKET;
+                                
+                                gettimeofday(&stv, NULL);
+                                trace->start_ts = stv.tv_sec + ((double)stv.tv_usec / 1000000.0);
+                                trace->last_ts = ts;
+                                
                                 return event;
                         }