X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt.i;h=6d9a3696c8045b86b75c1ea16e9d18b4f2869166;hb=612a98703cbf22bd57f49bb9a22154acb214fbf1;hp=f9fb451218a53166fe91d97a8ef5361b909f78af;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index f9fb4512..6d9a3696 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -32,23 +32,30 @@
 #define BT_LOG_TAG "BT2-PY"
 #include "logging.h"
 
+/*
+ * Include before `<babeltrace2/func-status.h>` because
+ * `<babeltrace2/babeltrace.h>` removes the `__BT_IN_BABELTRACE_H`
+ * definition.
+ */
 #include <babeltrace2/babeltrace.h>
 
 /*
  * This is not part of the API, but because those bindings reside within
  * the project, we take the liberty to use them.
  */
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 #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"
@@ -160,7 +167,6 @@ typedef int bt_bool;
 		$result = Py_False;
 	}
 	Py_INCREF($result);
-	return $result;
 }
 
 /*
@@ -180,11 +186,21 @@ 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
+ * header, `<babeltrace2/babeltrace.h>`.
+ */
+#define __BT_IN_BABELTRACE_H
+
 /* Property enumeration */
 %include <babeltrace2/property.h>
 
 /* Common function status codes */
-#define __BT_FUNC_STATUS_ENABLE
 %include <babeltrace2/func-status.h>
 
 /* Per-module interface files */
@@ -193,12 +209,15 @@ typedef int bt_bool;
 %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"