X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fstore.c;h=f19427e93d6470393c098a0fb8d05397f23bfcbe;hb=af672f03eccd2df655edb585af25f4b8f3e153ac;hp=3e0052d212813309aa3e38ebb3f26ae2cde92df3;hpb=955d98c9c1104d469c2989dbfb58f58ee6fe9bdc;p=elogind.git diff --git a/src/bootchart/store.c b/src/bootchart/store.c index 3e0052d21..f19427e93 100644 --- a/src/bootchart/store.c +++ b/src/bootchart/store.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include @@ -34,9 +32,11 @@ #include #include "util.h" +#include "time-util.h" #include "strxcpyx.h" #include "store.h" #include "bootchart.h" +#include "cgroup-util.h" /* * Alloc a static 4k buffer for stdio - primarily used to increase @@ -45,38 +45,13 @@ */ static char smaps_buf[4096]; static int skip = 0; -DIR *proc; -int procfd = -1; double gettime_ns(void) { struct timespec n; clock_gettime(CLOCK_MONOTONIC, &n); - return (n.tv_sec + (n.tv_nsec / 1000000000.0)); -} - -void log_uptime(void) { - _cleanup_fclose_ FILE *f = NULL; - char str[32]; - double uptime; - - f = fopen("/proc/uptime", "r"); - - if (!f) - return; - if (!fscanf(f, "%s %*s", str)) - return; - - uptime = strtod(str, NULL); - - log_start = gettime_ns(); - - /* start graph at kernel boot time */ - if (arg_relative) - graph_start = log_start; - else - graph_start = log_start - uptime; + return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC)); } static char *bufgetline(char *buf) { @@ -88,16 +63,17 @@ static char *bufgetline(char *buf) { c = strchr(buf, '\n'); if (c) c++; + return c; } -static int pid_cmdline_strscpy(char *buffer, size_t buf_len, int pid) { +static int pid_cmdline_strscpy(int procfd, char *buffer, size_t buf_len, int pid) { char filename[PATH_MAX]; - _cleanup_close_ int fd=-1; + _cleanup_close_ int fd = -1; ssize_t n; sprintf(filename, "%d/cmdline", pid); - fd = openat(procfd, filename, O_RDONLY); + fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC); if (fd < 0) return -errno; @@ -109,12 +85,19 @@ static int pid_cmdline_strscpy(char *buffer, size_t buf_len, int pid) { buffer[i] = ' '; buffer[n] = '\0'; } + return 0; } -void log_sample(int sample, struct list_sample_data **ptr) { - static int vmstat; - static int schedstat; +int log_sample(DIR *proc, + int sample, + struct ps_struct *ps_first, + struct list_sample_data **ptr, + int *pscount, + int *cpus) { + + static int vmstat = -1; + static int schedstat = -1; char buf[4096]; char key[256]; char val[256]; @@ -124,41 +107,36 @@ void log_sample(int sample, struct list_sample_data **ptr) { int c; int p; int mod; - static int e_fd; + static int e_fd = -1; ssize_t s; ssize_t n; struct dirent *ent; int fd; struct list_sample_data *sampledata; struct ps_sched_struct *ps_prev = NULL; + int procfd; sampledata = *ptr; - /* all the per-process stuff goes here */ - if (!proc) { - /* find all processes */ - proc = opendir("/proc"); - if (!proc) - return; - procfd = dirfd(proc); - } else { - rewinddir(proc); - } + procfd = dirfd(proc); + if (procfd < 0) + return -errno; - if (!vmstat) { + if (vmstat < 0) { /* block stuff */ - vmstat = openat(procfd, "vmstat", O_RDONLY); - if (vmstat == -1) { - log_error("Failed to open /proc/vmstat: %m"); - exit(EXIT_FAILURE); - } + vmstat = openat(procfd, "vmstat", O_RDONLY|O_CLOEXEC); + if (vmstat < 0) + return log_error_errno(errno, "Failed to open /proc/vmstat: %m"); } n = pread(vmstat, buf, sizeof(buf) - 1, 0); if (n <= 0) { - close(vmstat); - return; + vmstat = safe_close(vmstat); + if (n < 0) + return -errno; + return -ENODATA; } + buf[n] = '\0'; m = buf; @@ -177,37 +155,40 @@ vmstat_next: break; } - if (!schedstat) { + if (schedstat < 0) { /* overall CPU utilization */ - schedstat = openat(procfd, "schedstat", O_RDONLY); - if (schedstat == -1) { - log_error("Failed to open /proc/schedstat: %m"); - exit(EXIT_FAILURE); - } + schedstat = openat(procfd, "schedstat", O_RDONLY|O_CLOEXEC); + if (schedstat < 0) + return log_error_errno(errno, "Failed to open /proc/schedstat (requires CONFIG_SCHEDSTATS=y in kernel config): %m"); } n = pread(schedstat, buf, sizeof(buf) - 1, 0); if (n <= 0) { - close(schedstat); - return; + schedstat = safe_close(schedstat); + if (n < 0) + return -errno; + return -ENODATA; } + buf[n] = '\0'; m = buf; while (m) { + int r; + if (sscanf(m, "%s %*s %*s %*s %*s %*s %*s %s %s", key, rt, wt) < 3) goto schedstat_next; if (strstr(key, "cpu")) { - c = atoi((const char*)(key+3)); - if (c > MAXCPUS) + r = safe_atoi((const char*)(key+3), &c); + if (r < 0 || c > MAXCPUS -1) /* Oops, we only have room for MAXCPUS data */ break; sampledata->runtime[c] = atoll(rt); sampledata->waittime[c] = atoll(wt); - if (c == cpus) - cpus = c + 1; + if (c == *cpus) + *cpus = c + 1; } schedstat_next: m = bufgetline(m); @@ -216,16 +197,18 @@ schedstat_next: } if (arg_entropy) { - if (!e_fd) { - e_fd = openat(procfd, "sys/kernel/random/entropy_avail", O_RDONLY); + if (e_fd < 0) { + e_fd = openat(procfd, "sys/kernel/random/entropy_avail", O_RDONLY|O_CLOEXEC); + if (e_fd < 0) + return log_error_errno(errno, "Failed to open /proc/sys/kernel/random/entropy_avail: %m"); } - if (e_fd) { - n = pread(e_fd, buf, sizeof(buf) - 1, 0); - if (n > 0) { - buf[n] = '\0'; - sampledata->entropy_avail = atoi(buf); - } + n = pread(e_fd, buf, sizeof(buf) - 1, 0); + if (n <= 0) { + e_fd = safe_close(e_fd); + } else { + buf[n] = '\0'; + sampledata->entropy_avail = atoi(buf); } } @@ -254,23 +237,24 @@ schedstat_next: _cleanup_fclose_ FILE *st = NULL; char t[32]; struct ps_struct *parent; + int r; ps->next_ps = new0(struct ps_struct, 1); - if (!ps->next_ps) { - log_oom(); - exit (EXIT_FAILURE); - } + if (!ps->next_ps) + return log_oom(); + ps = ps->next_ps; ps->pid = pid; + ps->sched = -1; + ps->schedstat = -1; ps->sample = new0(struct ps_sched_struct, 1); - if (!ps->sample) { - log_oom(); - exit (EXIT_FAILURE); - } + if (!ps->sample) + return log_oom(); + ps->sample->sampledata = sampledata; - pscount++; + (*pscount)++; /* mark our first sample */ ps->first = ps->last = ps->sample; @@ -278,16 +262,16 @@ schedstat_next: ps->sample->waittime = atoll(wt); /* get name, start time */ - if (!ps->sched) { + if (ps->sched < 0) { sprintf(filename, "%d/sched", pid); - ps->sched = openat(procfd, filename, O_RDONLY); - if (ps->sched == -1) + ps->sched = openat(procfd, filename, O_RDONLY|O_CLOEXEC); + if (ps->sched < 0) continue; } s = pread(ps->sched, buf, sizeof(buf) - 1, 0); if (s <= 0) { - close(ps->sched); + ps->sched = safe_close(ps->sched); continue; } buf[s] = '\0'; @@ -299,7 +283,7 @@ schedstat_next: /* cmdline */ if (arg_show_cmdline) - pid_cmdline_strscpy(ps->name, sizeof(ps->name), pid); + pid_cmdline_strscpy(procfd, ps->name, sizeof(ps->name), pid); /* discard line 2 */ m = bufgetline(buf); @@ -313,17 +297,32 @@ schedstat_next: if (!sscanf(m, "%*s %*s %s", t)) continue; - ps->starttime = strtod(t, NULL) / 1000.0; + r = safe_atod(t, &ps->starttime); + if (r < 0) + continue; + + ps->starttime /= 1000.0; + + if (arg_show_cgroup) + /* if this fails, that's OK */ + cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, + ps->pid, &ps->cgroup); /* ppid */ sprintf(filename, "%d/stat", pid); - fd = openat(procfd, filename, O_RDONLY); - st = fdopen(fd, "r"); - if (!st) + fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC); + if (fd < 0) continue; - if (!fscanf(st, "%*s %*s %*s %i", &p)) { + + st = fdopen(fd, "re"); + if (!st) { + close(fd); continue; } + + if (!fscanf(st, "%*s %*s %*s %i", &p)) + continue; + ps->ppid = p; /* @@ -360,6 +359,7 @@ schedstat_next: children = parent->children; while (children->next) children = children->next; + children->next = ps; } } @@ -370,32 +370,31 @@ schedstat_next: * iteration */ /* rt, wt */ - if (!ps->schedstat) { + if (ps->schedstat < 0) { sprintf(filename, "%d/schedstat", pid); - ps->schedstat = openat(procfd, filename, O_RDONLY); - if (ps->schedstat == -1) + ps->schedstat = openat(procfd, filename, O_RDONLY|O_CLOEXEC); + if (ps->schedstat < 0) continue; } + s = pread(ps->schedstat, buf, sizeof(buf) - 1, 0); if (s <= 0) { /* clean up our file descriptors - assume that the process exited */ close(ps->schedstat); - if (ps->sched) - close(ps->sched); - //if (ps->smaps) - // fclose(ps->smaps); + ps->schedstat = -1; + ps->sched = safe_close(ps->sched); continue; } + buf[s] = '\0'; if (!sscanf(buf, "%s %s %*s", rt, wt)) continue; ps->sample->next = new0(struct ps_sched_struct, 1); - if (!ps->sample) { - log_oom(); - exit(EXIT_FAILURE); - } + if (!ps->sample->next) + return log_oom(); + ps->sample->next->prev = ps->sample; ps->sample = ps->sample->next; ps->last = ps->sample; @@ -403,9 +402,9 @@ schedstat_next: ps->sample->waittime = atoll(wt); ps->sample->sampledata = sampledata; ps->sample->ps_new = ps; - if (ps_prev) { + if (ps_prev) ps_prev->cross = ps->sample; - } + ps_prev = ps->sample; ps->total = (ps->last->runtime - ps->first->runtime) / 1000000000.0; @@ -416,15 +415,19 @@ schedstat_next: /* Pss */ if (!ps->smaps) { sprintf(filename, "%d/smaps", pid); - fd = openat(procfd, filename, O_RDONLY); - ps->smaps = fdopen(fd, "r"); - if (!ps->smaps) + fd = openat(procfd, filename, O_RDONLY|O_CLOEXEC); + if (fd < 0) + continue; + ps->smaps = fdopen(fd, "re"); + if (!ps->smaps) { + close(fd); continue; + } setvbuf(ps->smaps, smaps_buf, _IOFBF, sizeof(smaps_buf)); - } - else { + } else { rewind(ps->smaps); } + /* test to see if we need to skip another field */ if (skip == 0) { if (fgets(buf, sizeof(buf), ps->smaps) == NULL) { @@ -441,6 +444,7 @@ schedstat_next: } rewind(ps->smaps); } + while (1) { int pss_kb; @@ -461,32 +465,32 @@ schedstat_next: break; } } + if (ps->sample->pss > ps->pss_max) ps->pss_max = ps->sample->pss; catch_rename: /* catch process rename, try to randomize time */ mod = (arg_hz < 4.0) ? 4.0 : (arg_hz / 4.0); - if (((samples - ps->pid) + pid) % (int)(mod) == 0) { + if (((sample - ps->pid) + pid) % (int)(mod) == 0) { /* re-fetch name */ /* get name, start time */ if (!ps->sched) { sprintf(filename, "%d/sched", pid); - ps->sched = openat(procfd, filename, O_RDONLY); - if (ps->sched == -1) + ps->sched = openat(procfd, filename, O_RDONLY|O_CLOEXEC); + if (ps->sched < 0) continue; } + s = pread(ps->sched, buf, sizeof(buf) - 1, 0); if (s <= 0) { /* clean up file descriptors */ - close(ps->sched); - if (ps->schedstat) - close(ps->schedstat); - //if (ps->smaps) - // fclose(ps->smaps); + ps->sched = safe_close(ps->sched); + ps->schedstat = safe_close(ps->schedstat); continue; } + buf[s] = '\0'; if (!sscanf(buf, "%s %*s %*s", key)) @@ -496,7 +500,9 @@ catch_rename: /* cmdline */ if (arg_show_cmdline) - pid_cmdline_strscpy(ps->name, sizeof(ps->name), pid); + pid_cmdline_strscpy(procfd, ps->name, sizeof(ps->name), pid); } } + + return 0; }