X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwriter.c;h=fcc618661d29dc658ec5bce59395f071ab712512;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hp=fcc1eed9d3fce7f22edc8fcf7e1389b9a7cd2742;hpb=a619fcb71906fd9dd9ed75c3c8d9f14ab8204637;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index fcc1eed9..fcc61866 100644
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -26,19 +26,10 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-dev.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>
@@ -46,11 +37,13 @@
 #include "writer.h"
 #include <assert.h>
 
+static
 gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
 {
 	struct fs_writer *fs_writer = value;
 	struct writer_component *writer_component = user_data;
 
+	fs_writer->trace_static = 1;
 	writer_close(writer_component, fs_writer);
 
 	return TRUE;
@@ -130,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 =
+		struct bt_packet *packet =
 			bt_notification_packet_begin_get_packet(notification);
 
 		if (!packet) {
@@ -144,7 +137,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 	{
-		struct bt_ctf_packet *packet =
+		struct bt_packet *packet =
 			bt_notification_packet_end_get_packet(notification);
 
 		if (!packet) {
@@ -157,7 +150,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_EVENT:
 	{
-		struct bt_ctf_event *event = bt_notification_event_get_event(
+		struct bt_event *event = bt_notification_event_get_event(
 				notification);
 
 		if (!event) {
@@ -173,7 +166,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
 	{
-		struct bt_ctf_stream *stream =
+		struct bt_stream *stream =
 			bt_notification_stream_begin_get_stream(notification);
 
 		if (!stream) {
@@ -186,7 +179,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_END:
 	{
-		struct bt_ctf_stream *stream =
+		struct bt_stream *stream =
 			bt_notification_stream_end_get_stream(notification);
 
 		if (!stream) {
@@ -212,6 +205,7 @@ void writer_component_port_connected(
 {
 	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,
@@ -226,11 +220,9 @@ void writer_component_port_connected(
 	assert(!writer->input_iterator);
 	connection = bt_private_port_get_private_connection(self_port);
 	assert(connection);
-	writer->input_iterator =
-		bt_private_connection_create_notification_iterator(connection,
-			notif_types);
-
-	if (!writer->input_iterator) {
+	conn_status = bt_private_connection_create_notification_iterator(
+		connection, notif_types, &writer->input_iterator);
+	if (conn_status != BT_CONNECTION_STATUS_OK) {
 		writer->error = true;
 	}
 
@@ -279,6 +271,36 @@ end:
 	return ret;
 }
 
+static
+enum bt_component_status apply_one_bool(const char *key,
+		struct bt_value *params,
+		bool *option,
+		bool *found)
+{
+	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+	struct bt_value *value = NULL;
+	enum bt_value_status status;
+	bt_bool bool_val;
+
+	value = bt_value_map_get(params, key);
+	if (!value) {
+		goto end;
+	}
+	status = bt_value_bool_get(value, &bool_val);
+	if (status != BT_VALUE_STATUS_OK) {
+		ret = BT_COMPONENT_STATUS_ERROR;
+		goto end;
+	}
+
+	*option = (bool) bool_val;
+	if (found) {
+		*found = true;
+	}
+end:
+	bt_put(value);
+	return ret;
+}
+
 BT_HIDDEN
 enum bt_component_status writer_component_init(
 	struct bt_private_component *component, struct bt_value *params,
@@ -289,26 +311,21 @@ enum bt_component_status writer_component_init(
 	struct writer_component *writer_component = create_writer_component();
 	struct bt_value *value = NULL;
 	const char *path;
-	void *priv_port;
 
 	if (!writer_component) {
 		ret = BT_COMPONENT_STATUS_NOMEM;
 		goto end;
 	}
 
-	priv_port = bt_private_component_sink_add_input_private_port(component,
-		"in", NULL);
-	if (!priv_port) {
-		ret = BT_COMPONENT_STATUS_NOMEM;
+	ret = bt_private_component_sink_add_input_private_port(component,
+		"in", NULL, NULL);
+	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
 	}
 
-	bt_put(priv_port);
-
 	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;
 	}
@@ -321,11 +338,18 @@ enum bt_component_status writer_component_init(
 	bt_put(value);
 
 	writer_component->base_path = g_string_new(path);
-	if (!writer_component) {
+	if (!writer_component->base_path) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto error;
 	}
 
+	writer_component->single_trace = false;
+	ret = apply_one_bool("single-trace", params,
+			&writer_component->single_trace, NULL);
+	if (ret != BT_COMPONENT_STATUS_OK) {
+		goto end;
+	}
+
 	ret = bt_private_component_set_user_data(component, writer_component);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto error;