}
static inline
-int py_exc_to_status(bt_self_component_class *self_component_class,
+int py_exc_to_status_clear(
+ bt_self_component_class *self_component_class,
bt_self_component *self_component,
bt_self_message_iterator *self_message_iterator,
const char *module_name, int active_log_level)
}
BT_ASSERT(active_log_level != -1);
- log_exception_and_maybe_append_error(BT_LOG_WARNING,
+ log_exception_and_maybe_append_cause(BT_LOG_WARNING,
active_log_level, true,
self_component_class, self_component,
self_message_iterator, module_name);
}
static
-int py_exc_to_status_component_class(
+int py_exc_to_status_component_class_clear(
bt_self_component_class *self_component_class,
int active_log_level)
{
- return py_exc_to_status(self_component_class, NULL, NULL, NULL,
+ return py_exc_to_status_clear(self_component_class, NULL, NULL, NULL,
active_log_level);
}
static
-int py_exc_to_status_component(bt_self_component *self_component)
+int py_exc_to_status_component_clear(bt_self_component *self_component)
{
- return py_exc_to_status(NULL, self_component, NULL, NULL, -1);
+ return py_exc_to_status_clear(NULL, self_component, NULL, NULL, -1);
}
static
-int py_exc_to_status_message_iterator(
+int py_exc_to_status_message_iterator_clear(
bt_self_message_iterator *self_message_iterator)
{
- return py_exc_to_status(NULL, NULL, self_message_iterator, NULL, -1);
+ return py_exc_to_status_clear(NULL, NULL, self_message_iterator, NULL, -1);
}
static
/* 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,
{
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;
BT_COMP_LOG_CUR_LVL(BT_LOG_WARNING, log_level, self_component,
"Failed to call Python class's _bt_init_from_native() method: "
"py-cls-addr=%p", py_cls);
- status = py_exc_to_status_component(self_component);
+ status = py_exc_to_status_component_clear(self_component);
goto end;
}
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,
+ status = py_exc_to_status_component_class_clear(self_component_class,
log_level);
goto end;
}
*/
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);
}
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);
}
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);
*can_seek = PyObject_IsTrue(py_result);
status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
} else {
- status = py_exc_to_status_message_iterator(self_message_iterator);
+ status = py_exc_to_status_message_iterator_clear(self_message_iterator);
BT_ASSERT(status != __BT_FUNC_STATUS_OK);
}
py_result = PyObject_CallMethod(py_iter, "_bt_seek_beginning_from_native",
NULL);
BT_ASSERT(!py_result || py_result == Py_None);
- status = py_exc_to_status_message_iterator(self_message_iterator);
+ status = py_exc_to_status_message_iterator_clear(self_message_iterator);
+ Py_XDECREF(py_result);
+ 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_clear(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_clear(self_message_iterator);
Py_XDECREF(py_result);
return status;
}
"_bt_port_connected_from_native", "(OiO)", py_self_port_ptr,
self_component_port_type, py_other_port_ptr);
BT_ASSERT(!py_method_result || py_method_result == Py_None);
- status = py_exc_to_status_component(self_component);
+ status = py_exc_to_status_component_clear(self_component);
end:
Py_XDECREF(py_self_port_ptr);
py_method_result = PyObject_CallMethod(py_comp,
"_bt_graph_is_configured_from_native", NULL);
BT_ASSERT(!py_method_result || py_method_result == Py_None);
- status = py_exc_to_status_component(self_component);
+ status = py_exc_to_status_component_clear(self_component);
Py_XDECREF(py_method_result);
return status;
}
py_object, py_params_ptr,
method_data ? method_data : Py_None);
if (!py_results_addr) {
- status = py_exc_to_status_component_class(self_component_class,
+ status = py_exc_to_status_component_class_clear(self_component_class,
log_level);
if (status < 0) {
static const char *fmt =
}
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;
/*
* 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);
}
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:");
python_error:
/* Handling of errors that cause a Python exception to be set. */
- status = py_exc_to_status_message_iterator(self_message_iterator);
+ status = py_exc_to_status_message_iterator_clear(self_message_iterator);
BT_ASSERT(status != __BT_FUNC_STATUS_OK);
goto 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
py_method_result = PyObject_CallMethod(py_message_iter,
"_bt_next_from_native", NULL);
if (!py_method_result) {
- status = py_exc_to_status_message_iterator(message_iterator);
+ status = py_exc_to_status_message_iterator_clear(message_iterator);
BT_ASSERT(status != __BT_FUNC_STATUS_OK);
goto end;
}
BT_ASSERT(py_comp);
py_method_result = PyObject_CallMethod(py_comp,
"_user_consume", NULL);
- status = py_exc_to_status_component(self_component);
+ status = py_exc_to_status_component_clear(self_component);
BT_ASSERT(py_method_result || status != __BT_FUNC_STATUS_OK);
Py_XDECREF(py_method_result);
return status;
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);
- ret = bt_component_class_source_set_message_iterator_can_seek_beginning_method(component_class_source,
- component_class_can_seek_beginning);
- 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_seek_beginning_methods(component_class_source,
+ component_class_seek_beginning, component_class_can_seek_beginning);
+ ret = bt_component_class_source_set_message_iterator_seek_ns_from_origin_methods(
+ component_class_source, component_class_seek_ns_from_origin,
+ component_class_can_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_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_init_method(
+ 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(
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);
- ret = bt_component_class_filter_set_message_iterator_can_seek_beginning_method(component_class_filter,
- component_class_can_seek_beginning);
- BT_ASSERT(ret == 0);
- ret = bt_component_class_filter_set_message_iterator_seek_beginning_method(component_class_filter,
- component_class_seek_beginning);
+ ret = bt_component_class_filter_set_message_iterator_seek_beginning_methods(component_class_filter,
+ component_class_seek_beginning, component_class_can_seek_beginning);
BT_ASSERT(ret == 0);
+ ret = bt_component_class_filter_set_message_iterator_seek_ns_from_origin_methods(
+ component_class_filter, component_class_seek_ns_from_origin,
+ component_class_can_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);
BT_ASSERT(ret == 0);
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_init_method(
+ 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(
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);
projects / babeltrace.git / blobdiff