Changeset d994324 for tools

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.

Location:

tools

Files:

• traceanon/traceanon_parallel.c (modified) (7 diffs)
• tracertstats/tracertstats_parallel.c (modified) (7 diffs)
• tracestats/tracestats_parallel.c (modified) (4 diffs)

tools/traceanon/traceanon_parallel.c

@@ -1 +1 @@
 #define _GNU_SOURCE
 #include "libtrace.h"
+#include "data-struct/vector.h"
+#include "data-struct/message_queue.h"
+#include "combiners.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -11 +14 @@
 #include <assert.h>
 #include "ipenc.h"
-#include <data-struct/vector.h>
-#include <data-struct/message_queue.h>
 #include <signal.h>
 
@@ -155 +156 @@
 static void* per_packet(libtrace_t *trace, libtrace_packet_t *pkt, libtrace_message_t *mesg, UNUSED libtrace_thread_t *t)
 {
-        
         if (pkt) {
                 struct libtrace_ip *ipptr;
@@ -190 +190 @@
                 //libtrace_packet_t * packet_copy = trace_result_packet(trace, pkt);
                 //trace_publish_result(trace, trace_packet_get_order(pkt), pkt);
-                trace_publish_result(trace, t, trace_packet_get_order(pkt), pkt, RESULT_PACKET);
+
+                trace_publish_result(trace, t, trace_packet_get_order(pkt), (libtrace_generic_types_t){.pkt=pkt}, RESULT_PACKET);
                 //return ;
         }
@@ -200 +201 @@
                         break;
                         case MESSAGE_TICK:
-                                trace_publish_result(trace, t, mesg->additional.uint64, NULL, RESULT_TICK);
+                                trace_publish_result(trace, t, mesg->additional.uint64, (libtrace_generic_types_t){.pkt=NULL}, RESULT_TICK);
                 }
         }
@@ -213 +214 @@
         if (result) {
                 if (result->type == RESULT_PACKET) {
-                        libtrace_packet_t *packet = (libtrace_packet_t*) libtrace_result_get_value(result);
+                        libtrace_packet_t *packet = (libtrace_packet_t*) libtrace_result_get_value(result).pkt;
                         assert(libtrace_result_get_key(result) == packet_count++);
                         if (trace_write_packet(writer,packet)==-1) {
@@ -422 +423 @@
          
         int i = 1;
-        trace_parallel_config(trace, TRACE_OPTION_ORDERED, &i);
+        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_types_t){0});
         trace_parallel_config(trace, TRACE_OPTION_SET_CONFIG, &uc);
+
         //trace_set_hasher(trace, HASHER_CUSTOM, rand_hash, NULL);
         

tools/tracertstats/tracertstats_parallel.c

@@ -59 +59 @@
 #include "data-struct/vector.h"
 #include "data-struct/message_queue.h"
+#include "combiners.h"
 
 #ifndef UINT32_MAX
@@ -144 +145 @@
                 result_t *res;
                 ts = libtrace_result_get_key(result);
-                res = libtrace_result_get_value(result);
+                res = libtrace_result_get_value(result).ptr;
                 if (last_ts == 0)
                         last_ts = ts;
@@ -177 +178 @@
         static __thread uint64_t last_ts = 0, ts = 0;
         static __thread result_t * results = NULL;
-        
         // Unsure when we would hit this case but the old code had it, I 
         // guess we should keep it
@@ -189 +189 @@
                         // Publish and make a new one new
                         //fprintf(stderr, "Publishing result %"PRIu64"\n", last_ts);
-                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                        trace_publish_result(trace, t, (uint64_t) last_ts, (libtrace_generic_types_t){.ptr = results}, RESULT_NORMAL);
                         trace_post_reporter(trace);
                         results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
@@ -220 +220 @@
                                 // Should we always post this?
                                 if (results->total.count) {
-                                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                                        trace_publish_result(trace, t, (uint64_t) last_ts, (libtrace_generic_types_t){.ptr = results}, RESULT_NORMAL);
                                         trace_post_reporter(trace);
                                         results = NULL;
@@ -240 +240 @@
                                         if (next_update_time <= mesg->additional.uint64) {
                                                 //fprintf(stderr, "Got a tick and publishing early!!\n");
-                                                trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                                                trace_publish_result(trace, t, (uint64_t) last_ts, (libtrace_generic_types_t){.ptr = NULL}, RESULT_NORMAL);
                                                 trace_post_reporter(trace);
                                                 results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
@@ -288 +288 @@
         }*/
         int i = 1;
-        trace_parallel_config(trace, TRACE_OPTION_ORDERED, &i);
+        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_types_t){0});
         /* trace_parallel_config(trace, TRACE_OPTION_TRACETIME, &i); */
         //trace_set_hasher(trace, HASHER_CUSTOM, &bad_hash, NULL);

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);