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,
rcu_read_lock();
uevent = trace_ust_find_event(uchan->events, event->name, filter,
- event->loglevel, exclusion);
+ event->loglevel_type, event->loglevel, exclusion);
if (!uevent) {
uevent = trace_ust_create_event(event, filter_expression,
filter, exclusion, internal_event);
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, error = 0;
+ 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) {
+ error = LTTNG_ERR_UST_DISABLE_FAIL;
+ 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 < 0) {
+ /* Continue to disable the rest... */
+ error = LTTNG_ERR_UST_DISABLE_FAIL;
+ continue;
+ }
+ }
+
+ ret = error ? error : LTTNG_OK;
+error:
+ rcu_read_unlock();
+ free(events);
+ return ret;
+}
+
/*
* Enable all agent event for a given UST session.
*
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, event->loglevel,
- event->loglevel_type, filter,
+ aevent = agent_create_event(event->name, event->loglevel_type,
+ event->loglevel, filter,
filter_expression);
if (!aevent) {
ret = LTTNG_ERR_NOMEM;
}
/*
- * 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);
+ assert(aevent);
- DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id);
-
- 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