Changeset 76291d1 for tools/tracestats/tracestats_parallel.c

Timestamp:

03/31/15 16:02:53 (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:

4007dbb

Parents:

58bfabf

Message:

Add a quick mockup of shanes interface using functions for each message

I.e. set a function for MESSAGE_PACKET etc. which only receives packets.

Ported tracestats_parallel to use this interface.

Note it is not yet complete, however should give a feel of how it will work.
And provide a good work around to the thread issues on older machines.

File:

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

tools/tracestats/tracestats_parallel.c

@@ -87 +87 @@
 
 
-static void* per_packet(libtrace_t *trace, libtrace_thread_t *t,
-                        int mesg, libtrace_generic_t data,
+static void* per_packet(libtrace_t *trace UNUSED, libtrace_thread_t *t UNUSED,
+                        int mesg UNUSED, libtrace_generic_t data UNUSED,
                         libtrace_thread_t *sender UNUSED)
 {
-        /* Using first entry as total and those after for filter counts */
-        static __thread statistics_t * results = NULL;
-        int i, wlen;
-        libtrace_stat_t *stats;
-        libtrace_generic_t gen;
-
-        switch (mesg) {
-        case MESSAGE_PACKET:
-                /* Apply filters to every packet note the result */
-                wlen = trace_get_wire_length(data.pkt);
-                for(i=0;i<filter_count;++i) {
-                        if (filters[i].filter == NULL)
-                                continue;
-                        if(trace_apply_filter(filters[i].filter,data.pkt) > 0) {
-                                results[i+1].count++;
-                                results[i+1].bytes+=wlen;
-                        }
-                        if (trace_is_err(trace)) {
-                                trace_perror(trace, "trace_apply_filter");
-                                fprintf(stderr, "Removing filter from filterlist\n");
-                                /* This is a race, but will be atomic */
-                                filters[i].filter = NULL;
-                        }
-                }
-                results[0].count++;
-                results[0].bytes +=wlen;
-                return data.pkt;
-        case MESSAGE_STARTING:
-                /* Allocate space to hold a total count and one for each filter */
-                results = calloc(1, sizeof(statistics_t) * (filter_count + 1));
-                break;
-        case MESSAGE_STOPPING:
-                /* We only output one result per thread with the key 0 when the
-                 * trace is over. */
-                gen.ptr = results;
-                trace_publish_result(trace, t, 0, gen, RESULT_USER);
-                break;
-        default:
-                break;
-        }
         return NULL;
 }
@@ -184 +144 @@
 }
 
+
+static void* fn_starting(libtrace_t *trace UNUSED, libtrace_thread_t *t,
+                     libtrace_generic_t data UNUSED, void *global UNUSED, void*tls 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) {
+        statistics_t *results = tls;
+        libtrace_generic_t gen;
+        /* We only output one result per thread with the key 0 when the
+         * trace is over. */
+        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) {
+        statistics_t *results = tls;
+        int i, wlen;
+
+        /* Apply filters to every packet note the result */
+        wlen = trace_get_wire_length(data.pkt);
+        for(i=0;i<filter_count;++i) {
+                if (filters[i].filter == NULL)
+                        continue;
+                if(trace_apply_filter(filters[i].filter,data.pkt) > 0) {
+                        results[i+1].count++;
+                        results[i+1].bytes+=wlen;
+                }
+                if (trace_is_err(trace)) {
+                        trace_perror(trace, "trace_apply_filter");
+                        fprintf(stderr, "Removing filter from filterlist\n");
+                        /* This is a race, but will be atomic */
+                        filters[i].filter = NULL;
+                }
+        }
+        results[0].count++;
+        results[0].bytes +=wlen;
+        return data.pkt;
+}
+
 /* Process a trace, counting packets that match filter(s) */
 static void run_trace(char *uri, char *config, char *config_file)
@@ -212 +219 @@
                 }
         }
+
+        trace_set_handler(trace, MESSAGE_PACKET, fn_packet);
+        trace_set_handler(trace, MESSAGE_STARTING, fn_starting);
+        trace_set_handler(trace, MESSAGE_STOPPING, fn_stopping);
 
         /* Start the trace as a parallel trace */