From 1d3bc0177a1952473bbe45b5bbb4e4e4f69a84f4 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 21 Jul 2014 21:11:54 -0400 Subject: Merge systemd-verify with systemd-analyze --- src/analyze/analyze-verify.c | 280 +++++++++++++++++++++++++++++++++++++++++++ src/analyze/analyze-verify.h | 26 ++++ src/analyze/analyze.c | 94 +++++++++------ 3 files changed, 364 insertions(+), 36 deletions(-) create mode 100644 src/analyze/analyze-verify.c create mode 100644 src/analyze/analyze-verify.h (limited to 'src/analyze') diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c new file mode 100644 index 0000000000..5b16b6c3d9 --- /dev/null +++ b/src/analyze/analyze-verify.c @@ -0,0 +1,280 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include + +#include "manager.h" +#include "bus-util.h" +#include "log.h" +#include "strv.h" +#include "build.h" +#include "pager.h" +#include "analyze-verify.h" + +static int generate_path(char **var, char **filenames) { + char **filename; + + _cleanup_strv_free_ char **ans = NULL; + int r; + + STRV_FOREACH(filename, filenames) { + char *t; + + t = dirname_malloc(*filename); + if (!t) + return -ENOMEM; + + r = strv_consume(&ans, t); + if (r < 0) + return r; + } + + assert_se(strv_uniq(ans)); + + r = strv_extend(&ans, ""); + if (r < 0) + return r; + + *var = strv_join(ans, ":"); + if (!*var) + return -ENOMEM; + + return 0; +} + +static int verify_socket(Unit *u) { + int r; + + assert(u); + + if (u->type != UNIT_SOCKET) + return 0; + + /* Cannot run this without the service being around */ + + /* This makes sure instance is created if necessary. */ + r = socket_instantiate_service(SOCKET(u)); + if (r < 0) { + log_error_unit(u->id, "Socket %s cannot be started, failed to create instance.", + u->id); + return r; + } + + /* This checks both type of sockets */ + if (UNIT_ISSET(SOCKET(u)->service)) { + Service *service; + + service = SERVICE(UNIT_DEREF(SOCKET(u)->service)); + log_debug_unit(u->id, "%s uses %s", u->id, UNIT(service)->id); + + if (UNIT(service)->load_state != UNIT_LOADED) { + log_error_unit(u->id, "Service %s not loaded, %s cannot be started.", + UNIT(service)->id, u->id); + return -ENOENT; + } + } + + return 0; +} + +static int verify_executable(Unit *u, ExecCommand *exec) { + if (exec == NULL) + return 0; + + if (access(exec->path, X_OK) < 0) { + log_error_unit(u->id, "%s: command %s is not executable: %m", + u->id, exec->path); + return -errno; + } + + return 0; +} + +static int verify_executables(Unit *u) { + ExecCommand *exec; + int r = 0, k; + unsigned i; + + assert(u); + + exec = u->type == UNIT_SOCKET ? SOCKET(u)->control_command : + u->type == UNIT_MOUNT ? MOUNT(u)->control_command : + u->type == UNIT_SWAP ? SWAP(u)->control_command : NULL; + k = verify_executable(u, exec); + if (k < 0 && r == 0) + r = k; + + if (u->type == UNIT_SERVICE) + for (i = 0; i < ELEMENTSOF(SERVICE(u)->exec_command); i++) { + k = verify_executable(u, SERVICE(u)->exec_command[i]); + if (k < 0 && r == 0) + r = k; + } + + if (u->type == UNIT_SOCKET) + for (i = 0; i < ELEMENTSOF(SOCKET(u)->exec_command); i++) { + k = verify_executable(u, SOCKET(u)->exec_command[i]); + if (k < 0 && r == 0) + r = k; + } + + return r; +} + +static int verify_documentation(Unit *u, bool check_man) { + char **p; + int r = 0, k; + + STRV_FOREACH(p, u->documentation) { + log_debug_unit(u->id, "%s: found documentation item %s.", u->id, *p); + if (check_man && startswith(*p, "man:")) { + k = show_man_page(*p + 4, true); + if (k != 0) { + if (k < 0) + log_error_unit(u->id, "%s: can't show %s: %s", + u->id, *p, strerror(-r)); + else { + log_error_unit(u->id, "%s: man %s command failed with code %d", + u->id, *p + 4, k); + k = -ENOEXEC; + } + if (r == 0) + r = k; + } + } + } + + /* Check remote URLs? */ + + return r; +} + +static int verify_unit(Unit *u, bool check_man) { + _cleanup_bus_error_free_ sd_bus_error err = SD_BUS_ERROR_NULL; + Job *j; + int r, k; + + assert(u); + + if (log_get_max_level() >= LOG_DEBUG) + unit_dump(u, stdout, "\t"); + + log_debug_unit(u->id, "Creating %s/start job", u->id); + r = manager_add_job(u->manager, JOB_START, u, JOB_REPLACE, false, &err, &j); + if (sd_bus_error_is_set(&err)) + log_error_unit(u->id, "Error: %s: %s", + err.name, err.message); + if (r < 0) + log_error_unit(u->id, "Failed to create %s/start: %s", + u->id, strerror(-r)); + + k = verify_socket(u); + if (k < 0 && r == 0) + r = k; + + k = verify_executables(u); + if (k < 0 && r == 0) + r = k; + + k = verify_documentation(u, check_man); + if (k < 0 && r == 0) + r = k; + + return r; +} + +int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) { + _cleanup_bus_error_free_ sd_bus_error err = SD_BUS_ERROR_NULL; + Manager *m = NULL; + FILE *serial = NULL; + FDSet *fdset = NULL; + + _cleanup_free_ char *var = NULL; + + char **filename; + int r = 0, k; + + Unit *units[strv_length(filenames)]; + int i, count = 0; + + if (strv_isempty(filenames)) + return 0; + + /* set the path */ + r = generate_path(&var, filenames); + if (r < 0) { + log_error("Failed to generate unit load path: %s", strerror(-r)); + return r; + } + + assert_se(set_unit_path(var) >= 0); + + r = manager_new(running_as, true, &m); + if (r < 0) { + log_error("Failed to initalize manager: %s", strerror(-r)); + return r; + } + + log_debug("Starting manager..."); + + r = manager_startup(m, serial, fdset); + if (r < 0) { + log_error("Failed to start manager: %s", strerror(-r)); + goto finish; + } + + manager_clear_jobs(m); + + log_debug("Loading remaining units from the command line..."); + + STRV_FOREACH(filename, filenames) { + char fname[UNIT_NAME_MAX + 2 + 1] = "./"; + + log_debug("Handling %s...", *filename); + + /* manager_load_unit does not like pure basenames, so prepend + * the local directory, but only for valid names. manager_load_unit + * will print the error for other ones. */ + if (!strchr(*filename, '/') && strlen(*filename) <= UNIT_NAME_MAX) { + strncat(fname + 2, *filename, UNIT_NAME_MAX); + k = manager_load_unit(m, NULL, fname, &err, &units[count]); + } else + k = manager_load_unit(m, NULL, *filename, &err, &units[count]); + if (k < 0) { + log_error("Failed to load %s: %s", *filename, strerror(-k)); + if (r == 0) + r = k; + } else + count ++; + } + + for (i = 0; i < count; i++) { + k = verify_unit(units[i], check_man); + if (k < 0 && r == 0) + r = k; + } + +finish: + manager_free(m); + + return r; +} diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h new file mode 100644 index 0000000000..5c86d9862b --- /dev/null +++ b/src/analyze/analyze-verify.h @@ -0,0 +1,26 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include + +#include "path-lookup.h" + +int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man); diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 0a4190ceb4..66e2aabe96 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -41,6 +41,7 @@ #include "special.h" #include "hashmap.h" #include "pager.h" +#include "analyze-verify.h" #define SCALE_X (0.1 / 1000.0) /* pixels per us */ #define SCALE_Y (20.0) @@ -74,6 +75,7 @@ static bool arg_no_pager = false; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; static bool arg_user = false; +static bool arg_man = true; struct boot_times { usec_t firmware_time; @@ -1178,17 +1180,17 @@ static int set_log_level(sd_bus *bus, char **args) { return 0; } -static int help(void) { +static void help(void) { pager_open_if_enabled(); printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Process systemd profiling information.\n\n" + "Profile systemd, show unit dependencies, check unit files.\n\n" " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" - " --system Connect to system manager\n" - " --user Connect to user manager\n" + " --system Operate on system systemd instance\n" + " --user Operate on user systemd instance\n" " -H --host=[USER@]HOST Operate on remote host\n" " -M --machine=CONTAINER Operate on local container\n" " --order When generating a dependency graph, show only order\n" @@ -1200,6 +1202,7 @@ static int help(void) { " services, which finished TIMESPAN earlier, than the\n" " latest in the branch. The unit of TIMESPAN is seconds\n" " unless specified with a different unit, i.e. 50ms\n\n" + " --no-man Do not check for existence of man pages\n" "Commands:\n" " time Print time spent in the kernel before reaching userspace\n" " blame Print list of running units ordered by time to init\n" @@ -1207,14 +1210,13 @@ static int help(void) { " plot Output SVG graphic showing service initialization\n" " dot Output dependency graph in dot(1) format\n" " set-log-level LEVEL Set logging threshold for systemd\n" - " dump Output state serialization of service manager\n", - program_invocation_short_name); + " dump Output state serialization of service manager\n" + " verify Check unit files for correctness\n" + , program_invocation_short_name); /* When updating this list, including descriptions, apply - * changes to shell-completion/bash/systemd and - * shell-completion/systemd-zsh-completion.zsh too. */ - - return 0; + * changes to shell-completion/bash/systemd-analyze and + * shell-completion/zsh/_systemd-analyze too. */ } static int parse_argv(int argc, char *argv[]) { @@ -1227,7 +1229,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_DOT_FROM_PATTERN, ARG_DOT_TO_PATTERN, ARG_FUZZ, - ARG_NO_PAGER + ARG_NO_PAGER, + ARG_NO_MAN, }; static const struct option options[] = { @@ -1251,12 +1254,15 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); + opterr = 0; + while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) { switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -1311,19 +1317,27 @@ static int parse_argv(int argc, char *argv[]) { arg_host = optarg; break; + case ARG_NO_MAN: + arg_man = false; + break; + case '?': + log_error("Unknown option %s.", argv[optind-1]); + return -EINVAL; + + case ':': + log_error("Missing argument to %s.", argv[optind-1]); return -EINVAL; default: - assert_not_reached("Unhandled option"); + assert_not_reached("Unhandled option code."); } } - return 1; + return 1; /* work to do */ } int main(int argc, char *argv[]) { - _cleanup_bus_unref_ sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); @@ -1335,28 +1349,36 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); - if (r < 0) { - log_error("Failed to create bus connection: %s", strerror(-r)); - goto finish; - } + if (streq(argv[optind], "verify")) + r = verify_units(argv+optind+1, + arg_user ? SYSTEMD_USER : SYSTEMD_SYSTEM, + arg_man); + else { + _cleanup_bus_unref_ sd_bus *bus = NULL; + + r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); + if (r < 0) { + log_error("Failed to create bus connection: %s", strerror(-r)); + goto finish; + } - if (!argv[optind] || streq(argv[optind], "time")) - r = analyze_time(bus); - else if (streq(argv[optind], "blame")) - r = analyze_blame(bus); - else if (streq(argv[optind], "critical-chain")) - r = analyze_critical_chain(bus, argv+optind+1); - else if (streq(argv[optind], "plot")) - r = analyze_plot(bus); - else if (streq(argv[optind], "dot")) - r = dot(bus, argv+optind+1); - else if (streq(argv[optind], "dump")) - r = dump(bus, argv+optind+1); - else if (streq(argv[optind], "set-log-level")) - r = set_log_level(bus, argv+optind+1); - else - log_error("Unknown operation '%s'.", argv[optind]); + if (!argv[optind] || streq(argv[optind], "time")) + r = analyze_time(bus); + else if (streq(argv[optind], "blame")) + r = analyze_blame(bus); + else if (streq(argv[optind], "critical-chain")) + r = analyze_critical_chain(bus, argv+optind+1); + else if (streq(argv[optind], "plot")) + r = analyze_plot(bus); + else if (streq(argv[optind], "dot")) + r = dot(bus, argv+optind+1); + else if (streq(argv[optind], "dump")) + r = dump(bus, argv+optind+1); + else if (streq(argv[optind], "set-log-level")) + r = set_log_level(bus, argv+optind+1); + else + log_error("Unknown operation '%s'.", argv[optind]); + } finish: pager_close(); -- cgit v1.2.3-54-g00ecf