X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=189236beb1171a05ba21e89b3ecb51216a7b5e47;hp=d7034efa5fc20175c019bd4426a1d3c4f0af1d6b;hb=ae0a823f9f7e1d3800479488a58efc2f92f27d89;hpb=e261a6cc54e9a5567bf12c963f96fe22e9cf345c diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index d7034efa5..189236beb 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -1,21 +1,11 @@ /* - * Copyright (C) 2011 - David Goulet + * 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, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -24,12 +14,15 @@ #include #include #include +#include +#include #include "channel.h" #include "event.h" #include "kernel.h" #include "lttng-sessiond.h" -#include "ust-ctl.h" +#include "lttng-ust-ctl.h" +#include "lttng-ust-error.h" #include "ust-app.h" #include "trace-kernel.h" #include "trace-ust.h" @@ -61,45 +54,15 @@ static void add_unique_ust_event(struct lttng_ht *ht, } /* - * Disable kernel tracepoint event for a channel from the kernel session. + * 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. */ int event_kernel_disable_event(struct ltt_kernel_channel *kchan, - char *event_name) + const char *event_name, enum lttng_event_type type) { - int ret; - struct ltt_kernel_event *kevent; - - assert(kchan); - - kevent = trace_kernel_get_event_by_name(event_name, kchan, - LTTNG_EVENT_ALL); - 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_event_type(struct ltt_kernel_channel *kchan, - enum lttng_event_type type) -{ - int ret; + int ret, error = 0, found = 0; struct ltt_kernel_event *kevent; assert(kchan); @@ -108,22 +71,26 @@ int event_kernel_disable_event_type(struct ltt_kernel_channel *kchan, 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 all kernel event for a channel from the kernel session. - */ -int event_kernel_disable_event_all(struct ltt_kernel_channel *kchan) -{ - return event_kernel_disable_event_type(kchan, LTTNG_EVENT_ALL); + if (event_name != NULL && !found) { + ret = LTTNG_ERR_NO_EVENT; + } else { + ret = error ? LTTNG_ERR_KERN_DISABLE_FAIL : LTTNG_OK; + } + + return ret; } /* @@ -143,23 +110,11 @@ int event_kernel_enable_event(struct ltt_kernel_channel *kchan, kevent = trace_kernel_find_event(event->name, kchan, event->type, filter); if (kevent == NULL) { - ret = kernel_create_event(event, kchan, - filter_expression, filter); + ret = kernel_create_event(event, kchan, filter_expression, filter); /* We have passed ownership */ filter_expression = NULL; filter = NULL; - 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; - } + if (ret) { goto end; } } else if (kevent->enabled == 0) { @@ -208,16 +163,16 @@ 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_type, event->loglevel, exclusion); + (enum lttng_ust_loglevel_type) event->loglevel_type, + event->loglevel, exclusion); if (!uevent) { - uevent = trace_ust_create_event(event, filter_expression, - filter, exclusion, internal_event); + 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 (uevent == NULL) { - ret = LTTNG_ERR_UST_ENABLE_FAIL; + if (ret != LTTNG_OK) { goto error; } @@ -227,11 +182,20 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, if (uevent->enabled) { /* It's already enabled so everything is OK */ + assert(!to_create); ret = LTTNG_ERR_UST_EVENT_ENABLED; goto end; } 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 */ @@ -251,11 +215,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); @@ -291,7 +250,7 @@ error: * Disable UST tracepoint of a channel from a UST session. */ int event_ust_disable_tracepoint(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, char *event_name) + struct ltt_ust_channel *uchan, const char *event_name) { int ret; struct ltt_ust_event *uevent; @@ -328,17 +287,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, @@ -353,6 +313,59 @@ error: return ret; } +/* + * Disable all UST tracepoints for a channel from a UST session. + */ +int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan) +{ + int ret, i, size, error = 0; + struct lttng_ht_iter iter; + struct ltt_ust_event *uevent = NULL; + struct lttng_event *events = NULL; + + assert(usess); + assert(uchan); + + rcu_read_lock(); + + /* Disabling existing events */ + cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, + node.node) { + if (uevent->enabled == 1) { + ret = event_ust_disable_tracepoint(usess, uchan, + uevent->attr.name); + if (ret < 0) { + error = LTTNG_ERR_UST_DISABLE_FAIL; + continue; + } + } + } + + /* 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++) { + ret = event_ust_disable_tracepoint(usess, uchan, + events[i].name); + if (ret < 0) { + /* Continue to disable the rest... */ + error = LTTNG_ERR_UST_DISABLE_FAIL; + continue; + } + } + + ret = error ? error : LTTNG_OK; +error: + rcu_read_unlock(); + free(events); + return ret; +} + /* * Enable all agent event for a given UST session. * @@ -390,6 +403,70 @@ error: return ret; } +/* + * 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. * @@ -413,7 +490,7 @@ int event_agent_enable(struct ltt_ust_session *usess, filter_expression ? filter_expression : "NULL"); aevent = agent_find_event(event->name, event->loglevel_type, - event->loglevel, agt); + event->loglevel, filter_expression, agt); if (!aevent) { aevent = agent_create_event(event->name, event->loglevel_type, event->loglevel, filter, @@ -422,11 +499,23 @@ int event_agent_enable(struct ltt_ust_session *usess, ret = LTTNG_ERR_NOMEM; goto error; } + filter = NULL; + filter_expression = NULL; created = 1; + assert(!aevent->enabled); + } + + if (created && aevent->filter) { + ret = add_filter_app_ctx( + aevent->filter, aevent->filter_expression, agt); + if (ret != LTTNG_OK) { + goto error; + } } /* Already enabled? */ if (aevent->enabled) { + ret = LTTNG_OK; goto end; } @@ -440,13 +529,16 @@ int event_agent_enable(struct ltt_ust_session *usess, agent_add_event(aevent, agt); } -end: - return LTTNG_OK; + ret = LTTNG_OK; + goto end; error: if (created) { agent_destroy_event(aevent); } +end: + free(filter); + free(filter_expression); return ret; } @@ -541,10 +633,12 @@ static int event_agent_disable_one(struct ltt_ust_session *usess, /* If the agent event exists, it must be available on the UST side. */ assert(uevent); - 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; + 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; + } } /* @@ -571,7 +665,7 @@ error: * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt, - char *event_name) + const char *event_name) { int ret = LTTNG_OK; struct agent_event *aevent; @@ -634,7 +728,7 @@ int event_agent_disable_all(struct ltt_ust_session *usess, goto error; } - /* Flag every event that they are now enabled. */ + /* Disable every event. */ rcu_read_lock(); cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent, node.node) { @@ -644,14 +738,13 @@ int event_agent_disable_all(struct ltt_ust_session *usess, ret = event_agent_disable(usess, agt, aevent->name); if (ret != LTTNG_OK) { - rcu_read_unlock(); - goto error; + goto error_unlock; } } - rcu_read_unlock(); - ret = LTTNG_OK; +error_unlock: + rcu_read_unlock(); error: return ret; }