enum lttng_error_query_target_type target_type;
};
+struct lttng_error_query_result {
+ enum lttng_error_query_result_type type;
+ char *name;
+ char *description;
+};
+
+struct lttng_error_query_results {
+ struct lttng_dynamic_pointer_array results;
+};
+
+namespace {
struct lttng_error_query_comm {
/* enum lttng_error_query_target_type */
int8_t target_type;
struct lttng_error_query parent;
/* Mutable only because of the reference count. */
struct lttng_trigger *trigger;
- struct lttng_action_path action_path;
-};
-
-struct lttng_error_query_result {
- enum lttng_error_query_result_type type;
- char *name;
- char *description;
+ struct lttng_action_path *action_path;
};
struct lttng_error_query_result_comm {
/* `count` instances of `struct lttng_error_query_result` follow. */
char payload[];
} LTTNG_PACKED;
-
-struct lttng_error_query_results {
- struct lttng_dynamic_pointer_array results;
-};
+} /* namespace */
static
enum lttng_error_code lttng_error_query_result_mi_serialize(
goto end;
}
- query = (lttng_error_query_trigger *) zmalloc(sizeof(*query));
+ query = zmalloc<lttng_error_query_trigger>();
if (!query) {
PERROR("Failed to allocate trigger error query");
goto error;
goto end;
}
- query = (lttng_error_query_condition *) zmalloc(sizeof(*query));
+ query = zmalloc<lttng_error_query_condition>();
if (!query) {
PERROR("Failed to allocate condition error query");
goto error;
goto end;
}
- query = (lttng_error_query_action *) zmalloc(sizeof(*query));
+ query = zmalloc<lttng_error_query_action>();
if (!query) {
PERROR("Failed to allocate action error query");
goto error;
void lttng_error_query_destroy(struct lttng_error_query *query)
{
- struct lttng_error_query_trigger *trigger_query;
-
if (!query) {
return;
}
- trigger_query = container_of(query, typeof(*trigger_query), parent);
- lttng_trigger_put(trigger_query->trigger);
- free(trigger_query);
+ switch (query->target_type) {
+ case LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER:
+ {
+ struct lttng_error_query_trigger *trigger_query =
+ container_of(query, typeof(*trigger_query),
+ parent);
+
+ lttng_trigger_put(trigger_query->trigger);
+ free(trigger_query);
+ break;
+ }
+ case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+ {
+ struct lttng_error_query_condition *condition_query =
+ container_of(query, typeof(*condition_query),
+ parent);
+
+ lttng_trigger_put(condition_query->trigger);
+ free(condition_query);
+ break;
+ }
+ case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
+ {
+ struct lttng_error_query_action *action_query =
+ container_of(query, typeof(*action_query),
+ parent);
+
+ lttng_trigger_put(action_query->trigger);
+ lttng_action_path_destroy(action_query->action_path);
+ free(action_query);
+ break;
+ }
+ default:
+ abort();
+ }
}
static
int init_ret;
struct lttng_error_query_result_counter *counter;
- counter = (lttng_error_query_result_counter *) zmalloc(sizeof(*counter));
+ counter = zmalloc<lttng_error_query_result_counter>();
if (!counter) {
PERROR("Failed to allocate error query counter result");
goto end;
struct lttng_error_query_results *lttng_error_query_results_create(void)
{
- struct lttng_error_query_results *set = (lttng_error_query_results *) zmalloc(sizeof(*set));
+ struct lttng_error_query_results *set = zmalloc<lttng_error_query_results>();
if (!set) {
PERROR("Failed to allocate an error query result set");
goto end;
}
- ret = lttng_action_path_serialize(&query_action->action_path, payload);
+ ret = lttng_action_path_serialize(query_action->action_path, payload);
if (ret) {
goto end;
}
container_of(query, typeof(*query_action), parent);
return get_trigger_action_from_path(
- trigger, &query_action->action_path);
+ trigger, query_action->action_path);
}
int lttng_error_query_serialize(const struct lttng_error_query *query,