projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lua plugin: Don't destroy interpreter early
[collectd.git]
/
src
/
numa.c
diff --git
a/src/numa.c
b/src/numa.c
index
6ef3f09
..
dfe7a6d
100644
(file)
--- a/
src/numa.c
+++ b/
src/numa.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if !KERNEL_LINUX
#error "No applicable input method."
#if !KERNEL_LINUX
#error "No applicable input method."
@@
-47,7
+47,7
@@
static void numa_dispatch_value(int node, /* {{{ */
vl.values_len = 1;
sstrncpy(vl.plugin, "numa", sizeof(vl.plugin));
vl.values_len = 1;
sstrncpy(vl.plugin, "numa", sizeof(vl.plugin));
- s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "node%i", node);
+ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "node%i", node);
sstrncpy(vl.type, "vmpage_action", sizeof(vl.type));
sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
sstrncpy(vl.type, "vmpage_action", sizeof(vl.type));
sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
@@
-62,13
+62,12
@@
static int numa_read_node(int node) /* {{{ */
int status;
int success;
int status;
int success;
- s
s
nprintf(path, sizeof(path), NUMA_ROOT_DIR "/node%i/numastat", node);
+ snprintf(path, sizeof(path), NUMA_ROOT_DIR "/node%i/numastat", node);
fh = fopen(path, "r");
if (fh == NULL) {
fh = fopen(path, "r");
if (fh == NULL) {
- char errbuf[1024];
ERROR("numa plugin: Reading node %i failed: open(%s): %s", node, path,
ERROR("numa plugin: Reading node %i failed: open(%s): %s", node, path,
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
return -1;
}
return -1;
}
@@
-127,7
+126,7
@@
static int numa_init(void) /* {{{ */
struct stat statbuf = {0};
int status;
struct stat statbuf = {0};
int status;
- s
s
nprintf(path, sizeof(path), NUMA_ROOT_DIR "/node%i", max_node + 1);
+ snprintf(path, sizeof(path), NUMA_ROOT_DIR "/node%i", max_node + 1);
status = stat(path, &statbuf);
if (status == 0) {
status = stat(path, &statbuf);
if (status == 0) {
@@
-137,9
+136,7
@@
static int numa_init(void) /* {{{ */
break;
} else /* ((status != 0) && (errno != ENOENT)) */
{
break;
} else /* ((status != 0) && (errno != ENOENT)) */
{
- char errbuf[1024];
- ERROR("numa plugin: stat(%s) failed: %s", path,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("numa plugin: stat(%s) failed: %s", path, STRERRNO);
return -1;
}
}
return -1;
}
}