*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <errno.h>
#include <urcu/list.h>
#include <string.h>
/*
* Enable kernel tracepoint event for a channel from the kernel session.
+ * We own filter_expression and filter.
*/
int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
struct lttng_event *event)
/*
* Enable UST tracepoint event for a channel from a UST session.
+ * We own filter_expression, filter, and exclusion.
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
filter, exclusion);
+ /* We have passed ownership */
+ filter_expression = NULL;
+ filter = NULL;
+ exclusion = NULL;
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
end:
rcu_read_unlock();
+ free(filter_expression);
+ free(filter);
+ free(exclusion);
return ret;
error:
trace_ust_destroy_event(uevent);
}
rcu_read_unlock();
+ free(filter_expression);
+ free(filter);
+ free(exclusion);
return ret;
}
{
const char *default_event_name = NULL;
- if (domain == LTTNG_DOMAIN_JUL) {
+ switch (domain) {
+ case LTTNG_DOMAIN_LOG4J:
if (is_root) {
- default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
+ default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
} else {
- default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+ default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
}
- } else if (domain == LTTNG_DOMAIN_LOG4J) {
+ break;
+ case LTTNG_DOMAIN_JUL:
if (is_root) {
- default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
+ default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
} else {
- default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
+ default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
}
- } else {
+ break;
+ case LTTNG_DOMAIN_PYTHON:
+ default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+ break;
+ default:
assert(0);
}
return default_event_name;
}
-
/*
* Disable a single agent event for a given UST session.
*
ust_channel_name = DEFAULT_JUL_CHANNEL_NAME;
} else if (agt->domain == LTTNG_DOMAIN_LOG4J) {
ust_channel_name = DEFAULT_LOG4J_CHANNEL_NAME;
+ } else if (agt->domain == LTTNG_DOMAIN_PYTHON) {
+ ust_channel_name = DEFAULT_PYTHON_CHANNEL_NAME;
} else {
ret = LTTNG_ERR_INVALID;
goto error;