X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=cdfc1a8649cd0c8c7242c745ad4733df4b6829fd;hb=c6aa2d41cdd9daddc133e43cf6e1f2daae818cdd;hp=80721a78848ef7850fb2162cb11157119fb58ffa;hpb=022d91ba14053d6093a6d6a1af02a345c6fd42d2;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index 80721a788..cdfc1a864 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -622,10 +622,11 @@ error: * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ int event_agent_enable_all(struct ltt_ust_session *usess, - struct lttng_event *event, struct lttng_filter_bytecode *filter) + struct agent *agt, struct lttng_event *event, + struct lttng_filter_bytecode *filter) { int ret; - struct agent_event *jevent; + struct agent_event *aevent; struct lttng_ht_iter iter; assert(usess); @@ -633,16 +634,16 @@ int event_agent_enable_all(struct ltt_ust_session *usess, DBG("Event agent enabling ALL events for session %" PRIu64, usess->id); /* Enable event on agent application through TCP socket. */ - ret = event_agent_enable(usess, event, filter); + 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->agent.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(); @@ -657,44 +658,46 @@ error: * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_agent_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 agent_event *jevent; + struct agent_event *aevent; assert(usess); assert(event); + assert(agt); 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 = agent_find_event(event->name, event->loglevel, &usess->agent); - if (!jevent) { - jevent = agent_create_event(event->name, filter); - 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; } - jevent->loglevel = event->loglevel; - jevent->loglevel_type = event->loglevel_type; + aevent->loglevel = event->loglevel; + aevent->loglevel_type = event->loglevel_type; created = 1; } /* Already enabled? */ - if (jevent->enabled) { + if (aevent->enabled) { goto end; } - ret = agent_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) { - agent_add_event(jevent, &usess->agent); + agent_add_event(aevent, agt); } end: @@ -702,55 +705,94 @@ end: error: if (created) { - agent_destroy_event(jevent); + agent_destroy_event(aevent); } return ret; } +/* + * Return the agent default event name to use by testing if the process is root + * or not. Return NULL on error. + */ +const char *event_get_default_agent_ust_name(enum lttng_domain_type domain) +{ + const char *default_event_name = NULL; + + if (domain == LTTNG_DOMAIN_JUL) { + if (is_root) { + default_event_name = DEFAULT_SYS_JUL_EVENT_NAME; + } else { + default_event_name = DEFAULT_USER_JUL_EVENT_NAME; + } + } else if (domain == LTTNG_DOMAIN_LOG4J) { + if (is_root) { + default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME; + } else { + default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME; + } + } else { + assert(0); + } + + return default_event_name; +} + + /* * Disable a single agent event for a given UST session. * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_agent_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 agent_event *jevent; + struct agent_event *aevent; struct ltt_ust_event *uevent = NULL; struct ltt_ust_channel *uchan = NULL; - char *ust_event_name; + const char *ust_event_name, *ust_channel_name; + assert(agt); assert(usess); assert(event_name); DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id); - jevent = agent_find_event_by_name(event_name, &usess->agent); - 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; } + 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 { + ret = LTTNG_ERR_INVALID; + goto error; + } + /* * 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); + (char *) ust_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; + ust_event_name = event_get_default_agent_ust_name(agt->domain); + if (!ust_event_name) { + ret = LTTNG_ERR_FATAL; + goto error; } /* @@ -758,8 +800,8 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name) * 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, - jevent->filter, 0, NULL); + uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name, + aevent->filter, 0, NULL); /* If the agent event exists, it must be available on the UST side. */ assert(uevent); @@ -769,7 +811,13 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name) goto error; } - ret = agent_disable_event(jevent); + /* + * 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; } @@ -785,41 +833,38 @@ error: * * Return LTTNG_OK on success or else a LTTNG_ERR* code. */ -int event_agent_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 agent_event *jevent; + int ret; + struct agent_event *aevent; struct lttng_ht_iter iter; + assert(agt); assert(usess); - /* Enable event on agent application through TCP socket. */ - ret = event_agent_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; - } + /* + * 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. */ rcu_read_lock(); - cds_lfht_for_each_entry(usess->agent.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_agent_disable(usess, jevent->name); - if (ret != LTTNG_OK) { - rcu_read_unlock(); - goto error; - } + if (!aevent->enabled) { + continue; + } + + ret = event_agent_disable(usess, agt, aevent->name); + if (ret != LTTNG_OK) { + rcu_read_unlock(); + goto error; } - jevent->enabled = 0; } rcu_read_unlock();