X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-stream.c;h=4ca9ce1059bd5545fd2481d5a7dbf35dadafcdc7;hb=26fc5aedf;hp=41098dc796341087e72e90e69f5a0819593a2244;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index 41098dc7..4ca9ce10 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
+#define BT_COMP_LOG_SELF_COMP (stream->trace->fs_sink->self_comp)
+#define BT_LOG_OUTPUT_LEVEL (stream->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
-#include "logging.h"
+#include "plugins/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>
@@ -31,6 +33,7 @@
 #include "ctfser/ctfser.h"
 #include "compat/endian.h"
 
+#include "fs-sink.h"
 #include "fs-sink-trace.h"
 #include "fs-sink-stream.h"
 #include "translate-trace-ir-to-ctf-ir.h"
@@ -153,6 +156,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);
@@ -160,15 +164,17 @@ struct fs_sink_stream *fs_sink_stream_create(struct fs_sink_trace *trace,
 	stream->prev_packet_state.end_cs = UINT64_C(-1);
 	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);
+	ret = try_translate_stream_class_trace_ir_to_ctf_ir(trace->fs_sink,
+		trace->trace, bt_stream_borrow_class_const(ir_stream),
+		&stream->sc);
 	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;
 	}
@@ -511,10 +517,11 @@ int write_packet_context(struct fs_sink_stream *stream)
 
 	/* Other members */
 	if (stream->sc->packet_context_fc) {
-		const bt_field *packet_context_field =
-			bt_packet_borrow_context_field_const(
-				stream->packet_state.packet);
+		const bt_field *packet_context_field;
 
+		BT_ASSERT(stream->packet_state.packet);
+		packet_context_field = bt_packet_borrow_context_field_const(
+			stream->packet_state.packet);
 		BT_ASSERT(packet_context_field);
 		ret = write_struct_field(stream,
 			(void *) stream->sc->packet_context_fc,
@@ -555,17 +562,17 @@ int fs_sink_stream_open_packet(struct fs_sink_stream *stream,
 	ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
 		UINT64_C(0xc1fc1fc1), 8, 32, BYTE_ORDER);
 	if (ret) {
-		BT_LOGE("Error writing packet header magic: stream-file-name=%s",
+		BT_COMP_LOGE("Error writing packet header magic: stream-file-name=%s",
 			stream->file_name->str);
 		goto end;
 	}
 
 	/* Packet header: UUID */
-	for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
+	for (i = 0; i < BT_UUID_LEN; i++) {
 		ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
-			(uint64_t) stream->sc->tc->uuid[i], 8, 8, BYTE_ORDER);
+			(uint64_t) stream->sc->trace->uuid[i], 8, 8, BYTE_ORDER);
 		if (ret) {
-			BT_LOGE("Error writing packet header UUID: stream-file-name=%s",
+			BT_COMP_LOGE("Error writing packet header UUID: stream-file-name=%s",
 				stream->file_name->str);
 			goto end;
 		}
@@ -575,7 +582,7 @@ int fs_sink_stream_open_packet(struct fs_sink_stream *stream,
 	ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
 		bt_stream_class_get_id(stream->sc->ir_sc), 8, 64, BYTE_ORDER);
 	if (ret) {
-		BT_LOGE("Error writing packet header stream class id: "
+		BT_COMP_LOGE("Error writing packet header stream class id: "
 			"stream-file-name=%s, stream-class-id=%"PRIu64,
 			stream->file_name->str,
 			bt_stream_class_get_id(stream->sc->ir_sc));
@@ -586,7 +593,7 @@ int fs_sink_stream_open_packet(struct fs_sink_stream *stream,
 	ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
 		bt_stream_get_id(stream->ir_stream), 8, 64, BYTE_ORDER);
 	if (ret) {
-		BT_LOGE("Error writing packet header stream id: "
+		BT_COMP_LOGE("Error writing packet header stream id: "
 			"stream-file-name=%s, stream-id=%"PRIu64,
 			stream->file_name->str,
 			bt_stream_get_id(stream->ir_stream));