X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt.i;h=4e48876848d30347539003364805141c17abac1a;hb=f2fb1b3297ca0bc13b53189a063b63944be7fae9;hp=c87a5e7280ca3300600878515df709b2a4f200dc;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index c87a5e72..4e488768 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -49,10 +49,13 @@
 #include "common/assert.h"
 #include "py-common/py-common.h"
 
-typedef const uint8_t *bt_uuid;
+/* Used by some interface files */
+#include "native_bt_bt2_objects.h"
+#include "native_bt_log_and_append_error.h"
 %}
 
 typedef int bt_bool;
+typedef uint64_t bt_listener_id;
 
 /* For uint*_t/int*_t */
 %include "stdint.i"
@@ -136,6 +139,16 @@ typedef int bt_bool;
 			SWIG_From_unsigned_SS_long_SS_long((uint64_t) (*$1)));
 }
 
+/* Output argument typemap for initialized bt_boot output parameter (always appends) */
+%typemap(in, numinputs=0) (bt_bool *) (bt_bool temp) {
+	$1 = &temp;
+}
+
+%typemap(argout) bt_bool * {
+	$result = SWIG_Python_AppendOutput(resultobj,
+			SWIG_From_bool(*$1));
+}
+
 /* Input argument typemap for UUID bytes */
 %typemap(in) bt_uuid {
 	$1 = (unsigned char *) PyBytes_AsString($input);
@@ -164,7 +177,6 @@ typedef int bt_bool;
 		$result = Py_False;
 	}
 	Py_INCREF($result);
-	return $result;
 }
 
 /*
@@ -184,6 +196,10 @@ typedef int bt_bool;
 	$result = $1;
 }
 
+/* Native part initialization and finalization */
+void bt_bt2_init_from_bt2(void);
+void bt_bt2_exit_handler(void);
+
 /*
  * Define `__BT_IN_BABELTRACE_H` to allow specific headers to be
  * included. This remains defined as long as we don't include the main
@@ -198,20 +214,25 @@ typedef int bt_bool;
 %include <babeltrace2/func-status.h>
 
 /* Per-module interface files */
+%include "native_bt_autodisc.i"
 %include "native_bt_clock_class.i"
 %include "native_bt_clock_snapshot.i"
 %include "native_bt_component.i"
 %include "native_bt_component_class.i"
 %include "native_bt_connection.i"
+%include "native_bt_error.i"
 %include "native_bt_event.i"
 %include "native_bt_event_class.i"
 %include "native_bt_field.i"
 %include "native_bt_field_class.i"
 %include "native_bt_field_path.i"
 %include "native_bt_graph.i"
+%include "native_bt_integer_range_set.i"
+%include "native_bt_interrupter.i"
 %include "native_bt_logging.i"
 %include "native_bt_message.i"
 %include "native_bt_message_iterator.i"
+%include "native_bt_mip.i"
 %include "native_bt_packet.i"
 %include "native_bt_plugin.i"
 %include "native_bt_port.i"