X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=a153b2351cccae5d2b125d23e8a088bd0c2d52af;hp=8348f04b07a44c7875c7e54ae95e3a922c308778;hb=eb1e0bd499a6f47d2bcc5a2b828356101d8b00c3;hpb=fc7a59ceb8b73a1610a5bce28131dc2cf338aa70 diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c index 8348f04b0..a153b2351 100644 --- a/lttng-sessiond/main.c +++ b/lttng-sessiond/main.c @@ -1508,7 +1508,9 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) { int ret; pid_t pid; + const char *consumer_to_use; const char *verbosity; + struct stat st; DBG("Spawning consumerd"); @@ -1524,11 +1526,26 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) } switch (consumer_data->type) { case LTTNG_CONSUMER_KERNEL: - execl(INSTALL_BIN_PATH "/" CONSUMERD_FILE, - "lttng-consumerd", verbosity, "-k", - "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path, - "--consumerd-err-sock", consumer_data->err_unix_sock_path, - NULL); + /* + * Find out which consumerd to execute. We will first + * try the 64-bit path, then the 32-bit one, then + * fallback on sessiond's installation directory. + */ + if (stat(consumerd64_bin, &st) == 0) { + consumer_to_use = consumerd64_bin; + } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) { + consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE; + } else if (stat(consumerd32_bin, &st) == 0) { + consumer_to_use = consumerd32_bin; + } else { + break; + } + DBG("Using kernel consumer at: %s", consumer_to_use); + execl(consumer_to_use, + "lttng-consumerd", verbosity, "-k", + "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path, + "--consumerd-err-sock", consumer_data->err_unix_sock_path, + NULL); break; case LTTNG_CONSUMER64_UST: { @@ -1561,6 +1578,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) goto error; } } + DBG("Using 64-bit UST consumer at: %s", consumerd64_bin); ret = execl(consumerd64_bin, verbosity, "-u", "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path, "--consumerd-err-sock", consumer_data->err_unix_sock_path, @@ -1604,6 +1622,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) goto error; } } + DBG("Using 32-bit UST consumer at: %s", consumerd32_bin); ret = execl(consumerd32_bin, verbosity, "-u", "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path, "--consumerd-err-sock", consumer_data->err_unix_sock_path, @@ -2074,9 +2093,7 @@ static int list_lttng_ust_global_events(char *channel_name, tmp[i].type = LTTNG_EVENT_FUNCTION; break; case LTTNG_UST_TRACEPOINT_LOGLEVEL: - /* TODO */ - ret = -LTTCOMM_NOT_IMPLEMENTED; - goto error; + tmp[i].type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL; break; } i++; @@ -2548,6 +2565,12 @@ error: /* * Command LTTNG_ENABLE_EVENT processed by the client thread. + * + * TODO: currently, both events and loglevels are kept within the same + * namespace for UST global registry/app registery, so if an event + * happen to have the same name as the loglevel (very unlikely though), + * and an attempt is made to enable/disable both in the same session, + * the first to be created will be the only one allowed to exist. */ static int cmd_enable_event(struct ltt_session *session, int domain, char *channel_name, struct lttng_event *event) @@ -2690,11 +2713,11 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain, } switch (event_type) { - case LTTNG_KERNEL_SYSCALL: + case LTTNG_EVENT_SYSCALL: ret = event_kernel_enable_all_syscalls(session->kernel_session, kchan, kernel_tracer_fd); break; - case LTTNG_KERNEL_TRACEPOINT: + case LTTNG_EVENT_TRACEPOINT: /* * This call enables all LTTNG_KERNEL_TRACEPOINTS and * events already registered to the channel. @@ -2702,7 +2725,7 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain, ret = event_kernel_enable_all_tracepoints(session->kernel_session, kchan, kernel_tracer_fd); break; - case LTTNG_KERNEL_ALL: + case LTTNG_EVENT_ALL: /* Enable syscalls and tracepoints */ ret = event_kernel_enable_all(session->kernel_session, kchan, kernel_tracer_fd); @@ -2719,8 +2742,69 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain, kernel_wait_quiescent(kernel_tracer_fd); break; + case LTTNG_DOMAIN_UST: + { + struct lttng_channel *attr; + struct ltt_ust_channel *uchan; + struct ltt_ust_session *usess = session->ust_session; + + /* Get channel from global UST domain */ + uchan = trace_ust_find_channel_by_name(usess->domain_global.channels, + channel_name); + if (uchan == NULL) { + /* Create default channel */ + attr = channel_new_default_attr(domain); + if (attr == NULL) { + ret = LTTCOMM_FATAL; + goto error; + } + snprintf(attr->name, NAME_MAX, "%s", channel_name); + attr->name[NAME_MAX - 1] = '\0'; + + /* Use the internal command enable channel */ + ret = cmd_enable_channel(session, domain, attr); + if (ret != LTTCOMM_OK) { + free(attr); + goto error; + } + free(attr); + + /* Get the newly created channel reference back */ + uchan = trace_ust_find_channel_by_name( + usess->domain_global.channels, channel_name); + if (uchan == NULL) { + /* Something is really wrong */ + ret = LTTCOMM_FATAL; + goto error; + } + } + + /* At this point, the session and channel exist on the tracer */ + + switch (event_type) { + case LTTNG_EVENT_ALL: + case LTTNG_EVENT_TRACEPOINT: + ret = event_ust_enable_all_tracepoints(usess, domain, uchan); + if (ret != LTTCOMM_OK) { + goto error; + } + break; + default: + ret = LTTCOMM_UST_ENABLE_FAIL; + goto error; + } + + /* Manage return value */ + if (ret != LTTCOMM_OK) { + goto error; + } + + break; + } + case LTTNG_DOMAIN_UST_EXEC_NAME: + case LTTNG_DOMAIN_UST_PID: + case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: default: - /* TODO: Userspace tracing */ ret = LTTCOMM_NOT_IMPLEMENTED; goto error; }