Changeset 62b2d97

Timestamp:

01/08/19 09:40:10 (4 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

3c828b8

Parents:

f47025d

Message:

Add callback for meta packets

Location:

lib

Files:

• libtrace_int.h (modified) (1 diff)
• libtrace_parallel.h (modified) (3 diffs)
• trace_parallel.c (modified) (3 diffs)

lib/libtrace_int.h

@@ -294 +294 @@
         fn_cb_dataless message_pausing;
         fn_cb_packet message_packet;
+        fn_cb_packet message_meta_packet;
         fn_cb_result message_result;
         fn_cb_first_packet message_first_packet;

lib/libtrace_parallel.h

@@ -135 +135 @@
          */
         MESSAGE_PACKET,
+
+        /** A libtrace meta packet is ready, this will trigger the meta packet
+         *  callback for the processing threads.
+         */
+        MESSAGE_META_PACKET,
 
         /** A libtrace result is ready, this will trigger the result callback
@@ -519 +524 @@
 
 /**
+ * A callback function triggered when a processing thread receives a meta packet.
+ *
+ * @param libtrace The parallel trace.
+ * @param t The thread that is running
+ * @param global The global storage.
+ * @param tls The thread local storage.
+ * @param packet The packet to be processed.
+ *
+ * @return either the packet itself if it is not being published as a result
+ *   or NULL otherwise. If returning NULL, it is the user's responsibility
+ *   to ensure the packet is freed when the reporter thread is finished with it.
+ */
+typedef libtrace_packet_t* (*fn_cb_meta_packet)(libtrace_t *libtrace,
+                                           libtrace_thread_t *t,
+                                           void *global,
+                                           void *tls,
+                                           libtrace_packet_t *packet);
+
+/**
  * Callback for handling a result message. Should only be required by the
  * reporter thread.
@@ -599 +623 @@
 DLLEXPORT int trace_set_packet_cb(libtrace_callback_set_t *cbset,
                 fn_cb_packet handler);
+
+/**
+ * Registers a meta packet callback against a callback set.
+ *
+ * @param cbset The callback set.
+ * @param handler The meta packet callback funtion.
+ * @return 0 if successful, -1 otherwise.
+ */
+DLLEXPORT int trace_set_meta_packet_cb(libtrace_callback_set_t *cbset,
+                fn_cb_meta_packet handler);
 
 /**

lib/trace_parallel.c

@@ -242 +242 @@
         case MESSAGE_PACKET:
                 return;
-        }
-
+        case MESSAGE_META_PACKET:
+                return;
+        }
         if (fn)
                 (*fn)(trace, thread, trace->global_blob, thread->user_data);
@@ -496 +497 @@
                         t->accepted_packets++;
                 }
-                if (trace->perpkt_cbs->message_packet)
-                        *packet = (*trace->perpkt_cbs->message_packet)(trace, t, trace->global_blob, t->user_data, *packet);
+
+                /* If packet is meta call the meta callback */
+                if (IS_LIBTRACE_META_PACKET((*packet))) {
+                        if (trace->perpkt_cbs->message_meta_packet) {
+                                *packet = (*trace->perpkt_cbs->message_meta_packet)(trace, t, trace->global_blob,
+                                        t->user_data, *packet);
+                        }
+                } else {
+                        if (trace->perpkt_cbs->message_packet) {
+                                *packet = (*trace->perpkt_cbs->message_packet)(trace, t, trace->global_blob, t->user_data,
+                                        *packet);
+                        }
+                }
                 trace_fin_packet(*packet);
         } else {
@@ -2035 +2047 @@
                 fn_cb_packet handler) {
         cbset->message_packet = handler;
+        return 0;
+}
+
+DLLEXPORT int trace_set_meta_packet_cb(libtrace_callback_set_t *cbset,
+                fn_cb_meta_packet handler) {
+        cbset->message_meta_packet = handler;
         return 0;
 }