Changeset ea911b7


Ignore:
Timestamp:
01/29/16 16:54:17 (4 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
libtrace4, pfring
Children:
9b9c279
Parents:
b24d186 (diff), 733c8b4 (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 branch 'origin/libtrace4' into libtrace4

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/combiner_ordered.c

    r21c0d70 r733c8b4  
    5151                        c->last_ts_tick = peeked->key;
    5252
    53                         /* Tick doesn't match packet order */
    54                         if (!trace_is_parallel(trace)) {
    55                                 /* Pass straight to reporter */
    56                                 libtrace_generic_t gt = {.res = peeked};
    57                                 ASSERT_RET (libtrace_deque_pop_front(v, (void *) peeked), == 1);
    58                                 send_message(trace, &trace->reporter_thread,
    59                                                 MESSAGE_RESULT, gt,
    60                                                 &trace->reporter_thread);
    61                                 return 0;
    62                         }
    63                         /* Tick matches packet order */
    64                         *key = peeked->key;
    65                         return 1;
     53                        /* Pass straight to reporter */
     54                        libtrace_generic_t gt = {.res = peeked};
     55                        ASSERT_RET (libtrace_deque_pop_front(v, (void *) peeked), == 1);
     56                        send_message(trace, &trace->reporter_thread,
     57                                        MESSAGE_RESULT, gt,
     58                                        &trace->reporter_thread);
     59                        return 0;
    6660
    6761                } else {
     
    157151
    158152                ASSERT_RET (libtrace_deque_pop_front(&queues[min_queue], (void *) &r), == 1);
     153
     154                //printf("%lu %lu %lu %lu %d\n", key[0], key[1], key[2], key[3], min_queue);
    159155
    160156                send_message(trace, &trace->reporter_thread,
  • lib/trace.c

    rb24d186 rea911b7  
    136136static void trace_init(void)
    137137{
     138        struct timeval tv;
     139        gettimeofday(&tv, NULL);
     140        srand(tv.tv_sec);
     141
    138142        if (!formats_list) {
    139143                duck_constructor();
Note: See TracChangeset for help on using the changeset viewer.