/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* 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,
#include <lttng/lttng.h>
#include <common/error.h>
#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/filter.h>
+#include <common/context.h>
#include "channel.h"
#include "event.h"
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) {
uevent = trace_ust_find_event(uchan->events, event->name, filter,
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;
}
}
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 */
}
}
- 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);
/* 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,
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.
*
filter_expression ? filter_expression : "NULL");
aevent = agent_find_event(event->name, event->loglevel_type,
- event->loglevel, filter_expression, agt);
+ event->loglevel, filter_expression, agt);
if (!aevent) {
aevent = agent_create_event(event->name, event->loglevel_type,
event->loglevel, filter,
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 (aevent->enabled) {
+ ret = LTTNG_OK;
goto end;
}
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;
}
/* 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;
+ }
}
/*
projects / lttng-tools.git / blobdiff