#include <babeltrace/graph/component-class.h>
#include <babeltrace/graph/component-class-internal.h>
#include <babeltrace/values.h>
+#include <babeltrace/values-const.h>
#include <babeltrace/object-internal.h>
#include <babeltrace/object.h>
#include <babeltrace/compiler-internal.h>
return (void *) query_exec;
}
-enum bt_query_status bt_private_query_executor_query(
+enum bt_query_executor_status bt_private_query_executor_query(
struct bt_private_query_executor *priv_query_exec,
struct bt_component_class *comp_cls,
- const char *object, struct bt_value *params,
- struct bt_value **user_result)
+ const char *object, const struct bt_value *params,
+ const struct bt_value **user_result)
{
typedef enum bt_query_status (*method_t)(void *, void *,
- const void *, void *, void *);
+ const void *, const void *, void *);
struct bt_query_executor *query_exec = (void *) priv_query_exec;
enum bt_query_status status;
+ enum bt_query_executor_status exec_status;
method_t method = NULL;
BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
/* Not an error: nothing to query */
BT_LIB_LOGD("Component class has no registered query method: "
"%!+C", comp_cls);
- status = BT_QUERY_STATUS_UNSUPPORTED;
+ exec_status = BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED;
goto end;
}
status = method(comp_cls, query_exec, object, params, 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_EXECUTOR_CANCELED &&
- status != BT_QUERY_STATUS_UNSUPPORTED,
- "Unexpected (illegal) returned status: status=%s",
- bt_query_status_string(status));
BT_ASSERT_PRE(status != BT_QUERY_STATUS_OK || *user_result,
"User method returned `BT_QUERY_STATUS_OK` without a result.");
+ exec_status = (int) status;
if (query_exec->canceled) {
BT_OBJECT_PUT_REF_AND_RESET(*user_result);
- status = BT_QUERY_STATUS_EXECUTOR_CANCELED;
+ status = BT_QUERY_EXECUTOR_STATUS_CANCELED;
goto end;
}
end:
- return status;
+ return exec_status;
}
-enum bt_query_status bt_private_query_executor_cancel(
+enum bt_query_executor_status bt_private_query_executor_cancel(
struct bt_private_query_executor *priv_query_exec)
{
struct bt_query_executor *query_exec = (void *) priv_query_exec;
BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
query_exec->canceled = BT_TRUE;
BT_LOGV("Canceled query executor: addr=%p", query_exec);
- return BT_QUERY_STATUS_OK;
+ return BT_QUERY_EXECUTOR_STATUS_OK;
}
bt_bool bt_query_executor_is_canceled(struct bt_query_executor *query_exec)