X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=4e5771f03639b476748c97a459e8c7aab0829fee;hp=82deb9b0e4cc2acff6942ffbfa38aa5d9374ddb8;hb=bbccc3d2cb9f83aecf00a207de9eef68c766bf9c;hpb=0ba98ebc83bf874d34c8c84b164a6ad803e9de75 diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index 82deb9b0e..4e5771f03 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -38,12 +38,11 @@ #include #include -#include -#include +#include +#include +#include #include #include -#include -#include #include "lttng-sessiond.h" #include "channel.h" @@ -51,6 +50,7 @@ #include "event.h" #include "futex.h" #include "kernel.h" +#include "modprobe.h" #include "shm.h" #include "ust-ctl.h" #include "utils.h" @@ -77,7 +77,7 @@ struct consumer_data { /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; -const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP; +const char default_tracing_group[] = DEFAULT_TRACING_GROUP; const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; @@ -98,18 +98,18 @@ static char *rundir; /* Consumer daemon specific control data */ static struct consumer_data kconsumer_data = { .type = LTTNG_CONSUMER_KERNEL, - .err_unix_sock_path = KCONSUMERD_ERR_SOCK_PATH, - .cmd_unix_sock_path = KCONSUMERD_CMD_SOCK_PATH, + .err_unix_sock_path = DEFAULT_KCONSUMERD_ERR_SOCK_PATH, + .cmd_unix_sock_path = DEFAULT_KCONSUMERD_CMD_SOCK_PATH, }; static struct consumer_data ustconsumer64_data = { .type = LTTNG_CONSUMER64_UST, - .err_unix_sock_path = USTCONSUMERD64_ERR_SOCK_PATH, - .cmd_unix_sock_path = USTCONSUMERD64_CMD_SOCK_PATH, + .err_unix_sock_path = DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, + .cmd_unix_sock_path = DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, }; static struct consumer_data ustconsumer32_data = { .type = LTTNG_CONSUMER32_UST, - .err_unix_sock_path = USTCONSUMERD32_ERR_SOCK_PATH, - .cmd_unix_sock_path = USTCONSUMERD32_CMD_SOCK_PATH, + .err_unix_sock_path = DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, + .cmd_unix_sock_path = DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, }; static int dispatch_thread_exit; @@ -215,11 +215,11 @@ void setup_consumerd_path(void) if (bin) { consumerd64_bin = bin; } - libdir = getenv("LTTNG_TOOLS_CONSUMERD32_LIBDIR"); + libdir = getenv("LTTNG_CONSUMERD32_LIBDIR"); if (libdir) { consumerd32_libdir = libdir; } - libdir = getenv("LTTNG_TOOLS_CONSUMERD64_LIBDIR"); + libdir = getenv("LTTNG_CONSUMERD64_LIBDIR"); if (libdir) { consumerd64_libdir = libdir; } @@ -269,41 +269,6 @@ static int check_thread_quit_pipe(int fd, uint32_t events) return 0; } -/* - * Remove modules in reverse load order. - */ -static int modprobe_remove_kernel_modules(void) -{ - int ret = 0, i; - char modprobe[256]; - - for (i = ARRAY_SIZE(kernel_modules_list) - 1; i >= 0; i--) { - ret = snprintf(modprobe, sizeof(modprobe), - "/sbin/modprobe -r -q %s", - kernel_modules_list[i].name); - if (ret < 0) { - perror("snprintf modprobe -r"); - goto error; - } - modprobe[sizeof(modprobe) - 1] = '\0'; - ret = system(modprobe); - if (ret == -1) { - ERR("Unable to launch modprobe -r for module %s", - kernel_modules_list[i].name); - } else if (kernel_modules_list[i].required - && WEXITSTATUS(ret) != 0) { - ERR("Unable to remove module %s", - kernel_modules_list[i].name); - } else { - DBG("Modprobe removal successful %s", - kernel_modules_list[i].name); - } - } - -error: - return ret; -} - /* * Return group ID of the tracing group or -1 if not found. */ @@ -456,7 +421,7 @@ static void cleanup(void) DBG2("Closing kernel fd"); close(kernel_tracer_fd); DBG("Unloading kernel modules"); - modprobe_remove_kernel_modules(); + modprobe_remove_lttng_all(); } close(thread_quit_pipe[0]); @@ -1145,10 +1110,16 @@ static void *thread_manage_apps(void *data) } /* - * Add channel(s) and event(s) to newly registered apps - * from lttng global UST domain. + * Validate UST version compatibility. */ - update_ust_app(ust_cmd.sock); + ret = ust_app_validate_version(ust_cmd.sock); + if (ret >= 0) { + /* + * Add channel(s) and event(s) to newly registered apps + * from lttng global UST domain. + */ + update_ust_app(ust_cmd.sock); + } ret = ust_app_register_done(ust_cmd.sock); if (ret < 0) { @@ -1702,147 +1673,64 @@ error: } /* - * modprobe_kernel_modules + * Check version of the lttng-modules. */ -static int modprobe_kernel_modules(void) +static int validate_lttng_modules_version(void) { - int ret = 0, i; - char modprobe[256]; - - for (i = 0; i < ARRAY_SIZE(kernel_modules_list); i++) { - ret = snprintf(modprobe, sizeof(modprobe), - "/sbin/modprobe %s%s", - kernel_modules_list[i].required ? "" : "-q ", - kernel_modules_list[i].name); - if (ret < 0) { - perror("snprintf modprobe"); - goto error; - } - modprobe[sizeof(modprobe) - 1] = '\0'; - ret = system(modprobe); - if (ret == -1) { - ERR("Unable to launch modprobe for module %s", - kernel_modules_list[i].name); - } else if (kernel_modules_list[i].required - && WEXITSTATUS(ret) != 0) { - ERR("Unable to load module %s", - kernel_modules_list[i].name); - } else { - DBG("Modprobe successfully %s", - kernel_modules_list[i].name); - } - } - -error: - return ret; + return kernel_validate_version(kernel_tracer_fd); } /* - * mount_debugfs + * Setup necessary data for kernel tracer action. */ -static int mount_debugfs(char *path) +static int init_kernel_tracer(void) { int ret; - char *type = "debugfs"; - ret = run_as_mkdir_recursive(path, S_IRWXU | S_IRWXG, geteuid(), getegid()); - if (ret < 0) { - PERROR("Cannot create debugfs path"); - goto error; - } - - ret = mount(type, path, type, 0, NULL); + /* Modprobe lttng kernel modules */ + ret = modprobe_lttng_control(); if (ret < 0) { - PERROR("Cannot mount debugfs"); - goto error; - } - - DBG("Mounted debugfs successfully at %s", path); - -error: - return ret; -} - -/* - * Setup necessary data for kernel tracer action. - */ -static void init_kernel_tracer(void) -{ - int ret; - char *proc_mounts = "/proc/mounts"; - char line[256]; - char *debugfs_path = NULL, *lttng_path = NULL; - FILE *fp; - - /* Detect debugfs */ - fp = fopen(proc_mounts, "r"); - if (fp == NULL) { - ERR("Unable to probe %s", proc_mounts); goto error; } - while (fgets(line, sizeof(line), fp) != NULL) { - if (strstr(line, "debugfs") != NULL) { - /* Remove first string */ - strtok(line, " "); - /* Dup string here so we can reuse line later on */ - debugfs_path = strdup(strtok(NULL, " ")); - DBG("Got debugfs path : %s", debugfs_path); - break; - } - } - - fclose(fp); - - /* Mount debugfs if needded */ - if (debugfs_path == NULL) { - ret = asprintf(&debugfs_path, "/mnt/debugfs"); - if (ret < 0) { - perror("asprintf debugfs path"); - goto error; - } - ret = mount_debugfs(debugfs_path); - if (ret < 0) { - perror("Cannot mount debugfs"); - goto error; - } + /* Open debugfs lttng */ + kernel_tracer_fd = open(module_proc_lttng, O_RDWR); + if (kernel_tracer_fd < 0) { + DBG("Failed to open %s", module_proc_lttng); + ret = -1; + goto error_open; } - /* Modprobe lttng kernel modules */ - ret = modprobe_kernel_modules(); + /* Validate kernel version */ + ret = validate_lttng_modules_version(); if (ret < 0) { - goto error; + goto error_version; } - /* Setup lttng kernel path */ - ret = asprintf(<tng_path, "%s/lttng", debugfs_path); + ret = modprobe_lttng_data(); if (ret < 0) { - perror("asprintf lttng path"); - goto error; + goto error_modules; } - /* Open debugfs lttng */ - kernel_tracer_fd = open(lttng_path, O_RDWR); - if (kernel_tracer_fd < 0) { - DBG("Failed to open %s", lttng_path); - goto error; - } - - free(lttng_path); - free(debugfs_path); DBG("Kernel tracer fd %d", kernel_tracer_fd); - return; + return 0; + +error_version: + modprobe_remove_lttng_control(); + close(kernel_tracer_fd); + kernel_tracer_fd = 0; + return LTTCOMM_KERN_VERSION; + +error_modules: + close(kernel_tracer_fd); + +error_open: + modprobe_remove_lttng_control(); error: - if (lttng_path) { - free(lttng_path); - } - if (debugfs_path) { - free(debugfs_path); - } WARN("No kernel tracer available"); kernel_tracer_fd = 0; - return; + return LTTCOMM_KERN_NA; } /* @@ -2271,11 +2159,11 @@ static int cmd_disable_channel(struct ltt_session *session, } break; } +#if 0 case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: - ret = LTTCOMM_NOT_IMPLEMENTED; - goto error; +#endif default: ret = LTTCOMM_UNKNOWN_DOMAIN; goto error; @@ -2334,11 +2222,11 @@ static int cmd_enable_channel(struct ltt_session *session, } break; } +#if 0 case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: - ret = LTTCOMM_NOT_IMPLEMENTED; - goto error; +#endif default: ret = LTTCOMM_UNKNOWN_DOMAIN; goto error; @@ -2401,11 +2289,13 @@ static int cmd_disable_event(struct ltt_session *session, int domain, channel_name); break; } +#if 0 case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: +#endif default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -2468,11 +2358,13 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain, break; } +#if 0 case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: +#endif default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -2509,11 +2401,13 @@ static int cmd_add_context(struct ltt_session *session, int domain, } break; } +#if 0 case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: +#endif default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -2624,11 +2518,13 @@ static int cmd_enable_event(struct ltt_session *session, int domain, } break; } +#if 0 case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: +#endif default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -2759,11 +2655,13 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain, break; } +#if 0 case LTTNG_DOMAIN_UST_EXEC_NAME: case LTTNG_DOMAIN_UST_PID: case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: +#endif default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -2797,7 +2695,7 @@ static ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events) } break; default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -3026,9 +2924,20 @@ static int cmd_calibrate(int domain, struct lttng_calibrate *calibrate) } break; } + case LTTNG_DOMAIN_UST: + { + struct lttng_ust_calibrate ucalibrate; + + ucalibrate.type = calibrate->type; + ret = ust_app_calibrate_glb(&ucalibrate); + if (ret < 0) { + ret = LTTCOMM_UST_CALIBRATE_FAIL; + goto error; + } + break; + } default: - /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -3064,7 +2973,7 @@ static int cmd_register_consumer(struct ltt_session *session, int domain, break; default: /* TODO: Userspace tracing */ - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -3140,7 +3049,7 @@ static ssize_t cmd_list_channels(int domain, struct ltt_session *session, break; default: *channels = NULL; - ret = -LTTCOMM_NOT_IMPLEMENTED; + ret = -LTTCOMM_UND; goto error; } @@ -3187,7 +3096,7 @@ static ssize_t cmd_list_events(int domain, struct ltt_session *session, break; } default: - ret = -LTTCOMM_NOT_IMPLEMENTED; + ret = -LTTCOMM_UND; goto error; } @@ -3278,9 +3187,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx) /* Kernel tracer check */ if (kernel_tracer_fd == 0) { /* Basically, load kernel tracer modules */ - init_kernel_tracer(); - if (kernel_tracer_fd == 0) { - ret = LTTCOMM_KERN_NA; + ret = init_kernel_tracer(); + if (ret != 0) { goto error; } } @@ -3654,7 +3562,7 @@ static void *thread_manage_clients(void *data) * Notify parent pid that we are ready to accept command for client side. */ if (opt_sig_parent) { - kill(ppid, SIGCHLD); + kill(ppid, SIGUSR1); } while (1) { @@ -4112,13 +4020,13 @@ static int set_consumer_sockets(struct consumer_data *consumer_data, switch (consumer_data->type) { case LTTNG_CONSUMER_KERNEL: - snprintf(path, PATH_MAX, KCONSUMERD_PATH, rundir); + snprintf(path, PATH_MAX, DEFAULT_KCONSUMERD_PATH, rundir); break; case LTTNG_CONSUMER64_UST: - snprintf(path, PATH_MAX, USTCONSUMERD64_PATH, rundir); + snprintf(path, PATH_MAX, DEFAULT_USTCONSUMERD64_PATH, rundir); break; case LTTNG_CONSUMER32_UST: - snprintf(path, PATH_MAX, USTCONSUMERD32_PATH, rundir); + snprintf(path, PATH_MAX, DEFAULT_USTCONSUMERD32_PATH, rundir); break; default: ERR("Consumer type unknown"); @@ -4169,14 +4077,14 @@ static void sighandler(int sig) { switch (sig) { case SIGPIPE: - DBG("SIGPIPE catched"); + DBG("SIGPIPE caugth"); return; case SIGINT: - DBG("SIGINT catched"); + DBG("SIGINT caugth"); stop_threads(); break; case SIGTERM: - DBG("SIGTERM catched"); + DBG("SIGTERM caugth"); stop_threads(); break; default: @@ -4278,7 +4186,7 @@ int main(int argc, char **argv) is_root = !getuid(); if (is_root) { - rundir = strdup(LTTNG_RUNDIR); + rundir = strdup(DEFAULT_LTTNG_RUNDIR); /* Create global run dir with root access */ ret = create_lttng_rundir(rundir); @@ -4304,9 +4212,9 @@ int main(int argc, char **argv) /* Setup kernel consumerd path */ snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, - KCONSUMERD_ERR_SOCK_PATH, rundir); + DEFAULT_KCONSUMERD_ERR_SOCK_PATH, rundir); snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, - KCONSUMERD_CMD_SOCK_PATH, rundir); + DEFAULT_KCONSUMERD_CMD_SOCK_PATH, rundir); DBG2("Kernel consumer err path: %s", kconsumer_data.err_unix_sock_path); @@ -4325,7 +4233,7 @@ int main(int argc, char **argv) * Create rundir from home path. This will create something like * $HOME/.lttng */ - ret = asprintf(&rundir, LTTNG_HOME_RUNDIR, home_path); + ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path); if (ret < 0) { ret = -ENOMEM; goto error; @@ -4360,9 +4268,9 @@ int main(int argc, char **argv) /* 32 bits consumerd path setup */ snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, - USTCONSUMERD32_ERR_SOCK_PATH, rundir); + DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, rundir); snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, - USTCONSUMERD32_CMD_SOCK_PATH, rundir); + DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, rundir); DBG2("UST consumer 32 bits err path: %s", ustconsumer32_data.err_unix_sock_path); @@ -4371,9 +4279,9 @@ int main(int argc, char **argv) /* 64 bits consumerd path setup */ snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, - USTCONSUMERD64_ERR_SOCK_PATH, rundir); + DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, rundir); snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, - USTCONSUMERD64_CMD_SOCK_PATH, rundir); + DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, rundir); DBG2("UST consumer 64 bits err path: %s", ustconsumer64_data.err_unix_sock_path);