const struct lttng_trigger *trigger)
{
struct lttng_error_query_trigger *query = NULL;
- struct lttng_trigger *trigger_copy;
+ struct lttng_trigger *trigger_copy = NULL;
- trigger_copy = lttng_trigger_copy(trigger);
- if (!trigger_copy) {
+ if (!trigger) {
goto end;
}
- if (!trigger) {
+ trigger_copy = lttng_trigger_copy(trigger);
+ if (!trigger_copy) {
goto end;
}
query = zmalloc(sizeof(*query));
if (!query) {
PERROR("Failed to allocate trigger error query");
- goto end;
+ goto error;
}
query->parent.target_type = LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER;
query->trigger = trigger_copy;
+ trigger_copy = NULL;
+
+error:
+ lttng_trigger_put(trigger_copy);
end:
return query ? &query->parent : NULL;
}
{
struct lttng_error_query_action *query = NULL;
typeof(query->action_index) action_index;
- struct lttng_trigger *trigger_copy;
+ struct lttng_trigger *trigger_copy = NULL;
if (!trigger || !action) {
goto end;
action_status = lttng_action_group_get_count(
trigger->action, &action_group_count);
if (action_status != LTTNG_ACTION_STATUS_OK) {
- goto end;
+ goto error;
}
for (i = 0; i < action_group_count; i++) {
if (!action_index.is_set) {
/* Not found; invalid action. */
- goto end;
+ goto error;
}
} else {
/*
* Trigger action is not a group and not equal to the target
* action; invalid action provided.
*/
- goto end;
+ goto error;
}
query = zmalloc(sizeof(*query));
if (!query) {
PERROR("Failed to allocate action error query");
- goto end;
+ goto error;
}
query->parent.target_type = LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION;
query->trigger = trigger_copy;
+ trigger_copy = NULL;
query->action_index = action_index;
+error:
+ lttng_trigger_put(trigger_copy);
end:
return query ? &query->parent : NULL;
}
goto error;
}
+ counter->value = value;
goto end;
error:
lttng_error_query_result_destroy(&counter->parent);
}
LTTNG_HIDDEN
-const struct lttng_action *lttng_error_query_action_borrow_action_target(
+struct lttng_action *lttng_error_query_action_borrow_action_target(
const struct lttng_error_query *query,
- const struct lttng_trigger *trigger)
+ struct lttng_trigger *trigger)
{
- const struct lttng_action *target_action = NULL;
+ struct lttng_action *target_action = NULL;
const struct lttng_error_query_action *query_action =
container_of(query, typeof(*query_action), parent);
- const struct lttng_action *trigger_action =
- lttng_trigger_get_const_action(trigger);
+ struct lttng_action *trigger_action =
+ lttng_trigger_get_action(trigger);
if (!query_action->action_index.is_set) {
target_action = trigger_action;
goto end;
}
- target_action = lttng_action_group_get_at_index(trigger_action,
+ target_action = lttng_action_group_borrow_mutable_at_index(
+ trigger_action,
LTTNG_OPTIONAL_GET(query_action->action_index));
}