X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fcomponent-class.c;h=4cfc3dc7cc5510419f77498ba91fb24fc4d53269;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=12a3eec0307331f39d246b486af60e9870c1c1dc;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git diff --git a/lib/graph/component-class.c b/lib/graph/component-class.c index 12a3eec0..4cfc3dc7 100644 --- a/lib/graph/component-class.c +++ b/lib/graph/component-class.c @@ -22,21 +22,21 @@ */ #define BT_LOG_TAG "COMP-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define BT_ASSERT_PRE_COMP_CLS_HOT(_cc) \ @@ -134,15 +134,15 @@ end: struct bt_component_class_source *bt_component_class_source_create( const char *name, - bt_component_class_source_notification_iterator_next_method method) + bt_component_class_source_message_iterator_next_method method) { struct bt_component_class_source *source_class = NULL; int ret; BT_ASSERT_PRE_NON_NULL(name, "Name"); - BT_ASSERT_PRE_NON_NULL(method, "Notification iterator next method"); + BT_ASSERT_PRE_NON_NULL(method, "Message iterator next method"); BT_LOGD("Creating source component class: " - "name=\"%s\", notif-iter-next-method-addr=%p", + "name=\"%s\", msg-iter-next-method-addr=%p", name, method); source_class = g_new0(struct bt_component_class_source, 1); if (!source_class) { @@ -163,7 +163,7 @@ struct bt_component_class_source *bt_component_class_source_create( goto end; } - source_class->methods.notif_iter_next = method; + source_class->methods.msg_iter_next = method; BT_LIB_LOGD("Created source component class: %!+C", source_class); end: @@ -172,15 +172,15 @@ end: struct bt_component_class_filter *bt_component_class_filter_create( const char *name, - bt_component_class_filter_notification_iterator_next_method method) + bt_component_class_filter_message_iterator_next_method method) { struct bt_component_class_filter *filter_class = NULL; int ret; BT_ASSERT_PRE_NON_NULL(name, "Name"); - BT_ASSERT_PRE_NON_NULL(method, "Notification iterator next method"); + BT_ASSERT_PRE_NON_NULL(method, "Message iterator next method"); BT_LOGD("Creating filter component class: " - "name=\"%s\", notif-iter-next-method-addr=%p", + "name=\"%s\", msg-iter-next-method-addr=%p", name, method); filter_class = g_new0(struct bt_component_class_filter, 1); if (!filter_class) { @@ -201,7 +201,7 @@ struct bt_component_class_filter *bt_component_class_filter_create( goto end; } - filter_class->methods.notif_iter_next = method; + filter_class->methods.msg_iter_next = method; BT_LIB_LOGD("Created filter component class: %!+C", filter_class); end: @@ -245,7 +245,8 @@ end: return (void *) sink_class; } -int bt_component_class_source_set_init_method( +enum bt_component_class_status +bt_component_class_source_set_init_method( struct bt_component_class_source *comp_cls, bt_component_class_source_init_method method) { @@ -255,10 +256,11 @@ int bt_component_class_source_set_init_method( comp_cls->methods.init = method; BT_LIB_LOGV("Set source component class's initialization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_init_method( +enum bt_component_class_status +bt_component_class_filter_set_init_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_init_method method) { @@ -268,10 +270,11 @@ int bt_component_class_filter_set_init_method( comp_cls->methods.init = method; BT_LIB_LOGV("Set filter component class's initialization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_init_method( +enum bt_component_class_status +bt_component_class_sink_set_init_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_init_method method) { @@ -281,10 +284,11 @@ int bt_component_class_sink_set_init_method( comp_cls->methods.init = method; BT_LIB_LOGV("Set sink component class's initialization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_finalize_method( +enum bt_component_class_status +bt_component_class_source_set_finalize_method( struct bt_component_class_source *comp_cls, bt_component_class_source_finalize_method method) { @@ -294,10 +298,11 @@ int bt_component_class_source_set_finalize_method( comp_cls->methods.finalize = method; BT_LIB_LOGV("Set source component class's finalization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_finalize_method( +enum bt_component_class_status +bt_component_class_filter_set_finalize_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_finalize_method method) { @@ -307,10 +312,11 @@ int bt_component_class_filter_set_finalize_method( comp_cls->methods.finalize = method; BT_LIB_LOGV("Set filter component class's finalization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_finalize_method( +enum bt_component_class_status +bt_component_class_sink_set_finalize_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_finalize_method method) { @@ -320,10 +326,11 @@ int bt_component_class_sink_set_finalize_method( comp_cls->methods.finalize = method; BT_LIB_LOGV("Set sink component class's finalization method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_query_method( +enum bt_component_class_status +bt_component_class_source_set_query_method( struct bt_component_class_source *comp_cls, bt_component_class_source_query_method method) { @@ -333,10 +340,11 @@ int bt_component_class_source_set_query_method( comp_cls->methods.query = method; BT_LIB_LOGV("Set source component class's query method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_query_method( +enum bt_component_class_status +bt_component_class_filter_set_query_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_query_method method) { @@ -346,10 +354,11 @@ int bt_component_class_filter_set_query_method( comp_cls->methods.query = method; BT_LIB_LOGV("Set filter component class's query method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_query_method( +enum bt_component_class_status +bt_component_class_sink_set_query_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_query_method method) { @@ -359,10 +368,11 @@ int bt_component_class_sink_set_query_method( comp_cls->methods.query = method; BT_LIB_LOGV("Set sink component class's query method: " "%!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_accept_input_port_connection_method( +enum bt_component_class_status +bt_component_class_filter_set_accept_input_port_connection_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_accept_input_port_connection_method method) { @@ -372,10 +382,11 @@ int bt_component_class_filter_set_accept_input_port_connection_method( comp_cls->methods.accept_input_port_connection = method; BT_LIB_LOGV("Set filter component class's \"accept input port connection\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_accept_input_port_connection_method( +enum bt_component_class_status +bt_component_class_sink_set_accept_input_port_connection_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_accept_input_port_connection_method method) { @@ -385,10 +396,11 @@ int bt_component_class_sink_set_accept_input_port_connection_method( comp_cls->methods.accept_input_port_connection = method; BT_LIB_LOGV("Set sink component class's \"accept input port connection\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_accept_output_port_connection_method( +enum bt_component_class_status +bt_component_class_source_set_accept_output_port_connection_method( struct bt_component_class_source *comp_cls, bt_component_class_source_accept_output_port_connection_method method) { @@ -398,10 +410,11 @@ int bt_component_class_source_set_accept_output_port_connection_method( comp_cls->methods.accept_output_port_connection = method; BT_LIB_LOGV("Set source component class's \"accept output port connection\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_accept_output_port_connection_method( +enum bt_component_class_status +bt_component_class_filter_set_accept_output_port_connection_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_accept_output_port_connection_method method) { @@ -411,10 +424,11 @@ int bt_component_class_filter_set_accept_output_port_connection_method( comp_cls->methods.accept_output_port_connection = method; BT_LIB_LOGV("Set filter component class's \"accept output port connection\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_input_port_connected_method( +enum bt_component_class_status +bt_component_class_filter_set_input_port_connected_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_input_port_connected_method method) { @@ -424,10 +438,11 @@ int bt_component_class_filter_set_input_port_connected_method( comp_cls->methods.input_port_connected = method; BT_LIB_LOGV("Set filter component class's \"input port connected\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_input_port_connected_method( +enum bt_component_class_status +bt_component_class_sink_set_input_port_connected_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_input_port_connected_method method) { @@ -437,10 +452,11 @@ int bt_component_class_sink_set_input_port_connected_method( comp_cls->methods.input_port_connected = method; BT_LIB_LOGV("Set sink component class's \"input port connected\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_output_port_connected_method( +enum bt_component_class_status +bt_component_class_source_set_output_port_connected_method( struct bt_component_class_source *comp_cls, bt_component_class_source_output_port_connected_method method) { @@ -450,10 +466,11 @@ int bt_component_class_source_set_output_port_connected_method( comp_cls->methods.output_port_connected = method; BT_LIB_LOGV("Set source component class's \"output port connected\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_output_port_connected_method( +enum bt_component_class_status +bt_component_class_filter_set_output_port_connected_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_output_port_connected_method method) { @@ -463,114 +480,191 @@ int bt_component_class_filter_set_output_port_connected_method( comp_cls->methods.output_port_connected = method; BT_LIB_LOGV("Set filter component class's \"output port connected\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_input_port_disconnected_method( +enum bt_component_class_status +bt_component_class_sink_set_graph_is_configured_method( + struct bt_component_class_sink *comp_cls, + bt_component_class_sink_graph_is_configured_method method) +{ + BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_NON_NULL(method, "Method"); + BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + comp_cls->methods.graph_is_configured = method; + BT_LIB_LOGV("Set sink component class's \"graph is configured\" method" + ": %!+C", comp_cls); + return BT_COMPONENT_CLASS_STATUS_OK; +} + +int bt_component_class_source_set_message_iterator_init_method( + struct bt_component_class_source *comp_cls, + bt_component_class_source_message_iterator_init_method method) +{ + BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_NON_NULL(method, "Method"); + BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_init = method; + BT_LIB_LOGV("Set source component class's message iterator initialization method" + ": %!+C", comp_cls); + return BT_COMPONENT_CLASS_STATUS_OK; +} + +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_init_method( struct bt_component_class_filter *comp_cls, - bt_component_class_filter_input_port_disconnected_method method) + bt_component_class_filter_message_iterator_init_method method) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); - comp_cls->methods.input_port_disconnected = method; - BT_LIB_LOGV("Set filter component class's \"input port disconnected\" method" + comp_cls->methods.msg_iter_init = method; + BT_LIB_LOGV("Set filter component class's message iterator initialization method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_sink_set_input_port_disconnected_method( - struct bt_component_class_sink *comp_cls, - bt_component_class_sink_input_port_disconnected_method method) +enum bt_component_class_status +bt_component_class_source_set_message_iterator_finalize_method( + struct bt_component_class_source *comp_cls, + bt_component_class_source_message_iterator_finalize_method method) +{ + BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_NON_NULL(method, "Method"); + BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_finalize = method; + BT_LIB_LOGV("Set source component class's message iterator finalization method" + ": %!+C", comp_cls); + return BT_COMPONENT_CLASS_STATUS_OK; +} + +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_finalize_method( + struct bt_component_class_filter *comp_cls, + bt_component_class_filter_message_iterator_finalize_method method) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); - comp_cls->methods.input_port_disconnected = method; - BT_LIB_LOGV("Set sink component class's \"input port disconnected\" method" + comp_cls->methods.msg_iter_finalize = method; + BT_LIB_LOGV("Set filter component class's message iterator finalization method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_output_port_disconnected_method( +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method( + struct bt_component_class_filter *comp_cls, + bt_component_class_filter_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_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_seek_ns_from_origin = method; + BT_LIB_LOGV("Set filter component class's message iterator \"seek nanoseconds from origin\" method" + ": %!+C", comp_cls); + return BT_COMPONENT_CLASS_STATUS_OK; +} + +enum bt_component_class_status +bt_component_class_source_set_message_iterator_seek_ns_from_origin_method( struct bt_component_class_source *comp_cls, - bt_component_class_source_output_port_disconnected_method method) + 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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.output_port_disconnected = method; - BT_LIB_LOGV("Set source component class's \"output port disconnected\" method" + comp_cls->methods.msg_iter_seek_ns_from_origin = method; + BT_LIB_LOGV("Set source component class's message iterator \"seek nanoseconds from origin\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_output_port_disconnected_method( +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_seek_beginning_method( struct bt_component_class_filter *comp_cls, - bt_component_class_filter_output_port_disconnected_method method) + 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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.output_port_disconnected = method; - BT_LIB_LOGV("Set filter component class's \"output port disconnected\" method" + comp_cls->methods.msg_iter_seek_beginning = method; + BT_LIB_LOGV("Set filter component class's message iterator \"seek beginning\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_notification_iterator_init_method( +enum bt_component_class_status +bt_component_class_source_set_message_iterator_seek_beginning_method( struct bt_component_class_source *comp_cls, - bt_component_class_source_notification_iterator_init_method method) + 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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.notif_iter_init = method; - BT_LIB_LOGV("Set source component class's notification iterator initialization method" + comp_cls->methods.msg_iter_seek_beginning = method; + BT_LIB_LOGV("Set source component class's message iterator \"seek beginning\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_notification_iterator_init_method( +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_can_seek_beginning_method( struct bt_component_class_filter *comp_cls, - bt_component_class_filter_notification_iterator_init_method method) + 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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.notif_iter_init = method; - BT_LIB_LOGV("Set filter component class's notification iterator initialization method" + comp_cls->methods.msg_iter_can_seek_beginning = method; + BT_LIB_LOGV("Set filter component class's message iterator \"can seek beginning\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_source_set_notification_iterator_finalize_method( +enum bt_component_class_status +bt_component_class_source_set_message_iterator_can_seek_beginning_method( struct bt_component_class_source *comp_cls, - bt_component_class_source_notification_iterator_finalize_method method) + bt_component_class_source_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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.notif_iter_finalize = method; - BT_LIB_LOGV("Set source component class's notification iterator finalization method" + comp_cls->methods.msg_iter_can_seek_beginning = method; + BT_LIB_LOGV("Set source component class's message iterator \"can seek beginning\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_filter_set_notification_iterator_finalize_method( +enum bt_component_class_status +bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method( struct bt_component_class_filter *comp_cls, - bt_component_class_filter_notification_iterator_finalize_method method) + bt_component_class_filter_message_iterator_can_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_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_can_seek_ns_from_origin = method; + BT_LIB_LOGV("Set filter component class's message iterator \"can seek nanoseconds from origin\" method" + ": %!+C", comp_cls); + return BT_COMPONENT_CLASS_STATUS_OK; +} + +enum bt_component_class_status +bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method( + struct bt_component_class_source *comp_cls, + bt_component_class_source_message_iterator_can_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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.notif_iter_finalize = method; - BT_LIB_LOGV("Set filter component class's notification iterator finalization method" + comp_cls->methods.msg_iter_can_seek_ns_from_origin = method; + BT_LIB_LOGV("Set source component class's message iterator \"can seek nanoseconds from origin\" method" ": %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_set_description( +bt_component_class_status bt_component_class_set_description( struct bt_component_class *comp_cls, const char *description) { @@ -583,10 +677,10 @@ int bt_component_class_set_description( comp_cls, bt_component_class_get_name(comp_cls), bt_component_class_type_string(comp_cls->type)); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } -int bt_component_class_set_help( +bt_component_class_status bt_component_class_set_help( struct bt_component_class *comp_cls, const char *help) { @@ -595,7 +689,7 @@ int bt_component_class_set_help( BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); g_string_assign(comp_cls->help, help); BT_LIB_LOGV("Set component class's help text: %!+C", comp_cls); - return 0; + return BT_COMPONENT_CLASS_STATUS_OK; } const char *bt_component_class_get_name(const struct bt_component_class *comp_cls)