Changeset d994324 for lib/trace.c


Ignore:
Timestamp:
09/17/14 13:45:29 (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:
9e429e8
Parents:
2498008
Message:

Remove anything to do with the combiner from set configuration and removes any options/storage related to these such as the next expected packet.

Instead this is done using trace_set_combiner now, and the for the built-in combiners.h header. This is a lot more flexible and allows the users to specify there own combiner, and any number of options for it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/trace.c

    r2498008 rd994324  
    265265        libtrace->state = STATE_NEW;
    266266        libtrace->perpkt_queue_full = false;
    267         libtrace->reporter_flags = 0;
    268267        libtrace->global_blob = NULL;
    269268        libtrace->per_pkt = NULL;
    270269        libtrace->reporter = NULL;
    271270        libtrace->hasher = NULL;
    272         libtrace->expected_key = 0;
    273271        libtrace_zero_ocache(&libtrace->packet_freelist);
    274272        libtrace_zero_thread(&libtrace->hasher_thread);
     
    386384        libtrace->state = STATE_NEW; // TODO MAYBE DEAD
    387385        libtrace->perpkt_queue_full = false;
    388         libtrace->reporter_flags = 0;
    389386        libtrace->global_blob = NULL;
    390387        libtrace->per_pkt = NULL;
    391388        libtrace->reporter = NULL;
    392389        libtrace->hasher = NULL;
    393         libtrace->expected_key = 0;
    394390        libtrace_zero_ocache(&libtrace->packet_freelist);
    395391        libtrace_zero_thread(&libtrace->hasher_thread);
     
    741737        dest->buf_control=TRACE_CTRL_PACKET;
    742738        dest->order = packet->order;
     739        dest->hash = packet->hash;
     740        dest->error = packet->error;
    743741        /* Reset the cache - better to recalculate than try to convert
    744742         * the values over to the new packet */
Note: See TracChangeset for help on using the changeset viewer.