Changeset 9b9c279

Timestamp:

01/29/16 16:58:55 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

pfring

Parents:

9e7c502 (diff), ea911b7 (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 remote-tracking branch 'origin/libtrace4' into pfring

Location:

lib

Files:

• combiner_ordered.c (modified) (2 diffs)
• trace.c (modified) (1 diff)

lib/combiner_ordered.c

@@ -51 +51 @@
                         c->last_ts_tick = peeked->key;
 
-                        /* Tick doesn't match packet order */
-                        if (!trace_is_parallel(trace)) {
-                                /* Pass straight to reporter */
-                                libtrace_generic_t gt = {.res = peeked};
-                                ASSERT_RET (libtrace_deque_pop_front(v, (void *) peeked), == 1);
-                                send_message(trace, &trace->reporter_thread,
-                                                MESSAGE_RESULT, gt,
-                                                &trace->reporter_thread);
-                                return 0;
-                        }
-                        /* Tick matches packet order */
-                        *key = peeked->key;
-                        return 1;
+                        /* Pass straight to reporter */
+                        libtrace_generic_t gt = {.res = peeked};
+                        ASSERT_RET (libtrace_deque_pop_front(v, (void *) peeked), == 1);
+                        send_message(trace, &trace->reporter_thread,
+                                        MESSAGE_RESULT, gt,
+                                        &trace->reporter_thread);
+                        return 0;
 
                 } else {
@@ -157 +151 @@
 
                 ASSERT_RET (libtrace_deque_pop_front(&queues[min_queue], (void *) &r), == 1);
+
+                //printf("%lu %lu %lu %lu %d\n", key[0], key[1], key[2], key[3], min_queue);
 
                 send_message(trace, &trace->reporter_thread,

lib/trace.c

@@ -136 +136 @@
 static void trace_init(void)
 {
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        srand(tv.tv_sec);
+
         if (!formats_list) {
                 duck_constructor();