Changeset 62b3c4e for lib/libtrace.h.in

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:

• lib/libtrace.h.in (modified) (5 diffs)

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,