X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class.c;h=9bbf4172e751845d0c1afc2b32fe11457249fef4;hb=2e1b56154a3032b52687751ed2e5c1a8a5134f7c;hp=8b5abf9b31a4a1b52b8209eae0104d3383cf0904;hpb=2b55df78b247562ac2b006c597a651cfb0cf9b8b;p=babeltrace.git

diff --git a/src/lib/graph/component-class.c b/src/lib/graph/component-class.c
index 8b5abf9b..9bbf4172 100644
--- a/src/lib/graph/component-class.c
+++ b/src/lib/graph/component-class.c
@@ -304,9 +304,9 @@ bt_component_class_sink_set_get_supported_mip_versions_method(
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_source_set_init_method(
+bt_component_class_source_set_initialize_method(
 		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_init_method method)
+		bt_component_class_source_initialize_method method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(method, "Method");
@@ -318,9 +318,9 @@ bt_component_class_source_set_init_method(
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_filter_set_init_method(
+bt_component_class_filter_set_initialize_method(
 		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_init_method method)
+		bt_component_class_filter_initialize_method method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(method, "Method");
@@ -332,9 +332,9 @@ bt_component_class_filter_set_init_method(
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_sink_set_init_method(
+bt_component_class_sink_set_initialize_method(
 		struct bt_component_class_sink *comp_cls,
-		bt_component_class_sink_init_method method)
+		bt_component_class_sink_initialize_method method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(method, "Method");
@@ -500,28 +500,28 @@ bt_component_class_sink_set_graph_is_configured_method(
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_source_set_message_iterator_init_method(
+bt_component_class_source_set_message_iterator_initialize_method(
 		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_message_iterator_init_method method)
+		bt_component_class_source_message_iterator_initialize_method method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(method, "Method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_init = method;
+	comp_cls->methods.msg_iter_initialize = method;
 	BT_LIB_LOGD("Set source component class's message iterator initialization method"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_filter_set_message_iterator_init_method(
+bt_component_class_filter_set_message_iterator_initialize_method(
 		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_message_iterator_init_method method)
+		bt_component_class_filter_message_iterator_initialize_method method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(method, "Method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_init = method;
+	comp_cls->methods.msg_iter_initialize = method;
 	BT_LIB_LOGD("Set filter component class's message iterator initialization method"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
@@ -556,113 +556,65 @@ bt_component_class_filter_set_message_iterator_finalize_method(
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method(
+bt_component_class_filter_set_message_iterator_seek_ns_from_origin_methods(
 		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_message_iterator_seek_ns_from_origin_method method)
+		bt_component_class_filter_message_iterator_seek_ns_from_origin_method seek_method,
+		bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method can_seek_method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
+	BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_seek_ns_from_origin = method;
+	comp_cls->methods.msg_iter_seek_ns_from_origin = seek_method;
+	comp_cls->methods.msg_iter_can_seek_ns_from_origin = can_seek_method;
 	BT_LIB_LOGD("Set filter component class's message iterator \"seek nanoseconds from origin\" method"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_source_set_message_iterator_seek_ns_from_origin_method(
-		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_message_iterator_seek_ns_from_origin_method method)
-{
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
-	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_seek_ns_from_origin = method;
-	BT_LIB_LOGD("Set source component class's message iterator \"seek nanoseconds from origin\" method"
-		": %!+C", comp_cls);
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_component_class_set_method_status
-bt_component_class_filter_set_message_iterator_seek_beginning_method(
-		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_message_iterator_seek_beginning_method method)
-{
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
-	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_seek_beginning = method;
-	BT_LIB_LOGD("Set filter component class's message iterator \"seek beginning\" method"
-		": %!+C", comp_cls);
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_component_class_set_method_status
-bt_component_class_source_set_message_iterator_seek_beginning_method(
-		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_message_iterator_seek_beginning_method method)
-{
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
-	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_seek_beginning = method;
-	BT_LIB_LOGD("Set source component class's message iterator \"seek beginning\" method"
-		": %!+C", comp_cls);
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_component_class_set_method_status
-bt_component_class_filter_set_message_iterator_can_seek_beginning_method(
-		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_message_iterator_can_seek_beginning_method method)
-{
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
-	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_can_seek_beginning = method;
-	BT_LIB_LOGD("Set filter component class's message iterator \"can seek beginning\" method"
-		": %!+C", comp_cls);
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_component_class_set_method_status
-bt_component_class_source_set_message_iterator_can_seek_beginning_method(
+bt_component_class_source_set_message_iterator_seek_ns_from_origin_methods(
 		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_message_iterator_can_seek_beginning_method method)
+		bt_component_class_source_message_iterator_seek_ns_from_origin_method seek_method,
+		bt_component_class_source_message_iterator_can_seek_ns_from_origin_method can_seek_method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
+	BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_can_seek_beginning = method;
-	BT_LIB_LOGD("Set source component class's message iterator \"can seek beginning\" method"
+	comp_cls->methods.msg_iter_seek_ns_from_origin = seek_method;
+	comp_cls->methods.msg_iter_can_seek_ns_from_origin = can_seek_method;
+	BT_LIB_LOGD("Set source component class's message iterator \"seek nanoseconds from origin\" methods"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method(
+bt_component_class_filter_set_message_iterator_seek_beginning_methods(
 		struct bt_component_class_filter *comp_cls,
-		bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method method)
+		bt_component_class_filter_message_iterator_seek_beginning_method seek_method,
+		bt_component_class_filter_message_iterator_can_seek_beginning_method can_seek_method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
+	BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_can_seek_ns_from_origin = method;
-	BT_LIB_LOGD("Set filter component class's message iterator \"can seek nanoseconds from origin\" method"
+	comp_cls->methods.msg_iter_seek_beginning = seek_method;
+	comp_cls->methods.msg_iter_can_seek_beginning = can_seek_method;
+	BT_LIB_LOGD("Set filter component class's message iterator \"seek beginning\" methods"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
 }
 
 enum bt_component_class_set_method_status
-bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method(
+bt_component_class_source_set_message_iterator_seek_beginning_methods(
 		struct bt_component_class_source *comp_cls,
-		bt_component_class_source_message_iterator_can_seek_ns_from_origin_method method)
+		bt_component_class_source_message_iterator_seek_beginning_method seek_method,
+		bt_component_class_source_message_iterator_can_seek_beginning_method can_seek_method)
 {
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
-	BT_ASSERT_PRE_NON_NULL(method, "Method");
+	BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method");
 	BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls);
-	comp_cls->methods.msg_iter_can_seek_ns_from_origin = method;
-	BT_LIB_LOGD("Set source component class's message iterator \"can seek nanoseconds from origin\" method"
+	comp_cls->methods.msg_iter_seek_beginning = seek_method;
+	comp_cls->methods.msg_iter_can_seek_beginning = can_seek_method;
+	BT_LIB_LOGD("Set source component class's message iterator \"seek beginning\" methods"
 		": %!+C", comp_cls);
 	return BT_FUNC_STATUS_OK;
 }