X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_component_class.i.h;h=4a0fdbcd45ebdb26e518ad750dba08efcad6ebfc;hb=4175c1d52f91f7e5d66a12135ad8ec6ec736a539;hp=fc10efef34b6bff60ab069c7075a43c5930703a2;hpb=774b7f288e268259639df192409a348c32d1f57a;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/native_bt_component_class.i.h b/src/bindings/python/bt2/bt2/native_bt_component_class.i.h index fc10efef..4a0fdbcd 100644 --- a/src/bindings/python/bt2/bt2/native_bt_component_class.i.h +++ b/src/bindings/python/bt2/bt2/native_bt_component_class.i.h @@ -23,6 +23,7 @@ */ #include "logging/comp-logging.h" +#include "compat/glib.h" /* * This hash table associates a BT component class object address to a @@ -183,10 +184,16 @@ int py_exc_to_status_message_iterator( return py_exc_to_status(NULL, NULL, self_message_iterator, NULL, -1); } +static +bool bt_bt2_is_python_component_class(const bt_component_class *comp_cls) +{ + return bt_g_hash_table_contains(bt_cc_ptr_to_py_cls, comp_cls); +} + /* Component class proxy methods (delegate to the attached Python object) */ static -bt_component_class_init_method_status component_class_init( +bt_component_class_initialize_method_status component_class_init( bt_self_component *self_component, void *self_component_v, swig_type_info *self_comp_cls_type_swig_type, @@ -195,7 +202,7 @@ bt_component_class_init_method_status component_class_init( { const bt_component *component = bt_self_component_as_component(self_component); const bt_component_class *component_class = bt_component_borrow_class_const(component); - bt_component_class_init_method_status status = __BT_FUNC_STATUS_OK; + bt_component_class_initialize_method_status status = __BT_FUNC_STATUS_OK; PyObject *py_cls = NULL; PyObject *py_comp = NULL; PyObject *py_params_ptr = NULL; @@ -203,8 +210,6 @@ bt_component_class_init_method_status component_class_init( bt_logging_level log_level = get_self_component_log_level( self_component); - (void) init_method_data; - BT_ASSERT(self_component); BT_ASSERT(self_component_v); BT_ASSERT(self_comp_cls_type_swig_type); @@ -242,13 +247,21 @@ bt_component_class_init_method_status component_class_init( /* * Do the equivalent of this: * - * py_comp = py_cls._bt_init_from_native(py_comp_ptr, py_params_ptr) + * py_comp = py_cls._bt_init_from_native(py_comp_ptr, + * py_params_ptr, init_method_data ? init_method_data : Py_None) * * _UserComponentType._bt_init_from_native() calls the Python * component object's __init__() function. + * + * We don't take any reference on `init_method_data` which, if + * not `NULL`, is assumed to be a `PyObject *`: the user's + * __init__() function will eventually take a reference if + * needed. If `init_method_data` is `NULL`, then we pass + * `Py_None` as the initialization's Python object. */ py_comp = PyObject_CallMethod(py_cls, - "_bt_init_from_native", "(OO)", py_comp_ptr, py_params_ptr); + "_bt_init_from_native", "(OOO)", py_comp_ptr, py_params_ptr, + init_method_data ? init_method_data : Py_None); if (!py_comp) { BT_COMP_LOG_CUR_LVL(BT_LOG_WARNING, log_level, self_component, "Failed to call Python class's _bt_init_from_native() method: " @@ -284,14 +297,161 @@ end: return status; } +static +bt_component_class_get_supported_mip_versions_method_status +component_class_get_supported_mip_versions( + const bt_component_class *component_class, + bt_self_component_class *self_component_class, + const bt_value *params, void *init_method_data, + bt_logging_level log_level, + bt_integer_range_set_unsigned *supported_versions) +{ + uint64_t i; + PyObject *py_cls = NULL; + PyObject *py_params_ptr = NULL; + PyObject *py_range_set_addr = NULL; + bt_integer_range_set_unsigned *ret_range_set = NULL; + bt_component_class_get_supported_mip_versions_method_status status = + __BT_FUNC_STATUS_OK; + + py_cls = lookup_cc_ptr_to_py_cls(component_class); + if (!py_cls) { + BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG, + "Cannot find Python class associated to native component class: " + "comp-cls-addr=%p", component_class); + goto error; + } + + py_params_ptr = SWIG_NewPointerObj(SWIG_as_voidptr(params), + SWIGTYPE_p_bt_value, 0); + if (!py_params_ptr) { + BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG, + "Failed to create a SWIG pointer object."); + goto error; + } + + /* + * We don't take any reference on `init_method_data` which, if + * not `NULL`, is assumed to be a `PyObject *`: the user's + * _user_get_supported_mip_versions() function will eventually + * take a reference if needed. If `init_method_data` is `NULL`, + * then we pass `Py_None` as the initialization's Python object. + */ + py_range_set_addr = PyObject_CallMethod(py_cls, + "_bt_get_supported_mip_versions_from_native", "(OOi)", + py_params_ptr, init_method_data ? init_method_data : Py_None, + (int) log_level); + if (!py_range_set_addr) { + BT_LOG_WRITE_CUR_LVL(BT_LOG_WARNING, log_level, BT_LOG_TAG, + "Failed to call Python class's _bt_get_supported_mip_versions_from_native() method: " + "py-cls-addr=%p", py_cls); + status = py_exc_to_status_component_class(self_component_class, + log_level); + goto end; + } + + /* + * The returned object, on success, is an integer object + * (PyLong) containing the address of a BT unsigned integer + * range set object (new reference). + */ + ret_range_set = PyLong_AsVoidPtr(py_range_set_addr); + BT_ASSERT(!PyErr_Occurred()); + BT_ASSERT(ret_range_set); + + /* Copy returned ranges to input range set */ + for (i = 0; i < bt_integer_range_set_get_range_count( + bt_integer_range_set_unsigned_as_range_set_const(ret_range_set)); + i++) { + const bt_integer_range_unsigned *range = + bt_integer_range_set_unsigned_borrow_range_by_index_const( + ret_range_set, i); + bt_integer_range_set_add_range_status add_range_status; + + add_range_status = bt_integer_range_set_unsigned_add_range( + supported_versions, + bt_integer_range_unsigned_get_lower(range), + bt_integer_range_unsigned_get_upper(range)); + if (add_range_status) { + BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG, + "Failed to add range to supported MIP versions range set."); + goto error; + } + } + + goto end; + +error: + PyErr_Clear(); + status = __BT_FUNC_STATUS_ERROR; + +end: + Py_XDECREF(py_params_ptr); + Py_XDECREF(py_range_set_addr); + bt_integer_range_set_unsigned_put_ref(ret_range_set); + return status; +} + +static +bt_component_class_get_supported_mip_versions_method_status +component_class_source_get_supported_mip_versions( + bt_self_component_class_source *self_component_class_source, + const bt_value *params, void *init_method_data, + bt_logging_level log_level, + bt_integer_range_set_unsigned *supported_versions) +{ + const bt_component_class_source *component_class_source = bt_self_component_class_source_as_component_class_source(self_component_class_source); + const bt_component_class *component_class = bt_component_class_source_as_component_class_const(component_class_source); + bt_self_component_class *self_component_class = bt_self_component_class_source_as_self_component_class(self_component_class_source); + + return component_class_get_supported_mip_versions( + component_class, self_component_class, + params, init_method_data, log_level, supported_versions); +} + +static +bt_component_class_get_supported_mip_versions_method_status +component_class_filter_get_supported_mip_versions( + bt_self_component_class_filter *self_component_class_filter, + const bt_value *params, void *init_method_data, + bt_logging_level log_level, + bt_integer_range_set_unsigned *supported_versions) +{ + const bt_component_class_filter *component_class_filter = bt_self_component_class_filter_as_component_class_filter(self_component_class_filter); + const bt_component_class *component_class = bt_component_class_filter_as_component_class_const(component_class_filter); + bt_self_component_class *self_component_class = bt_self_component_class_filter_as_self_component_class(self_component_class_filter); + + return component_class_get_supported_mip_versions( + component_class, self_component_class, + params, init_method_data, log_level, supported_versions); +} + +static +bt_component_class_get_supported_mip_versions_method_status +component_class_sink_get_supported_mip_versions( + bt_self_component_class_sink *self_component_class_sink, + const bt_value *params, void *init_method_data, + bt_logging_level log_level, + bt_integer_range_set_unsigned *supported_versions) +{ + const bt_component_class_sink *component_class_sink = bt_self_component_class_sink_as_component_class_sink(self_component_class_sink); + const bt_component_class *component_class = bt_component_class_sink_as_component_class_const(component_class_sink); + bt_self_component_class *self_component_class = bt_self_component_class_sink_as_self_component_class(self_component_class_sink); + + return component_class_get_supported_mip_versions( + component_class, self_component_class, + params, init_method_data, log_level, supported_versions); +} + /* * Method of bt_component_class_source to initialize a bt_self_component_source * of that class. */ static -bt_component_class_init_method_status component_class_source_init( +bt_component_class_initialize_method_status component_class_source_init( bt_self_component_source *self_component_source, + bt_self_component_source_configuration *config, const bt_value *params, void *init_method_data) { bt_self_component *self_component = bt_self_component_source_as_self_component(self_component_source); @@ -303,8 +463,9 @@ bt_component_class_init_method_status component_class_source_init( } static -bt_component_class_init_method_status component_class_filter_init( +bt_component_class_initialize_method_status component_class_filter_init( bt_self_component_filter *self_component_filter, + bt_self_component_filter_configuration *config, const bt_value *params, void *init_method_data) { bt_self_component *self_component = bt_self_component_filter_as_self_component(self_component_filter); @@ -316,8 +477,9 @@ bt_component_class_init_method_status component_class_filter_init( } static -bt_component_class_init_method_status component_class_sink_init( +bt_component_class_initialize_method_status component_class_sink_init( bt_self_component_sink *self_component_sink, + bt_self_component_sink_configuration *config, const bt_value *params, void *init_method_data) { bt_self_component *self_component = bt_self_component_sink_as_self_component(self_component_sink); @@ -379,34 +541,32 @@ void component_class_sink_finalize(bt_self_component_sink *self_component_sink) } static -bt_bool component_class_can_seek_beginning( - bt_self_message_iterator *self_message_iterator) +bt_component_class_message_iterator_can_seek_beginning_method_status +component_class_can_seek_beginning( + bt_self_message_iterator *self_message_iterator, bt_bool *can_seek) { PyObject *py_iter; PyObject *py_result = NULL; - bt_bool can_seek_beginning = false; - + bt_component_class_message_iterator_can_seek_beginning_method_status status; py_iter = bt_self_message_iterator_get_data(self_message_iterator); BT_ASSERT(py_iter); - py_result = PyObject_GetAttrString(py_iter, "_bt_can_seek_beginning_from_native"); + py_result = PyObject_CallMethod(py_iter, + "_bt_can_seek_beginning_from_native", NULL); BT_ASSERT(!py_result || PyBool_Check(py_result)); if (py_result) { - can_seek_beginning = PyObject_IsTrue(py_result); + *can_seek = PyObject_IsTrue(py_result); + status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK; } else { - /* - * Once can_seek_beginning can report errors, convert the - * exception to a status. For now, log and return false; - */ - loge_exception_message_iterator(self_message_iterator); - PyErr_Clear(); + status = py_exc_to_status_message_iterator(self_message_iterator); + BT_ASSERT(status != __BT_FUNC_STATUS_OK); } Py_XDECREF(py_result); - return can_seek_beginning; + return status; } static @@ -427,6 +587,56 @@ component_class_seek_beginning(bt_self_message_iterator *self_message_iterator) return status; } +static +bt_component_class_message_iterator_can_seek_ns_from_origin_method_status +component_class_can_seek_ns_from_origin( + bt_self_message_iterator *self_message_iterator, + int64_t ns_from_origin, bt_bool *can_seek) +{ + PyObject *py_iter; + PyObject *py_result = NULL; + bt_component_class_message_iterator_can_seek_ns_from_origin_method_status status; + py_iter = bt_self_message_iterator_get_data(self_message_iterator); + BT_ASSERT(py_iter); + + py_result = PyObject_CallMethod(py_iter, + "_bt_can_seek_ns_from_origin_from_native", "L", ns_from_origin); + + BT_ASSERT(!py_result || PyBool_Check(py_result)); + + if (py_result) { + *can_seek = PyObject_IsTrue(py_result); + status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_OK; + } else { + status = py_exc_to_status_message_iterator(self_message_iterator); + BT_ASSERT(status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_OK); + } + + Py_XDECREF(py_result); + + return status; +} + +static +bt_component_class_message_iterator_seek_ns_from_origin_method_status +component_class_seek_ns_from_origin( + bt_self_message_iterator *self_message_iterator, + int64_t ns_from_origin) +{ + PyObject *py_iter; + PyObject *py_result; + bt_component_class_message_iterator_seek_ns_from_origin_method_status status; + + py_iter = bt_self_message_iterator_get_data(self_message_iterator); + BT_ASSERT(py_iter); + py_result = PyObject_CallMethod(py_iter, + "_bt_seek_ns_from_origin_from_native", "L", ns_from_origin); + BT_ASSERT(!py_result || py_result == Py_None); + status = py_exc_to_status_message_iterator(self_message_iterator); + Py_XDECREF(py_result); + return status; +} + static bt_component_class_port_connected_method_status component_class_port_connected( bt_self_component *self_component, @@ -572,7 +782,7 @@ bt_component_class_query_method_status component_class_query( const bt_component_class *component_class, bt_self_component_class *self_component_class, bt_private_query_executor *priv_query_executor, - const char *object, const bt_value *params, + const char *object, const bt_value *params, void *method_data, const bt_value **result) { PyObject *py_cls = NULL; @@ -588,6 +798,14 @@ bt_component_class_query_method_status component_class_query( bt_logging_level log_level = bt_query_executor_get_logging_level(query_exec); + /* + * If there's any `method_data`, assume this component class is + * getting queried from Python, so that `method_data` is a + * Python object to pass to the user's _user_query() method. + */ + BT_ASSERT(!method_data || + bt_bt2_is_python_component_class(component_class)); + py_cls = lookup_cc_ptr_to_py_cls(component_class); if (!py_cls) { BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG, @@ -620,15 +838,28 @@ bt_component_class_query_method_status component_class_query( goto error; } + /* + * We don't take any reference on `method_data` which, if not + * `NULL`, is assumed to be a `PyObject *`: the user's + * _user_query() function will eventually take a reference if + * needed. If `method_data` is `NULL`, then we pass `Py_None` as + * the initialization's Python object. + */ py_results_addr = PyObject_CallMethod(py_cls, - "_bt_query_from_native", "(OOO)", py_priv_query_exec_ptr, - py_object, py_params_ptr); + "_bt_query_from_native", "(OOOO)", py_priv_query_exec_ptr, + py_object, py_params_ptr, + method_data ? method_data : Py_None); if (!py_results_addr) { - BT_LOG_WRITE_CUR_LVL(BT_LOG_WARNING, log_level, BT_LOG_TAG, - "Failed to call Python class's _bt_query_from_native() method: " - "py-cls-addr=%p", py_cls); status = py_exc_to_status_component_class(self_component_class, log_level); + if (status < 0) { + static const char *fmt = + "Failed to call Python class's _bt_query_from_native() method: py-cls-addr=%p"; + BT_LOG_WRITE_CUR_LVL(BT_LOG_WARNING, log_level, BT_LOG_TAG, + fmt, py_cls); + BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT_CLASS( + self_component_class, fmt, py_cls); + } goto end; } @@ -659,7 +890,7 @@ static bt_component_class_query_method_status component_class_source_query( bt_self_component_class_source *self_component_class_source, bt_private_query_executor *priv_query_executor, - const char *object, const bt_value *params, + const char *object, const bt_value *params, void *method_data, const bt_value **result) { const bt_component_class_source *component_class_source = bt_self_component_class_source_as_component_class_source(self_component_class_source); @@ -667,14 +898,14 @@ bt_component_class_query_method_status component_class_source_query( bt_self_component_class *self_component_class = bt_self_component_class_source_as_self_component_class(self_component_class_source); return component_class_query(component_class, self_component_class, - priv_query_executor, object, params, result); + priv_query_executor, object, params, method_data, result); } static bt_component_class_query_method_status component_class_filter_query( bt_self_component_class_filter *self_component_class_filter, bt_private_query_executor *priv_query_executor, - const char *object, const bt_value *params, + const char *object, const bt_value *params, void *method_data, const bt_value **result) { const bt_component_class_filter *component_class_filter = bt_self_component_class_filter_as_component_class_filter(self_component_class_filter); @@ -682,14 +913,14 @@ bt_component_class_query_method_status component_class_filter_query( bt_self_component_class *self_component_class = bt_self_component_class_filter_as_self_component_class(self_component_class_filter); return component_class_query(component_class, self_component_class, - priv_query_executor, object, params, result); + priv_query_executor, object, params, method_data, result); } static bt_component_class_query_method_status component_class_sink_query( bt_self_component_class_sink *self_component_class_sink, bt_private_query_executor *priv_query_executor, - const char *object, const bt_value *params, + const char *object, const bt_value *params, void *method_data, const bt_value **result) { const bt_component_class_sink *component_class_sink = bt_self_component_class_sink_as_component_class_sink(self_component_class_sink); @@ -697,20 +928,22 @@ bt_component_class_query_method_status component_class_sink_query( bt_self_component_class *self_component_class = bt_self_component_class_sink_as_self_component_class(self_component_class_sink); return component_class_query(component_class, self_component_class, - priv_query_executor, object, params, result); + priv_query_executor, object, params, method_data, result); } static -bt_component_class_message_iterator_init_method_status +bt_component_class_message_iterator_initialize_method_status component_class_message_iterator_init( bt_self_message_iterator *self_message_iterator, + bt_self_message_iterator_configuration *config, bt_self_component *self_component, bt_self_component_port_output *self_component_port_output) { - bt_component_class_message_iterator_init_method_status status = __BT_FUNC_STATUS_OK; + bt_component_class_message_iterator_initialize_method_status status = __BT_FUNC_STATUS_OK; PyObject *py_comp_cls = NULL; PyObject *py_iter_cls = NULL; PyObject *py_iter_ptr = NULL; + PyObject *py_config_ptr = NULL; PyObject *py_component_port_output_ptr = NULL; PyObject *py_init_method_result = NULL; PyObject *py_iter = NULL; @@ -765,15 +998,27 @@ component_class_message_iterator_init( /* * Initialize object: * - * py_iter.__init__(self_output_port) + * py_iter.__init__(config, self_output_port) * - * through the _init_for_native helper static method. + * through the _init_from_native helper static method. * * At this point, py_iter._ptr is set, so this initialization * function has access to self._component (which gives it the * user Python component object from which the iterator was * created). */ + py_config_ptr = SWIG_NewPointerObj(SWIG_as_voidptr(config), + SWIGTYPE_p_bt_self_message_iterator_configuration, 0); + if (!py_config_ptr) { + const char *err = "Failed to create a SWIG pointer object"; + + BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_component, + "%s", err); + BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_MESSAGE_ITERATOR( + self_message_iterator, err); + goto error; + } + py_component_port_output_ptr = SWIG_NewPointerObj( SWIG_as_voidptr(self_component_port_output), SWIGTYPE_p_bt_self_component_port_output, 0); @@ -788,7 +1033,8 @@ component_class_message_iterator_init( } py_init_method_result = PyObject_CallMethod(py_iter, - "_bt_init_from_native", "O", py_component_port_output_ptr); + "_bt_init_from_native", "OO", py_config_ptr, + py_component_port_output_ptr); if (!py_init_method_result) { BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_component, "User's __init__() method failed:"); @@ -840,27 +1086,33 @@ end: } static -bt_component_class_message_iterator_init_method_status +bt_component_class_message_iterator_initialize_method_status component_class_source_message_iterator_init( bt_self_message_iterator *self_message_iterator, + bt_self_message_iterator_configuration *config, bt_self_component_source *self_component_source, bt_self_component_port_output *self_component_port_output) { - bt_self_component *self_component = bt_self_component_source_as_self_component(self_component_source); + bt_self_component *self_component = + bt_self_component_source_as_self_component(self_component_source); - return component_class_message_iterator_init(self_message_iterator, self_component, self_component_port_output); + return component_class_message_iterator_init(self_message_iterator, + config, self_component, self_component_port_output); } static -bt_component_class_message_iterator_init_method_status +bt_component_class_message_iterator_initialize_method_status component_class_filter_message_iterator_init( bt_self_message_iterator *self_message_iterator, + bt_self_message_iterator_configuration *config, bt_self_component_filter *self_component_filter, bt_self_component_port_output *self_component_port_output) { - bt_self_component *self_component = bt_self_component_filter_as_self_component(self_component_filter); + bt_self_component *self_component = + bt_self_component_filter_as_self_component(self_component_filter); - return component_class_message_iterator_init(self_message_iterator, self_component, self_component_port_output); + return component_class_message_iterator_init(self_message_iterator, + config, self_component, self_component_port_output); } static @@ -1011,7 +1263,7 @@ bt_component_class_source *bt_bt2_component_class_source_create( goto end; } - ret = bt_component_class_source_set_init_method(component_class_source, component_class_source_init); + ret = bt_component_class_source_set_initialize_method(component_class_source, component_class_source_init); BT_ASSERT(ret == 0); ret = bt_component_class_source_set_finalize_method(component_class_source, component_class_source_finalize); BT_ASSERT(ret == 0); @@ -1020,13 +1272,20 @@ bt_component_class_source *bt_bt2_component_class_source_create( BT_ASSERT(ret == 0); ret = bt_component_class_source_set_message_iterator_seek_beginning_method(component_class_source, component_class_seek_beginning); + ret = bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method( + component_class_source, component_class_can_seek_ns_from_origin); + BT_ASSERT(ret == 0); + ret = bt_component_class_source_set_message_iterator_seek_ns_from_origin_method( + component_class_source, component_class_seek_ns_from_origin); BT_ASSERT(ret == 0); ret = bt_component_class_source_set_output_port_connected_method(component_class_source, component_class_source_output_port_connected); BT_ASSERT(ret == 0); ret = bt_component_class_source_set_query_method(component_class_source, component_class_source_query); BT_ASSERT(ret == 0); - ret = bt_component_class_source_set_message_iterator_init_method( + ret = bt_component_class_source_set_get_supported_mip_versions_method(component_class_source, component_class_source_get_supported_mip_versions); + BT_ASSERT(ret == 0); + ret = bt_component_class_source_set_message_iterator_initialize_method( component_class_source, component_class_source_message_iterator_init); BT_ASSERT(ret == 0); ret = bt_component_class_source_set_message_iterator_finalize_method( @@ -1061,7 +1320,7 @@ bt_component_class_filter *bt_bt2_component_class_filter_create( goto end; } - ret = bt_component_class_filter_set_init_method(component_class_filter, component_class_filter_init); + ret = bt_component_class_filter_set_initialize_method(component_class_filter, component_class_filter_init); BT_ASSERT(ret == 0); ret = bt_component_class_filter_set_finalize_method (component_class_filter, component_class_filter_finalize); BT_ASSERT(ret == 0); @@ -1071,6 +1330,11 @@ bt_component_class_filter *bt_bt2_component_class_filter_create( ret = bt_component_class_filter_set_message_iterator_seek_beginning_method(component_class_filter, component_class_seek_beginning); BT_ASSERT(ret == 0); + ret = bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method( + component_class_filter, component_class_can_seek_ns_from_origin); + BT_ASSERT(ret == 0); + ret = bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method( + component_class_filter, component_class_seek_ns_from_origin); ret = bt_component_class_filter_set_input_port_connected_method(component_class_filter, component_class_filter_input_port_connected); BT_ASSERT(ret == 0); @@ -1079,7 +1343,9 @@ bt_component_class_filter *bt_bt2_component_class_filter_create( BT_ASSERT(ret == 0); ret = bt_component_class_filter_set_query_method(component_class_filter, component_class_filter_query); BT_ASSERT(ret == 0); - ret = bt_component_class_filter_set_message_iterator_init_method( + ret = bt_component_class_filter_set_get_supported_mip_versions_method(component_class_filter, component_class_filter_get_supported_mip_versions); + BT_ASSERT(ret == 0); + ret = bt_component_class_filter_set_message_iterator_initialize_method( component_class_filter, component_class_filter_message_iterator_init); BT_ASSERT(ret == 0); ret = bt_component_class_filter_set_message_iterator_finalize_method( @@ -1114,7 +1380,7 @@ bt_component_class_sink *bt_bt2_component_class_sink_create( goto end; } - ret = bt_component_class_sink_set_init_method(component_class_sink, component_class_sink_init); + ret = bt_component_class_sink_set_initialize_method(component_class_sink, component_class_sink_init); BT_ASSERT(ret == 0); ret = bt_component_class_sink_set_finalize_method(component_class_sink, component_class_sink_finalize); BT_ASSERT(ret == 0); @@ -1126,6 +1392,8 @@ bt_component_class_sink *bt_bt2_component_class_sink_create( BT_ASSERT(ret == 0); ret = bt_component_class_sink_set_query_method(component_class_sink, component_class_sink_query); BT_ASSERT(ret == 0); + ret = bt_component_class_sink_set_get_supported_mip_versions_method(component_class_sink, component_class_sink_get_supported_mip_versions); + BT_ASSERT(ret == 0); register_cc_ptr_to_py_cls(component_class, py_cls); end: