*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <errno.h>
#include <urcu/list.h>
#include <string.h>
assert(node_ptr == &event->node.node);
}
-/*
- * Setup a lttng_event used to enable *all* syscall tracing.
- */
-static void init_syscalls_kernel_event(struct lttng_event *event)
-{
- assert(event);
-
- event->name[0] = '\0';
- /*
- * We use LTTNG_EVENT* here since the trace kernel creation will make the
- * right changes for the kernel.
- */
- event->type = LTTNG_EVENT_SYSCALL;
-}
-
/*
* Disable kernel tracepoint event for a channel from the kernel session.
*/
return ret;
}
+/*
+ * Enable kernel system call for a channel from the kernel session.
+ */
+int event_kernel_enable_syscall(struct ltt_kernel_channel *kchan,
+ char *syscall_name)
+{
+ int ret;
+
+ assert(kchan);
+
+ ret = kernel_enable_syscall(syscall_name, kchan);
+ if (ret < 0) {
+ ret = LTTNG_ERR_KERN_ENABLE_FAIL;
+ goto error;
+ }
+
+ DBG("Kernel syscall %s enable for channel %s.",
+ syscall_name, kchan->channel->name);
+
+ ret = LTTNG_OK;
+
+error:
+ return ret;
+}
+
+/*
+ * Disable kernel system call for a channel from the kernel session.
+ */
+int event_kernel_disable_syscall(struct ltt_kernel_channel *kchan,
+ char *syscall_name)
+{
+ int ret;
+
+ assert(kchan);
+
+ ret = kernel_disable_syscall(syscall_name, kchan);
+ if (ret < 0) {
+ ret = LTTNG_ERR_KERN_DISABLE_FAIL;
+ goto error;
+ }
+
+ DBG("Kernel syscall %s disable for channel %s.",
+ !strcmp(syscall_name, "*") ? "<all>" : syscall_name,
+ kchan->channel->name);
+
+ ret = LTTNG_OK;
+
+error:
+ return ret;
+}
+
/*
* Disable kernel tracepoint events for a channel from the kernel session.
*/
return ret;
}
-/*
- * Disable kernel syscall events for a channel from the kernel session.
- */
-int event_kernel_disable_all_syscalls(struct ltt_kernel_channel *kchan)
-{
- ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
- return LTTNG_OK; /* Return OK so disable all succeeds */
-}
-
/*
* Disable all kernel event for a channel from the kernel session.
*/
ret = event_kernel_disable_all_tracepoints(kchan);
if (ret != LTTNG_OK)
return ret;
- ret = event_kernel_disable_all_syscalls(kchan);
+ ret = event_kernel_disable_syscall(kchan, "*");
return ret;
}
/*
* 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)
return ret;
}
-/*
- * Enable all kernel tracepoint events of a channel of the kernel session.
- */
-int event_kernel_enable_all_tracepoints(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int size, i, ret;
- struct ltt_kernel_event *kevent;
- struct lttng_event *event_list = NULL;
-
- assert(kchan);
-
- /* For each event in the kernel session */
- cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
- if (kevent->enabled == 0) {
- ret = kernel_enable_event(kevent);
- if (ret < 0) {
- /* Enable failed but still continue */
- continue;
- }
- }
- }
-
- size = kernel_list_events(kernel_tracer_fd, &event_list);
- if (size < 0) {
- ret = LTTNG_ERR_KERN_LIST_FAIL;
- goto end;
- }
-
- for (i = 0; i < size; i++) {
- kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan);
- if (kevent == NULL) {
- /* Default event type for enable all */
- event_list[i].type = LTTNG_EVENT_TRACEPOINT;
- /* Enable each single tracepoint event */
- ret = kernel_create_event(&event_list[i], kchan);
- if (ret < 0) {
- /* Ignore error here and continue */
- }
- }
- }
- free(event_list);
-
- ret = LTTNG_OK;
-end:
- return ret;
-}
-
-/*
- * Enable all kernel sycalls events of a channel of the kernel session.
- */
-int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int ret;
- struct lttng_event event;
-
- assert(kchan);
-
- init_syscalls_kernel_event(&event);
-
- DBG("Enabling all syscall tracing");
-
- ret = kernel_create_event(&event, kchan);
- if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTNG_ERR_KERN_EVENT_EXIST;
- } else {
- ret = LTTNG_ERR_KERN_ENABLE_FAIL;
- }
- goto end;
- }
-
- ret = LTTNG_OK;
-end:
- return ret;
-}
-
-/*
- * Enable all kernel events of a channel of the kernel session.
- */
-int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int tp_ret;
-
- assert(kchan);
-
- tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
- if (tp_ret != LTTNG_OK) {
- goto end;
- }
-
- /*
- * Reaching this code path means that all tracepoints were enabled without
- * errors so we ignore the error value of syscalls.
- *
- * At the moment, failing to enable syscalls on "lttng enable-event -a -k"
- * is not considered an error that need to be returned to the client since
- * tracepoints did not fail. Future work will allow us to send back
- * multiple errors to the client in one API call.
- */
- (void) event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd);
-
-end:
- return tp_ret;
-}
-
/*
* ============================
* UST : The Ultimate Frontier!
/*
* 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.
*
struct agent_event *aevent;
struct ltt_ust_event *uevent = NULL;
struct ltt_ust_channel *uchan = NULL;
- const char *ust_event_name;
+ const char *ust_event_name, *ust_channel_name;
assert(agt);
assert(usess);
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 if (agt->domain == LTTNG_DOMAIN_PYTHON) {
+ ust_channel_name = DEFAULT_PYTHON_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;
projects / lttng-tools.git / blobdiff