Changeset 0862c20 for lib/libtrace_int.h


Ignore:
Timestamp:
08/12/14 15:22:24 (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:
957a72a
Parents:
7e4e9b8 (diff), f051c1b (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 'develop' of https://github.com/rsanger/libtrace into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace_int.h

    rbe3f75b rf051c1b  
    177177        THREAD_HASHER,
    178178        THREAD_PERPKT,
    179         THREAD_REDUCER,
     179        THREAD_REPORTER,
    180180        THREAD_KEEPALIVE
    181181};
     
    307307        /** For the sliding window hasher implementation */
    308308        pthread_rwlock_t window_lock;
    309         /** Set once trace_join has been called */
    310         bool joined;
    311309        /** Set to indicate a perpkt's queue is full as such the writing perpkt cannot proceed */
    312310        bool perpkt_queue_full;
    313311        /** Global storage for this trace, shared among all the threads  */
    314312        void* global_blob;
    315         /** Requested size of the pkt buffer (currently only used if using dedicated hasher thread) */
    316         int packet_freelist_size;
    317313        /** The actual freelist */
    318314        libtrace_ocache_t packet_freelist;
    319         /** The number of packets that can queue per thread - XXX consider deadlocks with non malloc()'d packets that need to be released */
    320         int perpkt_buffer_size;
    321         /** The reducer flags */
    322         int reducer_flags;
    323         /** The tick interval - in milliseconds (0 or -ve==disabled) */
    324         int tick_interval;
     315        /** The reporter flags */
     316        int reporter_flags;
    325317        /** Used to track the next expected key */
    326318        uint64_t expected_key;
    327319        /** User defined per_pkt function called when a pkt is ready */
    328320        fn_per_pkt per_pkt;
    329         /** User defined reducer function entry point XXX not hooked up */
    330         fn_reducer reducer;
     321        /** User defined reporter function entry point XXX not hooked up */
     322        fn_reporter reporter;
    331323        /** The hasher function */
    332324        enum hasher_types hasher_type;
     
    336328       
    337329        libtrace_thread_t hasher_thread;
    338         libtrace_thread_t reducer_thread;
     330        libtrace_thread_t reporter_thread;
    339331        libtrace_thread_t keepalive_thread;
    340332        int perpkt_thread_count;
     
    351343         */
    352344        uint64_t dropped_packets;
    353         uint64_t received_packets;
     345        uint64_t received_packets;
     346        struct user_configuration config;
    354347};
    355348
Note: See TracChangeset for help on using the changeset viewer.