ctf: notif-iter: pass current stream ID to get_stream() medop

[babeltrace.git] / plugins / ctf / common / notif-iter / notif-iter.h

diff --git a/plugins/ctf/common/notif-iter/notif-iter.h b/plugins/ctf/common/notif-iter/notif-iter.h
index 23277754a759b0d863bef1726a34757adb9572a0..c14146e3e297d794d3d62ee5a3738d90468feafa 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.h
+++ b/plugins/ctf/common/notif-iter/notif-iter.h
@@ -54,12 +54,12 @@ enum bt_ctf_notif_iter_medium_status {
         * The medium function called by the notification iterator
         * function reached the end of the file.
         */
-       BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF =   -4,
+       BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF =   1,
 
        /**
         * There is no data available right now, try again later.
         */
-       BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN = -3,
+       BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN = 11,
 
        /** Invalid argument. */
        BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL = -2,
@@ -189,13 +189,16 @@ struct bt_ctf_notif_iter_medium_ops {
         * corresponding stream class is found by the notification
         * iterator.
         *
-        * @param stream_class  Stream class associated to the stream
+        * @param stream_class  Stream class of the stream to get
+        * @param stream_id     Stream (instance) ID of the stream
+        *                      to get (-1ULL if not available)
         * @param data          User data
         * @returns             Stream instance (weak reference) or
         *                      \c NULL on error
         */
        struct bt_ctf_stream * (* get_stream)(
-                       struct bt_ctf_stream_class *stream_class, void *data);
+                       struct bt_ctf_stream_class *stream_class,
+                       uint64_t stream_id, void *data);
 };
 
 /** CTF notification iterator. */
@@ -240,14 +243,13 @@ struct bt_ctf_notif_iter_notif_event {
  *                             at a time
  * @param medops               Medium operations
  * @param medops_data          User data (passed to medium operations)
- * @param err_stream           Error stream (can be \c NULL to disable)
  * @returns                    New CTF notification iterator on
  *                             success, or \c NULL on error
  */
 BT_HIDDEN
 struct bt_ctf_notif_iter *bt_ctf_notif_iter_create(struct bt_ctf_trace *trace,
        size_t max_request_sz, struct bt_ctf_notif_iter_medium_ops medops,
-       void *medops_data, FILE *err_stream);
+       void *medops_data);
 
 /**
  * Destroys a CTF notification iterator, freeing all internal resources.
@@ -302,4 +304,48 @@ enum bt_ctf_notif_iter_status bt_ctf_notif_iter_get_packet_header_context_fields
                struct bt_ctf_field **packet_header_field,
                struct bt_ctf_field **packet_context_field);
 
+BT_HIDDEN
+void bt_ctf_notif_iter_set_medops_data(struct bt_ctf_notif_iter *notit,
+               void *medops_data);
+
+static inline
+const char *bt_ctf_notif_iter_medium_status_string(
+               enum bt_ctf_notif_iter_medium_status status)
+{
+       switch (status) {
+       case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF:
+               return "BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF";
+       case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN:
+               return "BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN";
+       case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL:
+               return "BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL";
+       case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR:
+               return "BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR";
+       case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK:
+               return "BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK";
+       default:
+               return "(unknown)";
+       }
+}
+
+static inline
+const char *bt_ctf_notif_iter_status_string(
+               enum bt_ctf_notif_iter_status status)
+{
+       switch (status) {
+       case BT_CTF_NOTIF_ITER_STATUS_EOF:
+               return "BT_CTF_NOTIF_ITER_STATUS_EOF";
+       case BT_CTF_NOTIF_ITER_STATUS_AGAIN:
+               return "BT_CTF_NOTIF_ITER_STATUS_AGAIN";
+       case BT_CTF_NOTIF_ITER_STATUS_INVAL:
+               return "BT_CTF_NOTIF_ITER_STATUS_INVAL";
+       case BT_CTF_NOTIF_ITER_STATUS_ERROR:
+               return "BT_CTF_NOTIF_ITER_STATUS_ERROR";
+       case BT_CTF_NOTIF_ITER_STATUS_OK:
+               return "BT_CTF_NOTIF_ITER_STATUS_OK";
+       default:
+               return "(unknown)";
+       }
+}
+
 #endif /* CTF_NOTIF_ITER_H */