X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fcounter%2Fcounter.c;h=be20f89538bede60a5bf4457a44eda80f82d237e;hb=1353b066072e6c389ff35853bac83f65597e7a6a;hp=d9b7baeeb0ec13ceb6ee523e2d52c8ad9db7c5b8;hpb=7c7301d5827bd10ec7c34da7ffc5fe74e5047d38;p=babeltrace.git

diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c
index d9b7baee..be20f895 100644
--- a/src/plugins/utils/counter/counter.c
+++ b/src/plugins/utils/counter/counter.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2017 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 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_COMP_LOG_SELF_COMP (counter->self_comp)
@@ -30,6 +14,7 @@
 #include "common/common.h"
 #include "common/assert.h"
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include "plugins/common/param-validation/param-validation.h"
 
@@ -117,13 +102,12 @@ static
 void destroy_private_counter_data(struct counter *counter)
 {
 	if (counter) {
-		bt_self_component_port_input_message_iterator_put_ref(
+		bt_message_iterator_put_ref(
 			counter->msg_iter);
 		g_free(counter);
 	}
 }
 
-BT_HIDDEN
 void counter_finalize(bt_self_component_sink *comp)
 {
 	struct counter *counter;
@@ -133,17 +117,17 @@ void counter_finalize(bt_self_component_sink *comp)
 			bt_self_component_sink_as_self_component(comp));
 	BT_ASSERT(counter);
 	try_print_last(counter);
-	bt_self_component_port_input_message_iterator_put_ref(counter->msg_iter);
+	bt_message_iterator_put_ref(counter->msg_iter);
 	g_free(counter);
 }
 
+static
 struct bt_param_validation_map_value_entry_descr counter_params[] = {
 	{ "step", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_UNSIGNED_INTEGER } },
 	{ "hide-zero", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
 	BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END
 };
 
-BT_HIDDEN
 bt_component_class_initialize_method_status counter_init(
 		bt_self_component_sink *component,
 		bt_self_component_sink_configuration *config,
@@ -213,30 +197,29 @@ end:
 	return status;
 }
 
-BT_HIDDEN
 bt_component_class_sink_graph_is_configured_method_status
 counter_graph_is_configured(
 		bt_self_component_sink *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 counter *counter;
-	bt_self_component_port_input_message_iterator *iterator;
+	bt_message_iterator *iterator;
 
 	counter = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(comp));
 	BT_ASSERT(counter);
 
-	msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+	msg_iter_status = bt_message_iterator_create_from_sink_component(
 		comp, bt_self_component_sink_borrow_input_port_by_name(comp,
 			in_port_name), &iterator);
-	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;
 	}
 
-	BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
+	BT_MESSAGE_ITERATOR_MOVE_REF(
 		counter->msg_iter, iterator);
 
 	status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
@@ -244,7 +227,6 @@ end:
 	return status;
 }
 
-BT_HIDDEN
 bt_component_class_sink_consume_method_status counter_consume(
 		bt_self_component_sink *comp)
 {
@@ -266,7 +248,7 @@ bt_component_class_sink_consume_method_status counter_consume(
 	}
 
 	/* Consume messages */
-	next_status = bt_self_component_port_input_message_iterator_next(
+	next_status = bt_message_iterator_next(
 		counter->msg_iter, &msgs, &msg_count);
 	if (next_status < 0) {
 		status = (int) next_status;