picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge systemd-verify with systemd-analyze

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-07-21 21:11:54 -04:00
parent 1a40a3393e
commit 1d3bc0177a
7 changed files with 121 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -122,7 +122,6 @@
/systemd-update-utmp
/systemd-user-sessions
/systemd-vconsole-setup
/systemd-verify
/tags
/test-architecture
/test-async

28
Makefile.am
View File

@ -350,8 +350,7 @@ bin_PROGRAMS = \
systemd-delta \
systemd-analyze \
systemd-run \
systemd-path \
systemd-verify
systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@ -1226,19 +1225,6 @@ CLEANFILES += \
# ------------------------------------------------------------------------------
systemd_verify_SOURCES = \
src/verify/verify.c
systemd_verify_CFLAGS = \
$(AM_CFLAGS) \
$(SECCOMP_CFLAGS)
systemd_verify_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
manual_tests += \
test-ns \
test-loopback \
@ -1738,11 +1724,19 @@ endif
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
src/analyze/analyze.c
src/analyze/analyze.c \
src/analyze/analyze-verify.c \
src/analyze/analyze-verify.h
systemd_verify_CFLAGS = \
$(AM_CFLAGS) \
$(SECCOMP_CFLAGS)
systemd_analyze_LDADD = \
libsystemd-core.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-shared.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \

133
src/verify/verify.c → src/analyze/analyze-verify.c
View File

@ -28,9 +28,7 @@
#include "strv.h"
#include "build.h"
#include "pager.h"
SystemdRunningAs arg_running_as = SYSTEMD_SYSTEM;
bool arg_no_man = false;
#include "analyze-verify.h"
static int generate_path(char **var, char **filenames) {
char **filename;
@ -142,16 +140,13 @@ static int verify_executables(Unit *u) {
return r;
}
static int verify_documentation(Unit *u) {
static int verify_documentation(Unit *u, bool check_man) {
char **p;
int r = 0, k;
if (arg_no_man)
return 0;
STRV_FOREACH(p, u->documentation) {
log_debug_unit(u->id, "%s: found documentation item %s.", u->id, *p);
if (startswith(*p, "man:")) {
if (check_man && startswith(*p, "man:")) {
k = show_man_page(*p + 4, true);
if (k != 0) {
if (k < 0)
@ -173,7 +168,7 @@ static int verify_documentation(Unit *u) {
return r;
}
static int test_unit(Unit *u) {
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;
@ -200,20 +195,20 @@ static int test_unit(Unit *u) {
if (k < 0 && r == 0)
r = k;
k = verify_documentation(u);
k = verify_documentation(u, check_man);
if (k < 0 && r == 0)
r = k;
return r;
}
static int test_units(char **filenames) {
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;
_cleanup_free_ char *var = NULL;
char **filename;
int r = 0, k;
@ -221,6 +216,9 @@ static int test_units(char **filenames) {
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) {
@ -230,7 +228,7 @@ static int test_units(char **filenames) {
assert_se(set_unit_path(var) >= 0);
r = manager_new(arg_running_as, true, &m);
r = manager_new(running_as, true, &m);
if (r < 0) {
log_error("Failed to initalize manager: %s", strerror(-r));
return r;
@ -249,20 +247,28 @@ static int test_units(char **filenames) {
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);
k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
/* 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(-r));
log_error("Failed to load %s: %s", *filename, strerror(-k));
if (r == 0)
r = k;
}
count ++;
} else
count ++;
}
for (i = 0; i < count; i++) {
k = test_unit(units[i]);
k = verify_unit(units[i], check_man);
if (k < 0 && r == 0)
r = k;
}
@ -272,92 +278,3 @@ finish:
return r;
}
static void help(void) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
"Check if unit files can be correctly loaded.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --system Test system units\n"
" --user Test user units\n"
" --no-man Do not check for existence of man pages\n"
, program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
ARG_USER,
ARG_SYSTEM,
ARG_NO_MAN,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "user", no_argument, NULL, ARG_USER },
{ "system", no_argument, NULL, ARG_SYSTEM },
{}
};
int c;
assert(argc >= 1);
assert(argv);
opterr = 0;
while ((c = getopt_long(argc, argv, ":h", options, NULL)) >= 0)
switch (c) {
case 'h':
help();
return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
puts(SYSTEMD_FEATURES);
return 0;
case ARG_USER:
arg_running_as = SYSTEMD_USER;
break;
case ARG_SYSTEM:
arg_running_as = SYSTEMD_SYSTEM;
break;
case ARG_NO_MAN:
arg_no_man = true;
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 code.");
}
return 1; /* work to do */
}
int main(int argc, char *argv[]) {
int r;
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
if (r <= 0)
goto finish;
r = test_units(argv + optind);
finish:
return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}

26
src/analyze/analyze-verify.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
***/
#include <stdbool.h>
#include "path-lookup.h"
int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man);

94
src/analyze/analyze.c
View File

@ -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;
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]);
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]);
}
finish:
pager_close();

2
src/shared/path-lookup.c
View File

@ -212,7 +212,7 @@ int lookup_paths_init(
if (!p->unit_path || append) {
/* Let's figure something out. */
char **unit_path;
_cleanup_strv_free_ char **unit_path;
int r;
/* For the user units we include share/ in the search

1
src/verify/Makefile
View File

@ -1 +0,0 @@
../../Makefile