Changeset b51edf5 for lib/trace.c

Timestamp:

03/07/06 10:50:19 (16 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:

8f80e87

Parents:

e4e1635

Message:

Added RT_KEYCHANGE to rt protocol
Fixed incorrect calculation in trace_get_seconds
rt_read_packet now returns sizeof(rt_header_t) + packet length
trace_get_capture_length no longer asserts for packet->size = 0

File:

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

lib/trace.c

@@ -1172 +1172 @@
                 /* timeval -> seconds */
                 tv = packet->trace->format->get_timeval(packet);
-                seconds = tv.tv_sec + ((tv.tv_usec * UINT_MAX * 1.0)/1000000);
+                seconds = tv.tv_sec + ((tv.tv_usec * 1.0) / 1000000);
         }
 
@@ -1180 +1180 @@
 size_t trace_get_capture_length(const libtrace_packet_t *packet) {
 
-        assert(packet->size>0 && packet->size<65536);
+        /* Packets can be have a size of zero */
+        assert(packet->size>=0 && packet->size<65536);
 
         if (packet->trace->format->get_capture_length) {