#include "ust-app.h"
#include "trace-kernel.h"
#include "trace-ust.h"
+#include "agent.h"
/*
* Add unique UST event based on the event name, filter bytecode and loglevel.
key.name = event->attr.name;
key.filter = (struct lttng_filter_bytecode *) event->filter;
- key.loglevel = event->attr.loglevel;
+ key.loglevel_type = event->attr.loglevel_type;
+ key.loglevel_value = event->attr.loglevel;
key.exclusion = event->exclusion;
node_ptr = cds_lfht_add_unique(ht->ht,
* ============================
*/
-/*
- * 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,
- char *filter_expression,
- struct lttng_filter_bytecode *filter)
-{
- int ret, i, size;
- struct lttng_ht_iter iter;
- struct ltt_ust_event *uevent = NULL;
- struct lttng_event *events = NULL;
-
- assert(usess);
- assert(uchan);
-
- rcu_read_lock();
-
- /* Enable existing events */
- cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
- node.node) {
- if (uevent->enabled == 0) {
- ret = ust_app_enable_event_glb(usess, uchan, uevent);
- if (ret < 0) {
- continue;
- }
- uevent->enabled = 1;
- }
- }
-
- /* 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++) {
- /*
- * Check if event exist and if so, continue since it was enable
- * previously.
- */
- uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
- events[i].loglevel, NULL);
- if (uevent != NULL) {
- ret = ust_app_enable_event_pid(usess, uchan, uevent,
- events[i].pid);
- if (ret < 0) {
- if (ret != -LTTNG_UST_ERR_EXIST) {
- ret = LTTNG_ERR_UST_ENABLE_FAIL;
- goto error;
- }
- }
- continue;
- }
-
- /* Create ust event */
- uevent = trace_ust_create_event(&events[i], filter_expression,
- filter, NULL);
- if (uevent == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error_destroy;
- }
-
- /* Create event for the specific PID */
- ret = ust_app_enable_event_pid(usess, uchan, uevent,
- events[i].pid);
- if (ret < 0) {
- if (ret == -LTTNG_UST_ERR_EXIST) {
- ret = LTTNG_ERR_UST_EVENT_EXIST;
- goto error;
- } else {
- ret = LTTNG_ERR_UST_ENABLE_FAIL;
- goto error_destroy;
- }
- }
-
- uevent->enabled = 1;
- /* Add ltt ust event to channel */
- rcu_read_lock();
- add_unique_ust_event(uchan->events, uevent);
- rcu_read_unlock();
- }
- free(events);
-
- rcu_read_unlock();
- return LTTNG_OK;
-
-error_destroy:
- trace_ust_destroy_event(uevent);
-
-error:
- free(events);
- rcu_read_unlock();
- return ret;
-}
-
/*
* Enable UST tracepoint event for a channel from a UST session.
* We own filter_expression, filter, and exclusion.
struct ltt_ust_channel *uchan, struct lttng_event *event,
char *filter_expression,
struct lttng_filter_bytecode *filter,
- struct lttng_event_exclusion *exclusion)
+ struct lttng_event_exclusion *exclusion,
+ bool internal_event)
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
rcu_read_lock();
uevent = trace_ust_find_event(uchan->events, event->name, filter,
- event->loglevel, exclusion);
- if (uevent == NULL) {
+ event->loglevel_type, event->loglevel, exclusion);
+ if (!uevent) {
uevent = trace_ust_create_event(event, filter_expression,
- filter, exclusion);
+ filter, exclusion, internal_event);
/* We have passed ownership */
filter_expression = NULL;
filter = NULL;
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;
- 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) {
- 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 != LTTNG_OK) {
- /* Continue to disable the rest... */
- continue;
- }
- }
- free(events);
-
- rcu_read_unlock();
- return LTTNG_OK;
-
-error:
- free(events);
- rcu_read_unlock();
- return ret;
-}
-
/*
* Enable all agent event for a given UST session.
*
*/
int event_agent_enable_all(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter ,char *filter_expression)
{
int ret;
struct agent_event *aevent;
DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
/* Enable event on agent application through TCP socket. */
- ret = event_agent_enable(usess, agt, event, filter);
+ ret = event_agent_enable(usess, agt, event, filter, filter_expression);
if (ret != LTTNG_OK) {
goto error;
}
*/
int event_agent_enable(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter,
+ char *filter_expression)
{
int ret, created = 0;
struct agent_event *aevent;
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);
+ ", loglevel %d and filter \"%s\"", event->name,
+ usess->id, event->loglevel_type, event->loglevel,
+ filter_expression ? filter_expression : "NULL");
- aevent = agent_find_event(event->name, event->loglevel, agt);
+ aevent = agent_find_event(event->name, event->loglevel_type,
+ event->loglevel, agt);
if (!aevent) {
- aevent = agent_create_event(event->name, filter);
+ aevent = agent_create_event(event->name, event->loglevel_type,
+ event->loglevel, filter,
+ filter_expression);
if (!aevent) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
- aevent->loglevel = event->loglevel;
- aevent->loglevel_type = event->loglevel_type;
created = 1;
}
}
/*
- * Return the agent default event name to use by testing if the process is root
- * or not. Return NULL on error.
+ * Return the default event name associated with the provided UST domain. Return
+ * NULL on error.
*/
const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
{
switch (domain) {
case LTTNG_DOMAIN_LOG4J:
- if (is_root) {
- default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
- } else {
- default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
- }
+ default_event_name = DEFAULT_LOG4J_EVENT_NAME;
break;
case LTTNG_DOMAIN_JUL:
- if (is_root) {
- default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
- } else {
- default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
- }
+ default_event_name = DEFAULT_JUL_EVENT_NAME;
break;
case LTTNG_DOMAIN_PYTHON:
- default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+ default_event_name = DEFAULT_PYTHON_EVENT_NAME;
break;
default:
assert(0);
}
/*
- * Disable a single agent event for a given UST session.
+ * Disable a given agent event for a given UST session.
*
+ * Must be called with the RCU read lock held.
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
- char *event_name)
+static int event_agent_disable_one(struct ltt_ust_session *usess,
+ struct agent *agt, struct agent_event *aevent)
{
int ret;
- struct agent_event *aevent;
struct ltt_ust_event *uevent = NULL;
struct ltt_ust_channel *uchan = NULL;
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);
+ assert(aevent);
- aevent = agent_find_event_by_name(event_name, agt);
- if (!aevent) {
- ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
- goto error;
- }
+ DBG("Event agent disabling %s (loglevel type %d, loglevel value %d) for session %" PRIu64,
+ aevent->name, aevent->loglevel_type, aevent->loglevel_value,
+ usess->id);
/* Already disabled? */
if (!aevent->enabled) {
}
/*
- * 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.
+ * Agent UST event has its loglevel type forced to
+ * LTTNG_UST_LOGLEVEL_ALL. The actual loglevel type/value filtering
+ * happens thanks to an UST filter. The following -1 is actually
+ * ignored since the type is LTTNG_UST_LOGLEVEL_ALL.
*/
uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name,
- aevent->filter, 0, NULL);
+ aevent->filter, LTTNG_UST_LOGLEVEL_ALL, -1, NULL);
/* If the agent event exists, it must be available on the UST side. */
assert(uevent);
error:
return ret;
}
+
+/*
+ * Disable all agent events matching a given name 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, struct agent *agt,
+ char *event_name)
+{
+ int ret = LTTNG_OK;
+ struct agent_event *aevent;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *node;
+
+ assert(agt);
+ assert(usess);
+ assert(event_name);
+
+ DBG("Event agent disabling %s (all loglevels) for session %" PRIu64, event_name, usess->id);
+
+ rcu_read_lock();
+ agent_find_events_by_name(event_name, agt, &iter);
+ node = lttng_ht_iter_get_node_str(&iter);
+
+ if (node == NULL) {
+ DBG2("Event agent NOT found by name %s", event_name);
+ ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto end;
+ }
+
+ do {
+ aevent = caa_container_of(node, struct agent_event, node);
+ ret = event_agent_disable_one(usess, agt, aevent);
+
+ if (ret != LTTNG_OK) {
+ goto end;
+ }
+
+ /* Get next duplicate agent event by name. */
+ agent_event_next_duplicate(event_name, agt, &iter);
+ node = lttng_ht_iter_get_node_str(&iter);
+ } while (node);
+end:
+ rcu_read_unlock();
+ return ret;
+}
/*
* Disable all agent event for a given UST session.
*
goto error;
}
- /* Flag every event that they are now enabled. */
+ /* Disable every event. */
rcu_read_lock();
cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
node.node) {
ret = event_agent_disable(usess, agt, aevent->name);
if (ret != LTTNG_OK) {
- rcu_read_unlock();
- goto error;
+ goto error_unlock;
}
}
- rcu_read_unlock();
-
ret = LTTNG_OK;
+error_unlock:
+ rcu_read_unlock();
error:
return ret;
}
projects / lttng-tools.git / blobdiff