summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
949f049)
Implement the proposal to rename the --user-id option to --owner-uid in
the add-trigger and remove-trigger commands. Update the output of
list-triggers as well.
Change-Id: I79977a0efe80d96917fcaf55909a78c81047c388
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
OPT_CONDITION,
OPT_ACTION,
OPT_ID,
OPT_CONDITION,
OPT_ACTION,
OPT_ID,
OPT_RATE_POLICY,
OPT_NAME,
OPT_RATE_POLICY,
OPT_NAME,
{ OPT_CONDITION, '\0', "condition", true },
{ OPT_ACTION, '\0', "action", true },
{ OPT_NAME, '\0', "name", true },
{ OPT_CONDITION, '\0', "condition", true },
{ OPT_ACTION, '\0', "action", true },
{ OPT_NAME, '\0', "name", true },
- { OPT_USER_ID, '\0', "user-id", true },
+ { OPT_OWNER_UID, '\0', "owner-uid", true },
ARGPAR_OPT_DESCR_SENTINEL,
};
ARGPAR_OPT_DESCR_SENTINEL,
};
char *error = NULL;
char *name = NULL;
int i;
char *error = NULL;
char *name = NULL;
int i;
+ char *owner_uid = NULL;
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
- if (!assign_string(&user_id, item_opt->arg,
- "--user-id")) {
+ if (!assign_string(&owner_uid, item_opt->arg,
+ "--owner-uid")) {
enum lttng_trigger_status trigger_status;
char *end;
long long uid;
errno = 0;
enum lttng_trigger_status trigger_status;
char *end;
long long uid;
errno = 0;
- uid = strtol(user_id, &end, 10);
- if (end == user_id || *end != '\0' || errno != 0) {
- ERR("Failed to parse `%s` as a user id.", user_id);
+ uid = strtol(owner_uid, &end, 10);
+ if (end == owner_uid || *end != '\0' || errno != 0) {
+ ERR("Failed to parse `%s` as a user id.", owner_uid);
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
lttng_trigger_destroy(trigger);
free(error);
free(name);
lttng_trigger_destroy(trigger);
free(error);
free(name);
assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
MSG("- name: %s", name);
assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
MSG("- name: %s", name);
- MSG(" user id: %d", trigger_uid);
+ MSG(" owner uid: %d", trigger_uid);
condition = lttng_trigger_get_const_condition(trigger);
condition_type = lttng_condition_get_type(condition);
condition = lttng_trigger_get_const_condition(trigger);
condition_type = lttng_condition_get_type(condition);
enum {
OPT_HELP,
OPT_LIST_OPTIONS,
enum {
OPT_HELP,
OPT_LIST_OPTIONS,
};
static const
struct argpar_opt_descr remove_trigger_options[] = {
{ OPT_HELP, 'h', "help", false },
{ OPT_LIST_OPTIONS, '\0', "list-options", false },
};
static const
struct argpar_opt_descr remove_trigger_options[] = {
{ OPT_HELP, 'h', "help", false },
{ OPT_LIST_OPTIONS, '\0', "list-options", false },
- { OPT_USER_ID, '\0', "user-id", true },
+ { OPT_OWNER_UID, '\0', "owner-uid", true },
ARGPAR_OPT_DESCR_SENTINEL,
};
ARGPAR_OPT_DESCR_SENTINEL,
};
unsigned int triggers_count;
enum lttng_trigger_status trigger_status;
const struct lttng_trigger *trigger_to_remove = NULL;
unsigned int triggers_count;
enum lttng_trigger_status trigger_status;
const struct lttng_trigger *trigger_to_remove = NULL;
+ char *owner_uid = NULL;
long long uid;
argpar_parse_ret = argpar_parse(argc - 1, argv + 1,
long long uid;
argpar_parse_ret = argpar_parse(argc - 1, argv + 1,
remove_trigger_options);
ret = 0;
goto end;
remove_trigger_options);
ret = 0;
goto end;
- if (!assign_string(&user_id, item_opt->arg,
- "--user-id")) {
+ if (!assign_string(&owner_uid, item_opt->arg,
+ "--owner-uid")) {
- uid = strtol(user_id, &end, 10);
- if (end == user_id || *end != '\0' || errno != 0) {
- ERR("Failed to parse `%s` as an integer.", user_id);
+ uid = strtol(owner_uid, &end, 10);
+ if (end == owner_uid || *end != '\0' || errno != 0) {
+ ERR("Failed to parse `%s` as an integer.", owner_uid);
}
} else {
uid = geteuid();
}
} else {
uid = geteuid();
end:
argpar_parse_ret_fini(&argpar_parse_ret);
lttng_triggers_destroy(triggers);
end:
argpar_parse_ret_fini(&argpar_parse_ret);
lttng_triggers_destroy(triggers);
cat > "${tmp_expected_stdout}" <<- EOF
- name: hello
cat > "${tmp_expected_stdout}" <<- EOF
- name: hello
condition: event rule hit
rule: test-name (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: test-name (type: tracepoint, domain: ust)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: A
cat > "${tmp_expected_stdout}" <<- EOF
- name: A
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
actions:
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
actions:
errors: none
errors: none
- name: B
errors: none
errors: none
- name: B
condition: event rule hit
rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
actions:
condition: event rule hit
rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
actions:
errors: none
errors: none
- name: C
errors: none
errors: none
- name: C
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: D
errors: none
errors: none
- name: D
condition: event rule hit
rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
actions:
condition: event rule hit
rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
actions:
errors: none
errors: none
- name: E
errors: none
errors: none
- name: E
condition: event rule hit
rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
actions:
condition: event rule hit
rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
actions:
errors: none
errors: none
- name: F
errors: none
errors: none
- name: F
condition: event rule hit
rule: capture-payload-field (type: tracepoint, domain: ust)
captures:
condition: event rule hit
rule: capture-payload-field (type: tracepoint, domain: ust)
captures:
errors: none
errors: none
- name: G
errors: none
errors: none
- name: G
condition: event rule hit
rule: capture-array (type: tracepoint, domain: ust)
captures:
condition: event rule hit
rule: capture-array (type: tracepoint, domain: ust)
captures:
errors: none
errors: none
- name: H
errors: none
errors: none
- name: H
condition: event rule hit
rule: capture-chan-ctx (type: tracepoint, domain: ust)
captures:
condition: event rule hit
rule: capture-chan-ctx (type: tracepoint, domain: ust)
captures:
errors: none
errors: none
- name: I
errors: none
errors: none
- name: I
condition: event rule hit
rule: capture-app-ctx (type: tracepoint, domain: ust)
captures:
condition: event rule hit
rule: capture-app-ctx (type: tracepoint, domain: ust)
captures:
errors: none
errors: none
- name: J
errors: none
errors: none
- name: J
condition: event rule hit
rule: lemming (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: lemming (type: tracepoint, domain: ust)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
condition: event rule hit
rule: my_channel_enable (type: probe, location: lttng_channel_enable)
actions:
condition: event rule hit
rule: my_channel_enable (type: probe, location: lttng_channel_enable)
actions:
errors: none
errors: none
- name: T1
errors: none
errors: none
- name: T1
condition: event rule hit
rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
actions:
condition: event rule hit
rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
actions:
errors: none
errors: none
- name: T2
errors: none
errors: none
- name: T2
condition: event rule hit
rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
actions:
condition: event rule hit
rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
condition: event rule hit
rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
actions:
condition: event rule hit
rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
condition: event rule hit
rule: open (type: syscall)
actions:
condition: event rule hit
rule: open (type: syscall)
actions:
errors: none
errors: none
- name: T1
errors: none
errors: none
- name: T1
condition: event rule hit
rule: ptrace (type: syscall, filter: a > 2)
actions:
condition: event rule hit
rule: ptrace (type: syscall, filter: a > 2)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T1
errors: none
errors: none
- name: T1
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T2
errors: none
errors: none
- name: T2
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T3
errors: none
errors: none
- name: T3
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T4
errors: none
errors: none
- name: T4
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T5
errors: none
errors: none
- name: T5
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T6
errors: none
errors: none
- name: T6
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T7
errors: none
errors: none
- name: T7
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T8
errors: none
errors: none
- name: T8
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T9
errors: none
errors: none
- name: T9
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
cat > "${tmp_expected_stdout}" <<- EOF
- name: T0
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
errors: none
errors: none
- name: T1
errors: none
errors: none
- name: T1
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: some-event (type: tracepoint, domain: ust)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: ABC
cat > "${tmp_expected_stdout}" <<- EOF
- name: ABC
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
actions:
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
actions:
errors: none
errors: none
- name: DEF
errors: none
errors: none
- name: DEF
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
cat > "${tmp_expected_stdout}" <<- EOF
- name: DEF
cat > "${tmp_expected_stdout}" <<- EOF
- name: DEF
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions: