X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=872a6cea160940c59e7a0d2bf6699dd7208a8ce3;hp=d0dcda171e7588bac957cc5c5fada29b799e1a9f;hb=6e911cad03751b6814fddd65b19a592acdc2b7b7;hpb=fefd409b002735b415c5f653cdb2587be454f145 diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index d0dcda171..872a6cea1 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -1000,9 +1000,18 @@ 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; + + event_name = event->name; + + if (event->loglevel_type || event->loglevel || event->enabled + || event->pid || event->filter || event->exclusion) { + return LTTNG_ERR_UNK; + } rcu_read_lock(); @@ -1030,8 +1039,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 +1082,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; } @@ -1071,6 +1098,7 @@ int cmd_disable_event(struct ltt_session *session, int domain, channel_name); break; } + case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: { struct agent *agt; @@ -1078,7 +1106,15 @@ int cmd_disable_event(struct ltt_session *session, int domain, assert(usess); - agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL); + 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; @@ -1112,9 +1148,13 @@ error: * Command LTTNG_DISABLE_ALL_EVENT processed by the client thread. */ int cmd_disable_event_all(struct ltt_session *session, int domain, - char *channel_name) + char *channel_name, + struct lttng_event *event) { int ret; + char *event_name; + + event_name = event->name; rcu_read_lock(); @@ -1142,8 +1182,18 @@ 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; } @@ -1174,8 +1224,15 @@ int cmd_disable_event_all(struct ltt_session *session, int domain, goto error; } - ret = event_ust_disable_all_tracepoints(usess, uchan); - if (ret != 0) { + switch (event->type) { + case LTTNG_EVENT_ALL: + ret = event_ust_disable_all_tracepoints(usess, uchan); + if (ret != 0) { + goto error; + } + break; + default: + ret = LTTNG_ERR_UNK; goto error; } @@ -1183,6 +1240,7 @@ int cmd_disable_event_all(struct ltt_session *session, int domain, break; } + case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: { struct agent *agt; @@ -1190,7 +1248,15 @@ int cmd_disable_event_all(struct ltt_session *session, int domain, assert(usess); - agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL); + 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; @@ -1417,12 +1483,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; } @@ -1480,8 +1557,10 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, } break; } + 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; @@ -1489,9 +1568,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, assert(usess); - agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL); + agt = trace_ust_find_agent(usess, domain->type); if (!agt) { - agt = agent_create(LTTNG_DOMAIN_JUL); + agt = agent_create(domain->type); if (!agt) { ret = -LTTNG_ERR_NOMEM; goto error; @@ -1503,13 +1582,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'; /* @@ -1520,7 +1598,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; @@ -1616,7 +1700,7 @@ int cmd_enable_event_all(struct ltt_session *session, 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: /* @@ -1712,58 +1796,22 @@ int cmd_enable_event_all(struct ltt_session *session, break; } + case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: { - struct agent *agt; - struct lttng_event uevent, event; - struct lttng_domain tmp_dom; + struct lttng_event event; struct ltt_ust_session *usess = session->ust_session; assert(usess); - agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL); - if (!agt) { - agt = agent_create(LTTNG_DOMAIN_JUL); - 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) { + ret = cmd_enable_event(session, domain, NULL, &event, + filter_expression, filter, NULL, wpipe); + if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) { goto error; } @@ -1810,8 +1858,9 @@ ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events) goto error; } 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; @@ -2540,6 +2589,7 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session, } break; } + case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_JUL: if (session->ust_session) { struct lttng_ht_iter iter;