Changeset 62b3c4e for tools/traceanon/traceanon_parallel.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:

• tools/traceanon/traceanon_parallel.c (modified) (2 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
                 }