X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=ee3ebfe3bce81f0aa5d79b05a43e566f6e3a38a0;hp=ac4b0b4a365f7f493973f7389cd58f241c8292ae;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hpb=0cd3b1d4a59305a7efb608605d2e74c0ea347383 diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index ac4b0b4a3..ee3ebfe3b 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -45,6 +45,32 @@ static void init_syscalls_kernel_event(struct lttng_event *event) event->type = LTTNG_EVENT_SYSCALL; } +/* + * Return 1 if loglevels match or 0 on failure. + */ +static int loglevel_match(struct ltt_ust_event *uevent, + enum lttng_ust_loglevel_type log_type, int loglevel) +{ + /* + * For the loglevel type ALL, the loglevel is set to -1 but the event + * received by the session daemon is 0 which does not match the negative + * value in the existing event. + */ + if (log_type == LTTNG_UST_LOGLEVEL_ALL) { + loglevel = -1; + } + + if (uevent == NULL || uevent->attr.loglevel_type != log_type || + uevent->attr.loglevel != loglevel) { + goto no_match; + } + + return 1; + +no_match: + return 0; +} + /* * Disable kernel tracepoint event for a channel from the kernel session. */ @@ -56,20 +82,20 @@ int event_kernel_disable_tracepoint(struct ltt_kernel_session *ksession, kevent = trace_kernel_get_event_by_name(event_name, kchan); if (kevent == NULL) { - ret = LTTCOMM_NO_EVENT; + ret = LTTNG_ERR_NO_EVENT; goto error; } ret = kernel_disable_event(kevent); if (ret < 0) { - ret = LTTCOMM_KERN_DISABLE_FAIL; + ret = LTTNG_ERR_KERN_DISABLE_FAIL; goto error; } DBG("Kernel event %s disable for channel %s.", kevent->event->name, kchan->channel->name); - ret = LTTCOMM_OK; + ret = LTTNG_OK; error: return ret; @@ -92,7 +118,7 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession, continue; } } - ret = LTTCOMM_OK; + ret = LTTNG_OK; return ret; } @@ -103,7 +129,7 @@ int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan) { ERR("Cannot disable syscall tracing for existing session. Please destroy session instead."); - return LTTCOMM_OK; /* Return OK so disable all succeeds */ + return LTTNG_OK; /* Return OK so disable all succeeds */ } /* @@ -115,7 +141,7 @@ int event_kernel_disable_all(struct ltt_kernel_session *ksession, int ret; ret = event_kernel_disable_all_tracepoints(ksession, kchan); - if (ret != LTTCOMM_OK) + if (ret != LTTNG_OK) return ret; ret = event_kernel_disable_all_syscalls(ksession, kchan); return ret; @@ -134,26 +160,32 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession, if (kevent == NULL) { ret = kernel_create_event(event, kchan); if (ret < 0) { - if (ret == -EEXIST) { - ret = LTTCOMM_KERN_EVENT_EXIST; - } else { - ret = LTTCOMM_KERN_ENABLE_FAIL; + switch (-ret) { + case EEXIST: + ret = LTTNG_ERR_KERN_EVENT_EXIST; + break; + case ENOSYS: + ret = LTTNG_ERR_KERN_EVENT_ENOSYS; + break; + default: + ret = LTTNG_ERR_KERN_ENABLE_FAIL; + break; } goto end; } } else if (kevent->enabled == 0) { ret = kernel_enable_event(kevent); if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; + ret = LTTNG_ERR_KERN_ENABLE_FAIL; goto end; } } else { /* At this point, the event is considered enabled */ - ret = LTTCOMM_KERN_EVENT_EXIST; + ret = LTTNG_ERR_KERN_EVENT_EXIST; goto end; } - ret = LTTCOMM_OK; + ret = LTTNG_OK; end: return ret; } @@ -181,7 +213,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession, size = kernel_list_events(kernel_tracer_fd, &event_list); if (size < 0) { - ret = LTTCOMM_KERN_LIST_FAIL; + ret = LTTNG_ERR_KERN_LIST_FAIL; goto end; } @@ -199,7 +231,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession, } free(event_list); - ret = LTTCOMM_OK; + ret = LTTNG_OK; end: return ret; @@ -221,14 +253,14 @@ int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession, ret = kernel_create_event(&event, kchan); if (ret < 0) { if (ret == -EEXIST) { - ret = LTTCOMM_KERN_EVENT_EXIST; + ret = LTTNG_ERR_KERN_EVENT_EXIST; } else { - ret = LTTCOMM_KERN_ENABLE_FAIL; + ret = LTTNG_ERR_KERN_ENABLE_FAIL; } goto end; } - ret = LTTCOMM_OK; + ret = LTTNG_OK; end: return ret; } @@ -239,15 +271,26 @@ end: int event_kernel_enable_all(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan, int kernel_tracer_fd) { - int ret; + int tp_ret; - ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd); - if (ret != LTTCOMM_OK) { + tp_ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd); + if (tp_ret != LTTNG_OK) { goto end; } - ret = event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd); + + /* + * Reaching this code path means that all tracepoints were enabled without + * errors so we ignore the error value of syscalls. + * + * At the moment, failing to enable syscalls on "lttng enable-event -a -k" + * is not considered an error that need to be returned to the client since + * tracepoints did not fail. Future work will allow us to send back + * multiple errors to the client in one API call. + */ + (void) event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd); + end: - return ret; + return tp_ret; } /* @@ -262,8 +305,7 @@ end: int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, struct ltt_ust_channel *uchan) { - int ret, i; - size_t size; + int ret, i, size; struct lttng_ht_iter iter; struct ltt_ust_event *uevent = NULL; struct lttng_event *events = NULL; @@ -286,7 +328,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, /* Get all UST available events */ size = ust_app_list_events(&events); if (size < 0) { - ret = LTTCOMM_UST_LIST_FAIL; + ret = LTTNG_ERR_UST_LIST_FAIL; goto error; } @@ -302,7 +344,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, events[i].pid); if (ret < 0) { if (ret != -EEXIST) { - ret = LTTCOMM_UST_ENABLE_FAIL; + ret = LTTNG_ERR_UST_ENABLE_FAIL; goto error; } } @@ -312,7 +354,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, /* Create ust event */ uevent = trace_ust_create_event(&events[i]); if (uevent == NULL) { - ret = LTTCOMM_FATAL; + ret = LTTNG_ERR_FATAL; goto error_destroy; } @@ -321,10 +363,10 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, events[i].pid); if (ret < 0) { if (ret == -EEXIST) { - ret = LTTCOMM_UST_EVENT_EXIST; + ret = LTTNG_ERR_UST_EVENT_EXIST; goto error; } else { - ret = LTTCOMM_UST_ENABLE_FAIL; + ret = LTTNG_ERR_UST_ENABLE_FAIL; goto error_destroy; } } @@ -345,11 +387,11 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: #endif default: - ret = LTTCOMM_UND; + ret = LTTNG_ERR_UND; goto error; } - return LTTCOMM_OK; + return LTTNG_OK; error_destroy: trace_ust_destroy_event(uevent); @@ -365,22 +407,37 @@ error: int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain, struct ltt_ust_channel *uchan, struct lttng_event *event) { - int ret = LTTCOMM_OK, to_create = 0; + int ret = LTTNG_OK, to_create = 0; struct ltt_ust_event *uevent; uevent = trace_ust_find_event_by_name(uchan->events, event->name); if (uevent == NULL) { uevent = trace_ust_create_event(event); if (uevent == NULL) { - ret = LTTCOMM_FATAL; + ret = LTTNG_ERR_FATAL; goto error; } /* Valid to set it after the goto error since uevent is still NULL */ to_create = 1; } + /* Check loglevels */ + ret = loglevel_match(uevent, event->loglevel_type, event->loglevel); + if (ret == 0) { + /* + * No match meaning that the user tried to enable a known event but + * with a different loglevel. + */ + DBG("Enable event %s does not match existing event %s with loglevel " + "respectively of %d and %d", event->name, uevent->attr.name, + uevent->attr.loglevel, event->loglevel); + ret = LTTNG_ERR_EVENT_EXIST_LOGLEVEL; + goto error; + } + if (uevent->enabled) { /* It's already enabled so everything is OK */ + ret = LTTNG_OK; goto end; } @@ -399,10 +456,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain, if (ret < 0) { if (ret == -EEXIST) { - ret = LTTCOMM_UST_EVENT_EXIST; + ret = LTTNG_ERR_UST_EVENT_EXIST; goto end; } else { - ret = LTTCOMM_UST_ENABLE_FAIL; + ret = LTTNG_ERR_UST_ENABLE_FAIL; goto error; } } @@ -414,7 +471,7 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: #endif default: - ret = LTTCOMM_UND; + ret = LTTNG_ERR_UND; goto end; } @@ -428,7 +485,7 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain, DBG("Event UST %s %s in channel %s", uevent->attr.name, to_create ? "created" : "enabled", uchan->name); - ret = LTTCOMM_OK; + ret = LTTNG_OK; end: return ret; @@ -459,13 +516,13 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain, uevent = trace_ust_find_event_by_name(uchan->events, event_name); if (uevent == NULL) { - ret = LTTCOMM_UST_EVENT_NOT_FOUND; + ret = LTTNG_ERR_UST_EVENT_NOT_FOUND; goto error; } if (uevent->enabled == 0) { /* It's already enabled so everything is OK */ - ret = LTTCOMM_OK; + ret = LTTNG_OK; goto end; } @@ -473,7 +530,7 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST: ret = ust_app_disable_event_glb(usess, uchan, uevent); if (ret < 0 && ret != -EEXIST) { - ret = LTTCOMM_UST_DISABLE_FAIL; + ret = LTTNG_ERR_UST_DISABLE_FAIL; goto error; } break; @@ -483,12 +540,12 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: #endif default: - ret = LTTCOMM_UND; + ret = LTTNG_ERR_UND; goto error; } uevent->enabled = 0; - ret = LTTCOMM_OK; + ret = LTTNG_OK; end: DBG2("Event UST %s disabled in channel %s", uevent->attr.name, @@ -504,8 +561,7 @@ error: int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain, struct ltt_ust_channel *uchan) { - int ret, i; - size_t size; + int ret, i, size; struct lttng_ht_iter iter; struct ltt_ust_event *uevent = NULL; struct lttng_event *events = NULL; @@ -528,7 +584,7 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain, /* Get all UST available events */ size = ust_app_list_events(&events); if (size < 0) { - ret = LTTCOMM_UST_LIST_FAIL; + ret = LTTNG_ERR_UST_LIST_FAIL; goto error; } @@ -539,7 +595,7 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain, ret = ust_app_disable_event_pid(usess, uchan, uevent, events[i].pid); if (ret < 0 && ret != -EEXIST) { - ret = LTTCOMM_UST_DISABLE_FAIL; + ret = LTTNG_ERR_UST_DISABLE_FAIL; goto error; } uevent->enabled = 0; @@ -556,11 +612,11 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: #endif default: - ret = LTTCOMM_UND; + ret = LTTNG_ERR_UND; goto error; } - return LTTCOMM_OK; + return LTTNG_OK; error: free(events);