bool lttng_trigger_is_equal(
const struct lttng_trigger *a, const struct lttng_trigger *b)
{
- if (strcmp(a->name, b->name) != 0) {
+ if (!!a->name != !!b->name) {
+ /* Both must be either anonymous or named. */
+ return false;
+ }
+
+ if (a->name && strcmp(a->name, b->name) != 0) {
return false;
}
return true;
}
+LTTNG_HIDDEN
enum lttng_trigger_status lttng_trigger_set_name(struct lttng_trigger *trigger,
const char* name)
{
char *name_copy = NULL;
enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
- if (!trigger || !name ||
- strlen(name) == 0) {
+ if (!trigger) {
status = LTTNG_TRIGGER_STATUS_INVALID;
goto end;
}
- name_copy = strdup(name);
- if (!name_copy) {
- status = LTTNG_TRIGGER_STATUS_ERROR;
- goto end;
+ if (name) {
+ name_copy = strdup(name);
+ if (!name_copy) {
+ status = LTTNG_TRIGGER_STATUS_ERROR;
+ goto end;
+ }
}
free(trigger->name);
/* Apply to any domain. */
type = LTTNG_DOMAIN_NONE;
break;
- case LTTNG_CONDITION_TYPE_ON_EVENT:
+ case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
/* Return the domain of the event rule. */
- c_status = lttng_condition_on_event_get_rule(
+ c_status = lttng_condition_event_rule_matches_get_rule(
trigger->condition, &event_rule);
assert(c_status == LTTNG_CONDITION_STATUS_OK);
type = lttng_event_rule_get_domain_type(event_rule);
}
switch (lttng_condition_get_type(condition)) {
- case LTTNG_CONDITION_TYPE_ON_EVENT:
+ case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
{
struct lttng_event_rule *event_rule;
const enum lttng_condition_status condition_status =
- lttng_condition_on_event_borrow_rule_mutable(
- condition, &event_rule);
+ lttng_condition_event_rule_matches_borrow_rule_mutable(
+ condition, &event_rule);
assert(condition_status == LTTNG_CONDITION_STATUS_OK);
}
/* Generate the capture bytecode. */
- ret = lttng_condition_on_event_generate_capture_descriptor_bytecode(
+ ret = lttng_condition_event_rule_matches_generate_capture_descriptor_bytecode(
condition);
if (ret != LTTNG_OK) {
goto end;
{
int ret;
struct lttng_payload copy_buffer;
+ struct lttng_condition *condition_copy = NULL;
+ struct lttng_action *action_copy = NULL;
struct lttng_trigger *copy = NULL;
+ enum lttng_trigger_status trigger_status;
+ const char *trigger_name;
+ uid_t trigger_owner_uid;
lttng_payload_init(©_buffer);
- ret = lttng_trigger_serialize(trigger, ©_buffer);
+ ret = lttng_condition_serialize(trigger->condition, ©_buffer);
+ if (ret < 0) {
+ goto end;
+ }
+
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ ©_buffer, 0, -1);
+
+ ret = lttng_condition_create_from_payload(
+ &view, &condition_copy);
+ if (ret < 0) {
+ goto end;
+ }
+ }
+
+ lttng_payload_clear(©_buffer);
+
+ ret = lttng_action_serialize(trigger->action, ©_buffer);
if (ret < 0) {
goto end;
}
struct lttng_payload_view view =
lttng_payload_view_from_payload(
©_buffer, 0, -1);
- ret = lttng_trigger_create_from_payload(
- &view, ©);
+
+ ret = lttng_action_create_from_payload(
+ &view, &action_copy);
if (ret < 0) {
- copy = NULL;
goto end;
}
}
+ copy = lttng_trigger_create(condition_copy, action_copy);
+ if (!copy) {
+ ERR("Failed to allocate trigger during trigger copy");
+ goto end;
+ }
+
+ trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
+ switch (trigger_status) {
+ case LTTNG_TRIGGER_STATUS_OK:
+ trigger_status = lttng_trigger_set_name(copy, trigger_name);
+ if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+ ERR("Failed to set name of new trigger during copy");
+ goto error_cleanup_trigger;
+ }
+ break;
+ case LTTNG_TRIGGER_STATUS_UNSET:
+ break;
+ default:
+ ERR("Failed to get name of original trigger during copy");
+ goto error_cleanup_trigger;
+ }
+
+ trigger_status = lttng_trigger_get_owner_uid(
+ trigger, &trigger_owner_uid);
+ switch (trigger_status) {
+ case LTTNG_TRIGGER_STATUS_OK:
+ LTTNG_OPTIONAL_SET(©->creds.uid, trigger_owner_uid);
+ break;
+ case LTTNG_TRIGGER_STATUS_UNSET:
+ break;
+ default:
+ ERR("Failed to get owner uid of original trigger during copy");
+ goto error_cleanup_trigger;
+ }
+
+ copy->tracer_token = trigger->tracer_token;
+ copy->registered = trigger->registered;
+ goto end;
+
+error_cleanup_trigger:
+ lttng_trigger_destroy(copy);
+ copy = NULL;
end:
+ lttng_condition_put(condition_copy);
+ lttng_action_put(action_copy);
lttng_payload_reset(©_buffer);
return copy;
}
lttng_trigger_get_const_condition(trigger);
switch (lttng_condition_get_type(condition)) {
- case LTTNG_CONDITION_TYPE_ON_EVENT:
+ case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
needs_tracer_notifier = true;
goto end;
case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE: