lib: strictly type function return status enumerations

[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 71061ffacccb30fddf49c18bd33992e7d58769a7..57166bc9a3e944e1ae1cf11057175d1862263930 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_trace_class.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace_class.i
@@ -22,84 +22,8 @@
  * THE SOFTWARE.
  */
 
-/* From trace-class-const.h */
-
-typedef enum bt_trace_class_status {
-       BT_TRACE_CLASS_STATUS_OK = 0,
-       BT_TRACE_CLASS_STATUS_NOMEM = -12,
-} bt_trace_class_status;
-
-typedef void (* bt_trace_class_destruction_listener_func)(
-               const bt_trace_class *trace_class, void *data);
-
-extern bt_bool bt_trace_class_assigns_automatic_stream_class_id(
-               const bt_trace_class *trace_class);
-
-extern const char *bt_trace_class_get_name(
-               const bt_trace_class *trace_class);
-
-extern bt_uuid bt_trace_class_get_uuid(
-               const bt_trace_class *trace_class);
-
-extern uint64_t bt_trace_class_get_environment_entry_count(
-               const bt_trace_class *trace_class);
-
-extern void bt_trace_class_borrow_environment_entry_by_index_const(
-               const bt_trace_class *trace_class, uint64_t index,
-               const char **OUT, const bt_value **OUT);
-
-extern const bt_value *
-bt_trace_class_borrow_environment_entry_value_by_name_const(
-               const bt_trace_class *trace_class, const char *name);
-
-extern uint64_t bt_trace_class_get_stream_class_count(
-               const bt_trace_class *trace_class);
-
-extern const bt_stream_class *
-bt_trace_class_borrow_stream_class_by_index_const(
-               const bt_trace_class *trace_class, uint64_t index);
-
-extern const bt_stream_class *bt_trace_class_borrow_stream_class_by_id_const(
-               const bt_trace_class *trace_class, uint64_t id);
-
-extern bt_trace_class_status bt_trace_class_add_destruction_listener(
-        const bt_trace_class *trace_class,
-        bt_trace_class_destruction_listener_func listener,
-        void *data, uint64_t *listener_id);
-
-extern bt_trace_class_status bt_trace_class_remove_destruction_listener(
-        const bt_trace_class *trace_class, uint64_t listener_id);
-
-extern void bt_trace_class_get_ref(const bt_trace_class *trace_class);
-
-extern void bt_trace_class_put_ref(const bt_trace_class *trace_class);
-
-/* From trace-class.h */
-
-extern bt_trace_class *bt_trace_class_create(bt_self_component *self_comp);
-
-extern void bt_trace_class_set_assigns_automatic_stream_class_id(
-               bt_trace_class *trace_class, bt_bool value);
-
-extern bt_trace_class_status bt_trace_class_set_name(
-               bt_trace_class *trace_class, const char *name);
-
-extern void bt_trace_class_set_uuid(bt_trace_class *trace_class,
-               bt_uuid uuid);
-
-extern bt_trace_class_status bt_trace_class_set_environment_entry_integer(
-               bt_trace_class *trace_class,
-               const char *name, int64_t value);
-
-extern bt_trace_class_status bt_trace_class_set_environment_entry_string(
-               bt_trace_class *trace_class,
-               const char *name, const char *value);
-
-extern bt_stream_class *bt_trace_class_borrow_stream_class_by_index(
-               bt_trace_class *trace_class, uint64_t index);
-
-extern bt_stream_class *bt_trace_class_borrow_stream_class_by_id(
-               bt_trace_class *trace_class, uint64_t id);
+%include <babeltrace2/trace-ir/trace-class-const.h>
+%include <babeltrace2/trace-ir/trace-class.h>
 
 /* Helper functions for Python */
 %{
@@ -120,34 +44,32 @@ trace_class_destroyed_listener(const bt_trace_class *trace_class, void *py_calla
        if (py_res != NULL) {
                BT_ASSERT(py_res == Py_None);
        } else {
-               bt2_py_loge_exception();
+               loge_exception();
        }
 
        Py_DECREF(py_trace_class_ptr);
        Py_XDECREF(py_res);
 }
 
-uint64_t bt_py3_trace_class_add_destruction_listener(bt_trace_class *trace_class,
+uint64_t bt_bt2_trace_class_add_destruction_listener(bt_trace_class *trace_class,
        PyObject *py_callable)
 {
        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) {
+       if (status != __BT_FUNC_STATUS_OK) {
                BT_LOGF_STR("Failed to add trace class destruction listener.");
                abort();
        }
 
        Py_INCREF(py_callable);
-
        return id;
 }
 %}
 
-uint64_t bt_py3_trace_class_add_destruction_listener(bt_trace_class *trace_class,
+uint64_t bt_bt2_trace_class_add_destruction_listener(bt_trace_class *trace_class,
        PyObject *py_callable);