Ignore:
Timestamp:
03/12/15 17:14:42 (7 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
a978dec
Parents:
b54e2da
Message:

More documentation, including some renaming and modifications to behaviour

  • Removes accessor functions for libtrace_result_t, instead directly access the structure
  • Documentation for most functions
  • Split tick into interval and count messages for the two modes of operation
  • Normalise interval and packet order to use the erf timestamp format
  • Rename trace_send_message_to_XXX to trace trace_message_XXX
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/combiner_ordered.c

    r62b3c4e r6a6e6a8  
    4545                        live_count++;
    4646                        live[i] = true;
    47                         key[i] = libtrace_result_get_key(&r);
     47                        key[i] = r.key;
    4848                        if (i==0 || min_key > key[i]) {
    4949                                min_key = key[i];
     
    7272                {
    7373                        libtrace_deque_peek_front(&queues[min_queue], (void *) &r);
    74                         key[min_queue] = libtrace_result_get_key(&r);
     74                        key[min_queue] = r.key;
    7575                        if (key[min_queue] <= min_key) {
    7676                                // We are still the smallest, might be out of order though :(
     
    131131
    132132DLLEXPORT const libtrace_combine_t combiner_ordered = {
    133     init_combiner,      /* initialise */
     133        init_combiner,  /* initialise */
    134134        destroy,                /* destroy */
    135135        publish,                /* publish */
    136     read,                       /* read */
    137     read_final,         /* read_final */
    138     pause,                      /* pause */
    139     NULL,                       /* queues */
    140     {0}                         /* opts */
     136        read,                   /* read */
     137        read_final,             /* read_final */
     138        pause,                  /* pause */
     139        NULL,                   /* queues */
     140        {0}                             /* opts */
    141141};
Note: See TracChangeset for help on using the changeset viewer.