chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load-fragment: remove wrong ifdef guard
[elogind.git]
/
src
/
bootchart
/
store.c
diff --git
a/src/bootchart/store.c
b/src/bootchart/store.c
index 3099ff12083a8271df27ad24c4b646c037c404fd..a66387c304bd18cabe749ee7b7d8324a71d90a63 100644
(file)
--- a/
src/bootchart/store.c
+++ b/
src/bootchart/store.c
@@
-146,7
+146,7
@@
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) {
- log_error
(
"Failed to open /proc/vmstat: %m");
+ log_error
_errno(errno,
"Failed to open /proc/vmstat: %m");
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-178,7
+178,7
@@
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) {
- log_error
(
"Failed to open /proc/schedstat: %m");
+ log_error
_errno(errno,
"Failed to open /proc/schedstat: %m");
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-199,7
+199,7
@@
vmstat_next:
if (strstr(key, "cpu")) {
r = safe_atoi((const char*)(key+3), &c);
if (strstr(key, "cpu")) {
r = safe_atoi((const char*)(key+3), &c);
- if (r < 0 || c > MAXCPUS)
+ 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);