X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fquery-executor.c;h=bc6f542a6226429a87184ab9113fb07d4084b031;hb=88d1a0b7d8a6dc9061ad0ddc3a471f68eb53f9a7;hp=cf265fd3a8e74a8e3ce6dbe43ed9f018a5d0a303;hpb=7c14d64103ff43ddeb43aaa04df17beb107f1f78;p=babeltrace.git

diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index cf265fd3..bc6f542a 100644
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -74,10 +74,11 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 {
 	struct bt_query_executor *query_exec;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE_NON_NULL(object, "Object");
 	BT_LIB_LOGD("Creating query executor: "
-		"%![comp-cls-]+C, object=\"%s\", %![params-]%+v",
+		"%![comp-cls-]+C, object=\"%s\", %![params-]+v",
 		comp_cls, object, params);
 	query_exec = g_new0(struct bt_query_executor, 1);
 	if (!query_exec) {
@@ -87,7 +88,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 	}
 
 	query_exec->interrupters = g_ptr_array_new_with_free_func(
-		(GDestroyNotify) bt_object_put_no_null_check);
+		(GDestroyNotify) bt_object_put_ref_no_null_check);
 	if (!query_exec->interrupters) {
 		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
 		BT_OBJECT_PUT_REF_AND_RESET(query_exec);
@@ -110,7 +111,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 	}
 
 	query_exec->comp_cls = comp_cls;
-	bt_object_get_no_null_check(query_exec->comp_cls);
+	bt_object_get_ref_no_null_check(query_exec->comp_cls);
 
 	if (!params) {
 		query_exec->params = bt_value_null;
@@ -118,7 +119,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 		query_exec->params = params;
 	}
 
-	bt_object_get_no_null_check(query_exec->params);
+	bt_object_get_ref_no_null_check(query_exec->params);
 	query_exec->method_data = method_data;
 	query_exec->log_level = BT_LOGGING_LEVEL_NONE;
 	bt_query_executor_add_interrupter(query_exec,
@@ -126,7 +127,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 	bt_object_init_shared(&query_exec->base,
 		bt_query_executor_destroy);
 	BT_LIB_LOGD("Created query executor: "
-		"addr=%p, %![comp-cls-]+C, object=\"%s\", %![params-]%+v",
+		"addr=%p, %![comp-cls-]+C, object=\"%s\", %![params-]+v",
 		query_exec, comp_cls, object, params);
 
 end:
@@ -137,6 +138,7 @@ struct bt_query_executor *bt_query_executor_create(
 		const bt_component_class *comp_cls, const char *object,
 		const bt_value *params)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	return bt_query_executor_create_with_method_data(comp_cls,
 		object, params, NULL);
 }
@@ -157,6 +159,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
 	enum bt_component_class_query_method_status query_status;
 	method_t method = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
 	BT_ASSERT_PRE_NON_NULL(user_result, "Result (output)");
 
@@ -209,7 +212,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	if (!method) {
@@ -234,6 +237,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
 		bt_common_func_status_string(query_status), *user_result);
 	BT_ASSERT_POST(query_status != BT_FUNC_STATUS_OK || *user_result,
 		"User method returned `BT_FUNC_STATUS_OK` without a result.");
+	BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(query_status);
 	status = (int) query_status;
 
 	if (status < 0) {
@@ -255,10 +259,11 @@ enum bt_query_executor_add_interrupter_status bt_query_executor_add_interrupter(
 		struct bt_query_executor *query_exec,
 		const struct bt_interrupter *intr)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
 	BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
 	g_ptr_array_add(query_exec->interrupters, (void *) intr);
-	bt_object_get_no_null_check(intr);
+	bt_object_get_ref_no_null_check(intr);
 	BT_LIB_LOGD("Added interrupter to query executor: "
 		"query-exec-addr=%p, %![intr-]+z",
 		query_exec, intr);
@@ -272,12 +277,11 @@ bt_bool bt_query_executor_is_interrupted(const struct bt_query_executor *query_e
 		query_exec->interrupters);
 }
 
-void bt_query_executor_interrupt(struct bt_query_executor *query_exec)
+struct bt_interrupter *bt_query_executor_borrow_default_interrupter(
+		struct bt_query_executor *query_exec)
 {
 	BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
-	bt_interrupter_set(query_exec->default_interrupter);
-	BT_LIB_LOGI("Interrupted query executor: query-exec-addr=%p",
-		query_exec);
+	return query_exec->default_interrupter;
 }
 
 enum bt_query_executor_set_logging_level_status