X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_query_exec.i;h=857c33632b4d8f224a8dd04523cfc608edf4cae3;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=932bae8dc7cb0e45e79630b0c9464cf07147799c;hpb=f4e38e70bf6dc1ff8c9226d9c8eedaf26fa19f09;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_query_exec.i b/src/bindings/python/bt2/bt2/native_bt_query_exec.i
index 932bae8d..857c3363 100644
--- a/src/bindings/python/bt2/bt2/native_bt_query_exec.i
+++ b/src/bindings/python/bt2/bt2/native_bt_query_exec.i
@@ -22,41 +22,13 @@
  * THE SOFTWARE.
  */
 
-/* From query-executor-const.h */
+%include <babeltrace2/graph/private-query-executor.h>
+%include <babeltrace2/graph/query-executor.h>
 
-typedef enum bt_query_executor_status {
-	BT_QUERY_EXECUTOR_STATUS_OK = 0,
-	BT_QUERY_EXECUTOR_STATUS_AGAIN = 11,
-	BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED = 95,
-	BT_QUERY_EXECUTOR_STATUS_CANCELED = 125,
-	BT_QUERY_EXECUTOR_STATUS_ERROR = -1,
-	BT_QUERY_EXECUTOR_STATUS_NOMEM = -12,
-	BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT = -23,
-	BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS = -24,
-} bt_query_executor_status;
+%{
+#include "native_bt_query_exec.i.h"
+%}
 
-extern
-bt_bool bt_query_executor_is_canceled(
-		const bt_query_executor *query_executor);
-
-extern void bt_query_executor_get_ref(
-		const bt_query_executor *query_executor);
-
-extern void bt_query_executor_put_ref(
-		const bt_query_executor *query_executor);
-
-/* From query-executor.h */
-
-extern
-bt_query_executor *bt_query_executor_create(void);
-
-extern
-bt_query_executor_status bt_query_executor_query(
-		bt_query_executor *query_executor,
-		const bt_component_class *component_class,
-		const char *object, const bt_value *params,
-		bt_logging_level logging_level, const bt_value **OUT);
-
-extern
-bt_query_executor_status bt_query_executor_cancel(
-		bt_query_executor *query_executor);
+bt_query_executor *bt_bt2_query_executor_create(
+		const bt_component_class *component_class, const char *object,
+		const bt_value *params, PyObject *py_obj);