X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt.i;h=700c1d1712a1b9ce4ee4d5d0cf277b50148ba5a4;hb=8b305066676fc7aa433e8eb668f9de8802008025;hp=4f349f5c36e1e0b76c375e5978b8a7898af86a8a;hpb=2054a0d13fbfba65d23d17a1e35c9dd62f28c2ab;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index 4f349f5c..700c1d17 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -48,6 +48,10 @@
 
 #include "common/assert.h"
 #include "py-common/py-common.h"
+
+/* Used by some interface files */
+#include "native_bt_bt2_objects.h"
+#include "native_bt_log_and_append_error.h"
 %}
 
 typedef int bt_bool;
@@ -135,6 +139,16 @@ typedef uint64_t bt_listener_id;
 			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);
@@ -182,6 +196,10 @@ typedef uint64_t bt_listener_id;
 	$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
@@ -189,13 +207,20 @@ typedef uint64_t bt_listener_id;
  */
 #define __BT_IN_BABELTRACE_H
 
-/* Property enumeration */
-%include <babeltrace2/property.h>
+/*
+ * Define `__BT_ATTR_FORMAT_PRINTF` to nothing, otherwise SWIG fails to parse
+ * the included header files that use it.
+ */
+#define __BT_ATTR_FORMAT_PRINTF(_string_index, _first_to_check)
+
+/* Common types */
+%include <babeltrace2/types.h>
 
 /* Common function status codes */
 %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"
@@ -213,6 +238,7 @@ typedef uint64_t bt_listener_id;
 %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"
@@ -223,3 +249,13 @@ typedef uint64_t bt_listener_id;
 %include "native_bt_trace_class.i"
 %include "native_bt_value.i"
 %include "native_bt_version.i"
+
+%{
+
+/*
+ * This function is defined by SWIG.  Declare here to avoid a
+ * -Wmissing-prototypes warning.
+ */
+PyObject *SWIG_init(void);
+
+%}