diff options
| -rw-r--r-- | src/bootchart/bootchart.c | 10 | ||||
| -rw-r--r-- | src/bootchart/bootchart.h | 2 | ||||
| -rw-r--r-- | src/bootchart/svg.c | 14 |
3 files changed, 21 insertions, 5 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index adfaba57b0..e34c08a5eb 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -23,6 +23,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/resource.h> +#include <sys/stat.h> #include <stdio.h> #include <signal.h> #include <stdlib.h> @@ -32,6 +33,7 @@ #include <getopt.h> #include <limits.h> #include <errno.h> +#include <fcntl.h> #include "bootchart.h" @@ -51,6 +53,7 @@ double interval; FILE *of = NULL; int overrun = 0; static int exiting = 0; +int sysfd=-1; /* graph defaults */ int entropy = 0; @@ -273,6 +276,9 @@ int main(int argc, char *argv[]) of = fopen(output_file, "w"); } + if (sysfd < 0) { + sysfd = open("/sys", O_RDONLY); + } /* wait for /proc to become available, discarding samples */ if (!(graph_start > 0.0)) @@ -331,7 +337,6 @@ int main(int argc, char *argv[]) if (ps->smaps) fclose(ps->smaps); } - closedir(proc); if (!of) { t = time(NULL); @@ -350,6 +355,9 @@ int main(int argc, char *argv[]) fprintf(stderr, "bootchartd: Wrote %s\n", output_file); fclose(of); + closedir(proc); + close(sysfd); + /* nitpic cleanups */ ps = ps_first; while (ps->next_ps) { diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h index 7793cfc63c..6b11fd8b8e 100644 --- a/src/bootchart/bootchart.h +++ b/src/bootchart/bootchart.h @@ -117,6 +117,8 @@ extern char init_path[PATH_MAX]; extern FILE *of; extern DIR *proc; +extern int procfd; +extern int sysfd; extern double gettime_ns(void); extern void log_uptime(void); diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index 6ad7348ecb..dc55cb3797 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -28,6 +28,8 @@ #include <limits.h> #include <unistd.h> #include <sys/utsname.h> +#include <sys/stat.h> +#include <fcntl.h> #include "bootchart.h" #include "util.h" @@ -151,10 +153,12 @@ static void svg_title(void) char *c; FILE *f; time_t t; + int fd; struct utsname uts; /* grab /proc/cmdline */ - f = fopen("/proc/cmdline", "r"); + fd = openat(procfd, "cmdline", O_RDONLY); + f = fdopen(fd, "r"); if (f) { if (!fgets(cmdline, 255, f)) sprintf(cmdline, "Unknown"); @@ -167,8 +171,9 @@ static void svg_title(void) strncpy(rootbdev, &c[10], 3); rootbdev[3] = '\0'; } - sprintf(filename, "/sys/block/%s/device/model", rootbdev); - f = fopen(filename, "r"); + sprintf(filename, "block/%s/device/model", rootbdev); + fd = openat(sysfd, filename, O_RDONLY); + f = fdopen(fd, "r"); if (f) { if (!fgets(model, 255, f)) fprintf(stderr, "Error reading disk model for %s\n", rootbdev); @@ -184,7 +189,8 @@ static void svg_title(void) strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t)); /* CPU type */ - f = fopen("/proc/cpuinfo", "r"); + fd = openat(procfd, "cpuinfo", O_RDONLY); + f = fdopen(fd, "r"); if (f) { while (fgets(buf, 255, f)) { if (strstr(buf, "model name")) { |