Changeset 4007dbb for tools/tracestats

Timestamp:

08/21/15 11:22:30 (6 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:

eea427f

Parents:

76291d1

Message:

Updates the new interface to be more complete

This should work around any issues with systems without thread support.
This still remains compatible with existing code.
Examples/tools/tests still need to be updated to make use of the new interface.
And tests also need to be updated.
Adds debug memory stats as an option to configure.

File:

• tools/tracestats/tracestats_parallel.c (modified) (4 diffs)

tools/tracestats/tracestats_parallel.c

@@ -145 +145 @@
 
 
-static void* fn_starting(libtrace_t *trace UNUSED, libtrace_thread_t *t,
-                     libtrace_generic_t data UNUSED, void *global UNUSED, void*tls UNUSED) {
+static void* fn_starting(libtrace_t *trace UNUSED, libtrace_thread_t *t UNUSED, void *global UNUSED) {
         /* Allocate space to hold a total count and one for each filter */
-        statistics_t *results = calloc(1, sizeof(statistics_t) * (filter_count + 1));
-        trace_set_tls(t, results);
-        return NULL;
-}
-
-
-static void* fn_stopping(libtrace_t *trace, libtrace_thread_t *t UNUSED,
-                     libtrace_generic_t data UNUSED, void *global UNUSED, void*tls) {
+        return calloc(1, sizeof(statistics_t) * (filter_count + 1));
+}
+
+
+static void fn_stopping(libtrace_t *trace, libtrace_thread_t *t UNUSED,
+                        void *global UNUSED, void*tls) {
         statistics_t *results = tls;
         libtrace_generic_t gen;
@@ -162 +159 @@
         gen.ptr = results;
         trace_publish_result(trace, t, 0, gen, RESULT_USER);
-        return NULL;
-}
-
-static void* fn_packet(libtrace_t *trace, libtrace_thread_t *t UNUSED,
-                   libtrace_generic_t data, void *global UNUSED, void*tls) {
+}
+
+static libtrace_packet_t* fn_packet(libtrace_t *trace, libtrace_thread_t *t UNUSED,
+                   void *global UNUSED, void*tls, libtrace_packet_t *pkt) {
         statistics_t *results = tls;
         int i, wlen;
 
         /* Apply filters to every packet note the result */
-        wlen = trace_get_wire_length(data.pkt);
+        wlen = trace_get_wire_length(pkt);
         for(i=0;i<filter_count;++i) {
                 if (filters[i].filter == NULL)
                         continue;
-                if(trace_apply_filter(filters[i].filter,data.pkt) > 0) {
+                if(trace_apply_filter(filters[i].filter,pkt) > 0) {
                         results[i+1].count++;
                         results[i+1].bytes+=wlen;
@@ -188 +184 @@
         results[0].count++;
         results[0].bytes +=wlen;
-        return data.pkt;
+        return pkt;
 }
 
@@ -220 +216 @@
         }
 
-        trace_set_handler(trace, MESSAGE_PACKET, fn_packet);
-        trace_set_handler(trace, MESSAGE_STARTING, fn_starting);
-        trace_set_handler(trace, MESSAGE_STOPPING, fn_stopping);
+        trace_cb_packet(trace, fn_packet);
+        trace_cb_starting(trace, fn_starting);
+        trace_cb_stopping(trace, fn_stopping);
 
         /* Start the trace as a parallel trace */