Changeset 62b3c4e for tools

Timestamp:

03/05/15 15:44:30 (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:

ab3fa18

Parents:

b023181

Message:

Update the reporter method to match with the per_pkt method.

We now treat a result as a type of message.

Location:

tools

Files:

• traceanon/traceanon_parallel.c (modified) (2 diffs)
• tracertstats/tracertstats_parallel.c (modified) (3 diffs)
• tracestats/tracestats_parallel.c (modified) (3 diffs)

tools/traceanon/traceanon_parallel.c

@@ -208 +208 @@
 struct libtrace_out_t *writer = 0;
 
-static void write_out(libtrace_t *trace, libtrace_result_t *result, UNUSED libtrace_message_t *mesg) {
+static void write_out(libtrace_t *trace UNUSED, int mesg,
+                      libtrace_generic_t data,
+                      libtrace_thread_t *sender UNUSED) {
         static uint64_t packet_count = 0; // TESTING PURPOSES, this is not going to work with a live format
 
-        if (result) {
-                if (result->type == RESULT_PACKET) {
-                        libtrace_packet_t *packet = (libtrace_packet_t*) libtrace_result_get_value(result).pkt;
-                        assert(libtrace_result_get_key(result) == packet_count++);
+        switch (mesg) {
+        case MESSAGE_RESULT:
+                if (data.res->type == RESULT_PACKET) {
+                        libtrace_packet_t *packet = (libtrace_packet_t*) libtrace_result_get_value(data.res).pkt;
+                        assert(libtrace_result_get_key(data.res) == packet_count++);
                         if (trace_write_packet(writer,packet)==-1) {
                                 trace_perror_output(writer,"writer");
@@ -222 +225 @@
 
                 } else {
-                        assert(result->type == RESULT_TICK);
+                        assert(data.res->type == RESULT_TICK);
                         // Ignore it
                 }

tools/tracertstats/tracertstats_parallel.c

@@ -138 +138 @@
 
 static uint64_t last_ts = 0;
-static void process_result(libtrace_t *trace UNUSED, libtrace_result_t *result, libtrace_message_t *mesg UNUSED)  {
+static void process_result(libtrace_t *trace UNUSED, int mesg,
+                           libtrace_generic_t data,
+                           libtrace_thread_t *sender UNUSED) {
         static uint64_t ts = 0;
-
-        if (result) {
-                int j;
-                result_t *res;
-                ts = libtrace_result_get_key(result);
-                res = libtrace_result_get_value(result).ptr;
+        int j;
+        result_t *res;
+
+        switch (mesg) {
+                case MESSAGE_RESULT:
+                ts = libtrace_result_get_key(data.res);
+                res = libtrace_result_get_value(data.res).ptr;
                 if (last_ts == 0)
                         last_ts = ts;
@@ -274 +277 @@
                 return;
 
-        trace = trace_create(uri);
+        trace = trace_create(uri);
         if (trace_is_err(trace)) {
                 trace_perror(trace,"trace_create");
@@ -291 +294 @@
         }*/
         int i = 1;
-        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_types_t){0});
+        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_t){0});
         /* trace_parallel_config(trace, TRACE_OPTION_TRACETIME, &i); */
         //trace_set_hasher(trace, HASHER_CUSTOM, &bad_hash, NULL);

tools/tracestats/tracestats_parallel.c

@@ -105 +105 @@
 static void* per_packet(libtrace_t *trace, libtrace_thread_t *t,
                         int mesg, libtrace_generic_t data,
-                        libtrace_thread_t *sender)
+                        libtrace_thread_t *sender UNUSED)
 {
         // Using first entry as total and those after for filter counts
@@ -158 +158 @@
 }
 
-static void report_result(libtrace_t *trace UNUSED, libtrace_result_t *result, libtrace_message_t *mesg) {
+static void report_result(libtrace_t *trace UNUSED, int mesg,
+                          libtrace_generic_t data,
+                          libtrace_thread_t *sender UNUSED) {
         static uint64_t count=0, bytes=0;
-        uint64_t packets;
         int i;
-        if (result) {
-                int j;
+        libtrace_stat_t *stats;
+
+        switch (mesg) {
+        case MESSAGE_RESULT:
                 /* 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).ptr;
+                assert(libtrace_result_get_key(data.res) == 0);
+                statistics_t * res = libtrace_result_get_value(data.res).ptr;
                 count += res[0].count;
                 bytes += res[0].bytes;
-                for (j = 0; j < filter_count; j++) {
-                        filters[j].count += res[j+1].count;
-                        filters[j].bytes += res[j+1].bytes;
+                for (i = 0; i < filter_count; i++) {
+                        filters[i].count += res[i+1].count;
+                        filters[i].bytes += res[i+1].bytes;
                 }
                 free(res);
-        } else switch (mesg->code) {
-                libtrace_stat_t *stats;
-                case MESSAGE_STOPPING:
-                        stats = trace_get_statistics(trace, NULL);
-                        printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
-                        for(i=0;i<filter_count;++i) {
-                                printf("%30s:\t%12"PRIu64"\t%12"PRIu64"\t%7.03f\n",filters[i].expr,filters[i].count,filters[i].bytes,filters[i].count*100.0/count);
-                                filters[i].bytes=0;
-                                filters[i].count=0;
-                        }
-                        if (stats->received_valid)
-                                fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Input packets", stats->received);
-                        if (stats->filtered_valid)
-                                fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Filtered packets", stats->filtered);
-                        if (stats->dropped_valid)
-                                fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Dropped packets",stats->dropped);
-                        if (stats->accepted_valid)
-                                fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
-                                                "Accepted packets", stats->accepted);
-                        if (stats->errors_valid)
-                                fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
-                                                "Erred packets", stats->errors);
-                        printf("%30s:\t%12"PRIu64"\t%12" PRIu64 "\n","Total",count,bytes);
-                        totcount+=count;
-                        totbytes+=bytes;
-        }
-}
-
-static uint64_t rand_hash(libtrace_packet_t * pkt, void *data) {
+                break;
+        case MESSAGE_STOPPING:
+                stats = trace_get_statistics(trace, NULL);
+                printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
+                for(i=0;i<filter_count;++i) {
+                        printf("%30s:\t%12"PRIu64"\t%12"PRIu64"\t%7.03f\n",filters[i].expr,filters[i].count,filters[i].bytes,filters[i].count*100.0/count);
+                        filters[i].bytes=0;
+                        filters[i].count=0;
+                }
+                if (stats->received_valid)
+                        fprintf(stderr,"%30s:\t%12" PRIu64"\n",
+                                "Input packets", stats->received);
+                if (stats->filtered_valid)
+                        fprintf(stderr,"%30s:\t%12" PRIu64"\n",
+                                "Filtered packets", stats->filtered);
+                if (stats->dropped_valid)
+                        fprintf(stderr,"%30s:\t%12" PRIu64"\n",
+                                "Dropped packets",stats->dropped);
+                if (stats->accepted_valid)
+                        fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
+                                "Accepted packets", stats->accepted);
+                if (stats->errors_valid)
+                        fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
+                                "Erred packets", stats->errors);
+                printf("%30s:\t%12"PRIu64"\t%12" PRIu64 "\n","Total",count,bytes);
+                totcount+=count;
+                totbytes+=bytes;
+        }
+}
+
+static uint64_t rand_hash(libtrace_packet_t * pkt UNUSED, void *data UNUSED) {
         return rand();
 }
 
-static uint64_t bad_hash(libtrace_packet_t * pkt, void *data) {
+static uint64_t bad_hash(libtrace_packet_t * pkt UNUSED, void *data UNUSED) {
         return 0;
 }
@@ -234 +236 @@
         //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
         trace_parallel_config(trace, TRACE_OPTION_SET_CONFIG, &uc);
-        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_types_t){0});
+        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_t){0});
 
         //trace_parallel_config(trace, TRACE_OPTION_SET_MAPPER_BUFFER_SIZE, &option);