X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=a8e63896d001a5e36a64a6639c410603d4006dfd;hb=49d21f93659c296425c129bc7722bd8255f5c1b1;hp=cdfc1a8649cd0c8c7242c745ad4733df4b6829fd;hpb=71aecbf889a5e65466d36a46fe37720959ac7f35;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index cdfc1a864..a8e63896d 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -57,21 +58,6 @@ static void add_unique_ust_event(struct lttng_ht *ht, 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. */ @@ -104,6 +90,57 @@ error: 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 event %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.", + syscall_name[0] == '\0' ? "" : syscall_name, + kchan->channel->name); + + ret = LTTNG_OK; + +error: + return ret; +} + /* * Disable kernel tracepoint events for a channel from the kernel session. */ @@ -126,15 +163,6 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan) 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. */ @@ -147,12 +175,13 @@ int event_kernel_disable_all(struct ltt_kernel_channel *kchan) 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) @@ -245,36 +274,6 @@ 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. */ @@ -299,7 +298,7 @@ int event_kernel_enable_all(struct ltt_kernel_channel *kchan, * 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); + (void) event_kernel_enable_syscall(kchan, ""); end: return tp_ret; @@ -410,6 +409,7 @@ error: /* * 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, @@ -431,6 +431,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, 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; @@ -478,6 +482,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, end: rcu_read_unlock(); + free(filter_expression); + free(filter); + free(exclusion); return ret; error: @@ -493,6 +500,9 @@ error: trace_ust_destroy_event(uevent); } rcu_read_unlock(); + free(filter_expression); + free(filter); + free(exclusion); return ret; } @@ -718,26 +728,31 @@ const char *event_get_default_agent_ust_name(enum lttng_domain_type domain) { 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. * @@ -773,6 +788,8 @@ int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt, 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;