tests: reorganize CLI's `convert` tests

[babeltrace.git] / src / bindings / python / bt2 / bt2 / native_bt_trace_class.i

diff --git a/src/bindings/python/bt2/bt2/native_bt_trace_class.i b/src/bindings/python/bt2/bt2/native_bt_trace_class.i
index a4fdbba7e18aeba12cf16fed74962f1bff184e52..e060566425ded1fea062456a9c723e8e5516b3db 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_trace_class.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace_class.i
@@ -41,37 +41,35 @@ trace_class_destroyed_listener(const bt_trace_class *trace_class, void *py_calla
        }
 
        py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_class_ptr);
-       if (py_res != NULL) {
+       if (py_res) {
                BT_ASSERT(py_res == Py_None);
        } else {
-               bt2_py_loge_exception();
+               loge_exception("Trace class's destruction listener (Python)",
+                       BT_LOG_OUTPUT_LEVEL);
        }
 
        Py_DECREF(py_trace_class_ptr);
        Py_XDECREF(py_res);
 }
 
-uint64_t bt_py3_trace_class_add_destruction_listener(bt_trace_class *trace_class,
-       PyObject *py_callable)
+int bt_bt2_trace_class_add_destruction_listener(
+               bt_trace_class *trace_class, PyObject *py_callable,
+               bt_listener_id *id)
 {
-       uint64_t id = UINT64_C(-1);
-       bt_trace_class_status status;
+       bt_trace_class_add_listener_status status;
 
        BT_ASSERT(trace_class);
        BT_ASSERT(py_callable);
-
        status = bt_trace_class_add_destruction_listener(
-               trace_class, trace_class_destroyed_listener, py_callable, &id);
-       if (status != BT_TRACE_CLASS_STATUS_OK) {
-               BT_LOGF_STR("Failed to add trace class destruction listener.");
-               abort();
+               trace_class, trace_class_destroyed_listener, py_callable, id);
+       if (status == __BT_FUNC_STATUS_OK) {
+               Py_INCREF(py_callable);
        }
 
-       Py_INCREF(py_callable);
-
-       return id;
+       return status;
 }
 %}
 
-uint64_t bt_py3_trace_class_add_destruction_listener(bt_trace_class *trace_class,
-       PyObject *py_callable);
+int bt_bt2_trace_class_add_destruction_listener(
+               bt_trace_class *trace_class, PyObject *py_callable,
+               bt_listener_id *id);