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: reuse the KDBUS_CMD_FREE wrapper wherever appropriate
[elogind.git]
/
src
/
bootchart
/
store.c
diff --git
a/src/bootchart/store.c
b/src/bootchart/store.c
index 7f86cfe976c77c7e23621f825582f8960b8aa582..a66387c304bd18cabe749ee7b7d8324a71d90a63 100644
(file)
--- a/
src/bootchart/store.c
+++ b/
src/bootchart/store.c
@@
-34,9
+34,11
@@
#include <time.h>
#include "util.h"
#include <time.h>
#include "util.h"
+#include "time-util.h"
#include "strxcpyx.h"
#include "store.h"
#include "bootchart.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
/*
* Alloc a static 4k buffer for stdio - primarily used to increase
@@
-53,30
+55,25
@@
double gettime_ns(void) {
clock_gettime(CLOCK_MONOTONIC, &n);
clock_gettime(CLOCK_MONOTONIC, &n);
- return (n.tv_sec + (n.tv_nsec /
1000000000.0
));
+ return (n.tv_sec + (n.tv_nsec /
(double) NSEC_PER_SEC
));
}
}
-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);
+static double gettime_up(void) {
+ struct timespec n;
- log_start = gettime_ns();
+ clock_gettime(CLOCK_BOOTTIME, &n);
+ return (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
+}
- /* start graph at kernel boot time */
+void log_uptime(void) {
if (arg_relative)
if (arg_relative)
- graph_start = log_start;
- else
+ graph_start = log_start = gettime_ns();
+ else {
+ double uptime = gettime_up();
+
+ log_start = gettime_ns();
graph_start = log_start - uptime;
graph_start = log_start - uptime;
+ }
}
static char *bufgetline(char *buf) {
}
static char *bufgetline(char *buf) {
@@
-132,8
+129,6
@@
void log_sample(int sample, struct list_sample_data **ptr) {
struct list_sample_data *sampledata;
struct ps_sched_struct *ps_prev = NULL;
struct list_sample_data *sampledata;
struct ps_sched_struct *ps_prev = NULL;
-
-
sampledata = *ptr;
/* all the per-process stuff goes here */
sampledata = *ptr;
/* all the per-process stuff goes here */
@@
-151,8
+146,8
@@
void log_sample(int sample, struct list_sample_data **ptr) {
/* block stuff */
vmstat = openat(procfd, "vmstat", O_RDONLY);
if (vmstat == -1) {
/* block stuff */
vmstat = openat(procfd, "vmstat", O_RDONLY);
if (vmstat == -1) {
-
perror("open /proc/vmstat
");
- exit
(EXIT_FAILURE);
+
log_error_errno(errno, "Failed to open /proc/vmstat: %m
");
+ exit(EXIT_FAILURE);
}
}
}
}
@@
-183,8
+178,8
@@
vmstat_next:
/* overall CPU utilization */
schedstat = openat(procfd, "schedstat", O_RDONLY);
if (schedstat == -1) {
/* overall CPU utilization */
schedstat = openat(procfd, "schedstat", O_RDONLY);
if (schedstat == -1) {
-
perror("open /proc/schedstat
");
- exit
(EXIT_FAILURE);
+
log_error_errno(errno, "Failed to open /proc/schedstat: %m
");
+ exit(EXIT_FAILURE);
}
}
}
}
@@
-197,12
+192,14
@@
vmstat_next:
m = buf;
while (m) {
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")) {
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);
/* Oops, we only have room for MAXCPUS data */
break;
sampledata->runtime[c] = atoll(rt);
@@
-256,18
+253,19
@@
schedstat_next:
_cleanup_fclose_ FILE *st = NULL;
char t[32];
struct ps_struct *parent;
_cleanup_fclose_ FILE *st = NULL;
char t[32];
struct ps_struct *parent;
+ int r;
- ps->next_ps =
calloc(1, sizeof(struct ps_struct)
);
+ ps->next_ps =
new0(struct ps_struct, 1
);
if (!ps->next_ps) {
if (!ps->next_ps) {
-
perror("calloc(ps_struct)"
);
+
log_oom(
);
exit (EXIT_FAILURE);
}
ps = ps->next_ps;
ps->pid = pid;
exit (EXIT_FAILURE);
}
ps = ps->next_ps;
ps->pid = pid;
- ps->sample =
calloc(1, sizeof(struct ps_sched_struct)
);
+ ps->sample =
new0(struct ps_sched_struct, 1
);
if (!ps->sample) {
if (!ps->sample) {
-
perror("calloc(ps_struct)"
);
+
log_oom(
);
exit (EXIT_FAILURE);
}
ps->sample->sampledata = sampledata;
exit (EXIT_FAILURE);
}
ps->sample->sampledata = sampledata;
@@
-315,7
+313,16
@@
schedstat_next:
if (!sscanf(m, "%*s %*s %s", t))
continue;
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);
/* ppid */
sprintf(filename, "%d/stat", pid);
@@
-345,7
+352,7
@@
schedstat_next:
while ((parent->next_ps && parent->pid != ps->ppid))
parent = parent->next_ps;
while ((parent->next_ps && parent->pid != ps->ppid))
parent = parent->next_ps;
- if (
(!parent) || (parent->pid != ps->ppid)
) {
+ if (
parent->pid != ps->ppid
) {
/* orphan */
ps->ppid = 1;
parent = ps_first->next_ps;
/* orphan */
ps->ppid = 1;
parent = ps_first->next_ps;
@@
-393,10
+400,10
@@
schedstat_next:
if (!sscanf(buf, "%s %s %*s", rt, wt))
continue;
if (!sscanf(buf, "%s %s %*s", rt, wt))
continue;
- ps->sample->next =
calloc(1, sizeof(struct ps_sched_struct)
);
- if (!ps->sample) {
-
perror("calloc(ps_struct)"
);
- exit
(EXIT_FAILURE);
+ ps->sample->next =
new0(struct ps_sched_struct, 1
);
+ if (!ps->sample
->next
) {
+
log_oom(
);
+ exit(EXIT_FAILURE);
}
ps->sample->next->prev = ps->sample;
ps->sample = ps->sample->next;
}
ps->sample->next->prev = ps->sample;
ps->sample = ps->sample->next;