X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=bbc122152204bf4308a15f9afbe6a58dd4b587b3;hb=18a720cd7bbc2eeea6d075903668e21337b5d916;hp=bacaa5caab1b6c36741ec4151cea0338e5c84b27;hpb=5cdb6027a2b78fd93aa7f61174625190b5fc3459;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index bacaa5caa..bbc122152 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -47,6 +47,21 @@ static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER; static uint64_t relayd_net_seq_idx; +/* + * Both functions below are special case for the Kernel domain when + * enabling/disabling all events. + */ +static +int enable_kevent_all(struct ltt_session *session, + struct lttng_domain *domain, char *channel_name, + struct lttng_event *event, + char *filter_expression, + struct lttng_filter_bytecode *filter, int wpipe); +static +int disable_kevent_all(struct ltt_session *session, int domain, + char *channel_name, + struct lttng_event *event); + /* * Create a session path used by list_lttng_sessions for the case that the * session consumer is on the network. @@ -1000,9 +1015,24 @@ error: * Command LTTNG_DISABLE_EVENT processed by the client thread. */ int cmd_disable_event(struct ltt_session *session, int domain, - char *channel_name, char *event_name) + char *channel_name, + struct lttng_event *event) { int ret; + char *event_name; + + DBG("Disable event command for event \'%s\'", event->name); + + event_name = event->name; + + if (event->loglevel_type || event->loglevel || event->enabled + || event->pid || event->filter || event->exclusion) { + return LTTNG_ERR_UNK; + } + /* Special handling for kernel domain all events. */ + if (domain == LTTNG_DOMAIN_KERNEL && !strcmp(event_name, "*")) { + return disable_kevent_all(session, domain, channel_name, event); + } rcu_read_lock(); @@ -1030,8 +1060,19 @@ int cmd_disable_event(struct ltt_session *session, int domain, goto error; } - ret = event_kernel_disable_tracepoint(kchan, event_name); - if (ret != LTTNG_OK) { + switch (event->type) { + case LTTNG_EVENT_ALL: + case LTTNG_EVENT_TRACEPOINT: + ret = event_kernel_disable_tracepoint(kchan, event_name); + if (ret != LTTNG_OK) { + goto error; + } + break; + case LTTNG_EVENT_SYSCALL: + ret = event_kernel_disable_syscall(kchan, event_name); + break; + default: + ret = LTTNG_ERR_UNK; goto error; } @@ -1062,8 +1103,15 @@ int cmd_disable_event(struct ltt_session *session, int domain, goto error; } - ret = event_ust_disable_tracepoint(usess, uchan, event_name); - if (ret != LTTNG_OK) { + switch (event->type) { + case LTTNG_EVENT_ALL: + ret = event_ust_disable_tracepoint(usess, uchan, event_name); + if (ret != LTTNG_OK) { + goto error; + } + break; + default: + ret = LTTNG_ERR_UNK; goto error; } @@ -1079,13 +1127,25 @@ int cmd_disable_event(struct ltt_session *session, int domain, assert(usess); + switch (event->type) { + case LTTNG_EVENT_ALL: + break; + default: + ret = LTTNG_ERR_UNK; + goto error; + } + agt = trace_ust_find_agent(usess, domain); if (!agt) { ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND; goto error; } - - ret = event_agent_disable(usess, agt, event_name); + /* The wild card * means that everything should be disabled. */ + if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) { + ret = event_agent_disable_all(usess, agt); + } else { + ret = event_agent_disable(usess, agt, event_name); + } if (ret != LTTNG_OK) { goto error; } @@ -1110,12 +1170,17 @@ error: } /* - * Command LTTNG_DISABLE_ALL_EVENT processed by the client thread. + * Command LTTNG_DISABLE_EVENT for event "*" processed by the client thread. */ -int cmd_disable_event_all(struct ltt_session *session, int domain, - char *channel_name) +static +int disable_kevent_all(struct ltt_session *session, int domain, + char *channel_name, + struct lttng_event *event) { int ret; + char *event_name; + + event_name = event->name; rcu_read_lock(); @@ -1143,73 +1208,24 @@ int cmd_disable_event_all(struct ltt_session *session, int domain, goto error; } - ret = event_kernel_disable_all(kchan); - if (ret != LTTNG_OK) { + switch (event->type) { + case LTTNG_EVENT_ALL: + ret = event_kernel_disable_all(kchan); + if (ret != LTTNG_OK) { + goto error; + } + break; + case LTTNG_EVENT_SYSCALL: + ret = event_kernel_disable_syscall(kchan, event_name); + break; + default: + ret = LTTNG_ERR_UNK; goto error; } kernel_wait_quiescent(kernel_tracer_fd); break; } - case LTTNG_DOMAIN_UST: - { - struct ltt_ust_session *usess; - struct ltt_ust_channel *uchan; - - usess = session->ust_session; - - /* - * If a non-default channel has been created in the - * session, explicitely require that -c chan_name needs - * to be provided. - */ - if (usess->has_non_default_channel && channel_name[0] == '\0') { - ret = LTTNG_ERR_NEED_CHANNEL_NAME; - goto error; - } - - uchan = trace_ust_find_channel_by_name(usess->domain_global.channels, - channel_name); - if (uchan == NULL) { - ret = LTTNG_ERR_UST_CHAN_NOT_FOUND; - goto error; - } - - ret = event_ust_disable_all_tracepoints(usess, uchan); - if (ret != 0) { - goto error; - } - - DBG3("Disable all UST events in channel %s completed", channel_name); - - break; - } - case LTTNG_DOMAIN_LOG4J: - case LTTNG_DOMAIN_JUL: - { - struct agent *agt; - struct ltt_ust_session *usess = session->ust_session; - - assert(usess); - - agt = trace_ust_find_agent(usess, domain); - if (!agt) { - ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND; - goto error; - } - - ret = event_agent_disable_all(usess, agt); - if (ret != LTTNG_OK) { - goto error; - } - - break; - } -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; @@ -1366,6 +1382,14 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, assert(event); assert(channel_name); + DBG("Enable event command for event \'%s\'", event->name); + + /* Special handling for kernel domain all events. */ + if (domain->type == LTTNG_DOMAIN_KERNEL && !strcmp(event->name, "*")) { + return enable_kevent_all(session, domain, channel_name, event, + filter_expression, filter, wpipe); + } + ret = validate_event_name(event->name); if (ret) { goto error; @@ -1419,12 +1443,23 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, goto error; } - ret = event_kernel_enable_tracepoint(kchan, event); - if (ret != LTTNG_OK) { - if (channel_created) { - /* Let's not leak a useless channel. */ - kernel_destroy_channel(kchan); + switch (event->type) { + case LTTNG_EVENT_ALL: + case LTTNG_EVENT_TRACEPOINT: + ret = event_kernel_enable_tracepoint(kchan, event); + if (ret != LTTNG_OK) { + if (channel_created) { + /* Let's not leak a useless channel. */ + kernel_destroy_channel(kchan); + } + goto error; } + break; + case LTTNG_EVENT_SYSCALL: + ret = event_kernel_enable_syscall(kchan, event->name); + break; + default: + ret = LTTNG_ERR_UNK; goto error; } @@ -1485,6 +1520,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: { + const char *default_event_name, *default_chan_name; struct agent *agt; struct lttng_event uevent; struct lttng_domain tmp_dom; @@ -1506,13 +1542,12 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, memset(&uevent, 0, sizeof(uevent)); uevent.type = LTTNG_EVENT_TRACEPOINT; uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - if (is_root) { - strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME, - sizeof(uevent.name)); - } else { - strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME, - sizeof(uevent.name)); + default_event_name = event_get_default_agent_ust_name(domain->type); + if (!default_event_name) { + ret = -LTTNG_ERR_FATAL; + goto error; } + strncpy(uevent.name, default_event_name, sizeof(uevent.name)); uevent.name[sizeof(uevent.name) - 1] = '\0'; /* @@ -1523,7 +1558,13 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, memcpy(&tmp_dom, domain, sizeof(tmp_dom)); tmp_dom.type = LTTNG_DOMAIN_UST; - ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME, + if (domain->type == LTTNG_DOMAIN_LOG4J) { + default_chan_name = DEFAULT_LOG4J_CHANNEL_NAME; + } else { + default_chan_name = DEFAULT_JUL_CHANNEL_NAME; + } + + ret = cmd_enable_event(session, &tmp_dom, (char *) default_chan_name, &uevent, filter_expression, filter, NULL, wpipe); if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) { goto error; @@ -1559,10 +1600,12 @@ error: } /* - * Command LTTNG_ENABLE_ALL_EVENT processed by the client thread. + * Command LTTNG_ENABLE_EVENT for event "*" processed by the client thread. */ -int cmd_enable_event_all(struct ltt_session *session, - struct lttng_domain *domain, char *channel_name, int event_type, +static +int enable_kevent_all(struct ltt_session *session, + struct lttng_domain *domain, char *channel_name, + struct lttng_event *event, char *filter_expression, struct lttng_filter_bytecode *filter, int wpipe) { @@ -1617,9 +1660,9 @@ int cmd_enable_event_all(struct ltt_session *session, assert(kchan); } - switch (event_type) { + switch (event->type) { case LTTNG_EVENT_SYSCALL: - ret = event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd); + ret = event_kernel_enable_syscall(kchan, ""); break; case LTTNG_EVENT_TRACEPOINT: /* @@ -1649,135 +1692,6 @@ int cmd_enable_event_all(struct ltt_session *session, kernel_wait_quiescent(kernel_tracer_fd); break; } - case LTTNG_DOMAIN_UST: - { - struct ltt_ust_channel *uchan; - struct ltt_ust_session *usess = session->ust_session; - - assert(usess); - - /* - * If a non-default channel has been created in the - * session, explicitely require that -c chan_name needs - * to be provided. - */ - if (usess->has_non_default_channel && channel_name[0] == '\0') { - ret = LTTNG_ERR_NEED_CHANNEL_NAME; - goto error; - } - - /* Get channel from global UST domain */ - uchan = trace_ust_find_channel_by_name(usess->domain_global.channels, - channel_name); - if (uchan == NULL) { - /* Create default channel */ - attr = channel_new_default_attr(LTTNG_DOMAIN_UST, - usess->buffer_type); - if (attr == NULL) { - ret = LTTNG_ERR_FATAL; - goto error; - } - strncpy(attr->name, channel_name, sizeof(attr->name)); - - ret = cmd_enable_channel(session, domain, attr, wpipe); - if (ret != LTTNG_OK) { - free(attr); - goto error; - } - free(attr); - - /* Get the newly created channel reference back */ - uchan = trace_ust_find_channel_by_name( - usess->domain_global.channels, channel_name); - assert(uchan); - } - - /* At this point, the session and channel exist on the tracer */ - - switch (event_type) { - case LTTNG_EVENT_ALL: - case LTTNG_EVENT_TRACEPOINT: - ret = event_ust_enable_all_tracepoints(usess, uchan, - filter_expression, filter); - if (ret != LTTNG_OK) { - goto error; - } - break; - default: - ret = LTTNG_ERR_UST_ENABLE_FAIL; - goto error; - } - - /* Manage return value */ - if (ret != LTTNG_OK) { - goto error; - } - - break; - } - case LTTNG_DOMAIN_LOG4J: - case LTTNG_DOMAIN_JUL: - { - struct agent *agt; - struct lttng_event uevent, event; - struct lttng_domain tmp_dom; - struct ltt_ust_session *usess = session->ust_session; - - assert(usess); - - agt = trace_ust_find_agent(usess, domain->type); - if (!agt) { - agt = agent_create(domain->type); - if (!agt) { - ret = -LTTNG_ERR_NOMEM; - goto error; - } - agent_add(agt, usess->agents); - } - - /* Create the default tracepoint. */ - uevent.type = LTTNG_EVENT_TRACEPOINT; - uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - if (is_root) { - strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME, - sizeof(uevent.name)); - } else { - strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME, - sizeof(uevent.name)); - } - uevent.name[sizeof(uevent.name) - 1] = '\0'; - - /* - * The domain type is changed because we are about to enable the - * default channel and event for the JUL domain that are hardcoded. - * This happens in the UST domain. - */ - memcpy(&tmp_dom, domain, sizeof(tmp_dom)); - tmp_dom.type = LTTNG_DOMAIN_UST; - - ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME, - &uevent, NULL, NULL, NULL, wpipe); - if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) { - goto error; - } - - event.loglevel = LTTNG_LOGLEVEL_JUL_ALL; - event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - strncpy(event.name, "*", sizeof(event.name)); - event.name[sizeof(event.name) - 1] = '\0'; - - ret = event_agent_enable_all(usess, agt, &event, filter); - if (ret != LTTNG_OK) { - goto error; - } - - break; - } -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; @@ -1816,7 +1730,7 @@ ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events) break; case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: - nb_events = agent_list_events(events); + nb_events = agent_list_events(events, domain); if (nb_events < 0) { ret = LTTNG_ERR_UST_LIST_FAIL; goto error;