X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fevent.c;h=1f90c1c73069d97c520d2c8670ef12fe7dd68c64;hp=dfafd88e8b2dc1625daae860a03aceafb811d20a;hb=48842b309b2000205367409c0f29ca40ec3e251c;hpb=dfafb1032f78331195cd93103c131568544425e7 diff --git a/ltt-sessiond/event.c b/ltt-sessiond/event.c index dfafd88e8..1f90c1c73 100644 --- a/ltt-sessiond/event.c +++ b/ltt-sessiond/event.c @@ -15,14 +15,23 @@ * 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 "hashtable.h" #include "kernel-ctl.h" /* @@ -39,9 +48,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 +78,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 +94,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 +136,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 +177,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,25 +192,17 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession, } } } - free(event_list); - - /* Also enable syscalls when enabling all events */ - ret = event_kernel_enable_syscalls(ksession, kchan, kernel_tracer_fd); - if (ret < 0) { - goto error; - } - 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; @@ -188,11 +214,83 @@ 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. + */ +#ifdef DISABLE +int event_ust_enable_tracepoint(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) +{ + int ret; + struct lttng_ust_event ltt_uevent; + struct object_data *obj_event; + + strncpy(ltt_uevent.name, uevent->attr.name, sizeof(ltt_uevent.name)); + ltt_uevent.name[sizeof(ltt_uevent.name) - 1] = '\0'; + /* TODO: adjust to other instrumentation types */ + ltt_uevent.instrumentation = LTTNG_UST_TRACEPOINT; + + ret = ustctl_create_event(app->key.sock, <t_uevent, + uchan->obj, &obj_event); + if (ret < 0) { + DBG("Error ustctl create event %s for app pid: %d, sock: %d ret %d", + uevent->attr.name, app->key.pid, app->key.sock, ret); + goto next; + } + + uevent->obj = obj_event; + uevent->handle = obj_event->handle; + uevent->enabled = 1; ret = LTTCOMM_OK; +end: + return ret; +} +#endif -error: +#ifdef DISABLE +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_find_event_by_name(ustchan->events, event_name); + 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; } +#endif