X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink.c;h=20b33471db797215e7b4620c2f08700673d1318d;hb=118ae153da2f634b562674b14263a471b4c58de1;hp=e19624e07903dac0cc59c799a3d29267624aad37;hpb=ce67f5614a4db3b2de4d887eca52135b439b4937;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c
index e19624e0..20b33471 100644
--- a/src/plugins/ctf/fs-sink/fs-sink.c
+++ b/src/plugins/ctf/fs-sink/fs-sink.c
@@ -147,7 +147,7 @@ void destroy_fs_sink_comp(struct fs_sink_comp *fs_sink)
 		fs_sink->traces = NULL;
 	}
 
-	BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+	BT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
 		fs_sink->upstream_iter);
 	g_free(fs_sink);
 
@@ -296,7 +296,7 @@ bt_component_class_sink_consume_method_status handle_event_msg(
 		goto end;
 	}
 
-	BT_ASSERT(ec);
+	BT_ASSERT_DBG(ec);
 
 	if (stream->sc->default_clock_class) {
 		cs = bt_message_event_borrow_default_clock_snapshot_const(
@@ -338,7 +338,7 @@ bt_component_class_sink_consume_method_status handle_event_msg(
 		}
 	}
 
-	BT_ASSERT(stream->packet_state.is_open);
+	BT_ASSERT_DBG(stream->packet_state.is_open);
 	ret = fs_sink_stream_write_event(stream, cs, ir_event, ec);
 	if (G_UNLIKELY(ret)) {
 		status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_ERROR;
@@ -466,7 +466,7 @@ bt_component_class_sink_consume_method_status handle_packet_beginning_msg(
 		 */
 		if (stream->prev_packet_state.end_cs == UINT64_C(-1)) {
 			BT_COMP_LOGE("Incompatible discarded packets message "
-				"occuring before the stream's first packet: "
+				"occurring before the stream's first packet: "
 				"stream-id=%" PRIu64 ", stream-name=\"%s\", "
 				"trace-name=\"%s\", path=\"%s/%s\"",
 				bt_stream_get_id(ir_stream),
@@ -645,7 +645,7 @@ bt_component_class_sink_consume_method_status handle_stream_beginning_msg(
 	/*
 	 * Not supported: discarded events or discarded packets support
 	 * without packets support. Packets are the way to know where
-	 * discarded events/packets occured in CTF 1.8.
+	 * discarded events/packets occurred in CTF 1.8.
 	 */
 	if (!bt_stream_class_supports_packets(ir_sc)) {
 		BT_ASSERT(!bt_stream_class_supports_discarded_packets(ir_sc));
@@ -820,7 +820,7 @@ bt_component_class_sink_consume_method_status handle_discarded_events_msg(
 	if (stream->packet_state.is_open &&
 			stream->sc->discarded_events_has_ts) {
 		BT_COMP_LOGE("Unsupported discarded events message with "
-			"default clock snapshots occuring within a packet: "
+			"default clock snapshots occurring within a packet: "
 			"stream-id=%" PRIu64 ", stream-name=\"%s\", "
 			"trace-name=\"%s\", path=\"%s/%s\"",
 			bt_stream_get_id(ir_stream),
@@ -987,11 +987,11 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(
 
 	fs_sink = bt_self_component_get_data(
 			bt_self_component_sink_as_self_component(self_comp));
-	BT_ASSERT(fs_sink);
-	BT_ASSERT(fs_sink->upstream_iter);
+	BT_ASSERT_DBG(fs_sink);
+	BT_ASSERT_DBG(fs_sink->upstream_iter);
 
 	/* Consume messages */
-	next_status = bt_self_component_port_input_message_iterator_next(
+	next_status = bt_message_iterator_next(
 		fs_sink->upstream_iter, &msgs, &msg_count);
 	if (next_status < 0) {
 		status = (int) next_status;
@@ -1006,7 +1006,7 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(
 		for (i = 0; i < msg_count; i++) {
 			const bt_message *msg = msgs[i];
 
-			BT_ASSERT(msg);
+			BT_ASSERT_DBG(msg);
 
 			switch (bt_message_get_type(msg)) {
 			case BT_MESSAGE_TYPE_EVENT:
@@ -1041,7 +1041,7 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(
 					fs_sink, msg);
 				break;
 			default:
-				abort();
+				bt_common_abort();
 			}
 
 			BT_MESSAGE_PUT_REF_AND_RESET(msgs[i]);
@@ -1090,17 +1090,17 @@ ctf_fs_sink_graph_is_configured(
 		bt_self_component_sink *self_comp)
 {
 	bt_component_class_sink_graph_is_configured_method_status status;
-	bt_self_component_port_input_message_iterator_create_from_sink_component_status
+	bt_message_iterator_create_from_sink_component_status
 		msg_iter_status;
 	struct fs_sink_comp *fs_sink = bt_self_component_get_data(
 			bt_self_component_sink_as_self_component(self_comp));
 
 	msg_iter_status =
-		bt_self_component_port_input_message_iterator_create_from_sink_component(
+		bt_message_iterator_create_from_sink_component(
 			self_comp,
 			bt_self_component_sink_borrow_input_port_by_name(
 				self_comp, in_port_name), &fs_sink->upstream_iter);
-	if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+	if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
 		status = (int) msg_iter_status;
 		goto end;
 	}