Changeset f051c1b for tools/tracertstats/tracertstats_parallel.c

Timestamp:

08/12/14 14:14:50 (8 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:

0862c20

Parents:

f9a70ca

Message:

Tidies up the state messages received, now all states are passed through created->resumed->paused->stopped this might simplify some code. Removed the extra paused state.
Hooks up the reporter method through trace_pstart, hopefully resulting in simpler code most of the time. Also renames this from reducer to reporter anywhere it was not already. Adds a test for this also.
Removes is_packet from a result in favour of a more generic type, with packet being one of these.
Moves configuration for tuning relelated settings into a single structure.

File:

• tools/tracertstats/tracertstats_parallel.c (modified) (3 diffs)

tools/tracertstats/tracertstats_parallel.c

@@ -209 +209 @@
                         // Publish and make a new one new
                         //fprintf(stderr, "Publishing result %"PRIu64"\n", last_ts);
-                        trace_publish_result(trace, (uint64_t) last_ts, results);
-                        trace_post_reduce(trace);
+                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                        trace_post_reporter(trace);
                         results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
                         last_ts++;
@@ -234 +234 @@
                 // printf ("%d.%06d READ #%"PRIu64"\n", tv.tv_sec, tv.tv_usec, trace_packet_get(packet));
                 switch (mesg->code) {
-                        case MESSAGE_STARTED:
+                        case MESSAGE_STARTING:
                                 results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
                                 break;
-                        case MESSAGE_STOPPED:
+                        case MESSAGE_STOPPING:
                                 // Should we always post this?
                                 if (results->total.count) {
-                                        trace_publish_result(trace, (uint64_t) last_ts, results);
-                                        trace_post_reduce(trace);
+                                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                                        trace_post_reporter(trace);
                                         results = NULL;
                                 }
@@ -260 +260 @@
                                         if (next_update_time <= mesg->additional.uint64) {
                                                 //fprintf(stderr, "Got a tick and publishing early!!\n");
-                                                trace_publish_result(trace, (uint64_t) last_ts, results);
-                                                trace_post_reduce(trace);
+                                                trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
+                                                trace_post_reporter(trace);
                                                 results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
                                                 last_ts++;