projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt plugin: Support new metric from libvirt-5.0.0 virDomainMemoryStats()
[collectd.git]
/
src
/
memcached.c
diff --git
a/src/memcached.c
b/src/memcached.c
index
d2827a4
..
0baf6c2
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-32,8
+32,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <netdb.h>
#include <netinet/in.h>
#include <netdb.h>
#include <netinet/in.h>
@@
-69,7
+69,7
@@
struct memcached_s {
};
typedef struct memcached_s memcached_t;
};
typedef struct memcached_s memcached_t;
-static
_Bool memcached_have_instances = 0
;
+static
bool memcached_have_instances
;
static void memcached_free(void *arg) {
memcached_t *st = arg;
static void memcached_free(void *arg) {
memcached_t *st = arg;
@@
-99,9
+99,8
@@
static int memcached_connect_unix(memcached_t *st) {
/* create our socket descriptor */
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
/* create our socket descriptor */
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
- char errbuf[1024];
ERROR("memcached plugin: memcached_connect_unix: socket(2) failed: %s",
ERROR("memcached plugin: memcached_connect_unix: socket(2) failed: %s",
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
return -1;
}
return -1;
}
@@
-134,12
+133,10
@@
static int memcached_connect_inet(memcached_t *st) {
int status = getaddrinfo(st->connhost, st->connport, &ai_hints, &ai_list);
if (status != 0) {
int status = getaddrinfo(st->connhost, st->connport, &ai_hints, &ai_list);
if (status != 0) {
- char errbuf[1024];
ERROR("memcached plugin: memcached_connect_inet: "
"getaddrinfo(%s,%s) failed: %s",
st->connhost, st->connport,
ERROR("memcached plugin: memcached_connect_inet: "
"getaddrinfo(%s,%s) failed: %s",
st->connhost, st->connport,
- (status == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
- : gai_strerror(status));
+ (status == EAI_SYSTEM) ? STRERRNO : gai_strerror(status));
return -1;
}
return -1;
}
@@
-148,10
+145,9
@@
static int memcached_connect_inet(memcached_t *st) {
/* create our socket descriptor */
fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
if (fd < 0) {
/* create our socket descriptor */
fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
if (fd < 0) {
- char errbuf[1024];
WARNING("memcached plugin: memcached_connect_inet: "
"socket(2) failed: %s",
WARNING("memcached plugin: memcached_connect_inet: "
"socket(2) failed: %s",
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
continue;
}
continue;
}
@@
-246,9
+242,8
@@
static int memcached_query_daemon(char *buffer, size_t buffer_size,
status = (int)swrite(st->fd, "stats\r\n", strlen("stats\r\n"));
if (status != 0) {
status = (int)swrite(st->fd, "stats\r\n", strlen("stats\r\n"));
if (status != 0) {
- char errbuf[1024];
ERROR("memcached plugin: Instance \"%s\": write(2) failed: %s", st->name,
ERROR("memcached plugin: Instance \"%s\": write(2) failed: %s", st->name,
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
shutdown(st->fd, SHUT_RDWR);
close(st->fd);
st->fd = -1;
shutdown(st->fd, SHUT_RDWR);
close(st->fd);
st->fd = -1;
@@
-280,13
+275,12
@@
static int memcached_query_daemon(char *buffer, size_t buffer_size,
char const end_token[5] = {'E', 'N', 'D', '\r', '\n'};
if (status < 0) {
char const end_token[5] = {'E', 'N', 'D', '\r', '\n'};
if (status < 0) {
- char errbuf[1024];
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
continue;
ERROR("memcached plugin: Instance \"%s\": Error reading from socket: %s",
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
continue;
ERROR("memcached plugin: Instance \"%s\": Error reading from socket: %s",
- st->name,
sstrerror(errno, errbuf, sizeof(errbuf))
);
+ st->name,
STRERRNO
);
shutdown(st->fd, SHUT_RDWR);
close(st->fd);
st->fd = -1;
shutdown(st->fd, SHUT_RDWR);
close(st->fd);
st->fd = -1;
@@
-481,7
+475,7
@@
static int memcached_read(user_data_t *user_data) {
if (strsplit(line, fields, 3) != 3)
continue;
if (strsplit(line, fields, 3) != 3)
continue;
-
in
t name_len = strlen(fields[1]);
+
size_
t name_len = strlen(fields[1]);
if (name_len == 0)
continue;
if (name_len == 0)
continue;
@@
-708,7
+702,7
@@
static int config_add_instance(oconfig_item_t *ci) {
int status = 0;
/* Disable automatic generation of default instance in the init callback. */
int status = 0;
/* Disable automatic generation of default instance in the init callback. */
- memcached_have_instances =
1
;
+ memcached_have_instances =
true
;
memcached_t *st = calloc(1, sizeof(*st));
if (st == NULL) {
memcached_t *st = calloc(1, sizeof(*st));
if (st == NULL) {
@@
-761,7
+755,7
@@
static int config_add_instance(oconfig_item_t *ci) {
} /* int config_add_instance */
static int memcached_config(oconfig_item_t *ci) {
} /* int config_add_instance */
static int memcached_config(oconfig_item_t *ci) {
-
_B
ool have_instance_block = 0;
+
b
ool have_instance_block = 0;
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
@@
-803,7
+797,7
@@
static int memcached_init(void) {
int status = memcached_add_read_callback(st);
if (status == 0)
int status = memcached_add_read_callback(st);
if (status == 0)
- memcached_have_instances =
1
;
+ memcached_have_instances =
true
;
return status;
} /* int memcached_init */
return status;
} /* int memcached_init */