X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=2582e886d1e1a5f5352a6f91b8bd82b2ea914c7b;hp=aff833243ad968fbed03e27ffc32d52f3599bcad;hb=a433283e401f556b0eb87814475fc84b11fc9666;hpb=3b05775dd0434b4501d4d681610d876fb923e908 diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index aff833243..2582e886d 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -133,34 +133,34 @@ static struct consumer_data ustconsumer32_data = { /* Command line options */ static const struct option long_options[] = { - { "client-sock", 1, 0, 'c' }, - { "apps-sock", 1, 0, 'a' }, - { "kconsumerd-cmd-sock", 1, 0, '\0' }, - { "kconsumerd-err-sock", 1, 0, '\0' }, - { "ustconsumerd32-cmd-sock", 1, 0, '\0' }, - { "ustconsumerd32-err-sock", 1, 0, '\0' }, - { "ustconsumerd64-cmd-sock", 1, 0, '\0' }, - { "ustconsumerd64-err-sock", 1, 0, '\0' }, - { "consumerd32-path", 1, 0, '\0' }, - { "consumerd32-libdir", 1, 0, '\0' }, - { "consumerd64-path", 1, 0, '\0' }, - { "consumerd64-libdir", 1, 0, '\0' }, - { "daemonize", 0, 0, 'd' }, - { "background", 0, 0, 'b' }, - { "sig-parent", 0, 0, 'S' }, - { "help", 0, 0, 'h' }, - { "group", 1, 0, 'g' }, - { "version", 0, 0, 'V' }, - { "quiet", 0, 0, 'q' }, - { "verbose", 0, 0, 'v' }, - { "verbose-consumer", 0, 0, '\0' }, - { "no-kernel", 0, 0, '\0' }, - { "pidfile", 1, 0, 'p' }, - { "agent-tcp-port", 1, 0, '\0' }, - { "config", 1, 0, 'f' }, - { "load", 1, 0, 'l' }, - { "kmod-probes", 1, 0, '\0' }, - { "extra-kmod-probes", 1, 0, '\0' }, + { "client-sock", required_argument, 0, 'c' }, + { "apps-sock", required_argument, 0, 'a' }, + { "kconsumerd-cmd-sock", required_argument, 0, '\0' }, + { "kconsumerd-err-sock", required_argument, 0, '\0' }, + { "ustconsumerd32-cmd-sock", required_argument, 0, '\0' }, + { "ustconsumerd32-err-sock", required_argument, 0, '\0' }, + { "ustconsumerd64-cmd-sock", required_argument, 0, '\0' }, + { "ustconsumerd64-err-sock", required_argument, 0, '\0' }, + { "consumerd32-path", required_argument, 0, '\0' }, + { "consumerd32-libdir", required_argument, 0, '\0' }, + { "consumerd64-path", required_argument, 0, '\0' }, + { "consumerd64-libdir", required_argument, 0, '\0' }, + { "daemonize", no_argument, 0, 'd' }, + { "background", no_argument, 0, 'b' }, + { "sig-parent", no_argument, 0, 'S' }, + { "help", no_argument, 0, 'h' }, + { "group", required_argument, 0, 'g' }, + { "version", no_argument, 0, 'V' }, + { "quiet", no_argument, 0, 'q' }, + { "verbose", no_argument, 0, 'v' }, + { "verbose-consumer", no_argument, 0, '\0' }, + { "no-kernel", no_argument, 0, '\0' }, + { "pidfile", required_argument, 0, 'p' }, + { "agent-tcp-port", required_argument, 0, '\0' }, + { "config", required_argument, 0, 'f' }, + { "load", required_argument, 0, 'l' }, + { "kmod-probes", required_argument, 0, '\0' }, + { "extra-kmod-probes", required_argument, 0, '\0' }, { NULL, 0, 0, 0 } }; @@ -676,6 +676,9 @@ static void sessiond_cleanup(void) } } + DBG("Cleaning up all agent apps"); + agent_app_ht_clean(); + DBG("Closing all UST sockets"); ust_app_clean_list(); buffer_reg_destroy_registries(); @@ -4440,6 +4443,11 @@ static void usage(void) fprintf(stderr, " --extra-kmod-probes Specify extra kernel module probes to load\n"); } +static int string_match(const char *str1, const char *str2) +{ + return (str1 && str2) && !strcmp(str1, str2); +} + /* * Take an option from the getopt output and set it in the right variable to be * used later. @@ -4461,36 +4469,25 @@ static int set_option(int opt, const char *arg, const char *optname) goto end; } - switch (opt) { - case 0: - fprintf(stderr, "option %s", optname); - if (arg) { - fprintf(stderr, " with arg %s\n", arg); - } - break; - case 'c': + if (string_match(optname, "client-sock") || opt == 'c') { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "-c, --client-sock"); } else { snprintf(client_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'a': + } else if (string_match(optname, "apps-sock") || opt == 'a') { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "-a, --apps-sock"); } else { snprintf(apps_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'd': + } else if (string_match(optname, "daemonize") || opt == 'd') { opt_daemon = 1; - break; - case 'b': + } else if (string_match(optname, "background") || opt == 'b') { opt_background = 1; - break; - case 'g': + } else if (string_match(optname, "group") || opt == 'g') { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "-g, --group"); @@ -4510,71 +4507,61 @@ static int set_option(int opt, const char *arg, const char *optname) } tracing_group_name_override = 1; } - break; - case 'h': + } else if (string_match(optname, "help") || opt == 'h') { usage(); exit(EXIT_SUCCESS); - case 'V': + } else if (string_match(optname, "version") || opt == 'V') { fprintf(stdout, "%s\n", VERSION); exit(EXIT_SUCCESS); - case 'S': + } else if (string_match(optname, "sig-parent") || opt == 'S') { opt_sig_parent = 1; - break; - case 'E': + } else if (string_match(optname, "kconsumerd-err-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--kconsumerd-err-sock"); } else { snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'C': + } else if (string_match(optname, "kconsumerd-cmd-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--kconsumerd-cmd-sock"); } else { snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'F': + } else if (string_match(optname, "ustconsumerd64-err-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--ustconsumerd64-err-sock"); } else { snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'D': + } else if (string_match(optname, "ustconsumerd64-cmd-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--ustconsumerd64-cmd-sock"); } else { snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'H': + } else if (string_match(optname, "ustconsumerd32-err-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--ustconsumerd32-err-sock"); } else { snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'G': + } else if (string_match(optname, "ustconsumerd32-cmd-sock")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--ustconsumerd32-cmd-sock"); } else { snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, "%s", arg); } - break; - case 'N': + } else if (string_match(optname, "no-kernel")) { opt_no_kernel = 1; - break; - case 'q': + } else if (string_match(optname, "quiet") || opt == 'q') { lttng_opt_quiet = 1; - break; - case 'v': + } else if (string_match(optname, "verbose") || opt == 'v') { /* Verbose level can increase using multiple -v */ if (arg) { /* Value obtained from config file */ @@ -4586,15 +4573,13 @@ static int set_option(int opt, const char *arg, const char *optname) /* Clamp value to [0, 3] */ lttng_opt_verbose = lttng_opt_verbose < 0 ? 0 : (lttng_opt_verbose <= 3 ? lttng_opt_verbose : 3); - break; - case 'Z': + } else if (string_match(optname, "verbose-consumer")) { if (arg) { opt_verbose_consumer = config_parse_value(arg); } else { opt_verbose_consumer += 1; } - break; - case 'u': + } else if (string_match(optname, "consumerd32-path")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--consumerd32-path"); @@ -4609,8 +4594,7 @@ static int set_option(int opt, const char *arg, const char *optname) } consumerd32_bin_override = 1; } - break; - case 'U': + } else if (string_match(optname, "consumerd32-libdir")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--consumerd32-libdir"); @@ -4625,8 +4609,7 @@ static int set_option(int opt, const char *arg, const char *optname) } consumerd32_libdir_override = 1; } - break; - case 't': + } else if (string_match(optname, "consumerd64-path")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--consumerd64-path"); @@ -4641,8 +4624,7 @@ static int set_option(int opt, const char *arg, const char *optname) } consumerd64_bin_override = 1; } - break; - case 'T': + } else if (string_match(optname, "consumerd64-libdir")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--consumerd64-libdir"); @@ -4657,8 +4639,7 @@ static int set_option(int opt, const char *arg, const char *optname) } consumerd64_libdir_override = 1; } - break; - case 'p': + } else if (string_match(optname, "pidfile") || opt == 'p') { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "-p, --pidfile"); @@ -4670,9 +4651,7 @@ static int set_option(int opt, const char *arg, const char *optname) ret = -ENOMEM; } } - break; - case 'J': /* Agent TCP port. */ - { + } else if (string_match(optname, "agent-tcp-port")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--agent-tcp-port"); @@ -4696,9 +4675,7 @@ static int set_option(int opt, const char *arg, const char *optname) agent_tcp_port = (uint32_t) v; DBG3("Agent TCP port set to non default: %u", agent_tcp_port); } - break; - } - case 'l': + } else if (string_match(optname, "load") || opt == 'l') { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "-l, --load"); @@ -4710,8 +4687,7 @@ static int set_option(int opt, const char *arg, const char *optname) ret = -ENOMEM; } } - break; - case 'P': /* probe modules list */ + } else if (string_match(optname, "kmod-probes")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--kmod-probes"); @@ -4723,8 +4699,7 @@ static int set_option(int opt, const char *arg, const char *optname) ret = -ENOMEM; } } - break; - case 'e': + } else if (string_match(optname, "extra-kmod-probes")) { if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.", "--extra-kmod-probes"); @@ -4736,11 +4711,10 @@ static int set_option(int opt, const char *arg, const char *optname) ret = -ENOMEM; } } - break; - case 'f': - /* This is handled in set_options() thus silent break. */ - break; - default: + } else if (string_match(optname, "config") || opt == 'f') { + /* This is handled in set_options() thus silent skip. */ + goto end; + } else { /* Unknown option or other error. * Error is printed by getopt, just return */ ret = -1; @@ -4875,12 +4849,24 @@ static int set_options(int argc, char **argv) optopt = orig_optopt; optind = orig_optind; while (1) { - c = getopt_long(argc, argv, optstring, long_options, &option_index); + option_index = -1; + /* + * getopt_long() will not set option_index if it encounters a + * short option. + */ + c = getopt_long(argc, argv, optstring, long_options, + &option_index); if (c == -1) { break; } - ret = set_option(c, optarg, long_options[option_index].name); + /* + * Pass NULL as the long option name if popt left the index + * unset. + */ + ret = set_option(c, optarg, + option_index < 0 ? NULL : + long_options[option_index].name); if (ret < 0) { break; } @@ -5312,6 +5298,9 @@ int main(int argc, char **argv) void *status; const char *home_path, *env_app_timeout; + /* Initialize agent apps ht global variable */ + agent_apps_ht_by_sock = NULL; + init_kernel_workarounds(); rcu_register_thread(); @@ -5635,9 +5624,12 @@ int main(int argc, char **argv) goto exit_init_data; } - /* Initialize agent domain subsystem. */ - if (agent_setup()) { - /* ENOMEM at this point. */ + /* + * Initialize agent app hash table. We allocate the hash table here + * since cleanup() can get called after this point. + */ + if (agent_app_ht_alloc()) { + ERR("Failed to allocate Agent app hash table"); retval = -1; goto exit_init_data; }