Changeset ca87bcd

Timestamp:

08/23/05 16:04:06 (17 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:

e01bfa8

Parents:

06b2bcf

Message:

fixed API_VERSION define
added missing timestamp format conversions

Location:

lib

Files:

• libtrace.h (modified) (1 diff)
• trace.c (modified) (4 diffs)

lib/libtrace.h

@@ -35 +35 @@
 #include <netinet/in.h>
 
-/** API version as 3 byte hex digits */
-#define LIBTRACE_API_VERSION 0x010014
+/** API version as 3 byte hex digits, eg 0xXXYYZZ */
+#define LIBTRACE_API_VERSION 0x100014 
 
 #ifdef __cplusplus 

lib/trace.c

@@ -780 +780 @@
 uint64_t trace_get_erf_timestamp(const struct libtrace_packet_t *packet) {
         uint64_t timestamp = 0;
+        double seconds = 0.0;
         struct timeval ts;
 
         if (packet->trace->format->get_erf_timestamp) {
+                // timestamp -> timestamp
                 timestamp = packet->trace->format->get_erf_timestamp(packet);
         } else if (packet->trace->format->get_timeval) {
+                // timeval -> timestamp
                 ts = packet->trace->format->get_timeval(packet);
                 timestamp = ((((uint64_t)ts.tv_sec) << 32) + \
                                 (((uint64_t)ts.tv_usec * UINT_MAX)/1000000));
-        } 
+        } else if (packet->trace->format->get_seconds) {
+                // seconds -> timestamp
+                seconds = packet->trace->format->get_seconds(packet);
+                timestamp = (((uint32_t)seconds) << 32) + \
+                            (( seconds - (uint32_t)seconds   ) * UINT_MAX);
+        }
         return timestamp;
 }
@@ -802 +810 @@
         struct timeval tv;
         uint64_t ts = 0;
-
+        double seconds = 0.0
         if (packet->trace->format->get_timeval) {
+                // timeval -> timeval
                 tv = packet->trace->format->get_timeval(packet);
         } else if (packet->trace->format->get_erf_timestamp) {
+                // timestamp -> timeval
                 ts = packet->trace->format->get_erf_timestamp(packet);
 #if __BYTE_ORDER == __BIG_ENDIAN
@@ -821 +831 @@
                         tv.tv_sec += 1;
                 }
+        } else if (packet->trace->format->get_seconds) {
+                // seconds -> timeval
+                seconds = packet->trace->format->get_seconds(packet);
+                tv.tv_sec = (uint32_t)seconds;
+                tv.tv_usec = (uint32_t)(((seconds - tv.tv_sec) * 1000000)/UINT_MAX);
         }
 
@@ -834 +849 @@
         double seconds;
         uint64_t ts;
+        struct timeval tv;
         
         if (packet->trace->format->get_seconds) {
+                // seconds->seconds
                 seconds = packet->trace->format->get_seconds(packet);
         } else if (packet->trace->format->get_erf_timestamp) {
+                // timestamp -> seconds
                 ts = packet->trace->format->get_erf_timestamp(packet);
                 seconds =  (ts>>32) + ((ts & UINT_MAX)*1.0 / UINT_MAX);
-        } 
+        } else if (packet->trace->format->get_timeval) {
+                // timeval -> seconds
+                tv = packet->trace->format->get_timeval(packet);
+                seconds = tv.tv_sec + ((tv.tv_usec * UINT_MAX * 1.0)/1000000);
+        }
+
         return seconds;
 }