Changeset f625817 for tools

Timestamp:

09/11/15 15:00:27 (5 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.

Location:

tools

Files:

• tracertstats/tracertstats.c (modified) (5 diffs)
• tracestats/Makefile.am (modified) (2 diffs)

tools/tracertstats/tracertstats.c

@@ -130 +130 @@
 
 static uint64_t glob_last_ts = 0;
-static void process_result(libtrace_t *trace, int mesg,
-                           libtrace_generic_t data,
-                           libtrace_thread_t *sender UNUSED) {
+static void cb_result(libtrace_t *trace, libtrace_thread_t *sender UNUSED,
+                void *global UNUSED, void *tls UNUSED,
+                libtrace_result_t *result) {
         uint64_t ts = 0;
         static bool stopped = false;
@@ -142 +142 @@
                 return;
 
-        switch (mesg) {
-                case MESSAGE_RESULT:
-                ts = data.res->key;
-                res = data.res->value.ptr;
-                if (glob_last_ts == 0)
-                        glob_last_ts = ts;
-                while ((glob_last_ts >> 32) < (ts >> 32)) {
-                        report_results(glob_last_ts >> 32, count, bytes);
-                        count = 0;
-                        bytes = 0;
-                        for (j = 0; j < filter_count; j++)
-                                filters[j].count = filters[j].bytes = 0;
-                        glob_last_ts = ts;
-                }
-                count += res->total.count;
-                packets_seen += res->total.count;
-                bytes += res->total.bytes;
-                for (j = 0; j < filter_count; j++) {
-                        filters[j].count += res->filters[j].count;
-                        filters[j].bytes += res->filters[j].bytes;
-                }
-                free(res);
-        }
+        ts = result->key;
+        res = result->value.ptr;
+        if (glob_last_ts == 0)
+                glob_last_ts = ts;
+        while ((glob_last_ts >> 32) < (ts >> 32)) {
+                report_results(glob_last_ts >> 32, count, bytes);
+                count = 0;
+                bytes = 0;
+                for (j = 0; j < filter_count; j++)
+                        filters[j].count = filters[j].bytes = 0;
+                glob_last_ts = ts;
+        }
+        count += res->total.count;
+        packets_seen += res->total.count;
+        bytes += res->total.bytes;
+        for (j = 0; j < filter_count; j++) {
+                filters[j].count += res->filters[j].count;
+                filters[j].bytes += res->filters[j].bytes;
+        }
+        free(res);
 
         /* Be careful to only call pstop once from within this thread! */
@@ -246 +243 @@
 {
         libtrace_t *trace = NULL;
-        if (!merge_inputs) 
+        libtrace_callback_set_t *pktcbs, *repcbs;
+
+        if (!merge_inputs) 
                 create_output(uri);
 
@@ -268 +267 @@
         }
 
-        trace_cb_starting(trace, cb_starting);
-        trace_cb_stopping(trace, cb_stopping);
-        trace_cb_packet(trace, cb_packet);
-        trace_cb_tick_count(trace, cb_tick);
-        trace_cb_tick_interval(trace, cb_tick);
-
-        if (trace_pstart(trace, NULL, NULL, process_result)==-1) {
+        pktcbs = trace_create_callback_set();
+        trace_set_starting_cb(pktcbs, cb_starting);
+        trace_set_stopping_cb(pktcbs, cb_stopping);
+        trace_set_packet_cb(pktcbs, cb_packet);
+        trace_set_tick_count_cb(pktcbs, cb_tick);
+        trace_set_tick_interval_cb(pktcbs, cb_tick);
+
+        repcbs = trace_create_callback_set();
+        trace_set_result_cb(repcbs, cb_result);
+
+        if (trace_pstart(trace, NULL, pktcbs, repcbs)==-1) {
                 trace_perror(trace,"Failed to start trace");
                 trace_destroy(trace);
+                trace_destroy_callback_set(pktcbs);
+                trace_destroy_callback_set(repcbs);
                 if (!merge_inputs)
                         output_destroy(output);
@@ -292 +297 @@
 
         trace_destroy(trace);
+        trace_destroy_callback_set(pktcbs);
+        trace_destroy_callback_set(repcbs);
 
         if (!merge_inputs)

tools/tracestats/Makefile.am

@@ -1 @@
-bin_PROGRAMS = tracestats tracestats_parallel
+bin_PROGRAMS = tracestats
 bin_SCRIPTS = tracesummary
 
@@ -7 +7 @@
 include ../Makefile.tools
 tracestats_SOURCES = tracestats.c
-tracestats_parallel_SOURCES = tracestats_parallel.c