Changeset f051c1b for lib/libtrace_int.h

Timestamp:

08/12/14 14:14:50 (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:

0862c20

Parents:

f9a70ca

Message:

Tidies up the state messages received, now all states are passed through created->resumed->paused->stopped this might simplify some code. Removed the extra paused state.
Hooks up the reporter method through trace_pstart, hopefully resulting in simpler code most of the time. Also renames this from reducer to reporter anywhere it was not already. Adds a test for this also.
Removes is_packet from a result in favour of a more generic type, with packet being one of these.
Moves configuration for tuning relelated settings into a single structure.

File:

• lib/libtrace_int.h (modified) (4 diffs)

lib/libtrace_int.h

@@ -177 +177 @@
         THREAD_HASHER,
         THREAD_PERPKT,
-        THREAD_REDUCER,
+        THREAD_REPORTER,
         THREAD_KEEPALIVE
 };
@@ -307 +307 @@
         /** For the sliding window hasher implementation */
         pthread_rwlock_t window_lock;
-        /** Set once trace_join has been called */
-        bool joined;
         /** Set to indicate a perpkt's queue is full as such the writing perpkt cannot proceed */
         bool perpkt_queue_full;
         /** Global storage for this trace, shared among all the threads  */
         void* global_blob;
-        /** Requested size of the pkt buffer (currently only used if using dedicated hasher thread) */
-        int packet_freelist_size;
         /** The actual freelist */
         libtrace_ocache_t packet_freelist;
-        /** The number of packets that can queue per thread - XXX consider deadlocks with non malloc()'d packets that need to be released */
-        int perpkt_buffer_size;
-        /** The reducer flags */
-        int reducer_flags;
-        /** The tick interval - in milliseconds (0 or -ve==disabled) */
-        int tick_interval;
+        /** The reporter flags */
+        int reporter_flags;
         /** Used to track the next expected key */
         uint64_t expected_key;
         /** User defined per_pkt function called when a pkt is ready */
         fn_per_pkt per_pkt;
-        /** User defined reducer function entry point XXX not hooked up */
-        fn_reducer reducer;
+        /** User defined reporter function entry point XXX not hooked up */
+        fn_reporter reporter;
         /** The hasher function */
         enum hasher_types hasher_type;
@@ -336 +328 @@
         
         libtrace_thread_t hasher_thread;
-        libtrace_thread_t reducer_thread;
+        libtrace_thread_t reporter_thread;
         libtrace_thread_t keepalive_thread;
         int perpkt_thread_count;
@@ -351 +343 @@
          */
         uint64_t dropped_packets;
-        uint64_t received_packets; 
+        uint64_t received_packets;
+        struct user_configuration config;
 };