Changeset f051c1b for tools/tracestats/tracestats_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/tracestats/tracestats_parallel.c (modified) (5 diffs)

tools/tracestats/tracestats_parallel.c

@@ -67 +67 @@
         // trace_interrupt();
         // trace_pstop isn't really signal safe because its got lots of locks in it
-        // trace_pstop(trace);
-        if (s == 0) {
+    trace_pstop(trace);
+    /*if (s == 0) {
                 if (trace_ppause(trace) == -1)
                         trace_perror(trace, "Pause failed");
@@ -75 +75 @@
                 if (trace_pstart(trace, NULL, NULL, NULL) == -1)
                         trace_perror(trace, "Start failed");
-        }
+    }*/
         s = !s;
 }
@@ -129 +129 @@
                 // printf ("%d.%06d READ #%"PRIu64"\n", tv.tv_sec, tv.tv_usec, trace_packet_get(packet));
                 switch (mesg->code) {
-                        case MESSAGE_STOPPED:
-                                trace_publish_result(trace, 0, results); // Only ever using a single key 0
+                        case MESSAGE_STOPPING:
+                                trace_publish_result(trace, t, 0, results, RESULT_NORMAL); // Only ever using a single key 0
                                 fprintf(stderr, "Thread published resuslts WOWW\n");
                                 break;
-                        case MESSAGE_STARTED:
+                        case MESSAGE_STARTING:
                                 results = calloc(1, sizeof(statistics_t) * (filter_count + 1));
                                 break;
@@ -142 +142 @@
                                 fprintf(stderr, "Thread is pausing\n");
                                 break;
-                        case MESSAGE_PAUSED:
+                        case MESSAGE_RESUMING:
                                 fprintf(stderr, "Thread has paused\n");
                                 break;
@@ -228 +228 @@
         int option = 2;
         //option = 10000;
-        trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
+    //trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
         option = 2;
         trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);