X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=52fd9f5478a753492eb9ffee7b0c6d8eaf18d5e4;hp=db62151f57512c4dca6fb1affe32806c44415190;hb=fefd409b002735b415c5f653cdb2587be454f145;hpb=4031e53e78e673c7bf84fc5cc5f844b2a037b6f6 diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index db62151f5..52fd9f547 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -27,6 +27,7 @@ #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" @@ -314,7 +315,9 @@ end: * 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) + struct ltt_ust_channel *uchan, + char *filter_expression, + struct lttng_filter_bytecode *filter) { int ret, i, size; struct lttng_ht_iter iter; @@ -365,7 +368,8 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, } /* Create ust event */ - uevent = trace_ust_create_event(&events[i], filter, NULL); + uevent = trace_ust_create_event(&events[i], filter_expression, + filter, NULL); if (uevent == NULL) { ret = LTTNG_ERR_FATAL; goto error_destroy; @@ -409,6 +413,7 @@ error: */ 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) { @@ -424,7 +429,8 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, uevent = trace_ust_find_event(uchan->events, event->name, filter, event->loglevel, exclusion); if (uevent == NULL) { - uevent = trace_ust_create_event(event, filter, exclusion); + uevent = trace_ust_create_event(event, filter_expression, + filter, exclusion); if (uevent == NULL) { ret = LTTNG_ERR_UST_ENABLE_FAIL; goto error; @@ -611,37 +617,33 @@ error: } /* - * 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) { 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); 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,43 +654,50 @@ error: } /* - * Enable a single JUL event for a given UST session. + * 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) { int ret, created = 0; - struct jul_event *jevent; + struct agent_event *aevent; assert(usess); assert(event); + assert(agt); - DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id); + DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d " + "and loglevel %d", event->name, usess->id, event->loglevel_type, + event->loglevel); - jevent = jul_find_by_name(event->name, &usess->domain_jul); - if (!jevent) { - jevent = jul_create_event(event->name); - if (!jevent) { + aevent = agent_find_event(event->name, event->loglevel, agt); + if (!aevent) { + aevent = agent_create_event(event->name, filter); + if (!aevent) { ret = LTTNG_ERR_NOMEM; goto error; } + aevent->loglevel = event->loglevel; + aevent->loglevel_type = event->loglevel_type; created = 1; } /* Already enabled? */ - if (jevent->enabled) { + if (aevent->enabled) { 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: @@ -696,38 +705,76 @@ end: error: if (created) { - jul_destroy_event(jevent); + agent_destroy_event(aevent); } return ret; } /* - * Disable a single JUL event for a given UST session. + * Disable a single agent event for a given UST session. * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_jul_disable(struct ltt_ust_session *usess, char *event_name) +int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt, + char *event_name) { int ret; - struct jul_event *jevent; + struct agent_event *aevent; + struct ltt_ust_event *uevent = NULL; + struct ltt_ust_channel *uchan = NULL; + char *ust_event_name; + assert(agt); assert(usess); assert(event_name); - DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id); + DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id); - jevent = jul_find_by_name(event_name, &usess->domain_jul); - if (!jevent) { + aevent = agent_find_event_by_name(event_name, agt); + if (!aevent) { ret = LTTNG_ERR_UST_EVENT_NOT_FOUND; goto error; } /* Already disabled? */ - if (!jevent->enabled) { + if (!aevent->enabled) { goto end; } - ret = jul_disable_event(jevent); + /* + * 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, + DEFAULT_JUL_CHANNEL_NAME); + if (!uchan) { + ret = LTTNG_ERR_UST_CHAN_NOT_FOUND; + goto error; + } + + if (is_root) { + ust_event_name = DEFAULT_SYS_JUL_EVENT_NAME; + } else { + ust_event_name = DEFAULT_USER_JUL_EVENT_NAME; + } + + /* + * The loglevel is hardcoded with 0 here since the agent ust event is set + * with the loglevel type to ALL thus the loglevel stays 0. The event's + * filter is the one handling the loglevel for agent. + */ + uevent = trace_ust_find_event(uchan->events, ust_event_name, + aevent->filter, 0, NULL); + /* 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; + } + + ret = agent_disable_event(aevent, agt->domain); if (ret != LTTNG_OK) { goto error; } @@ -739,20 +786,22 @@ error: return ret; } /* - * Disable all JUL event for a given UST session. + * Disable all agent event 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_all(struct ltt_ust_session *usess, + struct agent *agt) { int ret, do_disable = 0; - struct jul_event *jevent; + struct agent_event *aevent; struct lttng_ht_iter iter; + assert(agt); assert(usess); - /* Enable event on JUL application through TCP socket. */ - ret = event_jul_disable(usess, "*"); + /* Disable event on agent application through TCP socket. */ + ret = event_agent_disable(usess, agt, "*"); if (ret != LTTNG_OK) { if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) { /* @@ -768,16 +817,16 @@ int event_jul_disable_all(struct ltt_ust_session *usess) /* 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) { - if (jevent->enabled && do_disable) { - ret = event_jul_disable(usess, jevent->name); + if (aevent->enabled && do_disable) { + ret = event_agent_disable(usess, agt, aevent->name); if (ret != LTTNG_OK) { rcu_read_unlock(); goto error; } } - jevent->enabled = 0; + aevent->enabled = 0; } rcu_read_unlock();