projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.8'
[collectd.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
c738860
..
83aca5e
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-69,17
+69,15
@@
static int load_config(const char *key, const char *value) {
"is not available, because I can't determine the "
"number of CPUS on this system. Sorry.");
#endif
"is not available, because I can't determine the "
"number of CPUS on this system. Sorry.");
#endif
- return
(-1)
;
+ return
-1
;
}
static void load_submit(gauge_t snum, gauge_t mnum, gauge_t lnum) {
int cores = 0;
}
static void load_submit(gauge_t snum, gauge_t mnum, gauge_t lnum) {
int cores = 0;
- char errbuf[1024];
#ifdef _SC_NPROCESSORS_ONLN
if (report_relative_load) {
if ((cores = sysconf(_SC_NPROCESSORS_ONLN)) < 1) {
#ifdef _SC_NPROCESSORS_ONLN
if (report_relative_load) {
if ((cores = sysconf(_SC_NPROCESSORS_ONLN)) < 1) {
- WARNING("load: sysconf failed : %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("load: sysconf failed : %s", STRERRNO);
}
}
#endif
}
}
#endif
@@
-114,9
+112,7
@@
static int load_read(void) {
if (getloadavg(load, 3) == 3)
load_submit(load[LOADAVG_1MIN], load[LOADAVG_5MIN], load[LOADAVG_15MIN]);
else {
if (getloadavg(load, 3) == 3)
load_submit(load[LOADAVG_1MIN], load[LOADAVG_5MIN], load[LOADAVG_15MIN]);
else {
- char errbuf[1024];
- WARNING("load: getloadavg failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("load: getloadavg failed: %s", STRERRNO);
}
/* #endif HAVE_GETLOADAVG */
}
/* #endif HAVE_GETLOADAVG */
@@
-129,27
+125,24
@@
static int load_read(void) {
int numfields;
if ((loadavg = fopen("/proc/loadavg", "r")) == NULL) {
int numfields;
if ((loadavg = fopen("/proc/loadavg", "r")) == NULL) {
- char errbuf[1024];
- WARNING("load: fopen: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ WARNING("load: fopen: %s", STRERRNO);
+ return -1;
}
if (fgets(buffer, 16, loadavg) == NULL) {
}
if (fgets(buffer, 16, loadavg) == NULL) {
- char errbuf[1024];
- WARNING("load: fgets: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("load: fgets: %s", STRERRNO);
fclose(loadavg);
fclose(loadavg);
- return
(-1)
;
+ return
-1
;
}
if (fclose(loadavg)) {
}
if (fclose(loadavg)) {
- char errbuf[1024];
- WARNING("load: fclose: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("load: fclose: %s", STRERRNO);
}
numfields = strsplit(buffer, fields, 8);
if (numfields < 3)
}
numfields = strsplit(buffer, fields, 8);
if (numfields < 3)
- return
(-1)
;
+ return
-1
;
snum = atof(fields[0]);
mnum = atof(fields[1]);
snum = atof(fields[0]);
mnum = atof(fields[1]);
@@
-177,10
+170,8
@@
static int load_read(void) {
if (perfstat_cpu_total(NULL, &cputotal, sizeof(perfstat_cpu_total_t), 1) <
0) {
if (perfstat_cpu_total(NULL, &cputotal, sizeof(perfstat_cpu_total_t), 1) <
0) {
- char errbuf[1024];
- WARNING("load: perfstat_cpu : %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ WARNING("load: perfstat_cpu : %s", STRERRNO);
+ return -1;
}
snum = (float)cputotal.loadavg[0] / (float)(1 << SBITS);
}
snum = (float)cputotal.loadavg[0] / (float)(1 << SBITS);
@@
-193,7
+184,7
@@
static int load_read(void) {
#error "No applicable input method."
#endif
#error "No applicable input method."
#endif
- return
(0)
;
+ return
0
;
}
void module_register(void) {
}
void module_register(void) {