X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdetails%2Fdetails.h;h=d9290c1fec948d04267ddfa97cb1e2afae103b24;hp=52a28cde06c895e7de03bbbc3cc74a9fde59359b;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=6c868a3a0167202c6a5d2ecae8bbb78a17b7e6ae

diff --git a/src/plugins/text/details/details.h b/src/plugins/text/details/details.h
index 52a28cde..d9290c1f 100644
--- a/src/plugins/text/details/details.h
+++ b/src/plugins/text/details/details.h
@@ -1,28 +1,12 @@
-#ifndef BABELTRACE_PLUGINS_TEXT_DETAILS_DETAILS_H
-#define BABELTRACE_PLUGINS_TEXT_DETAILS_DETAILS_H
-
 /*
- * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#ifndef BABELTRACE_PLUGINS_TEXT_DETAILS_DETAILS_H
+#define BABELTRACE_PLUGINS_TEXT_DETAILS_DETAILS_H
+
 #include <glib.h>
 #include <babeltrace2/babeltrace.h>
 #include <stdbool.h>
@@ -54,7 +38,7 @@ struct details_trace_class_meta {
 	 * Trace class destruction listener ID (`UINT64_C(-1)` if
 	 * there's no listener ID.
 	 */
-	uint64_t tc_destruction_listener_id;
+	bt_listener_id tc_destruction_listener_id;
 };
 
 /*
@@ -69,15 +53,19 @@ struct details_trace {
 	 * Trace destruction listener ID (`UINT64_C(-1)` if there's no
 	 * listener ID.
 	 */
-	uint64_t trace_destruction_listener_id;
+	bt_listener_id trace_destruction_listener_id;
 };
 
 /* A `sink.text.details` component */
 struct details_comp {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Component's configuration */
 	struct {
+		/* Write data objects */
+		bool with_data;
+
 		/* Write metadata objects */
 		bool with_meta;
 
@@ -96,9 +84,6 @@ struct details_comp {
 		/* Write message's time */
 		bool with_time;
 
-		/* Write trace class's name */
-		bool with_trace_class_name;
-
 		/* Write trace's name */
 		bool with_trace_name;
 
@@ -145,7 +130,7 @@ struct details_comp {
 	uint32_t next_unique_trace_id;
 
 	/* Upstream message iterator */
-	bt_self_component_port_input_message_iterator *msg_iter;
+	bt_message_iterator *msg_iter;
 
 	/*
 	 * True if this component printed something. This is used to
@@ -160,19 +145,20 @@ struct details_comp {
 };
 
 BT_HIDDEN
-bt_self_component_status details_init(
+bt_component_class_initialize_method_status details_init(
 		bt_self_component_sink *component,
+		bt_self_component_sink_configuration *config,
 		const bt_value *params, void *init_method_data);
 
 BT_HIDDEN
 void details_finalize(bt_self_component_sink *component);
 
 BT_HIDDEN
-bt_self_component_status details_graph_is_configured(
+bt_component_class_sink_graph_is_configured_method_status details_graph_is_configured(
 		bt_self_component_sink *comp);
 
 BT_HIDDEN
-bt_self_component_status details_consume(bt_self_component_sink *component);
+bt_component_class_sink_consume_method_status details_consume(bt_self_component_sink *component);
 
 BT_HIDDEN
 void details_destroy_details_trace_class_meta(