Changeset f051c1b for test/test-format-parallel-hasher.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:

• test/test-format-parallel-hasher.c (modified) (6 diffs)

test/test-format-parallel-hasher.c

@@ -95 +95 @@
         bool seen_start_message;
         bool seen_stop_message;
-        bool seen_paused_message;
+        bool seen_resumed_message;
         bool seen_pausing_message;
         int count;
@@ -125 +125 @@
         }
         else switch (mesg->code) {
-                case MESSAGE_STARTED:
+                case MESSAGE_STARTING:
                         assert(tls == NULL);
                         tls = calloc(sizeof(struct TLS), 1);
@@ -132 +132 @@
                         tls->seen_start_message = true;
                         break;
-                case MESSAGE_STOPPED:
+                case MESSAGE_STOPPING:
                         assert(tls->seen_start_message);
                         assert(tls != NULL);
@@ -139 +139 @@
 
                         // All threads publish to verify the thread count
-                        trace_publish_result(trace, (uint64_t) 0, (void *) tls->count);
-                        trace_post_reduce(trace);
+                        trace_publish_result(trace, t, (uint64_t) 0, (void *) tls->count, RESULT_NORMAL);
+                        trace_post_reporter(trace);
                         free(tls);
                         break;
@@ -152 +152 @@
                         tls->seen_pausing_message = true;
                         break;
-                case MESSAGE_PAUSED:
-                        assert(tls->seen_pausing_message);
-                        tls->seen_paused_message = true;
+                case MESSAGE_RESUMING:
+                        assert(tls->seen_pausing_message  || tls->seen_start_message);
+                        tls->seen_resumed_message = true;
                         break;
         }
@@ -197 +197 @@
         trace_pstart(trace, NULL, per_packet, NULL);
         iferr(trace,tracename);
-
         /* Make sure traces survive a pause and restart */
         trace_ppause(trace);