sink.ctf.fs: honor component's initial log level

[babeltrace.git] / src / plugins / ctf / fs-sink / fs-sink-stream.c

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index 026251a6ba750cafba10f27588e58b15c608d07f..a8fd554733b654f1ebf5cd11ff3079245e73a38b 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-STREAM"
-#include "logging.h"
+#define BT_LOG_OUTPUT_LEVEL (stream->log_level)
+#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
+#include "logging/log.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>
@@ -153,6 +154,7 @@ struct fs_sink_stream *fs_sink_stream_create(struct fs_sink_trace *trace,
                goto end;
        }
 
+       stream->log_level = trace->log_level;
        stream->trace = trace;
        stream->ir_stream = ir_stream;
        stream->packet_state.beginning_cs = UINT64_C(-1);
@@ -161,14 +163,16 @@ struct fs_sink_stream *fs_sink_stream_create(struct fs_sink_trace *trace,
        stream->prev_packet_state.discarded_events_counter = UINT64_C(-1);
        stream->prev_packet_state.seq_num = UINT64_C(-1);
        ret = try_translate_stream_class_trace_ir_to_ctf_ir(trace->tc,
-               bt_stream_borrow_class_const(ir_stream), &stream->sc);
+               bt_stream_borrow_class_const(ir_stream), &stream->sc,
+               stream->log_level);
        if (ret) {
                goto error;
        }
 
        set_stream_file_name(stream);
        g_string_append_printf(path, "/%s", stream->file_name->str);
-       ret = bt_ctfser_init(&stream->ctfser, path->str);
+       ret = bt_ctfser_init(&stream->ctfser, path->str,
+               stream->log_level);
        if (ret) {
                goto error;
        }
@@ -251,7 +255,7 @@ int write_array_field_elements(struct fs_sink_stream *stream,
                        bt_field_array_borrow_element_field_by_index_const(
                                field, i);
                ret = write_field(stream, fc->elem_fc, elem_field);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -270,7 +274,7 @@ int write_sequence_field(struct fs_sink_stream *stream,
        if (fc->length_is_before) {
                ret = bt_ctfser_write_unsigned_int(&stream->ctfser,
                        bt_field_array_get_length(field), 8, 32, BYTE_ORDER);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -289,10 +293,10 @@ int write_struct_field(struct fs_sink_stream *stream,
        int ret = 0;
        uint64_t i;
 
-       if (likely(align_struct)) {
+       if (G_LIKELY(align_struct)) {
                ret = bt_ctfser_align_offset_in_current_packet(&stream->ctfser,
                        fc->base.alignment);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -306,7 +310,7 @@ int write_struct_field(struct fs_sink_stream *stream,
                                fc, i)->fc;
 
                ret = write_field(stream, member_fc, memb_field);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -327,7 +331,7 @@ int write_variant_field(struct fs_sink_stream *stream,
        if (fc->tag_is_before) {
                ret = bt_ctfser_write_unsigned_int(&stream->ctfser,
                        opt_index, 8, 16, BYTE_ORDER);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -385,7 +389,7 @@ int write_event_header(struct fs_sink_stream *stream,
        /* Event class ID */
        ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                bt_event_class_get_id(ec->ir_ec), 8, 64, BYTE_ORDER);
-       if (unlikely(ret)) {
+       if (G_UNLIKELY(ret)) {
                goto end;
        }
 
@@ -394,7 +398,7 @@ int write_event_header(struct fs_sink_stream *stream,
                BT_ASSERT(cs);
                ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                        bt_clock_snapshot_get_value(cs), 8, 64, BYTE_ORDER);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -413,7 +417,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
 
        /* Header */
        ret = write_event_header(stream, cs, ec);
-       if (unlikely(ret)) {
+       if (G_UNLIKELY(ret)) {
                goto end;
        }
 
@@ -424,7 +428,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
                ret = write_struct_field(stream,
                        (void *) stream->sc->event_common_context_fc,
                        field, true);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -435,7 +439,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
                BT_ASSERT(field);
                ret = write_struct_field(stream, (void *) ec->spec_context_fc,
                        field, true);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }
@@ -446,7 +450,7 @@ int fs_sink_stream_write_event(struct fs_sink_stream *stream,
                BT_ASSERT(field);
                ret = write_struct_field(stream, (void *) ec->payload_fc,
                        field, true);
-               if (unlikely(ret)) {
+               if (G_UNLIKELY(ret)) {
                        goto end;
                }
        }