bt2: make can_seek_beginning a method instead of a property

[babeltrace.git] / src / bindings / python / bt2 / bt2 / native_bt_component_class.i.h

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 ff736a8057c6e12a73b6d4886a81271a3651c0c4..7299d0138d812d13d6950ebd67a0c025342265fc 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_component_class.i.h
+++ b/src/bindings/python/bt2/bt2/native_bt_component_class.i.h
@@ -538,34 +538,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
@@ -799,11 +797,16 @@ bt_component_class_query_method_status component_class_query(
                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;
        }