Changeset 6646938

Timestamp:

08/17/18 17:21:48 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop, master, ringdecrementfix, ringperformance

Children:

37ee856, 73a5b72

Parents:

54a76f2 (diff), 2044185 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'cachetimestamps' into develop

Location:

lib

Files:

• format_etsilive.c (modified) (7 diffs)
• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (1 diff)

lib/format_etsilive.c

@@ -83 +83 @@
         etsithread_t *receivers;
         int nextthreadid;
+        wandder_etsispec_t *shareddec;
 } etsilive_format_data_t;
 
@@ -227 +228 @@
         FORMAT_DATA->listenport = strdup(scan + 1);
 
+        FORMAT_DATA->shareddec = wandder_create_etsili_decoder();
+
         return 0;
 }
@@ -240 +243 @@
         if (FORMAT_DATA->listenport) {
                 free(FORMAT_DATA->listenport);
+        }
+        if (FORMAT_DATA->shareddec) {
+                wandder_free_etsili_decoder(FORMAT_DATA->shareddec);
         }
         free(libtrace->format_data);
@@ -522 +528 @@
         packet->wire_length = esock->cached.length;
         packet->capture_length = esock->cached.length;
-
-        /*
-        for (j = 0; j < packet->wire_length; j++) {
-                printf("%02x ", *(((uint8_t *)packet->buffer) + j));
-                if ((j % 16) == 15) printf("\n");
-        }
-        printf("\n");
-        */
 
         /* Advance the read pointer for this buffer
@@ -589 +587 @@
 
         /* Should never get here because cache is set when packet is read */
-        wandder_etsispec_t *dec;
         size_t reclen;
+        libtrace_t *libtrace = packet->trace;
+
+        assert(libtrace);
+        assert(FORMAT_DATA->shareddec);
 
         /* 0 should be ok here for quickly evaluating the first length
          * field... */
-        dec = wandder_create_etsili_decoder();
-        wandder_attach_etsili_buffer(dec, packet->buffer, 0, false);
-        reclen = (size_t)wandder_etsili_get_pdu_length(dec);
-        wandder_free_etsili_decoder(dec);
+        wandder_attach_etsili_buffer(FORMAT_DATA->shareddec, packet->buffer,
+                        0, false);
+        reclen = (size_t)wandder_etsili_get_pdu_length(
+                        FORMAT_DATA->shareddec);
 
         return reclen;
@@ -607 +608 @@
 }
 
-static struct timeval etsilive_get_timeval(const libtrace_packet_t *packet) {
-        /* TODO add cached timestamps to libtrace so we don't have to look
-         * this up again. */
-        struct timeval tv;
-        wandder_etsispec_t *dec;
-
-        tv.tv_sec = 0;
-        tv.tv_usec = 0;
-
-
-        dec = wandder_create_etsili_decoder();
-        wandder_attach_etsili_buffer(dec, packet->buffer, 0, false);
-        tv = wandder_etsili_get_header_timestamp(dec);
-        wandder_free_etsili_decoder(dec);
-        return tv;
+static uint64_t etsilive_get_erf_timestamp(const libtrace_packet_t *packet) {
+        return packet->order;
 }
 
@@ -652 +640 @@
         NULL,                           /* get_direction */
         NULL,                           /* set_direction */
-        NULL,                           /* get_erf_timestamp */
-        etsilive_get_timeval,           /* get_timeval */
+        etsilive_get_erf_timestamp,     /* get_erf_timestamp */
+        NULL,                           /* get_timeval */
         NULL,                           /* get_timespec */
         NULL,                           /* get_seconds */

lib/trace.c

@@ -1008 +1008 @@
                                 ++libtrace->accepted_packets;
                         }
-                        trace_packet_set_order(packet, libtrace->sequence_number);
+                        if (packet->order == 0) {
+                                trace_packet_set_order(packet, libtrace->sequence_number);
+                        }
                         ++libtrace->sequence_number;
                         if (!libtrace_parallel && packet->trace == libtrace)

lib/trace_parallel.c

@@ -1777 +1777 @@
         }
 
-        if (ret != 0) {
+        if (ret < 0) {
                 goto cleanup_none;
         }