X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fquery-executor.c;h=6d5334453b9aff444a06ff2d5a1441041424648d;hb=c2d9d9cf280189e77453e82e4979c307eef111e7;hp=1a51df9223192daedb2be18d109d0db71004561c;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index 1a51df92..6d533445 100644
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -21,9 +21,10 @@
  */
 
 #define BT_LOG_TAG "LIB/QUERY-EXECUTOR"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "common/assert.h"
+#include "common/common.h"
 #include "lib/assert-pre.h"
 #include <babeltrace2/graph/query-executor-const.h>
 #include <babeltrace2/graph/query-executor.h>
@@ -69,10 +70,11 @@ enum bt_query_executor_status bt_query_executor_query(
 		struct bt_query_executor *query_exec,
 		const struct bt_component_class *comp_cls,
 		const char *object, const struct bt_value *params,
+		bt_logging_level log_level,
 		const struct bt_value **user_result)
 {
 	typedef enum bt_query_status (*method_t)(void *, const void *,
-		const void *, const void *, const void *);
+		const void *, const void *, bt_logging_level, const void *);
 
 	enum bt_query_status status;
 	enum bt_query_executor_status exec_status;
@@ -123,11 +125,13 @@ enum bt_query_executor_status bt_query_executor_query(
 	}
 
 	BT_LIB_LOGD("Calling user's query method: "
-		"query-exec-addr=%p, %![cc-]+C, object=\"%s\", %![params-]+v",
-		query_exec, comp_cls, object, params);
+		"query-exec-addr=%p, %![cc-]+C, object=\"%s\", %![params-]+v, "
+		"log-level=%s",
+		query_exec, comp_cls, object, params,
+		bt_common_logging_level_string(log_level));
 	*user_result = NULL;
 	status = method((void *) comp_cls, query_exec, object, params,
-		user_result);
+		log_level, user_result);
 	BT_LIB_LOGD("User method returned: status=%s, %![res-]+v",
 		bt_query_status_string(status), *user_result);
 	BT_ASSERT_PRE(status != BT_QUERY_STATUS_OK || *user_result,