X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_trace_class.i;h=cc0793798f7d0245ccdb6f4360cd6aae23d7fd36;hb=0530003ff4f693e0a582a0ed4a15245455398b4a;hp=a4fdbba7e18aeba12cf16fed74962f1bff184e52;hpb=e4b56bb9b7a459b227c4bb124638b0cc8b95718c;p=babeltrace.git

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 a4fdbba7..cc079379 100644
--- a/src/bindings/python/bt2/bt2/native_bt_trace_class.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace_class.i
@@ -27,51 +27,9 @@
 
 /* Helper functions for Python */
 %{
-static void
-trace_class_destroyed_listener(const bt_trace_class *trace_class, void *py_callable)
-{
-	PyObject *py_trace_class_ptr = NULL;
-	PyObject *py_res = NULL;
-
-	py_trace_class_ptr = SWIG_NewPointerObj(SWIG_as_voidptr(trace_class),
-		SWIGTYPE_p_bt_trace_class, 0);
-	if (!py_trace_class_ptr) {
-		BT_LOGF_STR("Failed to create a SWIG pointer object.");
-		abort();
-	}
-
-	py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_class_ptr);
-	if (py_res != NULL) {
-		BT_ASSERT(py_res == Py_None);
-	} else {
-		bt2_py_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,
-	PyObject *py_callable)
-{
-	uint64_t id = UINT64_C(-1);
-	bt_trace_class_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();
-	}
-
-	Py_INCREF(py_callable);
-
-	return id;
-}
+#include "native_bt_trace_class.i.h"
 %}
 
-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);