chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: add API to check if a client has privileges
[elogind.git]
/
src
/
bootchart
/
bootchart.c
diff --git
a/src/bootchart/bootchart.c
b/src/bootchart/bootchart.c
index 0ae72c29bbb1571268343f1728a7c0d5995ed940..8ef5ad18a6ac742609fa83b1cd84098e6a77efe1 100644
(file)
--- a/
src/bootchart/bootchart.c
+++ b/
src/bootchart/bootchart.c
@@
-163,7
+163,7
@@
static void help(void) {
DEFAULT_INIT);
}
DEFAULT_INIT);
}
-static int parse_arg
s
(int argc, char *argv[]) {
+static int parse_arg
v
(int argc, char *argv[]) {
static const struct option options[] = {
{"rel", no_argument, NULL, 'r'},
{"freq", required_argument, NULL, 'f'},
static const struct option options[] = {
{"rel", no_argument, NULL, 'r'},
{"freq", required_argument, NULL, 'f'},
@@
-180,12
+180,14
@@
static int parse_args(int argc, char *argv[]) {
{"entropy", no_argument, NULL, 'e'},
{}
};
{"entropy", no_argument, NULL, 'e'},
{}
};
- int c;
+ int c
, r
;
- while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0) {
-
int r
;
+ if (getpid() == 1)
+
opterr = 0
;
+ while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0)
switch (c) {
switch (c) {
+
case 'r':
arg_relative = true;
break;
case 'r':
arg_relative = true;
break;
@@
-238,18
+240,22
@@
static int parse_args(int argc, char *argv[]) {
break;
case 'h':
help();
break;
case 'h':
help();
- exit (EXIT_SUCCESS);
+ return 0;
+ case '?':
+ if (getpid() != 1)
+ return -EINVAL;
+ else
+ return 0;
default:
default:
-
break
;
+
assert_not_reached("Unhandled option code.")
;
}
}
- }
- if (arg_hz <= 0
.0
) {
-
fprintf(stderr, "Error: Frequency needs to be > 0\n
");
+ if (arg_hz <= 0) {
+
log_error("Frequency needs to be > 0
");
return -EINVAL;
}
return -EINVAL;
}
- return
0
;
+ return
1
;
}
static void do_journal_append(char *file) {
}
static void do_journal_append(char *file) {
@@
-310,12
+316,13
@@
int main(int argc, char *argv[]) {
time_t t = 0;
int r;
struct rlimit rlim;
time_t t = 0;
int r;
struct rlimit rlim;
+ bool has_procfs = false;
parse_conf();
parse_conf();
- r = parse_arg
s
(argc, argv);
- if (r < 0)
- return EXIT_FAILURE;
+ r = parse_arg
v
(argc, argv);
+ if (r <
=
0)
+ return
r == 0 ? EXIT_SUCCESS :
EXIT_FAILURE;
/*
* If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
/*
* If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
@@
-349,6
+356,16
@@
int main(int argc, char *argv[]) {
log_uptime();
log_uptime();
+ if (graph_start < 0.0) {
+ fprintf(stderr,
+ "Failed to setup graph start time.\n\nThe system uptime "
+ "probably includes time that the system was suspended. "
+ "Use --rel to bypass this issue.\n");
+ exit (EXIT_FAILURE);
+ }
+
+ has_procfs = access("/proc/vmstat", F_OK) == 0;
+
LIST_HEAD_INIT(head);
/* main program loop */
LIST_HEAD_INIT(head);
/* main program loop */
@@
-363,8
+380,8
@@
int main(int argc, char *argv[]) {
sampledata = new0(struct list_sample_data, 1);
if (sampledata == NULL) {
sampledata = new0(struct list_sample_data, 1);
if (sampledata == NULL) {
- log_
error("Failed to allocate memory for a node: %m"
);
- return
-1
;
+ log_
oom(
);
+ return
EXIT_FAILURE
;
}
sampledata->sampletime = gettime_ns();
}
sampledata->sampletime = gettime_ns();
@@
-385,11
+402,11
@@
int main(int argc, char *argv[]) {
parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
}
parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
}
- /* wait for /proc to become available, discarding samples */
- if (graph_start <= 0.0)
- log_uptime();
- else
+ if (has_procfs)
log_sample(samples, &sampledata);
log_sample(samples, &sampledata);
+ else
+ /* wait for /proc to become available, discarding samples */
+ has_procfs = access("/proc/vmstat", F_OK) == 0;
sample_stop = gettime_ns();
sample_stop = gettime_ns();