ctf: msg-iter.c: rename `notit` to `msg_it`

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

diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.h b/src/plugins/ctf/common/msg-iter/msg-iter.h
index 65dd0ee163ffdac95e6a77ff4358d629be015da9..10ac2d0bd1a0e5526969e4fc9aa56d8bf5f3b092 100644 (file)
--- a/src/plugins/ctf/common/msg-iter/msg-iter.h
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.h
@@ -26,11 +26,12 @@
  * SOFTWARE.
  */
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <babeltrace2/babeltrace.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 
 #include "../metadata/ctf-meta.h"
 
@@ -253,7 +254,8 @@ struct bt_msg_iter;
 BT_HIDDEN
 struct bt_msg_iter *bt_msg_iter_create(struct ctf_trace_class *tc,
        size_t max_request_sz, struct bt_msg_iter_medium_ops medops,
-       void *medops_data);
+       void *medops_data, bt_logging_level log_level,
+       bt_self_component *self_comp);
 
 /**
  * Destroys a CTF message iterator, freeing all internal resources.
@@ -284,7 +286,7 @@ void bt_msg_iter_destroy(struct bt_msg_iter *msg_iter);
  */
 BT_HIDDEN
 enum bt_msg_iter_status bt_msg_iter_get_next_message(
-               struct bt_msg_iter *notit,
+               struct bt_msg_iter *msg_it,
                bt_self_message_iterator *msg_iter,
                bt_message **message);
 
@@ -304,16 +306,24 @@ struct bt_msg_iter_packet_properties {
 
 BT_HIDDEN
 enum bt_msg_iter_status bt_msg_iter_get_packet_properties(
-               struct bt_msg_iter *notit,
+               struct bt_msg_iter *msg_it,
                struct bt_msg_iter_packet_properties *props);
 
 BT_HIDDEN
-void bt_msg_iter_set_medops_data(struct bt_msg_iter *notit,
+enum bt_msg_iter_status bt_msg_iter_curr_packet_first_event_clock_snapshot(
+               struct bt_msg_iter *msg_it, uint64_t *first_event_cs);
+
+BT_HIDDEN
+enum bt_msg_iter_status bt_msg_iter_curr_packet_last_event_clock_snapshot(
+               struct bt_msg_iter *msg_it, uint64_t *last_event_cs);
+
+BT_HIDDEN
+void bt_msg_iter_set_medops_data(struct bt_msg_iter *msg_it,
                void *medops_data);
 
 BT_HIDDEN
 enum bt_msg_iter_status bt_msg_iter_seek(
-               struct bt_msg_iter *notit, off_t offset);
+               struct bt_msg_iter *msg_it, off_t offset);
 
 /*
  * Resets the iterator so that the next requested medium bytes are
@@ -323,20 +333,24 @@ enum bt_msg_iter_status bt_msg_iter_seek(
  * type `BT_MESSAGE_TYPE_STREAM_BEGINNING`.
  */
 BT_HIDDEN
-void bt_msg_iter_reset(struct bt_msg_iter *notit);
+void bt_msg_iter_reset(struct bt_msg_iter *msg_it);
 
 /*
  * Like bt_msg_iter_reset(), but preserves stream-dependent state.
  */
 BT_HIDDEN
-void bt_msg_iter_reset_for_next_stream_file(struct bt_msg_iter *notit);
+void bt_msg_iter_reset_for_next_stream_file(struct bt_msg_iter *msg_it);
+
+BT_HIDDEN
+void bt_msg_iter_set_emit_stream_beginning_message(struct bt_msg_iter *msg_it,
+               bool val);
 
 BT_HIDDEN
-void bt_msg_iter_set_emit_stream_beginning_message(struct bt_msg_iter *notit,
+void bt_msg_iter_set_emit_stream_end_message(struct bt_msg_iter *msg_it,
                bool val);
 
 BT_HIDDEN
-void bt_msg_iter_set_emit_stream_end_message(struct bt_msg_iter *notit,
+void bt_msg_iter_set_dry_run(struct bt_msg_iter *msg_it,
                bool val);
 
 static inline
@@ -345,15 +359,15 @@ const char *bt_msg_iter_medium_status_string(
 {
        switch (status) {
        case BT_MSG_ITER_MEDIUM_STATUS_EOF:
-               return "BT_MSG_ITER_MEDIUM_STATUS_EOF";
+               return "EOF";
        case BT_MSG_ITER_MEDIUM_STATUS_AGAIN:
-               return "BT_MSG_ITER_MEDIUM_STATUS_AGAIN";
+               return "AGAIN";
        case BT_MSG_ITER_MEDIUM_STATUS_INVAL:
-               return "BT_MSG_ITER_MEDIUM_STATUS_INVAL";
+               return "INVAL";
        case BT_MSG_ITER_MEDIUM_STATUS_ERROR:
-               return "BT_MSG_ITER_MEDIUM_STATUS_ERROR";
+               return "ERROR";
        case BT_MSG_ITER_MEDIUM_STATUS_OK:
-               return "BT_MSG_ITER_MEDIUM_STATUS_OK";
+               return "OK";
        default:
                return "(unknown)";
        }
@@ -365,15 +379,15 @@ const char *bt_msg_iter_status_string(
 {
        switch (status) {
        case BT_MSG_ITER_STATUS_EOF:
-               return "BT_MSG_ITER_STATUS_EOF";
+               return "EOF";
        case BT_MSG_ITER_STATUS_AGAIN:
-               return "BT_MSG_ITER_STATUS_AGAIN";
+               return "AGAIN";
        case BT_MSG_ITER_STATUS_INVAL:
-               return "BT_MSG_ITER_STATUS_INVAL";
+               return "INVAL";
        case BT_MSG_ITER_STATUS_ERROR:
-               return "BT_MSG_ITER_STATUS_ERROR";
+               return "ERROR";
        case BT_MSG_ITER_STATUS_OK:
-               return "BT_MSG_ITER_STATUS_OK";
+               return "OK";
        default:
                return "(unknown)";
        }