X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ltt-sessiond%2Fevent.c;h=eef0039d633c30c39d0127378809b3aca1a58bcb;hb=2bdd86d4c47902237c691d3c5409f32f205df81e;hp=66e134e4641be8690f9fffbbb10086a96d229bdc;hpb=8c9ae521a34f2d83c42ced6b00a599518e8473e8;p=lttng-tools.git diff --git a/ltt-sessiond/event.c b/ltt-sessiond/event.c index 66e134e46..eef0039d6 100644 --- a/ltt-sessiond/event.c +++ b/ltt-sessiond/event.c @@ -15,12 +15,20 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include #include #include #include +#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST +#include +#else +#include "lttng-ust-ctl.h" +#endif + #include "channel.h" #include "event.h" #include "kernel-ctl.h" @@ -39,9 +47,9 @@ static void init_syscalls_kernel_event(struct lttng_event *event) } /* - * Disable kernel event for a channel from the kernel session. + * Disable kernel tracepoint event for a channel from the kernel session. */ -int event_kernel_disable(struct ltt_kernel_session *ksession, +int event_kernel_disable_tracepoint(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan, char *event_name) { int ret; @@ -69,9 +77,9 @@ error: } /* - * Disable all kernel event for a channel from the kernel session. + * Disable kernel tracepoint events for a channel from the kernel session. */ -int event_kernel_disable_all(struct ltt_kernel_session *ksession, +int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan) { int ret; @@ -85,16 +93,39 @@ int event_kernel_disable_all(struct ltt_kernel_session *ksession, continue; } } - ret = LTTCOMM_OK; + return ret; +} + +/* + * Disable kernel syscall events for a channel from the kernel session. + */ +int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession, + struct ltt_kernel_channel *kchan) +{ + ERR("Cannot disable syscall tracing for existing session. Please destroy session instead."); + return LTTCOMM_OK; /* Return OK so disable all succeeds */ +} + +/* + * Disable all kernel event for a channel from the kernel session. + */ +int event_kernel_disable_all(struct ltt_kernel_session *ksession, + struct ltt_kernel_channel *kchan) +{ + int ret; + ret = event_kernel_disable_all_tracepoints(ksession, kchan); + if (ret != LTTCOMM_OK) + return ret; + ret = event_kernel_disable_all_syscalls(ksession, kchan); return ret; } /* - * Enable kernel event for a channel from the kernel session. + * Enable kernel tracepoint event for a channel from the kernel session. */ -int event_kernel_enable(struct ltt_kernel_session *ksession, +int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan, struct lttng_event *event) { int ret; @@ -104,27 +135,29 @@ int event_kernel_enable(struct ltt_kernel_session *ksession, if (kevent == NULL) { ret = kernel_create_event(event, kchan); if (ret < 0) { - ret = LTTCOMM_KERN_ENABLE_FAIL; - goto error; + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + } else { + ret = LTTCOMM_KERN_ENABLE_FAIL; + } + goto end; } } else if (kevent->enabled == 0) { ret = kernel_enable_event(kevent); if (ret < 0) { ret = LTTCOMM_KERN_ENABLE_FAIL; - goto error; + goto end; } } - ret = LTTCOMM_OK; - -error: +end: return ret; } /* - * Enable all kernel event of a channel of the kernel session. + * Enable all kernel tracepoint events of a channel of the kernel session. */ -int event_kernel_enable_all(struct ltt_kernel_session *ksession, +int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan, int kernel_tracer_fd) { int size, i, ret; @@ -143,7 +176,7 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession, size = kernel_list_events(kernel_tracer_fd, &event_list); if (size < 0) { ret = LTTCOMM_KERN_LIST_FAIL; - goto error; + goto end; } for (i = 0; i < size; i++) { @@ -158,19 +191,17 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession, } } } - free(event_list); - ret = LTTCOMM_OK; - -error: +end: return ret; + } /* - * Enable all kernel syscalls tracing. + * Enable all kernel tracepoint events of a channel of the kernel session. */ -int event_kernel_enable_syscalls(struct ltt_kernel_session *ksession, +int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession, struct ltt_kernel_channel *kchan, int kernel_tracer_fd) { int ret; @@ -182,11 +213,100 @@ int event_kernel_enable_syscalls(struct ltt_kernel_session *ksession, ret = kernel_create_event(&event, kchan); if (ret < 0) { - goto error; + goto end; } + ret = LTTCOMM_OK; +end: + return ret; +} +/* + * Enable all kernel events of a channel of the kernel session. + */ +int event_kernel_enable_all(struct ltt_kernel_session *ksession, + struct ltt_kernel_channel *kchan, int kernel_tracer_fd) +{ + int ret; + + ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd); + if (ret != LTTCOMM_OK) { + goto end; + } + ret = event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd); +end: + return ret; +} + +/* + * Enable UST tracepoint event for a channel from a UST session. + */ +int event_ust_enable_tracepoint(struct ltt_ust_session *ustsession, + struct ltt_ust_channel *ustchan, struct lttng_event *event) +{ + int ret; + struct ltt_ust_event *ustevent; + struct lttng_ust_event lttngustevent; + struct object_data *object_event; + + ustevent = trace_ust_get_event_by_name(event->name, ustchan); + if (ustevent == NULL) { + ustevent = trace_ust_create_event(event); + if (ustevent == NULL) { + ret = -1; + goto end; + } + strncpy(lttngustevent.name, event->name, + LTTNG_UST_SYM_NAME_LEN); + lttngustevent.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + /* TODO: adjust to other instrumentation types */ + lttngustevent.instrumentation = LTTNG_UST_TRACEPOINT; + ret = ustctl_create_event(ustsession->sock, <tngustevent, + ustchan->obj, &object_event); + if (ret < 0) { + if (ret == -EEXIST) { + ret = LTTCOMM_KERN_EVENT_EXIST; + } else { + ret = LTTCOMM_KERN_ENABLE_FAIL; + } + goto end; + } + ustevent->obj = object_event; + ustevent->handle = object_event->handle; + ustevent->enabled = 1; + /* Add event to event list */ + cds_list_add(&ustevent->list, &ustchan->events.head); + ustchan->events.count++; + } else if (ustevent->enabled == 0) { + ret = ustctl_enable(ustsession->sock, ustevent->obj); + if (ret < 0) { + ret = LTTCOMM_KERN_ENABLE_FAIL; + goto end; + } + ustevent->enabled = 1; + } ret = LTTCOMM_OK; +end: + return ret; +} -error: +int event_ust_disable_tracepoint(struct ltt_ust_session *ustsession, + struct ltt_ust_channel *ustchan, char *event_name) +{ + int ret; + struct ltt_ust_event *ustevent; + + ustevent = trace_ust_get_event_by_name(event_name, ustchan); + if (ustevent == NULL) { + ret = LTTCOMM_NO_EVENT; + goto end; + } + ret = ustctl_disable(ustsession->sock, ustevent->obj); + if (ret < 0) { + ret = LTTCOMM_UST_ENABLE_FAIL; + goto end; + } + ustevent->enabled = 0; + ret = LTTCOMM_OK; +end: return ret; }