Changeset f625817 for lib/libtrace_int.h

Timestamp:

09/11/15 15:00:27 (6 years ago)

Author:

Shane Alcock <salcock@…>

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:

322c516

Parents:

8c7490fe

Message:

Reworked callback API and removed old per_msg and reporter functions

Updated tracertstats to use the new callback API.

Extended the callback approach to the reporter thread as well as the per
packet threads.

Added libtrace_callback_set_t structure, which is used to register the
user callback functions.

Added callback functionality for MESSAGE_RESULT (needed now that reporter
threads also do callbacks) and MESSAGE_USER (for user-defined messages). The
MESSAGE_USER callback is essentially the same as the old per_msg function
style.

Updated combiners to use send_message to pass results to the reporter thread.
send_message itself is now no longer static, so that combiners can use it.

Disabled building of tracestats_parallel as it was using the older version
of the callback API. Will update in a future commit.

File:

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

lib/libtrace_int.h

@@ -284 +284 @@
 };
 #define ZERO_USER_CONFIG(config) memset(&config, 0, sizeof(struct user_configuration));
+
+struct callback_set {
+
+        fn_cb_starting message_starting;
+        fn_cb_dataless message_stopping;
+        fn_cb_dataless message_resuming;
+        fn_cb_dataless message_pausing;
+        fn_cb_packet message_packet;
+        fn_cb_result message_result;
+        fn_cb_first_packet message_first_packet;
+        fn_cb_tick message_tick_count;
+        fn_cb_tick message_tick_interval;
+        fn_cb_usermessage message_user;
+};
 
 /** A libtrace input trace 
@@ -333 +347 @@
         /** The actual freelist */
         libtrace_ocache_t packet_freelist;
-        /** User defined per_msg function called when a message is ready */
-        fn_cb_msg per_msg;
-        /** User defined reporter function entry point */
-        fn_reporter reporter;
         /** The hasher function */
         enum hasher_types hasher_type;
@@ -361 +371 @@
         struct user_configuration config;
         libtrace_combine_t combiner;
-        struct {
-                fn_cb_starting message_starting;
-                fn_cb_dataless message_stopping;
-                fn_cb_dataless message_resuming;
-                fn_cb_dataless message_pausing;
-                fn_cb_packet message_packet;
-                fn_cb_first_packet message_first_packet;
-                fn_cb_tick message_tick_count;
-                fn_cb_tick message_tick_interval;
-        } callbacks;
+        
+        /* Set of callbacks to be executed by per packet threads in response
+         * to various messages. */
+        struct callback_set *perpkt_cbs;
+        /* Set of callbacks to be executed by the reporter thread in response
+         * to various messages. */
+        struct callback_set *reporter_cbs;
 };
 
@@ -380 +387 @@
 libtrace_thread_t * get_thread_table(libtrace_t *libtrace);
 
+
+void send_message(libtrace_t *trace, libtrace_thread_t *target,
+                const enum libtrace_messages type,
+                libtrace_generic_t data, libtrace_thread_t *sender);
 
 /** A libtrace output trace