X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_trace.i;h=335e09ea7f266364369582e7f994b3324eb2b27f;hp=3448f646492cec8ef54060119e8a5e4cb7c1ef7d;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=5084732e40a7925d22f741e4ed08f19d36078fbe

diff --git a/src/bindings/python/bt2/bt2/native_bt_trace.i b/src/bindings/python/bt2/bt2/native_bt_trace.i
index 3448f646..335e09ea 100644
--- a/src/bindings/python/bt2/bt2/native_bt_trace.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace.i
@@ -1,73 +1,14 @@
 /*
- * The MIT License (MIT)
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2016 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
  */
 
-%include <babeltrace2/trace-ir/trace-const.h>
 %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();
-	}
-
-	Py_DECREF(py_trace_ptr);
-	Py_XDECREF(py_res);
-}
-
-uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace, PyObject *py_callable)
-{
-	uint64_t id = UINT64_C(-1);
-	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) {
-		BT_LOGF_STR("Failed to add trace destruction listener.");
-		abort();
-	}
-
-	Py_INCREF(py_callable);
-	return id;
-}
+#include "native_bt_trace.i.h"
 %}
 
-uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace,
-	PyObject *py_callable);
+int bt_bt2_trace_add_destruction_listener(bt_trace *trace,
+		PyObject *py_callable, bt_listener_id *id);