Changeset d994324 for tools/tracestats

Timestamp:

09/17/14 13:45:29 (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:

9e429e8

Parents:

2498008

Message:

Remove anything to do with the combiner from set configuration and removes any options/storage related to these such as the next expected packet.

Instead this is done using trace_set_combiner now, and the for the built-in combiners.h header. This is a lot more flexible and allows the users to specify there own combiner, and any number of options for it.

File:

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

tools/tracestats/tracestats_parallel.c

@@ -57 +57 @@
 #include "data-struct/vector.h"
 #include "data-struct/message_queue.h"
+#include "combiners.h"
 #include <pthread.h>
 
@@ -130 +131 @@
                 switch (mesg->code) {
                         case MESSAGE_STOPPING:
-                                trace_publish_result(trace, t, 0, results, RESULT_NORMAL); // Only ever using a single key 0
+                                trace_publish_result(trace, t, 0, (libtrace_generic_types_t){.ptr = results}, RESULT_NORMAL); // Only ever using a single key 0
                                 fprintf(stderr, "Thread published resuslts WOWW\n");
                                 break;
@@ -158 +159 @@
                 /* Get the results from each core and sum 'em up */
                 assert(libtrace_result_get_key(result) == 0);
-                statistics_t * res = libtrace_result_get_value(result);
+                statistics_t * res = libtrace_result_get_value(result).ptr;
                 count += res[0].count;
                 bytes += res[0].bytes;
@@ -223 +224 @@
         //option = 10000;
     //trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
-        option = 2;
         //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
         trace_parallel_config(trace, TRACE_OPTION_SET_CONFIG, &uc);
-        trace_parallel_config(trace, TRACE_OPTION_ORDERED, &uc);
+        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_types_t){0});
 
         //trace_parallel_config(trace, TRACE_OPTION_SET_MAPPER_BUFFER_SIZE, &option);