X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class.c;h=9bbf4172e751845d0c1afc2b32fe11457249fef4;hb=2e1b56154a3032b52687751ed2e5c1a8a5134f7c;hp=24a32ffc2df236e8fda444b1ab28d3788f14f93e;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git diff --git a/src/lib/graph/component-class.c b/src/lib/graph/component-class.c index 24a32ffc..9bbf4172 100644 --- a/src/lib/graph/component-class.c +++ b/src/lib/graph/component-class.c @@ -22,7 +22,7 @@ */ #define BT_LOG_TAG "LIB/COMPONENT-CLASS" -#include "lib/lib-logging.h" +#include "lib/logging.h" #include "common/assert.h" #include "lib/assert-pre.h" @@ -39,9 +39,10 @@ #include #include "component-class.h" +#include "lib/func-status.h" -#define BT_ASSERT_PRE_COMP_CLS_HOT(_cc) \ - BT_ASSERT_PRE_HOT(((const struct bt_component_class *) (_cc)), \ +#define BT_ASSERT_PRE_DEV_COMP_CLS_HOT(_cc) \ + BT_ASSERT_PRE_DEV_HOT(((const struct bt_component_class *) (_cc)), \ "Component class", ": %!+C", (_cc)) static @@ -82,6 +83,11 @@ void destroy_component_class(struct bt_object *obj) class->help = NULL; } + if (class->plugin_name) { + g_string_free(class->plugin_name, TRUE); + class->plugin_name = NULL; + } + if (class->destroy_listeners) { g_array_free(class->destroy_listeners, TRUE); class->destroy_listeners = NULL; @@ -100,26 +106,32 @@ int bt_component_class_init(struct bt_component_class *class, class->type = type; class->name = g_string_new(name); if (!class->name) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); goto error; } class->description = g_string_new(NULL); if (!class->description) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); goto error; } class->help = g_string_new(NULL); if (!class->help) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); + goto error; + } + + class->plugin_name = g_string_new(NULL); + if (!class->plugin_name) { + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); goto error; } class->destroy_listeners = g_array_new(FALSE, TRUE, sizeof(struct bt_component_class_destroy_listener)); if (!class->destroy_listeners) { - BT_LOGE_STR("Failed to allocate a GArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GArray."); goto error; } @@ -147,7 +159,8 @@ struct bt_component_class_source *bt_component_class_source_create( name, method); source_class = g_new0(struct bt_component_class_source, 1); if (!source_class) { - BT_LOGE_STR("Failed to allocate one source component class."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one source component class."); goto end; } @@ -185,7 +198,8 @@ struct bt_component_class_filter *bt_component_class_filter_create( name, method); filter_class = g_new0(struct bt_component_class_filter, 1); if (!filter_class) { - BT_LOGE_STR("Failed to allocate one filter component class."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one filter component class."); goto end; } @@ -222,7 +236,8 @@ struct bt_component_class_sink *bt_component_class_sink_create( name, method); sink_class = g_new0(struct bt_component_class_sink, 1); if (!sink_class) { - BT_LOGE_STR("Failed to allocate one sink component class."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one sink component class."); goto end; } @@ -246,470 +261,410 @@ end: return (void *) sink_class; } -enum bt_component_class_status -bt_component_class_source_set_init_method( +enum bt_component_class_set_method_status +bt_component_class_source_set_get_supported_mip_versions_method( struct bt_component_class_source *comp_cls, - bt_component_class_source_init_method method) + bt_component_class_source_get_supported_mip_versions_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.get_supported_mip_versions = method; + BT_LIB_LOGD("Set source component class's \"get supported MIP versions\" method: " + "%!+C", comp_cls); + return BT_FUNC_STATUS_OK; +} + +enum bt_component_class_set_method_status +bt_component_class_filter_set_get_supported_mip_versions_method( + struct bt_component_class_filter *comp_cls, + bt_component_class_filter_get_supported_mip_versions_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); + comp_cls->methods.get_supported_mip_versions = method; + BT_LIB_LOGD("Set filter component class's \"get supported MIP versions\" method: " + "%!+C", comp_cls); + return BT_FUNC_STATUS_OK; +} + +enum bt_component_class_set_method_status +bt_component_class_sink_set_get_supported_mip_versions_method( + struct bt_component_class_sink *comp_cls, + bt_component_class_sink_get_supported_mip_versions_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.get_supported_mip_versions = method; + BT_LIB_LOGD("Set sink component class's \"get supported MIP versions\" method: " + "%!+C", comp_cls); + return BT_FUNC_STATUS_OK; +} + +enum bt_component_class_set_method_status +bt_component_class_source_set_initialize_method( + struct bt_component_class_source *comp_cls, + bt_component_class_source_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.init = method; BT_LIB_LOGD("Set source component class's initialization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_filter_set_init_method( +enum bt_component_class_set_method_status +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"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.init = method; BT_LIB_LOGD("Set filter component class's initialization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_sink_set_init_method( +enum bt_component_class_set_method_status +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"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.init = method; BT_LIB_LOGD("Set sink component class's initialization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_source_set_finalize_method( struct bt_component_class_source *comp_cls, bt_component_class_source_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.finalize = method; BT_LIB_LOGD("Set source component class's finalization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_filter_set_finalize_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.finalize = method; BT_LIB_LOGD("Set filter component class's finalization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_sink_set_finalize_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.finalize = method; BT_LIB_LOGD("Set sink component class's finalization method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_source_set_query_method( struct bt_component_class_source *comp_cls, bt_component_class_source_query_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.query = method; BT_LIB_LOGD("Set source component class's query method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_filter_set_query_method( struct bt_component_class_filter *comp_cls, bt_component_class_filter_query_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.query = method; BT_LIB_LOGD("Set filter component class's query method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_status bt_component_class_sink_set_query_method( struct bt_component_class_sink *comp_cls, bt_component_class_sink_query_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.query = method; BT_LIB_LOGD("Set sink component class's query method: " "%!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -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) -{ - 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.accept_input_port_connection = method; - BT_LIB_LOGD("Set filter component class's \"accept input port connection\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -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) -{ - 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.accept_input_port_connection = method; - BT_LIB_LOGD("Set sink component class's \"accept input port connection\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -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) -{ - 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.accept_output_port_connection = method; - BT_LIB_LOGD("Set source component class's \"accept output port connection\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -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) -{ - 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.accept_output_port_connection = method; - BT_LIB_LOGD("Set filter component class's \"accept output port connection\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.input_port_connected = method; BT_LIB_LOGD("Set filter component class's \"input port connected\" method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.input_port_connected = method; BT_LIB_LOGD("Set sink component class's \"input port connected\" method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.output_port_connected = method; BT_LIB_LOGD("Set source component class's \"output port connected\" method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(method, "Method"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.output_port_connected = method; BT_LIB_LOGD("Set filter component class's \"output port connected\" method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.graph_is_configured = method; BT_LIB_LOGD("Set sink component class's \"graph is configured\" method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -int bt_component_class_source_set_message_iterator_init_method( +enum bt_component_class_set_method_status +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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.msg_iter_init = method; + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_initialize = method; BT_LIB_LOGD("Set source component class's message iterator initialization method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_filter_set_message_iterator_init_method( +enum bt_component_class_set_method_status +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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.msg_iter_init = method; + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); + comp_cls->methods.msg_iter_initialize = method; BT_LIB_LOGD("Set filter component class's message iterator initialization method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.msg_iter_finalize = method; BT_LIB_LOGD("Set source component class's message iterator finalization method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status +enum bt_component_class_set_method_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); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); comp_cls->methods.msg_iter_finalize = method; BT_LIB_LOGD("Set filter component class's message iterator finalization method" ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method( +enum bt_component_class_set_method_status +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_COMP_CLS_HOT(comp_cls); - comp_cls->methods.msg_iter_seek_ns_from_origin = 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 = 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_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_source_set_message_iterator_seek_ns_from_origin_method( +enum bt_component_class_set_method_status +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_seek_ns_from_origin_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_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" + 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 = 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_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_filter_set_message_iterator_seek_beginning_method( +enum bt_component_class_set_method_status +bt_component_class_filter_set_message_iterator_seek_beginning_methods( struct bt_component_class_filter *comp_cls, - bt_component_class_filter_message_iterator_seek_beginning_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_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" + BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method"); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); + 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_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_component_class_status -bt_component_class_source_set_message_iterator_seek_beginning_method( +enum bt_component_class_set_method_status +bt_component_class_source_set_message_iterator_seek_beginning_methods( struct bt_component_class_source *comp_cls, - bt_component_class_source_message_iterator_seek_beginning_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_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" + BT_ASSERT_PRE_NON_NULL(seek_method, "Seek method"); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); + 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_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -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_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.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_COMPONENT_CLASS_STATUS_OK; -} - -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_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.msg_iter_can_seek_beginning = method; - BT_LIB_LOGD("Set source component class's message iterator \"can seek beginning\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -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_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_LOGD("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.msg_iter_can_seek_ns_from_origin = method; - BT_LIB_LOGD("Set source component class's message iterator \"can seek nanoseconds from origin\" method" - ": %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; -} - -bt_component_class_status bt_component_class_set_description( +enum bt_component_class_set_description_status +bt_component_class_set_description( struct bt_component_class *comp_cls, const char *description) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(description, "Description"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); g_string_assign(comp_cls->description, description); BT_LIB_LOGD("Set component class's description: " "addr=%p, name=\"%s\", type=%s", comp_cls, bt_component_class_get_name(comp_cls), bt_component_class_type_string(comp_cls->type)); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } -bt_component_class_status bt_component_class_set_help( +enum bt_component_class_set_help_status bt_component_class_set_help( struct bt_component_class *comp_cls, const char *help) { BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(help, "Help"); - BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls); + BT_ASSERT_PRE_DEV_COMP_CLS_HOT(comp_cls); g_string_assign(comp_cls->help, help); BT_LIB_LOGD("Set component class's help text: %!+C", comp_cls); - return BT_COMPONENT_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } const char *bt_component_class_get_name(const struct bt_component_class *comp_cls) { - BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_DEV_NON_NULL(comp_cls, "Component class"); return comp_cls->name->str; } enum bt_component_class_type bt_component_class_get_type( const struct bt_component_class *comp_cls) { - BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_DEV_NON_NULL(comp_cls, "Component class"); return comp_cls->type; } const char *bt_component_class_get_description( const struct bt_component_class *comp_cls) { - BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_DEV_NON_NULL(comp_cls, "Component class"); return comp_cls->description && comp_cls->description->str[0] != '\0' ? comp_cls->description->str : NULL; @@ -718,7 +673,7 @@ const char *bt_component_class_get_description( const char *bt_component_class_get_help( const struct bt_component_class *comp_cls) { - BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); + BT_ASSERT_PRE_DEV_NON_NULL(comp_cls, "Component class"); return comp_cls->help && comp_cls->help->str[0] != '\0' ? comp_cls->help->str : NULL; }