sink.text.pretty: print inactivity msg handling with BT_LOGD_STR

[babeltrace.git] / plugins / ctf / lttng-live / metadata.c

diff --git a/plugins/ctf/lttng-live/metadata.c b/plugins/ctf/lttng-live/metadata.c
index 0aae051c5b22166dd6256e34dc5e3216445f5870..42aac5d9efe23f67f2047b7dc00233e88d063e95 100644 (file)
--- a/plugins/ctf/lttng-live/metadata.c
+++ b/plugins/ctf/lttng-live/metadata.c
@@ -54,15 +54,15 @@ struct packet_header {
 } __attribute__((__packed__));
 
 static
-enum bt_lttng_live_iterator_status lttng_live_update_clock_map(
+bt_lttng_live_iterator_status lttng_live_update_clock_map(
                struct lttng_live_trace *trace)
 {
-       enum bt_lttng_live_iterator_status status =
+       bt_lttng_live_iterator_status status =
                        BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
        size_t i;
        int count, ret;
 
-       BT_PUT(trace->cc_prio_map);
+       BT_OBJECT_PUT_REF_AND_RESET(trace->cc_prio_map);
        trace->cc_prio_map = bt_clock_class_priority_map_create();
        if (!trace->cc_prio_map) {
                goto error;
@@ -72,13 +72,13 @@ enum bt_lttng_live_iterator_status lttng_live_update_clock_map(
        BT_ASSERT(count >= 0);
 
        for (i = 0; i < count; i++) {
-               struct bt_clock_class *clock_class =
+               const bt_clock_class *clock_class =
                        bt_trace_get_clock_class_by_index(trace->trace, i);
 
                BT_ASSERT(clock_class);
                ret = bt_clock_class_priority_map_add_clock_class(
                        trace->cc_prio_map, clock_class, 0);
-               BT_PUT(clock_class);
+               BT_CLOCK_CLASS_PUT_REF_AND_RESET(clock_class);
 
                if (ret) {
                        goto error;
@@ -93,7 +93,7 @@ end:
 }
 
 BT_HIDDEN
-enum bt_lttng_live_iterator_status lttng_live_metadata_update(
+bt_lttng_live_iterator_status lttng_live_metadata_update(
                struct lttng_live_trace *trace)
 {
        struct lttng_live_session *session = trace->session;
@@ -103,7 +103,7 @@ enum bt_lttng_live_iterator_status lttng_live_metadata_update(
        char *metadata_buf = NULL;
        FILE *fp = NULL;
        enum ctf_metadata_decoder_status decoder_status;
-       enum bt_lttng_live_iterator_status status =
+       bt_lttng_live_iterator_status status =
                BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
 
        /* No metadata stream yet. */
@@ -195,7 +195,7 @@ enum bt_lttng_live_iterator_status lttng_live_metadata_update(
        decoder_status = ctf_metadata_decoder_decode(metadata->decoder, fp);
        switch (decoder_status) {
        case CTF_METADATA_DECODER_STATUS_OK:
-               BT_PUT(trace->trace);
+               BT_OBJECT_PUT_REF_AND_RESET(trace->trace);
                trace->trace = ctf_metadata_decoder_get_trace(metadata->decoder);
                trace->new_metadata_needed = false;
                status = lttng_live_update_clock_map(trace);