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_ASSERT_PRE_COMP_CLS_NON_NULL(comp_cls);
+ 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);
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_NON_NULL(query_exec, "Query executor");
- BT_ASSERT_PRE_NON_NULL(user_result, "Result (output)");
+ BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
+ BT_ASSERT_PRE_RES_OUT_NON_NULL(user_result);
/*
* Initial check: is the query executor already interrupted? If
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:
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:
query_exec->comp_cls;
method = (method_t) sink_cc->methods.query;
+ method_name = "bt_component_class_sink_query_method";
break;
}
default:
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) {
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");
+ BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
+ BT_ASSERT_PRE_INTR_NON_NULL(intr);
g_ptr_array_add(query_exec->interrupters, (void *) intr);
bt_object_get_ref_no_null_check(intr);
BT_LIB_LOGD("Added interrupter to query executor: "
bt_bool bt_query_executor_is_interrupted(const struct bt_query_executor *query_exec)
{
- BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
+ BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
return (bt_bool) bt_interrupter_array_any_is_set(
query_exec->interrupters);
}
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_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
return query_exec->default_interrupter;
}
bt_query_executor_set_logging_level(struct bt_query_executor *query_exec,
enum bt_logging_level log_level)
{
- BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
+ BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
query_exec->log_level = log_level;
return BT_FUNC_STATUS_OK;
}
enum bt_logging_level bt_query_executor_get_logging_level(
const struct bt_query_executor *query_exec)
{
- BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
+ BT_ASSERT_PRE_QUERY_EXEC_NON_NULL(query_exec);
return query_exec->log_level;
}