X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=ecb368fd51ae5fd7971f7aa23d220918a07f9d2f;hp=dacd56d33bd1985c76959c4982b1de85b1af521e;hb=ea9a44f03f3f6e144b5f7f312eee2a5f7a849ecb;hpb=b9866e086ad21be6f73c678e7c3548c8fdafeef5 diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index dacd56d33..ecb368fd5 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,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "channel.h" #include "event.h" @@ -61,45 +63,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) -{ - 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) + char *event_name, enum lttng_event_type type) { - int ret; + int ret, error = 0, found = 0; struct ltt_kernel_event *kevent; assert(kchan); @@ -108,22 +80,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; } /* @@ -353,6 +329,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 +419,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 +506,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,6 +515,7 @@ int event_agent_enable(struct ltt_ust_session *usess, ret = LTTNG_ERR_NOMEM; goto error; } + created = 1; } @@ -430,6 +524,13 @@ int event_agent_enable(struct ltt_ust_session *usess, goto end; } + if (created && filter) { + ret = add_filter_app_ctx(filter, filter_expression, agt); + if (ret != LTTNG_OK) { + goto error; + } + } + ret = agent_enable_event(aevent, agt->domain); if (ret != LTTNG_OK) { goto error; @@ -647,8 +748,6 @@ int event_agent_disable_all(struct ltt_ust_session *usess, goto error_unlock; } } - rcu_read_unlock(); - ret = LTTNG_OK; error_unlock: