X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_trace.i;h=5ecccf0c5150fc369470f8579201a2f337c15789;hb=0530003ff4f693e0a582a0ed4a15245455398b4a;hp=34530299959ce3caa707a097db2854f1405b38e6;hpb=3b2be7085899350a58fe836dc5e1a9650ce369b2;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_trace.i b/src/bindings/python/bt2/bt2/native_bt_trace.i
index 34530299..5ecccf0c 100644
--- a/src/bindings/python/bt2/bt2/native_bt_trace.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace.i
@@ -26,46 +26,8 @@
 %include <babeltrace2/trace-ir/trace.h>
 
 %{
-static void
-trace_destroyed_listener(const bt_trace *trace, void *py_callable)
-{
-	PyObject *py_trace_ptr = NULL;
-	PyObject *py_res = NULL;
-
-	py_trace_ptr = SWIG_NewPointerObj(SWIG_as_voidptr(trace),
-		SWIGTYPE_p_bt_trace, 0);
-	if (!py_trace_ptr) {
-		BT_LOGF_STR("Failed to create a SWIG pointer object.");
-		abort();
-	}
-
-	py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_ptr);
-	if (py_res) {
-		BT_ASSERT(py_res == Py_None);
-	} else {
-		loge_exception("Trace's destruction listener (Python)");
-	}
-
-	Py_DECREF(py_trace_ptr);
-	Py_XDECREF(py_res);
-}
-
-int bt_bt2_trace_add_destruction_listener(bt_trace *trace,
-		PyObject *py_callable, uint64_t *id)
-{
-	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_FUNC_STATUS_OK) {
-		Py_INCREF(py_callable);
-	}
-
-	return status;
-}
+#include "native_bt_trace.i.h"
 %}
 
 int bt_bt2_trace_add_destruction_listener(bt_trace *trace,
-		PyObject *py_callable, uint64_t *id);
+		PyObject *py_callable, bt_listener_id *id);