X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt.i;h=8146e8ff4299d85ca3cea46dfb7f5b5fc1046654;hb=0530003ff4f693e0a582a0ed4a15245455398b4a;hp=e538b268b448268c07fdd76c4af3544541495c1c;hpb=b03487ab5e72f71a01bd7ac78dff3a420b5f9ef8;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index e538b268..8146e8ff 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -32,14 +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>
-#include <babeltrace2/property.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_IN_BABELTRACE_H
+#include <babeltrace2/func-status.h>
+
 #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"
@@ -61,11 +77,11 @@ typedef int bt_bool;
  * functions on which we apply this typemap don't guarantee that the value of
  * `temp_value` will be unchanged or valid.
  */
-%typemap(in, numinputs=0) (const char **OUT) (char *temp_value = (void *) 1) {
+%typemap(in, numinputs=0) (const char **) (char *temp_value = (void *) 1) {
 	$1 = &temp_value;
 }
 
-%typemap(argout) (const char **OUT) {
+%typemap(argout) (const char **) {
 	if (*$1) {
 		/* SWIG_Python_AppendOutput() steals the created object */
 		$result = SWIG_Python_AppendOutput($result, SWIG_Python_str_FromChar(*$1));
@@ -77,11 +93,11 @@ typedef int bt_bool;
 }
 
 /* Output argument typemap for value output (always appends) */
-%typemap(in, numinputs=0) (bt_value **OUT) (struct bt_value *temp_value = NULL) {
+%typemap(in, numinputs=0) (bt_value **) (struct bt_value *temp_value = NULL) {
 	$1 = &temp_value;
 }
 
-%typemap(argout) (bt_value **OUT) {
+%typemap(argout) (bt_value **) {
 	if (*$1) {
 		/* SWIG_Python_AppendOutput() steals the created object */
 		$result = SWIG_Python_AppendOutput($result,
@@ -95,41 +111,33 @@ typedef int bt_bool;
 }
 
 /* Output argument typemap for initialized uint64_t output parameter (always appends) */
-%typemap(in, numinputs=0) (uint64_t *OUT) (uint64_t temp) {
+%typemap(in, numinputs=0) (uint64_t *) (uint64_t temp) {
 	$1 = &temp;
 }
 
-%typemap(argout) uint64_t *OUT {
+%typemap(argout) uint64_t * {
 	$result = SWIG_Python_AppendOutput(resultobj,
 			SWIG_From_unsigned_SS_long_SS_long((*$1)));
 }
 
 /* Output argument typemap for initialized int64_t output parameter (always appends) */
-%typemap(in, numinputs=0) (int64_t *OUT) (int64_t temp) {
+%typemap(in, numinputs=0) (int64_t *) (int64_t temp) {
 	$1 = &temp;
 }
 
-%typemap(argout) (int64_t *OUT) {
+%typemap(argout) (int64_t *) {
 	$result = SWIG_Python_AppendOutput(resultobj, SWIG_From_long_SS_long((*$1)));
 }
 
 /* Output argument typemap for initialized unsigned int output parameter (always appends) */
-%typemap(in, numinputs=0) (unsigned int *OUT) (unsigned int temp) {
+%typemap(in, numinputs=0) (unsigned int *) (unsigned int temp) {
 	$1 = &temp;
 }
 
-%typemap(argout) (unsigned int *OUT) {
+%typemap(argout) (unsigned int *) {
 	$result = SWIG_Python_AppendOutput(resultobj,
 			SWIG_From_unsigned_SS_long_SS_long((uint64_t) (*$1)));
 }
-/* Output argument typemap for initialized double output parameter (always appends) */
-%typemap(in, numinputs=0) (double *OUT) (double temp) {
-	$1 = &temp;
-}
-
-%typemap(argout) (double *OUT) {
-	$result = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*$1)));
-}
 
 /* Input argument typemap for UUID bytes */
 %typemap(in) bt_uuid {
@@ -159,7 +167,6 @@ typedef int bt_bool;
 		$result = Py_False;
 	}
 	Py_INCREF($result);
-	return $result;
 }
 
 /*
@@ -179,28 +186,43 @@ typedef int bt_bool;
 	$result = $1;
 }
 
-/* From property.h */
+/* 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>
 
-typedef enum bt_property_availability {
-	BT_PROPERTY_AVAILABILITY_AVAILABLE,
-	BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE,
-} bt_property_availability;
+/* 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"
 %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_notifier.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"