Changeset 62b3c4e for lib

Timestamp:

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

Location:

lib

Files:

• combiner_ordered.c (modified) (1 diff)
• combiner_sorted.c (modified) (1 diff)
• combiner_unordered.c (modified) (1 diff)
• libtrace.h.in (modified) (5 diffs)
• trace_parallel.c (modified) (3 diffs)

lib/combiner_ordered.c

@@ -60 +60 @@
                 /* Get the minimum queue and then do stuff */
                 libtrace_result_t r;
+                libtrace_generic_t gt = {.res = &r};
 
                 ASSERT_RET (libtrace_deque_pop_front(&queues[min_queue], (void *) &r), == 1);
-                trace->reporter(trace, &r, NULL);
+                trace->reporter(trace, MESSAGE_RESULT, gt, &trace->reporter_thread);
 
                 // We expect the key we read +1 now , todo put expected in our storage area

lib/combiner_sorted.c

@@ -58 +58 @@
         for (a = 0; a < libtrace_vector_get_size(&queues[0]); ++a) {
                 libtrace_result_t r;
-                ASSERT_RET (libtrace_vector_get(&queues[0], a,  (void *) &r), == 1);
-                trace->reporter(trace, &r, NULL);
+                libtrace_generic_t gt = {.res = &r};
+                ASSERT_RET (libtrace_vector_get(&queues[0], a, (void *) &r), == 1);
+                trace->reporter(trace, MESSAGE_RESULT, gt, &trace->reporter_thread);
         }
         libtrace_vector_empty(&queues[0]);

lib/combiner_unordered.c

@@ -34 +34 @@
                 while (libtrace_deque_get_size(v) != 0) {
                         libtrace_result_t r;
+                        libtrace_generic_t gt = {.res = &r};
                         ASSERT_RET (libtrace_deque_pop_front(v, (void *) &r), == 1);
-                        trace->reporter(trace, &r, NULL);
+                        trace->reporter(trace, MESSAGE_RESULT, gt, &trace->reporter_thread);
                 }
         }

lib/libtrace.h.in

@@ -3461 +3461 @@
 /*@}*/
 
+typedef struct libtrace_result_t libtrace_result_t;
 /**
  * A collection of types for convenience used in place of a
@@ -3471 +3472 @@
         void *ptr;
         libtrace_packet_t *pkt;
+        libtrace_result_t *res;
 
         /* C99 Integer types */
@@ -3517 +3519 @@
 
 /** Structure holding information about a result */
-typedef struct libtrace_result_t {
+struct libtrace_result_t {
         uint64_t key;
         libtrace_generic_t value;
         int type;
-} libtrace_result_t;
+};
 #define RESULT_NORMAL 0
 #define RESULT_PACKET 1
@@ -3546 +3548 @@
                             libtrace_generic_t data,
                             libtrace_thread_t *sender);
-typedef void (*fn_reporter)(libtrace_t* trace, libtrace_result_t *r, libtrace_message_t *m);
+typedef void (*fn_reporter)(libtrace_t* trace,
+                            int mesg_code,
+                            libtrace_generic_t data,
+                            libtrace_thread_t *sender);
 typedef uint64_t (*fn_hasher)(const libtrace_packet_t* packet, void *data);
 
@@ -3619 +3624 @@
 enum libtrace_messages {
         MESSAGE_PACKET,
+        MESSAGE_RESULT,
         MESSAGE_STARTING,
         MESSAGE_RESUMING,

lib/trace_parallel.c

@@ -1035 +1035 @@
         ASSERT_RET(pthread_mutex_unlock(&trace->libtrace_lock), == 0);
 
-        message.code = MESSAGE_STARTING;
-        message.sender = t;
-        (*trace->reporter)(trace, NULL, &message);
-        message.code = MESSAGE_RESUMING;
-        (*trace->reporter)(trace, NULL, &message);
+        (*trace->reporter)(trace, MESSAGE_STARTING, (libtrace_generic_t) {0}, t);
+        (*trace->reporter)(trace, MESSAGE_RESUMING, (libtrace_generic_t) {0}, t);
 
         while (!trace_finished(trace)) {
@@ -1056 +1053 @@
                                 assert(trace->combiner.pause);
                                 trace->combiner.pause(trace, &trace->combiner);
-                                message.code = MESSAGE_PAUSING;
-                                message.sender = t;
-                                (*trace->reporter)(trace, NULL, &message);
+                                (*trace->reporter)(trace, MESSAGE_PAUSING, (libtrace_generic_t) {0}, t);
                                 trace_thread_pause(trace, t);
-                                message.code = MESSAGE_RESUMING;
-                                (*trace->reporter)(trace, NULL, &message);
+                                (*trace->reporter)(trace, MESSAGE_RESUMING, (libtrace_generic_t) {0}, t);
                                 break;
-                        default:
-                                (*trace->reporter)(trace, NULL, &message);
+                default:
+                        (*trace->reporter)(trace, message.code, message.additional, message.sender);
                 }
         }
@@ -1072 +1066 @@
 
         // GOODBYE
-        message.code = MESSAGE_PAUSING;
-        message.sender = t;
-        (*trace->reporter)(trace, NULL, &message);
-        message.code = MESSAGE_STOPPING;
-        (*trace->reporter)(trace, NULL, &message);
+        (*trace->reporter)(trace, MESSAGE_PAUSING, (libtrace_generic_t) {0}, t);
+        (*trace->reporter)(trace, MESSAGE_STOPPING, (libtrace_generic_t) {0}, t);
 
         thread_change_state(trace, &trace->reporter_thread, THREAD_FINISHED, true);