Visibility hidden by default

[babeltrace.git] / src / lib / graph / query-executor.c

diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index be5bbba19ab16e53d89566ad7c47dec93b14bf12..97a12caaea92745c89c4b95b1133a3a8fb24b25b 100644 (file)
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -50,6 +50,7 @@ void bt_query_executor_destroy(struct bt_object *obj)
        g_free(query_exec);
 }
 
+BT_EXPORT
 struct bt_query_executor *bt_query_executor_create_with_method_data(
                const bt_component_class *comp_cls, const char *object,
                const bt_value *params, void *method_data)
@@ -58,7 +59,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
 
        BT_ASSERT_PRE_NO_ERROR();
        BT_ASSERT_PRE_COMP_CLS_NON_NULL(comp_cls);
-       BT_ASSERT_PRE_NON_NULL(object, "Object");
+       BT_ASSERT_PRE_NON_NULL("object", object, "Object");
        BT_LIB_LOGD("Creating query executor: "
                "%![comp-cls-]+C, object=\"%s\", %![params-]+v",
                comp_cls, object, params);
@@ -116,6 +117,7 @@ end:
        return (void *) query_exec;
 }
 
+BT_EXPORT
 struct bt_query_executor *bt_query_executor_create(
                const bt_component_class *comp_cls, const char *object,
                const bt_value *params)
@@ -125,6 +127,7 @@ struct bt_query_executor *bt_query_executor_create(
                object, params, NULL);
 }
 
+BT_EXPORT
 enum bt_query_executor_query_status bt_query_executor_query(
                struct bt_query_executor *query_exec,
                const struct bt_value **user_result)
@@ -140,6 +143,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
        enum bt_query_executor_query_status status;
        enum bt_component_class_query_method_status query_status;
        method_t method = NULL;
+       const char *method_name = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
        BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
@@ -175,6 +179,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
                        query_exec->comp_cls;
 
                method = (method_t) src_cc->methods.query;
+               method_name = "bt_component_class_source_query_method";
                break;
        }
        case BT_COMPONENT_CLASS_TYPE_FILTER:
@@ -183,6 +188,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
                        query_exec->comp_cls;
 
                method = (method_t) flt_cc->methods.query;
+               method_name = "bt_component_class_filter_query_method";
                break;
        }
        case BT_COMPONENT_CLASS_TYPE_SINK:
@@ -191,6 +197,7 @@ enum bt_query_executor_query_status bt_query_executor_query(
                        query_exec->comp_cls;
 
                method = (method_t) sink_cc->methods.query;
+               method_name = "bt_component_class_sink_query_method";
                break;
        }
        default:
@@ -217,9 +224,10 @@ enum bt_query_executor_query_status bt_query_executor_query(
                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,
+       BT_ASSERT_POST(method_name, "status-ok-with-result",
+               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);
+       BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(method_name, query_status);
        status = (int) query_status;
 
        if (status < 0) {
@@ -237,6 +245,7 @@ end:
        return status;
 }
 
+BT_EXPORT
 enum bt_query_executor_add_interrupter_status bt_query_executor_add_interrupter(
                struct bt_query_executor *query_exec,
                const struct bt_interrupter *intr)
@@ -252,6 +261,7 @@ enum bt_query_executor_add_interrupter_status bt_query_executor_add_interrupter(
        return BT_FUNC_STATUS_OK;
 }
 
+BT_EXPORT
 bt_bool bt_query_executor_is_interrupted(const struct bt_query_executor *query_exec)
 {
        BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
@@ -259,6 +269,7 @@ bt_bool bt_query_executor_is_interrupted(const struct bt_query_executor *query_e
                query_exec->interrupters);
 }
 
+BT_EXPORT
 struct bt_interrupter *bt_query_executor_borrow_default_interrupter(
                struct bt_query_executor *query_exec)
 {
@@ -266,6 +277,7 @@ struct bt_interrupter *bt_query_executor_borrow_default_interrupter(
        return query_exec->default_interrupter;
 }
 
+BT_EXPORT
 enum bt_query_executor_set_logging_level_status
 bt_query_executor_set_logging_level(struct bt_query_executor *query_exec,
                enum bt_logging_level log_level)
@@ -275,6 +287,7 @@ bt_query_executor_set_logging_level(struct bt_query_executor *query_exec,
        return BT_FUNC_STATUS_OK;
 }
 
+BT_EXPORT
 enum bt_logging_level bt_query_executor_get_logging_level(
                const struct bt_query_executor *query_exec)
 {
@@ -282,11 +295,13 @@ enum bt_logging_level bt_query_executor_get_logging_level(
        return query_exec->log_level;
 }
 
+BT_EXPORT
 void bt_query_executor_get_ref(const struct bt_query_executor *query_executor)
 {
        bt_object_get_ref(query_executor);
 }
 
+BT_EXPORT
 void bt_query_executor_put_ref(const struct bt_query_executor *query_executor)
 {
        bt_object_put_ref(query_executor);