chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "socket: add support for TCP fast Open"
[elogind.git]
/
src
/
bootchart
/
store.c
diff --git
a/src/bootchart/store.c
b/src/bootchart/store.c
index b6ba11356192eacd205965cd1edf67fa4927bb93..cedcba88ed1b8059c03281c75cd2a8fc1c52f992 100644
(file)
--- a/
src/bootchart/store.c
+++ b/
src/bootchart/store.c
@@
-37,6
+37,7
@@
#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
@@
-56,27
+57,22
@@
double gettime_ns(void) {
return (n.tv_sec + (n.tv_nsec / 1000000000.0));
}
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);
+static double gettime_up(void) {
+ struct timespec n;
- log_start = gettime_ns();
+ clock_gettime(CLOCK_BOOTTIME, &n);
+ return (n.tv_sec + (n.tv_nsec / 1000000000.0));
+}
- /* 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
+128,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
+145,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("Failed to open /proc/vmstat: %m
");
+ exit(EXIT_FAILURE);
}
}
}
}
@@
-183,8
+177,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("Failed to open /proc/schedstat: %m
");
+ exit(EXIT_FAILURE);
}
}
}
}
@@
-257,17
+251,17
@@
schedstat_next:
char t[32];
struct ps_struct *parent;
char t[32];
struct ps_struct *parent;
- 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;
@@
-317,6
+311,11
@@
schedstat_next:
ps->starttime = strtod(t, NULL) / 1000.0;
ps->starttime = strtod(t, NULL) / 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);
/* ppid */
sprintf(filename, "%d/stat", pid);
fd = openat(procfd, filename, O_RDONLY);
@@
-393,10
+392,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)
);
+ ps->sample->next =
new0(struct ps_sched_struct, 1
);
if (!ps->sample) {
if (!ps->sample) {
-
perror("calloc(ps_struct)"
);
- exit
(EXIT_FAILURE);
+
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;