X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fquery-executor.c;h=406a38c6193066fa8a6f1a16ad5a2ff2a431ed06;hb=6871026b82224d83bb63cbb44cc33c16c766d96d;hp=ebc1991ebfe659301449994e85c4620808cbacc5;hpb=3c729b9af1b926f739be5bbba4ec20a296746023;p=babeltrace.git

diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index ebc1991e..406a38c6 100644
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -68,16 +68,16 @@ void bt_query_executor_destroy(struct bt_object *obj)
 	g_free(query_exec);
 }
 
-struct bt_query_executor *bt_query_executor_create(
+struct bt_query_executor *bt_query_executor_create_with_method_data(
 		const bt_component_class *comp_cls, const char *object,
-		const bt_value *params)
+		const bt_value *params, void *method_data)
 {
 	struct bt_query_executor *query_exec;
 
 	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 +87,7 @@ struct bt_query_executor *bt_query_executor_create(
 	}
 
 	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 +110,7 @@ struct bt_query_executor *bt_query_executor_create(
 	}
 
 	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,20 +118,29 @@ struct bt_query_executor *bt_query_executor_create(
 		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,
 		query_exec->default_interrupter);
 	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:
 	return (void *) query_exec;
 }
 
+struct bt_query_executor *bt_query_executor_create(
+		const bt_component_class *comp_cls, const char *object,
+		const bt_value *params)
+{
+	return bt_query_executor_create_with_method_data(comp_cls,
+		object, params, NULL);
+}
+
 enum bt_query_executor_query_status bt_query_executor_query(
 		struct bt_query_executor *query_exec,
 		const struct bt_value **user_result)
@@ -141,6 +150,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
 		void * /* private query executor */,
 		const char * /* object */,
 		const struct bt_value * /* parameters */,
+		void * /* method data */,
 		const struct bt_value ** /* result */);
 
 	enum bt_query_executor_query_status status;
@@ -219,7 +229,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
 	*user_result = NULL;
 	query_status = method((void *) query_exec->comp_cls,
 		(void *) query_exec, query_exec->object->str,
-		query_exec->params, user_result);
+		query_exec->params, query_exec->method_data, user_result);
 	BT_LIB_LOGD("User method returned: status=%s, %![res-]+v",
 		bt_common_func_status_string(query_status), *user_result);
 	BT_ASSERT_POST(query_status != BT_FUNC_STATUS_OK || *user_result,
@@ -248,7 +258,7 @@ enum bt_query_executor_add_interrupter_status bt_query_executor_add_interrupter(
 	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);