X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdmesg%2Fdmesg.c;h=3ef752c0b58379cdf7b7698d5422c99d57ac9683;hb=8d8b141db4c46135a35be19e4a1c192f6a36d67b;hp=3392e3edfaf935bc3a4e272904b99fd2440ff94c;hpb=9c8a50444d989ebd205d0ed2841c6d324e958147;p=babeltrace.git

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 3392e3ed..3ef752c0 100644
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (dmesg_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 #include <string.h>
@@ -55,11 +55,7 @@ struct dmesg_msg_iter {
 
 	enum {
 		STATE_EMIT_STREAM_BEGINNING,
-		STATE_EMIT_STREAM_ACTIVITY_BEGINNING,
-		STATE_EMIT_PACKET_BEGINNING,
 		STATE_EMIT_EVENT,
-		STATE_EMIT_PACKET_END,
-		STATE_EMIT_STREAM_ACTIVITY_END,
 		STATE_EMIT_STREAM_END,
 		STATE_DONE,
 	} state;
@@ -81,7 +77,6 @@ struct dmesg_component {
 	bt_event_class *event_class;
 	bt_trace *trace;
 	bt_stream *stream;
-	bt_packet *packet;
 	bt_clock_class *clock_class;
 };
 
@@ -163,11 +158,6 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
 			BT_COMP_LOGE_STR("Cannot set stream class's default clock class.");
 			goto error;
 		}
-
-		bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
-			dmesg_comp->stream_class, BT_TRUE);
-		bt_stream_class_set_packets_have_end_default_clock_snapshot(
-			dmesg_comp->stream_class, BT_TRUE);
 	}
 
 	dmesg_comp->event_class = bt_event_class_create(
@@ -260,7 +250,7 @@ end:
 }
 
 static
-int create_packet_and_stream_and_trace(struct dmesg_component *dmesg_comp)
+int create_stream_and_trace(struct dmesg_component *dmesg_comp)
 {
 	int ret = 0;
 	const char *trace_name = NULL;
@@ -300,28 +290,19 @@ int create_packet_and_stream_and_trace(struct dmesg_component *dmesg_comp)
 		goto error;
 	}
 
-	dmesg_comp->packet = bt_packet_create(dmesg_comp->stream);
-	if (!dmesg_comp->packet) {
-		BT_COMP_LOGE_STR("Cannot create packet object.");
-		goto error;
-	}
-
 	goto end;
 
 error:
 	ret = -1;
 
 end:
-	if (basename) {
-		g_free(basename);
-	}
+	g_free(basename);
 
 	return ret;
 }
 
 static
-int try_create_meta_stream_packet(struct dmesg_component *dmesg_comp,
-		bool has_ts)
+int try_create_meta_stream(struct dmesg_component *dmesg_comp, bool has_ts)
 {
 	int ret = 0;
 
@@ -337,9 +318,9 @@ int try_create_meta_stream_packet(struct dmesg_component *dmesg_comp,
 		goto error;
 	}
 
-	ret = create_packet_and_stream_and_trace(dmesg_comp);
+	ret = create_stream_and_trace(dmesg_comp);
 	if (ret) {
-		BT_COMP_LOGE("Cannot create packet and stream objects: "
+		BT_COMP_LOGE("Cannot create stream object: "
 			"dmesg-comp-addr=%p", dmesg_comp);
 		goto error;
 	}
@@ -364,7 +345,6 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
 		g_string_free(dmesg_comp->params.path, TRUE);
 	}
 
-	bt_packet_put_ref(dmesg_comp->packet);
 	bt_trace_put_ref(dmesg_comp->trace);
 	bt_stream_class_put_ref(dmesg_comp->stream_class);
 	bt_event_class_put_ref(dmesg_comp->event_class);
@@ -375,21 +355,41 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
 }
 
 static
