lib: strictly type function return status enumerations

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

diff --git a/src/bindings/python/bt2/bt2/native_bt_trace.i b/src/bindings/python/bt2/bt2/native_bt_trace.i
index 2d8f538bf744b4d8fbb41e2e4851540afe2c3555..3e27a368c2e1f7562a262839b9f299134198ff52 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_trace.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace.i
@@ -22,55 +22,8 @@
  * THE SOFTWARE.
  */
 
-/* From trace-const.h */
-
-typedef enum bt_trace_status {
-       BT_TRACE_STATUS_OK = 0,
-       BT_TRACE_STATUS_NOMEM = -12,
-} bt_trace_status;
-
-typedef void (* bt_trace_destruction_listener_func)(
-               const bt_trace *trace, void *data);
-
-extern const bt_trace_class *bt_trace_borrow_class_const(
-               const bt_trace *trace);
-
-extern const char *bt_trace_get_name(const bt_trace *trace);
-
-extern uint64_t bt_trace_get_stream_count(const bt_trace *trace);
-
-extern const bt_stream *bt_trace_borrow_stream_by_index_const(
-               const bt_trace *trace, uint64_t index);
-
-extern const bt_stream *bt_trace_borrow_stream_by_id_const(
-               const bt_trace *trace, uint64_t id);
-
-extern bt_trace_status bt_trace_add_destruction_listener(
-               const bt_trace *trace,
-               bt_trace_destruction_listener_func listener,
-               void *data, uint64_t *listener_id);
-
-extern bt_trace_status bt_trace_remove_destruction_listener(
-               const bt_trace *trace, uint64_t listener_id);
-
-extern void bt_trace_get_ref(const bt_trace *trace);
-
-extern void bt_trace_put_ref(const bt_trace *trace);
-
-/* From trace.h */
-
-extern bt_trace_class *bt_trace_borrow_class(bt_trace *trace);
-
-extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
-
-extern bt_trace_status bt_trace_set_name(bt_trace *trace,
-               const char *name);
-
-extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
-               uint64_t index);
-
-extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
-               uint64_t id);
+%include <babeltrace2/trace-ir/trace-const.h>
+%include <babeltrace2/trace-ir/trace.h>
 
 %{
 static void
@@ -90,33 +43,31 @@ trace_destroyed_listener(const bt_trace *trace, void *py_callable)
        if (py_res != NULL) {
                BT_ASSERT(py_res == Py_None);
        } else {
-               bt2_py_loge_exception();
+               loge_exception();
        }
 
        Py_DECREF(py_trace_ptr);
        Py_XDECREF(py_res);
 }
 
-uint64_t bt_py3_trace_add_destruction_listener(bt_trace *trace, PyObject *py_callable)
+uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace, PyObject *py_callable)
 {
        uint64_t id = UINT64_C(-1);
-       bt_trace_status status;
+       bt_trace_add_listener_status status;
 
        BT_ASSERT(trace);
        BT_ASSERT(py_callable);
-
        status = bt_trace_add_destruction_listener(
                trace, trace_destroyed_listener, py_callable, &id);
-       if (status != BT_TRACE_STATUS_OK) {
+       if (status != __BT_FUNC_STATUS_OK) {
                BT_LOGF_STR("Failed to add trace destruction listener.");
                abort();
        }
 
        Py_INCREF(py_callable);
-
        return id;
 }
 %}
 
-uint64_t bt_py3_trace_add_destruction_listener(bt_trace *trace,
+uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace,
        PyObject *py_callable);