X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=52fd9f5478a753492eb9ffee7b0c6d8eaf18d5e4;hb=d979615c8e80be1989c7e889169fb6976f8080d6;hp=2ccffae657ba898c70c3ff161b46276a49f64486;hpb=be6a6276f221b9bc83c16e3c3ba6ca76f5f35350;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index 2ccffae65..52fd9f547 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -617,32 +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, - struct lttng_event *event, struct lttng_filter_bytecode *filter) +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 agent_event *aevent; struct lttng_ht_iter iter; assert(usess); - DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id); + 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, filter); + /* 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(); @@ -653,48 +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 " with loglevel type %d " + 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_event(event->name, event->loglevel, &usess->domain_jul); - if (!jevent) { - jevent = jul_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 = 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: @@ -702,37 +705,39 @@ 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_event_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; } @@ -754,13 +759,13 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name) } /* - * The loglevel is hardcoded with 0 here since the JUL ust event is set + * 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 JUL. + * filter is the one handling the loglevel for agent. */ uevent = trace_ust_find_event(uchan->events, ust_event_name, - jevent->filter, 0, NULL); - /* If the JUL event exists, it must be available on the UST side. */ + 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); @@ -769,7 +774,7 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name) goto error; } - ret = jul_disable_event(jevent); + ret = agent_disable_event(aevent, agt->domain); if (ret != LTTNG_OK) { goto error; } @@ -781,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) { /* @@ -810,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();