-bt_self_component_status create_port(
+bt_component_class_init_method_status create_port(
 		bt_self_component_source *self_comp)
 {
-	return bt_self_component_source_add_output_port(self_comp,
+	bt_component_class_init_method_status status;
+	bt_self_component_add_port_status add_port_status;
+
+	add_port_status = bt_self_component_source_add_output_port(self_comp,
 		"out", NULL, NULL);
+	switch (add_port_status) {
+	case BT_SELF_COMPONENT_ADD_PORT_STATUS_OK:
+		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+		break;
+	case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
+		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+		break;
+	case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR:
+		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+		break;
+	default:
+		abort();
+	}
+
+	return status;
 }
 
 BT_HIDDEN
-bt_self_component_status dmesg_init(
+bt_component_class_init_method_status dmesg_init(
 		bt_self_component_source *self_comp_src,
+		bt_self_component_source_configuration *config,
 		bt_value *params, void *init_method_data)
 {
 	int ret = 0;
 	struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
-	bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+	bt_component_class_init_method_status status =
+		BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
 	bt_self_component *self_comp =
 		bt_self_component_source_as_self_component(self_comp_src);
 	const bt_component *comp = bt_self_component_as_component(self_comp);
@@ -427,7 +427,7 @@ bt_self_component_status dmesg_init(
 	}
 
 	status = create_port(self_comp_src);
-	if (status != BT_SELF_COMPONENT_STATUS_OK) {
+	if (status != BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
 		goto error;
 	}
 
@@ -440,7 +440,7 @@ error:
 	bt_self_component_set_data(self_comp, NULL);
 
 	if (status >= 0) {
-		status = BT_SELF_COMPONENT_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
 	}
 
 end:
@@ -522,22 +522,22 @@ skip_ts:
 	/*
 	 * At this point, we know if the stream class's event header
 	 * field class should have a timestamp or not, so we can lazily
-	 * create the metadata, stream, and packet objects.
+	 * create the metadata and stream objects.
 	 */
-	ret = try_create_meta_stream_packet(dmesg_comp, has_timestamp);
+	ret = try_create_meta_stream(dmesg_comp, has_timestamp);
 	if (ret) {
-		/* try_create_meta_stream_packet() logs errors */
+		/* try_create_meta_stream() logs errors */
 		goto error;
 	}
 
 	if (dmesg_comp->clock_class) {
 		msg = bt_message_event_create_with_default_clock_snapshot(
 			msg_iter->pc_msg_iter,
-			dmesg_comp->event_class, dmesg_comp->packet, ts);
+			dmesg_comp->event_class, dmesg_comp->stream, ts);
 		msg_iter->last_clock_value = ts;
 	} else {
 		msg = bt_message_event_create(msg_iter->pc_msg_iter,
-			dmesg_comp->event_class, dmesg_comp->packet);
+			dmesg_comp->event_class, dmesg_comp->stream);
 	}
 
 	if (!msg) {
@@ -580,12 +580,7 @@ int fill_event_payload_from_line(struct dmesg_component *dmesg_comp,
 		len--;
 	}
 
-	ret = bt_field_string_clear(str_field);
-	if (ret) {
-		BT_COMP_LOGE_STR("Cannot clear string field object.");
-		goto error;
-	}
-
+	bt_field_string_clear(str_field);
 	ret = bt_field_string_append_with_length(str_field, line, len);
 	if (ret) {
 		BT_COMP_LOGE("Cannot append value to string field object: "
@@ -640,12 +635,14 @@ end:
 static
 void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 {
-	struct dmesg_component *dmesg_comp = dmesg_msg_iter->dmesg_comp;
+	struct dmesg_component *dmesg_comp;
 
 	if (!dmesg_msg_iter) {
 		return;
 	}
 
+	dmesg_comp = dmesg_msg_iter->dmesg_comp;
+
 	if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) {
 		if (fclose(dmesg_msg_iter->fp)) {
 			BT_COMP_LOGE_ERRNO("Cannot close input file", ".");
@@ -660,8 +657,9 @@ void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 
 
 BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_init(
+bt_component_class_message_iterator_init_method_status dmesg_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
 		bt_self_component_source *self_comp,
 		bt_self_component_port_output *self_port)
 {
@@ -669,8 +667,8 @@ bt_self_message_iterator_status dmesg_msg_iter_init(
 		bt_self_component_source_as_self_component(self_comp));
 	struct dmesg_msg_iter *dmesg_msg_iter =
 		g_new0(struct dmesg_msg_iter, 1);
-	bt_self_message_iterator_status status =
-		BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	bt_component_class_message_iterator_init_method_status status =
+		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 
 	if (!dmesg_msg_iter) {
 		BT_COMP_LOGE_STR("Failed to allocate on dmesg message iterator structure.");
@@ -700,7 +698,7 @@ error:
 	destroy_dmesg_msg_iter(dmesg_msg_iter);
 	bt_self_message_iterator_set_data(self_msg_iter, NULL);
 	if (status >= 0) {
-		status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
 	}
 
 end:
@@ -716,27 +714,25 @@ void dmesg_msg_iter_finalize(
 }
 
 static
-bt_self_message_iterator_status dmesg_msg_iter_next_one(
+bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one(
 		struct dmesg_msg_iter *dmesg_msg_iter,
 		bt_message **msg)
 {
 	ssize_t len;
 	struct dmesg_component *dmesg_comp;
-	bt_self_message_iterator_status status =
-		BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	bt_component_class_message_iterator_next_method_status status =
+		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 
 	BT_ASSERT(dmesg_msg_iter);
 	dmesg_comp = dmesg_msg_iter->dmesg_comp;
 	BT_ASSERT(dmesg_comp);
 
 	if (dmesg_msg_iter->state == STATE_DONE) {
-		status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
 		goto end;
 	}
 
 	if (dmesg_msg_iter->tmp_event_msg ||
-			dmesg_msg_iter->state == STATE_EMIT_PACKET_END ||
-			dmesg_msg_iter->state == STATE_EMIT_STREAM_ACTIVITY_END ||
 			dmesg_msg_iter->state == STATE_EMIT_STREAM_END) {
 		goto handle_state;
 	}
@@ -749,19 +745,18 @@ bt_self_message_iterator_status dmesg_msg_iter_next_one(
 			&dmesg_msg_iter->linebuf_len, dmesg_msg_iter->fp);
 		if (len < 0) {
 			if (errno == EINVAL) {
-				status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+				status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
 			} else if (errno == ENOMEM) {
-				status =
-					BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
+				status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR;
 			} else {
 				if (dmesg_msg_iter->state == STATE_EMIT_STREAM_BEGINNING) {
 					/* Stream did not even begin */
-					status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+					status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
 					goto end;
 				} else {
-					/* End current packet now */
+					/* End stream now */
 					dmesg_msg_iter->state =
-						STATE_EMIT_PACKET_END;
+						STATE_EMIT_STREAM_END;
 					goto handle_state;
 				}
 			}
@@ -801,26 +796,6 @@ handle_state:
 		BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
 		*msg = bt_message_stream_beginning_create(
 			dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
-		dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_BEGINNING;
-		break;
-	case STATE_EMIT_STREAM_ACTIVITY_BEGINNING:
-		BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
-		*msg = bt_message_stream_activity_beginning_create(
-			dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
-		dmesg_msg_iter->state = STATE_EMIT_PACKET_BEGINNING;
-		break;
-	case STATE_EMIT_PACKET_BEGINNING:
-		BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
-
-		if (dmesg_comp->clock_class) {
-			*msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
-				dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
-				dmesg_msg_iter->last_clock_value);
-		} else {
-			*msg = bt_message_packet_beginning_create(
-				dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
-		}
-
 		dmesg_msg_iter->state = STATE_EMIT_EVENT;
 		break;
 	case STATE_EMIT_EVENT:
@@ -828,23 +803,6 @@ handle_state:
 		*msg = dmesg_msg_iter->tmp_event_msg;
 		dmesg_msg_iter->tmp_event_msg = NULL;
 		break;
-	case STATE_EMIT_PACKET_END:
-		if (dmesg_comp->clock_class) {
-			*msg = bt_message_packet_end_create_with_default_clock_snapshot(
-				dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
-				dmesg_msg_iter->last_clock_value);
-		} else {
-			*msg = bt_message_packet_end_create(
-				dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
-		}
-
-		dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_END;
-		break;
-	case STATE_EMIT_STREAM_ACTIVITY_END:
-		*msg = bt_message_stream_activity_end_create(
-			dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
-		dmesg_msg_iter->state = STATE_EMIT_STREAM_END;
-		break;
 	case STATE_EMIT_STREAM_END:
 		*msg = bt_message_stream_end_create(
 			dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
@@ -857,7 +815,7 @@ handle_state:
 	if (!*msg) {
 		BT_COMP_LOGE("Cannot create message: dmesg-comp-addr=%p",
 			dmesg_comp);
-		status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
 	}
 
 end:
@@ -865,7 +823,7 @@ end:
 }
 
 BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_next(
+bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next(
 		bt_self_message_iterator *self_msg_iter,
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count)
@@ -873,18 +831,18 @@ bt_self_message_iterator_status dmesg_msg_iter_next(
 	struct dmesg_msg_iter *dmesg_msg_iter =
 		bt_self_message_iterator_get_data(
 			self_msg_iter);
-	bt_self_message_iterator_status status =
-		BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	bt_component_class_message_iterator_next_method_status status =
+		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 	uint64_t i = 0;
 
 	while (i < capacity &&
-			status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+			status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
 		bt_message *priv_msg = NULL;
 
 		status = dmesg_msg_iter_next_one(dmesg_msg_iter,
 			&priv_msg);
 		msgs[i] = priv_msg;
-		if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+		if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
 			i++;
 		}
 	}
@@ -903,25 +861,29 @@ bt_self_message_iterator_status dmesg_msg_iter_next(
 		 * message, in which case we'll return it.
 		 */
 		*count = i;
-		status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 	}
 
 	return status;
 }
 
 BT_HIDDEN
-bt_bool dmesg_msg_iter_can_seek_beginning(
-		bt_self_message_iterator *self_msg_iter)
+bt_component_class_message_iterator_can_seek_beginning_method_status
+dmesg_msg_iter_can_seek_beginning(
+		bt_self_message_iterator *self_msg_iter, bt_bool *can_seek)
 {
 	struct dmesg_msg_iter *dmesg_msg_iter =
 		bt_self_message_iterator_get_data(self_msg_iter);
 
 	/* Can't seek the beginning of the standard input stream */
-	return !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+	*can_seek = !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
 }
 
 BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_seek_beginning(
+bt_component_class_message_iterator_seek_beginning_method_status
+dmesg_msg_iter_seek_beginning(
 		bt_self_message_iterator *self_msg_iter)
 {
 	struct dmesg_msg_iter *dmesg_msg_iter =
@@ -932,5 +894,5 @@ bt_self_message_iterator_status dmesg_msg_iter_seek_beginning(
 	BT_MESSAGE_PUT_REF_AND_RESET(dmesg_msg_iter->tmp_event_msg);
 	dmesg_msg_iter->last_clock_value = 0;
 	dmesg_msg_iter->state = STATE_EMIT_STREAM_BEGINNING;
-	return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK;
 }