X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwriter.c;h=b87d78d26ceddf6064aceeaee10a656561faaefc;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=36e35d928819ed5ec2b131c04670f421184d6e54;hpb=6ca0eb99012c3c6bbe3da1f45086368403fcac30;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 36e35d92..b87d78d2 100644
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -26,26 +26,16 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
+#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITER"
+#include "logging.h"
+
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
 #include "writer.h"
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 
 static
 gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
@@ -62,7 +52,7 @@ gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
 static
 void destroy_writer_component_data(struct writer_component *writer_component)
 {
-	bt_put(writer_component->input_iterator);
+	bt_object_put_ref(writer_component->input_iterator);
 
 	g_hash_table_foreach_remove(writer_component->trace_map,
 			empty_trace_map, writer_component);
@@ -73,10 +63,10 @@ void destroy_writer_component_data(struct writer_component *writer_component)
 }
 
 BT_HIDDEN
-void writer_component_finalize(struct bt_private_component *component)
+void writer_component_finalize(struct bt_self_component *component)
 {
 	struct writer_component *writer_component = (struct writer_component *)
-		bt_private_component_get_user_data(component);
+		bt_self_component_get_user_data(component);
 
 	destroy_writer_component_data(writer_component);
 	g_free(writer_component);
@@ -85,7 +75,7 @@ void writer_component_finalize(struct bt_private_component *component)
 static
 void free_fs_writer(struct fs_writer *fs_writer)
 {
-	bt_put(fs_writer->writer);
+	bt_object_put_ref(fs_writer->writer);
 	g_free(fs_writer);
 }
 
@@ -133,7 +123,7 @@ enum bt_component_status handle_notification(
 	switch (bt_notification_get_type(notification)) {
 	case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
 	{
-		struct bt_ctf_packet *packet =
+		const struct bt_packet *packet =
 			bt_notification_packet_begin_get_packet(notification);
 
 		if (!packet) {
@@ -142,12 +132,12 @@ enum bt_component_status handle_notification(
 		}
 
 		ret = writer_new_packet(writer_component, packet);
-		bt_put(packet);
+		bt_object_put_ref(packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 	{
-		struct bt_ctf_packet *packet =
+		const struct bt_packet *packet =
 			bt_notification_packet_end_get_packet(notification);
 
 		if (!packet) {
@@ -155,12 +145,12 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_close_packet(writer_component, packet);
-		bt_put(packet);
+		bt_object_put_ref(packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_EVENT:
 	{
-		struct bt_ctf_event *event = bt_notification_event_get_event(
+		const struct bt_event *event = bt_notification_event_get_event(
 				notification);
 
 		if (!event) {
@@ -168,7 +158,7 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_output_event(writer_component, event);
-		bt_put(event);
+		bt_object_put_ref(event);
 		if (ret != BT_COMPONENT_STATUS_OK) {
 			goto end;
 		}
@@ -176,7 +166,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
 	{
-		struct bt_ctf_stream *stream =
+		const struct bt_stream *stream =
 			bt_notification_stream_begin_get_stream(notification);
 
 		if (!stream) {
@@ -184,12 +174,12 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_stream_begin(writer_component, stream);
-		bt_put(stream);
+		bt_object_put_ref(stream);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_END:
 	{
-		struct bt_ctf_stream *stream =
+		const struct bt_stream *stream =
 			bt_notification_stream_end_get_stream(notification);
 
 		if (!stream) {
@@ -197,11 +187,11 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_stream_end(writer_component, stream);
-		bt_put(stream);
+		bt_object_put_ref(stream);
 		break;
 	}
 	default:
-		puts("Unhandled notification type");
+		break;
 	}
 end:
 	return ret;
@@ -209,44 +199,36 @@ end:
 
 BT_HIDDEN
 void writer_component_port_connected(
-		struct bt_private_component *component,
+		struct bt_self_component *component,
 		struct bt_private_port *self_port,
 		struct bt_port *other_port)
 {
 	struct bt_private_connection *connection;
 	struct writer_component *writer;
 	enum bt_connection_status conn_status;
-	static const enum bt_notification_type notif_types[] = {
-		BT_NOTIFICATION_TYPE_EVENT,
-		BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-		BT_NOTIFICATION_TYPE_PACKET_END,
-		BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-		BT_NOTIFICATION_TYPE_STREAM_END,
-		BT_NOTIFICATION_TYPE_SENTINEL,
-	};
-
-	writer = bt_private_component_get_user_data(component);
-	assert(writer);
-	assert(!writer->input_iterator);
-	connection = bt_private_port_get_private_connection(self_port);
-	assert(connection);
+
+	writer = bt_self_component_get_user_data(component);
+	BT_ASSERT(writer);
+	BT_ASSERT(!writer->input_iterator);
+	connection = bt_private_port_get_connection(self_port);
+	BT_ASSERT(connection);
 	conn_status = bt_private_connection_create_notification_iterator(
-		connection, notif_types, &writer->input_iterator);
+		connection, &writer->input_iterator);
 	if (conn_status != BT_CONNECTION_STATUS_OK) {
 		writer->error = true;
 	}
 
-	bt_put(connection);
+	bt_object_put_ref(connection);
 }
 
 BT_HIDDEN
-enum bt_component_status writer_run(struct bt_private_component *component)
+enum bt_component_status writer_run(struct bt_self_component *component)
 {
 	enum bt_component_status ret;
 	struct bt_notification *notification = NULL;
 	struct bt_notification_iterator *it;
 	struct writer_component *writer_component =
-		bt_private_component_get_user_data(component);
+		bt_self_component_get_user_data(component);
 	enum bt_notification_iterator_status it_ret;
 
 	if (unlikely(writer_component->error)) {
@@ -255,13 +237,13 @@ enum bt_component_status writer_run(struct bt_private_component *component)
 	}
 
 	it = writer_component->input_iterator;
-	assert(it);
+	BT_ASSERT(it);
 	it_ret = bt_notification_iterator_next(it);
 
 	switch (it_ret) {
 	case BT_NOTIFICATION_ITERATOR_STATUS_END:
 		ret = BT_COMPONENT_STATUS_END;
-		BT_PUT(writer_component->input_iterator);
+		BT_OBJECT_PUT_REF_AND_RESET(writer_component->input_iterator);
 		goto end;
 	case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
 		ret = BT_COMPONENT_STATUS_AGAIN;
@@ -274,10 +256,10 @@ enum bt_component_status writer_run(struct bt_private_component *component)
 	}
 
 	notification = bt_notification_iterator_get_notification(it);
-	assert(notification);
+	BT_ASSERT(notification);
 	ret = handle_notification(writer_component, notification);
 end:
-	bt_put(notification);
+	bt_object_put_ref(notification);
 	return ret;
 }
 
@@ -296,26 +278,20 @@ enum bt_component_status apply_one_bool(const char *key,
 	if (!value) {
 		goto end;
 	}
-	status = bt_value_bool_get(value, &bool_val);
-	switch (status) {
-	case BT_VALUE_STATUS_OK:
-		break;
-	default:
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
+	bool_val = bt_value_bool_get(value);
+
 	*option = (bool) bool_val;
 	if (found) {
 		*found = true;
 	}
 end:
-	bt_put(value);
+	bt_object_put_ref(value);
 	return ret;
 }
 
 BT_HIDDEN
 enum bt_component_status writer_component_init(
-	struct bt_private_component *component, struct bt_value *params,
+	struct bt_self_component *component, struct bt_value *params,
 	UNUSED_VAR void *init_method_data)
 {
 	enum bt_component_status ret;
@@ -329,7 +305,7 @@ enum bt_component_status writer_component_init(
 		goto end;
 	}
 
-	ret = bt_private_component_sink_add_input_private_port(component,
+	ret = bt_self_component_sink_add_input_port(component,
 		"in", NULL, NULL);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
@@ -337,8 +313,7 @@ enum bt_component_status writer_component_init(
 
 	value = bt_value_map_get(params, "path");
 	if (!value || bt_value_is_null(value) || !bt_value_is_string(value)) {
-		fprintf(writer_component->err,
-				"[error] output path parameter required\n");
+		BT_LOGE_STR("Missing mandatory \"path\" parameter.");
 		ret = BT_COMPONENT_STATUS_INVALID;
 		goto error;
 	}
@@ -348,10 +323,10 @@ enum bt_component_status writer_component_init(
 		ret = BT_COMPONENT_STATUS_INVALID;
 		goto error;
 	}
-	bt_put(value);
+	bt_object_put_ref(value);
 
 	writer_component->base_path = g_string_new(path);
-	if (!writer_component) {
+	if (!writer_component->base_path) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto error;
 	}
@@ -363,7 +338,7 @@ enum bt_component_status writer_component_init(
 		goto end;
 	}
 
-	ret = bt_private_component_set_user_data(component, writer_component);
+	ret = bt_self_component_set_user_data(component, writer_component);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto error;
 	}