-/*
- * log.c
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- * Auke Kok <auke-jan.h.kok@intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/***
+ log.c - This file is part of systemd-bootchart
+
+ Copyright (C) 2009-2013 Intel Coproration
+
+ Authors:
+ Auke Kok <auke-jan.h.kok@intel.com>
+
+ 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/>.
+ ***/
#define _GNU_SOURCE 1
#include <unistd.h>
#include "bootchart.h"
+#include "util.h"
/*
* Alloc a static 4k buffer for stdio - primarily used to increase
*/
static char smaps_buf[4096];
DIR *proc;
-
+int procfd=-1;
double gettime_ns(void)
{
- struct timespec now;
+ struct timespec n;
- clock_gettime(CLOCK_MONOTONIC, &now);
+ clock_gettime(CLOCK_MONOTONIC, &n);
- return (now.tv_sec + (now.tv_nsec / 1000000000.0));
+ return (n.tv_sec + (n.tv_nsec / 1000000000.0));
}
double uptime;
f = fopen("/proc/uptime", "r");
+
if (!f)
return;
if (!fscanf(f, "%s %*s", str)) {
return c;
}
+static int pid_cmdline_strncpy(char *buffer, int pid, size_t buf_len) {
+ char filename[PATH_MAX];
+ int _cleanup_close_ fd=-1;
+ ssize_t n;
+
+ sprintf(filename, "%d/cmdline", pid);
+ fd = openat(procfd, filename, O_RDONLY);
+ if (fd < 0)
+ return -errno;
+
+ n = read(fd, buffer, buf_len-1);
+ if (n > 0) {
+ int i;
+ for (i = 0; i < n; i++)
+ if (buffer[i] == '\0')
+ buffer[i] = ' ';
+ buffer[n] = '\0';
+ }
+ return 0;
+}
void log_sample(int sample)
{
ssize_t s;
ssize_t n;
struct dirent *ent;
+ int fd;
+
+ /* all the per-process stuff goes here */
+ if (!proc) {
+ /* find all processes */
+ proc = opendir("/proc");
+ if (!proc)
+ return;
+ procfd = dirfd(proc);
+ } else {
+ rewinddir(proc);
+ }
if (!vmstat) {
/* block stuff */
- vmstat = open("/proc/vmstat", O_RDONLY);
+ vmstat = openat(procfd, "vmstat", O_RDONLY);
if (vmstat == -1) {
perror("open /proc/vmstat");
exit (EXIT_FAILURE);
while (m) {
if (sscanf(m, "%s %s", key, val) < 2)
goto vmstat_next;
- if (!strcmp(key, "pgpgin"))
+ if (streq(key, "pgpgin"))
blockstat[sample].bi = atoi(val);
- if (!strcmp(key, "pgpgout")) {
+ if (streq(key, "pgpgout")) {
blockstat[sample].bo = atoi(val);
break;
}
if (!schedstat) {
/* overall CPU utilization */
- schedstat = open("/proc/schedstat", O_RDONLY);
+ schedstat = openat(procfd, "schedstat", O_RDONLY);
if (schedstat == -1) {
perror("open /proc/schedstat");
exit (EXIT_FAILURE);
if (entropy) {
if (!e_fd) {
- e_fd = open("/proc/sys/kernel/random/entropy_avail", O_RDONLY);
+ e_fd = openat(procfd, "sys/kernel/random/entropy_avail", O_RDONLY);
}
if (e_fd) {
n = pread(e_fd, buf, sizeof(buf) - 1, 0);
- if (n > 0)
+ if (n > 0) {
+ buf[n] = '\0';
entropy_avail[sample] = atoi(buf);
+ }
}
}
- /* all the per-process stuff goes here */
- if (!proc) {
- /* find all processes */
- proc = opendir("/proc");
- if (!proc)
- return;
- } else {
- rewinddir(proc);
- }
-
while ((ent = readdir(proc)) != NULL) {
char filename[PATH_MAX];
int pid;
char t[32];
struct ps_struct *parent;
- ps->next_ps = malloc(sizeof(struct ps_struct));
+ ps->next_ps = calloc(1, sizeof(struct ps_struct));
if (!ps->next_ps) {
- perror("malloc(ps_struct)");
+ perror("calloc(ps_struct)");
exit (EXIT_FAILURE);
}
- memset(ps->next_ps, 0, sizeof(struct ps_struct));
ps = ps->next_ps;
ps->pid = pid;
- ps->sample = malloc(sizeof(struct ps_sched_struct) * (len + 1));
+ ps->sample = calloc(len + 1, sizeof(struct ps_sched_struct));
if (!ps->sample) {
- perror("malloc(ps_struct)");
+ perror("calloc(ps_struct)");
exit (EXIT_FAILURE);
}
- memset(ps->sample, 0, sizeof(struct ps_sched_struct) * (len + 1));
pscount++;
/* get name, start time */
if (!ps->sched) {
- sprintf(filename, "/proc/%d/sched", pid);
- ps->sched = open(filename, O_RDONLY);
+ sprintf(filename, "%d/sched", pid);
+ ps->sched = openat(procfd, filename, O_RDONLY);
if (ps->sched == -1)
continue;
}
close(ps->sched);
continue;
}
+ buf[s] = '\0';
if (!sscanf(buf, "%s %*s %*s", key))
continue;
- strncpy(ps->name, key, 16);
+ strncpy(ps->name, key, 256);
+
+ /* cmdline */
+ if (show_cmdline)
+ pid_cmdline_strncpy(ps->name, pid, 256);
+
/* discard line 2 */
m = bufgetline(buf);
if (!m)
ps->starttime = strtod(t, NULL) / 1000.0;
/* ppid */
- sprintf(filename, "/proc/%d/stat", pid);
- st = fopen(filename, "r");
+ sprintf(filename, "%d/stat", pid);
+ fd = openat(procfd, filename, O_RDONLY);
+ st = fdopen(fd, "r");
if (!st)
continue;
if (!fscanf(st, "%*s %*s %*s %i", &p)) {
/* rt, wt */
if (!ps->schedstat) {
- sprintf(filename, "/proc/%d/schedstat", pid);
- ps->schedstat = open(filename, O_RDONLY);
+ sprintf(filename, "%d/schedstat", pid);
+ ps->schedstat = openat(procfd, filename, O_RDONLY);
if (ps->schedstat == -1)
continue;
}
-
- if (pread(ps->schedstat, buf, sizeof(buf) - 1, 0) <= 0) {
+ 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)
// fclose(ps->smaps);
continue;
}
+ buf[s] = '\0';
+
if (!sscanf(buf, "%s %s %*s", rt, wt))
continue;
goto catch_rename;
/* Pss */
if (!ps->smaps) {
- sprintf(filename, "/proc/%d/smaps", pid);
- ps->smaps = fopen(filename, "r");
+ sprintf(filename, "%d/smaps", pid);
+ fd = openat(procfd, filename, O_RDONLY);
+ ps->smaps = fdopen(fd, "r");
if (!ps->smaps)
continue;
setvbuf(ps->smaps, smaps_buf, _IOFBF, sizeof(smaps_buf));
/* re-fetch name */
/* get name, start time */
if (!ps->sched) {
- sprintf(filename, "/proc/%d/sched", pid);
- ps->sched = open(filename, O_RDONLY);
+ sprintf(filename, "%d/sched", pid);
+ ps->sched = openat(procfd, filename, O_RDONLY);
if (ps->sched == -1)
continue;
}
- if (pread(ps->sched, buf, sizeof(buf) - 1, 0) <= 0) {
+ s = pread(ps->sched, buf, sizeof(buf) - 1, 0);
+ if (s <= 0) {
/* clean up file descriptors */
close(ps->sched);
if (ps->schedstat)
// fclose(ps->smaps);
continue;
}
+ buf[s] = '\0';
if (!sscanf(buf, "%s %*s %*s", key))
continue;
- strncpy(ps->name, key, 16);
+ strncpy(ps->name, key, 256);
+
+ /* cmdline */
+ if (show_cmdline)
+ pid_cmdline_strncpy(ps->name, pid, 256);
}
}
}
~ianmdlvl / elogind.git / blobdiff