X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=b0b37bed777a4eb5b537b0739c14115b5e3020a2;hp=db62151f57512c4dca6fb1affe32806c44415190;hb=b0a23296344e57bd2e48e62ec2d7e0d8a38661bb;hpb=4031e53e78e673c7bf84fc5cc5f844b2a037b6f6 diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index db62151f5..b0b37bed7 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 - David Goulet + * Copyright (C) 2016 - Jérémie Galarneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2 only, @@ -15,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -23,14 +24,18 @@ #include #include #include +#include +#include #include "channel.h" #include "event.h" #include "kernel.h" +#include "lttng-sessiond.h" #include "ust-ctl.h" #include "ust-app.h" #include "trace-kernel.h" #include "trace-ust.h" +#include "agent.h" /* * Add unique UST event based on the event name, filter bytecode and loglevel. @@ -47,7 +52,8 @@ static void add_unique_ust_event(struct lttng_ht *ht, key.name = event->attr.name; key.filter = (struct lttng_filter_bytecode *) event->filter; - key.loglevel = event->attr.loglevel; + key.loglevel_type = event->attr.loglevel_type; + key.loglevel_value = event->attr.loglevel; key.exclusion = event->exclusion; node_ptr = cds_lfht_add_unique(ht->ht, @@ -57,104 +63,52 @@ static void add_unique_ust_event(struct lttng_ht *ht, } /* - * Setup a lttng_event used to enable *all* syscall tracing. + * Disable kernel tracepoint events for a channel from the kernel session of + * a specified event_name and event type. + * On type LTTNG_EVENT_ALL all events with event_name are disabled. + * If event_name is NULL all events of the specified type are disabled. */ -static void init_syscalls_kernel_event(struct lttng_event *event) +int event_kernel_disable_event(struct ltt_kernel_channel *kchan, + char *event_name, enum lttng_event_type type) { - assert(event); - - event->name[0] = '\0'; - /* - * We use LTTNG_EVENT* here since the trace kernel creation will make the - * right changes for the kernel. - */ - event->type = LTTNG_EVENT_SYSCALL; -} - -/* - * Disable kernel tracepoint event for a channel from the kernel session. - */ -int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan, - char *event_name) -{ - int ret; - struct ltt_kernel_event *kevent; - - assert(kchan); - - kevent = trace_kernel_get_event_by_name(event_name, kchan); - if (kevent == NULL) { - ret = LTTNG_ERR_NO_EVENT; - goto error; - } - - ret = kernel_disable_event(kevent); - if (ret < 0) { - ret = LTTNG_ERR_KERN_DISABLE_FAIL; - goto error; - } - - DBG("Kernel event %s disable for channel %s.", - kevent->event->name, kchan->channel->name); - - ret = LTTNG_OK; - -error: - return ret; -} - -/* - * Disable kernel tracepoint events for a channel from the kernel session. - */ -int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan) -{ - int ret; + int ret, error = 0, found = 0; struct ltt_kernel_event *kevent; assert(kchan); /* For each event in the kernel session */ cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { + if (type != LTTNG_EVENT_ALL && kevent->type != type) + continue; + if (event_name != NULL && strcmp(event_name, kevent->event->name)) { + continue; + } + found++; ret = kernel_disable_event(kevent); if (ret < 0) { - /* We continue disabling the rest */ + error = 1; continue; } } - ret = LTTNG_OK; - return ret; -} + DBG("Disable kernel event: found %d events with name: %s and type: %d", + found, event_name ? event_name : "NULL", type); -/* - * Disable kernel syscall events for a channel from the kernel session. - */ -int event_kernel_disable_all_syscalls(struct ltt_kernel_channel *kchan) -{ - ERR("Cannot disable syscall tracing for existing session. Please destroy session instead."); - return LTTNG_OK; /* Return OK so disable all succeeds */ -} - -/* - * Disable all kernel event for a channel from the kernel session. - */ -int event_kernel_disable_all(struct ltt_kernel_channel *kchan) -{ - int ret; - - assert(kchan); + if (event_name != NULL && !found) { + ret = LTTNG_ERR_NO_EVENT; + } else { + ret = error ? LTTNG_ERR_KERN_DISABLE_FAIL : LTTNG_OK; + } - ret = event_kernel_disable_all_tracepoints(kchan); - if (ret != LTTNG_OK) - return ret; - ret = event_kernel_disable_all_syscalls(kchan); return ret; } /* * Enable kernel tracepoint event for a channel from the kernel session. + * We own filter_expression and filter. */ -int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan, - struct lttng_event *event) +int event_kernel_enable_event(struct ltt_kernel_channel *kchan, + struct lttng_event *event, char *filter_expression, + struct lttng_filter_bytecode *filter) { int ret; struct ltt_kernel_event *kevent; @@ -162,21 +116,14 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan, assert(kchan); assert(event); - kevent = trace_kernel_get_event_by_name(event->name, kchan); + kevent = trace_kernel_find_event(event->name, kchan, + event->type, filter); if (kevent == NULL) { - ret = kernel_create_event(event, kchan); - if (ret < 0) { - 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; - } + ret = kernel_create_event(event, kchan, filter_expression, filter); + /* We have passed ownership */ + filter_expression = NULL; + filter = NULL; + if (ret) { goto end; } } else if (kevent->enabled == 0) { @@ -193,224 +140,27 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan, ret = LTTNG_OK; end: + free(filter_expression); + free(filter); return ret; } -/* - * Enable all kernel tracepoint events of a channel of the kernel session. - */ -int event_kernel_enable_all_tracepoints(struct ltt_kernel_channel *kchan, - int kernel_tracer_fd) -{ - int size, i, ret; - struct ltt_kernel_event *kevent; - struct lttng_event *event_list = NULL; - - assert(kchan); - - /* For each event in the kernel session */ - cds_list_for_each_entry(kevent, &kchan->events_list.head, list) { - if (kevent->enabled == 0) { - ret = kernel_enable_event(kevent); - if (ret < 0) { - /* Enable failed but still continue */ - continue; - } - } - } - - size = kernel_list_events(kernel_tracer_fd, &event_list); - if (size < 0) { - ret = LTTNG_ERR_KERN_LIST_FAIL; - goto end; - } - - for (i = 0; i < size; i++) { - kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan); - if (kevent == NULL) { - /* Default event type for enable all */ - event_list[i].type = LTTNG_EVENT_TRACEPOINT; - /* Enable each single tracepoint event */ - ret = kernel_create_event(&event_list[i], kchan); - if (ret < 0) { - /* Ignore error here and continue */ - } - } - } - free(event_list); - - ret = LTTNG_OK; -end: - return ret; -} - -/* - * Enable all kernel sycalls events of a channel of the kernel session. - */ -int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan, - int kernel_tracer_fd) -{ - int ret; - struct lttng_event event; - - assert(kchan); - - init_syscalls_kernel_event(&event); - - DBG("Enabling all syscall tracing"); - - ret = kernel_create_event(&event, kchan); - if (ret < 0) { - if (ret == -EEXIST) { - ret = LTTNG_ERR_KERN_EVENT_EXIST; - } else { - ret = LTTNG_ERR_KERN_ENABLE_FAIL; - } - goto end; - } - - ret = LTTNG_OK; -end: - return ret; -} - -/* - * Enable all kernel events of a channel of the kernel session. - */ -int event_kernel_enable_all(struct ltt_kernel_channel *kchan, - int kernel_tracer_fd) -{ - int tp_ret; - - assert(kchan); - - tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd); - if (tp_ret != LTTNG_OK) { - goto end; - } - - /* - * 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(kchan, kernel_tracer_fd); - -end: - return tp_ret; -} - /* * ============================ * UST : The Ultimate Frontier! * ============================ */ -/* - * Enable all UST tracepoints for a channel from a UST session. - */ -int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter) -{ - int ret, i, size; - struct lttng_ht_iter iter; - struct ltt_ust_event *uevent = NULL; - struct lttng_event *events = NULL; - - assert(usess); - assert(uchan); - - rcu_read_lock(); - - /* Enable existing events */ - cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, - node.node) { - if (uevent->enabled == 0) { - ret = ust_app_enable_event_glb(usess, uchan, uevent); - if (ret < 0) { - continue; - } - uevent->enabled = 1; - } - } - - /* Get all UST available events */ - size = ust_app_list_events(&events); - if (size < 0) { - ret = LTTNG_ERR_UST_LIST_FAIL; - goto error; - } - - for (i = 0; i < size; i++) { - /* - * Check if event exist and if so, continue since it was enable - * previously. - */ - uevent = trace_ust_find_event(uchan->events, events[i].name, filter, - events[i].loglevel, NULL); - if (uevent != NULL) { - ret = ust_app_enable_event_pid(usess, uchan, uevent, - events[i].pid); - if (ret < 0) { - if (ret != -LTTNG_UST_ERR_EXIST) { - ret = LTTNG_ERR_UST_ENABLE_FAIL; - goto error; - } - } - continue; - } - - /* Create ust event */ - uevent = trace_ust_create_event(&events[i], filter, NULL); - if (uevent == NULL) { - ret = LTTNG_ERR_FATAL; - goto error_destroy; - } - - /* Create event for the specific PID */ - ret = ust_app_enable_event_pid(usess, uchan, uevent, - events[i].pid); - if (ret < 0) { - if (ret == -LTTNG_UST_ERR_EXIST) { - ret = LTTNG_ERR_UST_EVENT_EXIST; - goto error; - } else { - ret = LTTNG_ERR_UST_ENABLE_FAIL; - goto error_destroy; - } - } - - uevent->enabled = 1; - /* Add ltt ust event to channel */ - rcu_read_lock(); - add_unique_ust_event(uchan->events, uevent); - rcu_read_unlock(); - } - free(events); - - rcu_read_unlock(); - return LTTNG_OK; - -error_destroy: - trace_ust_destroy_event(uevent); - -error: - free(events); - rcu_read_unlock(); - return ret; -} - /* * Enable UST tracepoint event for a channel from a UST session. + * We own filter_expression, filter, and exclusion. */ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct lttng_event *event, + char *filter_expression, struct lttng_filter_bytecode *filter, - struct lttng_event_exclusion *exclusion) + struct lttng_event_exclusion *exclusion, + bool internal_event) { int ret = LTTNG_OK, to_create = 0; struct ltt_ust_event *uevent; @@ -422,11 +172,15 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, rcu_read_lock(); uevent = trace_ust_find_event(uchan->events, event->name, filter, - event->loglevel, exclusion); - if (uevent == NULL) { - uevent = trace_ust_create_event(event, filter, exclusion); - if (uevent == NULL) { - ret = LTTNG_ERR_UST_ENABLE_FAIL; + event->loglevel_type, event->loglevel, exclusion); + if (!uevent) { + ret = trace_ust_create_event(event, filter_expression, + filter, exclusion, internal_event, &uevent); + /* We have passed ownership */ + filter_expression = NULL; + filter = NULL; + exclusion = NULL; + if (ret != LTTNG_OK) { goto error; } @@ -441,6 +195,14 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, } uevent->enabled = 1; + if (to_create) { + /* Add ltt ust event to channel */ + add_unique_ust_event(uchan->events, uevent); + } + + if (!usess->active) { + goto end; + } if (to_create) { /* Create event on all UST registered apps for session */ @@ -460,11 +222,6 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, } } - if (to_create) { - /* Add ltt ust event to channel */ - add_unique_ust_event(uchan->events, uevent); - } - DBG("Event UST %s %s in channel %s", uevent->attr.name, to_create ? "created" : "enabled", uchan->name); @@ -472,6 +229,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, end: rcu_read_unlock(); + free(filter_expression); + free(filter); + free(exclusion); return ret; error: @@ -487,6 +247,9 @@ error: trace_ust_destroy_event(uevent); } rcu_read_unlock(); + free(filter_expression); + free(filter); + free(exclusion); return ret; } @@ -531,17 +294,18 @@ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, /* It's already disabled so everything is OK */ goto next; } + uevent->enabled = 0; + DBG2("Event UST %s disabled in channel %s", uevent->attr.name, + uchan->name); + if (!usess->active) { + goto next; + } ret = ust_app_disable_event_glb(usess, uchan, uevent); if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { ret = LTTNG_ERR_UST_DISABLE_FAIL; goto error; } - uevent->enabled = 0; - - DBG2("Event UST %s disabled in channel %s", uevent->attr.name, - uchan->name); - next: /* Get next duplicate event by name. */ cds_lfht_next_duplicate(ht->ht, trace_ust_ht_match_event_by_name, @@ -562,7 +326,7 @@ error: int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { - int ret, i, size; + int ret, i, size, error = 0; struct lttng_ht_iter iter; struct ltt_ust_event *uevent = NULL; struct lttng_event *events = NULL; @@ -579,6 +343,7 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, ret = event_ust_disable_tracepoint(usess, uchan, uevent->attr.name); if (ret < 0) { + error = LTTNG_ERR_UST_DISABLE_FAIL; continue; } } @@ -594,54 +359,48 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, for (i = 0; i < size; i++) { ret = event_ust_disable_tracepoint(usess, uchan, events[i].name); - if (ret != LTTNG_OK) { + if (ret < 0) { /* Continue to disable the rest... */ + error = LTTNG_ERR_UST_DISABLE_FAIL; continue; } } - free(events); - - rcu_read_unlock(); - return LTTNG_OK; + ret = error ? error : LTTNG_OK; error: - free(events); rcu_read_unlock(); + free(events); return ret; } /* - * Enable all JUL event for a given UST session. + * Enable all agent event for a given UST session. * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_jul_enable_all(struct ltt_ust_session *usess) +int event_agent_enable_all(struct ltt_ust_session *usess, + struct agent *agt, struct lttng_event *event, + struct lttng_filter_bytecode *filter ,char *filter_expression) { int ret; - struct jul_event *jevent; - struct lttng_event event; + struct agent_event *aevent; struct lttng_ht_iter iter; assert(usess); - DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id); - - /* Create the * wildcard event name for the Java agent. */ - memset(event.name, 0, sizeof(event.name)); - strncpy(event.name, "*", sizeof(event.name)); - event.name[sizeof(event.name) - 1] = '\0'; + DBG("Event agent enabling ALL events for session %" PRIu64, usess->id); - /* Enable event on JUL application through TCP socket. */ - ret = event_jul_enable(usess, &event); + /* Enable event on agent application through TCP socket. */ + ret = event_agent_enable(usess, agt, event, filter, filter_expression); if (ret != LTTNG_OK) { goto error; } /* Flag every event that they are now enabled. */ rcu_read_lock(); - cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent, + cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent, node.node) { - jevent->enabled = 1; + aevent->enabled = 1; } rcu_read_unlock(); @@ -652,82 +411,248 @@ error: } /* - * Enable a single JUL event for a given UST session. + * Check if this event's filter requires the activation of application contexts + * and enable them in the agent. + * TODO: bytecode iterator does not support non-legacy application + * contexts yet. Not an issue for now, since they are not generated by + * the lttng-ctl library. + */ +static int add_filter_app_ctx(struct lttng_filter_bytecode *bytecode, + const char *filter_expression, struct agent *agt) +{ + int ret = LTTNG_OK; + char *provider_name = NULL, *ctx_name = NULL; + struct bytecode_symbol_iterator *it = + bytecode_symbol_iterator_create(bytecode); + + if (!it) { + ret = LTTNG_ERR_NOMEM; + goto end; + } + + do { + struct lttng_event_context ctx; + const char *symbol_name = + bytecode_symbol_iterator_get_name(it); + + if (parse_application_context(symbol_name, &provider_name, + &ctx_name)) { + /* Not an application context. */ + continue; + } + + ctx.ctx = LTTNG_EVENT_CONTEXT_APP_CONTEXT; + ctx.u.app_ctx.provider_name = provider_name; + ctx.u.app_ctx.ctx_name = ctx_name; + + /* Recognized an application context. */ + DBG("Enabling event with filter expression \"%s\" requires enabling the %s:%s application context.", + filter_expression, provider_name, ctx_name); + + ret = agent_add_context(&ctx, agt); + if (ret != LTTNG_OK) { + ERR("Failed to add application context %s:%s.", + provider_name, ctx_name); + goto end; + } + + ret = agent_enable_context(&ctx, agt->domain); + if (ret != LTTNG_OK) { + ERR("Failed to enable application context %s:%s.", + provider_name, ctx_name); + goto end; + } + + free(provider_name); + free(ctx_name); + provider_name = ctx_name = NULL; + } while (bytecode_symbol_iterator_next(it) == 0); +end: + free(provider_name); + free(ctx_name); + bytecode_symbol_iterator_destroy(it); + return ret; +} + +/* + * Enable a single agent event for a given UST session. * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event) +int event_agent_enable(struct ltt_ust_session *usess, + struct agent *agt, struct lttng_event *event, + struct lttng_filter_bytecode *filter, + char *filter_expression) { int ret, created = 0; - struct jul_event *jevent; + struct agent_event *aevent; assert(usess); assert(event); - - DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id); - - jevent = jul_find_by_name(event->name, &usess->domain_jul); - if (!jevent) { - jevent = jul_create_event(event->name); - if (!jevent) { + assert(agt); + + DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d " + ", loglevel %d and filter \"%s\"", event->name, + usess->id, event->loglevel_type, event->loglevel, + filter_expression ? filter_expression : "NULL"); + + aevent = agent_find_event(event->name, event->loglevel_type, + event->loglevel, filter_expression, agt); + if (!aevent) { + aevent = agent_create_event(event->name, event->loglevel_type, + event->loglevel, filter, + filter_expression); + if (!aevent) { ret = LTTNG_ERR_NOMEM; goto error; } + filter = NULL; + filter_expression = NULL; created = 1; } + if (created && filter) { + ret = add_filter_app_ctx(filter, filter_expression, agt); + if (ret != LTTNG_OK) { + goto error; + } + } + /* Already enabled? */ - if (jevent->enabled) { + if (aevent->enabled) { + ret = LTTNG_OK; goto end; } - ret = jul_enable_event(jevent); + ret = agent_enable_event(aevent, agt->domain); if (ret != LTTNG_OK) { goto error; } /* If the event was created prior to the enable, add it to the domain. */ if (created) { - jul_add_event(jevent, &usess->domain_jul); + agent_add_event(aevent, agt); } -end: - return LTTNG_OK; + ret = LTTNG_OK; + goto end; error: if (created) { - jul_destroy_event(jevent); + agent_destroy_event(aevent); } +end: + free(filter); + free(filter_expression); return ret; } /* - * Disable a single JUL event for a given UST session. + * Return the default event name associated with the provided UST domain. Return + * NULL on error. + */ +const char *event_get_default_agent_ust_name(enum lttng_domain_type domain) +{ + const char *default_event_name = NULL; + + switch (domain) { + case LTTNG_DOMAIN_LOG4J: + default_event_name = DEFAULT_LOG4J_EVENT_NAME; + break; + case LTTNG_DOMAIN_JUL: + default_event_name = DEFAULT_JUL_EVENT_NAME; + break; + case LTTNG_DOMAIN_PYTHON: + default_event_name = DEFAULT_PYTHON_EVENT_NAME; + break; + default: + assert(0); + } + + return default_event_name; +} + +/* + * Disable a given agent event for a given UST session. * + * Must be called with the RCU read lock held. * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_jul_disable(struct ltt_ust_session *usess, char *event_name) +static int event_agent_disable_one(struct ltt_ust_session *usess, + struct agent *agt, struct agent_event *aevent) { int ret; - struct jul_event *jevent; + struct ltt_ust_event *uevent = NULL; + struct ltt_ust_channel *uchan = NULL; + const char *ust_event_name, *ust_channel_name; + assert(agt); assert(usess); - assert(event_name); + assert(aevent); - DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id); + DBG("Event agent disabling %s (loglevel type %d, loglevel value %d) for session %" PRIu64, + aevent->name, aevent->loglevel_type, aevent->loglevel_value, + usess->id); - jevent = jul_find_by_name(event_name, &usess->domain_jul); - if (!jevent) { - ret = LTTNG_ERR_UST_EVENT_NOT_FOUND; + /* Already disabled? */ + if (!aevent->enabled) { + goto end; + } + + if (agt->domain == LTTNG_DOMAIN_JUL) { + ust_channel_name = DEFAULT_JUL_CHANNEL_NAME; + } else if (agt->domain == LTTNG_DOMAIN_LOG4J) { + ust_channel_name = DEFAULT_LOG4J_CHANNEL_NAME; + } else if (agt->domain == LTTNG_DOMAIN_PYTHON) { + ust_channel_name = DEFAULT_PYTHON_CHANNEL_NAME; + } else { + ret = LTTNG_ERR_INVALID; goto error; } - /* Already disabled? */ - if (!jevent->enabled) { - goto end; + /* + * Disable it on the UST side. First get the channel reference then find + * the event and finally disable it. + */ + uchan = trace_ust_find_channel_by_name(usess->domain_global.channels, + (char *) ust_channel_name); + if (!uchan) { + ret = LTTNG_ERR_UST_CHAN_NOT_FOUND; + goto error; + } + + ust_event_name = event_get_default_agent_ust_name(agt->domain); + if (!ust_event_name) { + ret = LTTNG_ERR_FATAL; + goto error; } - ret = jul_disable_event(jevent); + /* + * Agent UST event has its loglevel type forced to + * LTTNG_UST_LOGLEVEL_ALL. The actual loglevel type/value filtering + * happens thanks to an UST filter. The following -1 is actually + * ignored since the type is LTTNG_UST_LOGLEVEL_ALL. + */ + uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name, + aevent->filter, LTTNG_UST_LOGLEVEL_ALL, -1, NULL); + /* If the agent event exists, it must be available on the UST side. */ + assert(uevent); + + if (usess->active) { + ret = ust_app_disable_event_glb(usess, uchan, uevent); + if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { + ret = LTTNG_ERR_UST_DISABLE_FAIL; + goto error; + } + } + + /* + * Flag event that it's disabled so the shadow copy on the ust app side + * will disable it if an application shows up. + */ + uevent->enabled = 0; + + ret = agent_disable_event(aevent, agt->domain); if (ret != LTTNG_OK) { goto error; } @@ -738,51 +663,93 @@ end: error: return ret; } + /* - * Disable all JUL event for a given UST session. + * Disable all agent events matching a given name for a given UST session. * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_jul_disable_all(struct ltt_ust_session *usess) +int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt, + char *event_name) { - int ret, do_disable = 0; - struct jul_event *jevent; + int ret = LTTNG_OK; + struct agent_event *aevent; struct lttng_ht_iter iter; + struct lttng_ht_node_str *node; + assert(agt); assert(usess); + assert(event_name); - /* Enable event on JUL application through TCP socket. */ - ret = event_jul_disable(usess, "*"); - if (ret != LTTNG_OK) { - if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) { - /* - * This means that no enable all was done before but still a user - * could want to disable everything even though the * wild card - * event does not exists. - */ - do_disable = 1; - } else { - goto error; + DBG("Event agent disabling %s (all loglevels) for session %" PRIu64, event_name, usess->id); + + rcu_read_lock(); + agent_find_events_by_name(event_name, agt, &iter); + node = lttng_ht_iter_get_node_str(&iter); + + if (node == NULL) { + DBG2("Event agent NOT found by name %s", event_name); + ret = LTTNG_ERR_UST_EVENT_NOT_FOUND; + goto end; + } + + do { + aevent = caa_container_of(node, struct agent_event, node); + ret = event_agent_disable_one(usess, agt, aevent); + + if (ret != LTTNG_OK) { + goto end; } + + /* Get next duplicate agent event by name. */ + agent_event_next_duplicate(event_name, agt, &iter); + node = lttng_ht_iter_get_node_str(&iter); + } while (node); +end: + rcu_read_unlock(); + return ret; +} +/* + * Disable all agent event for a given UST session. + * + * Return LTTNG_OK on success or else a LTTNG_ERR* code. + */ +int event_agent_disable_all(struct ltt_ust_session *usess, + struct agent *agt) +{ + int ret; + struct agent_event *aevent; + struct lttng_ht_iter iter; + + assert(agt); + assert(usess); + + /* + * Disable event on agent application. Continue to disable all other events + * if the * event is not found. + */ + ret = event_agent_disable(usess, agt, "*"); + if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_NOT_FOUND) { + goto error; } - /* Flag every event that they are now enabled. */ + /* Disable every event. */ rcu_read_lock(); - cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent, + cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent, node.node) { - if (jevent->enabled && do_disable) { - ret = event_jul_disable(usess, jevent->name); - if (ret != LTTNG_OK) { - rcu_read_unlock(); - goto error; - } + if (!aevent->enabled) { + continue; } - jevent->enabled = 0; - } - rcu_read_unlock(); + ret = event_agent_disable(usess, agt, aevent->name); + if (ret != LTTNG_OK) { + goto error_unlock; + } + } ret = LTTNG_OK; +error_unlock: + rcu_read_unlock(); error: return ret; }