chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network: link - simplify code a bit and remove some debug logging
[elogind.git]
/
src
/
bootchart
/
store.c
diff --git
a/src/bootchart/store.c
b/src/bootchart/store.c
old mode 100755
(executable)
new mode 100644
(file)
index
f8c97c2
..
78c5cf8
--- a/
src/bootchart/store.c
+++ b/
src/bootchart/store.c
@@
-61,7
+61,7
@@
void log_uptime(void) {
char str[32];
double uptime;
char str[32];
double uptime;
- f = fopen("/proc/uptime", "r");
+ f = fopen("/proc/uptime", "r
e
");
if (!f)
return;
if (!f)
return;
@@
-132,8
+132,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
+149,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
+181,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
+255,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;
@@
-275,7
+273,7
@@
schedstat_next:
pscount++;
/* mark our first sample */
pscount++;
/* mark our first sample */
- ps->first = ps->sample;
+ ps->first = ps->
last = ps->
sample;
ps->sample->runtime = atoll(rt);
ps->sample->waittime = atoll(wt);
ps->sample->runtime = atoll(rt);
ps->sample->waittime = atoll(wt);
@@
-345,7
+343,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
+391,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;