Changeset 62b3c4e for test/test-format-parallel-hasher.c

Timestamp:

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

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.

File:

• test/test-format-parallel-hasher.c (modified) (1 diff)

test/test-format-parallel-hasher.c

@@ -101 +101 @@
 static int totalpkts = 0;
 static int expected;
-static void report_result(libtrace_t *trace, 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 int totalthreads = 0;
-        if (result) {
-                assert(libtrace_result_get_key(result) == 0);
-                printf("%d,", libtrace_result_get_value(result).sint);
+        switch (mesg) {
+        case MESSAGE_RESULT:
+                assert(libtrace_result_get_key(data.res) == 0);
+                printf("%d,", libtrace_result_get_value(data.res).sint);
                 totalthreads++;
-                totalpkts += libtrace_result_get_value(result).sint;
-                assert(libtrace_result_get_value(result).sint == 25 ||
-                        libtrace_result_get_value(result).sint == expected - 25);
-        } else {
-                switch(mesg->code) {
-                        case MESSAGE_STARTING:
-                                // Should have two threads here
-                                assert(libtrace_get_perpkt_count(trace) == 2);
-                                printf("\tLooks like %d threads are being used!\n\tcounts(", libtrace_get_perpkt_count(trace));
-                                break;
-                        case MESSAGE_STOPPING:
-                                printf(")\n");
-                                assert(totalthreads == libtrace_get_perpkt_count(trace));
-                                break;
-                }
+                totalpkts += libtrace_result_get_value(data.res).sint;
+                assert(libtrace_result_get_value(data.res).sint == 25 ||
+                        libtrace_result_get_value(data.res).sint == expected - 25);
+                break;
+        case MESSAGE_STARTING:
+                // Should have two threads here
+                assert(libtrace_get_perpkt_count(trace) == 2);
+                printf("\tLooks like %d threads are being used!\n\tcounts(", libtrace_get_perpkt_count(trace));
+                break;
+        case MESSAGE_STOPPING:
+                printf(")\n");
+                assert(totalthreads == libtrace_get_perpkt_count(trace));
+                break;
         }
 }