projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/docker: add LD_PRELOAD wrapper to fopen/open/opendir syscalls
[collectd.git]
/
src
/
write_tsdb.c
diff --git
a/src/write_tsdb.c
b/src/write_tsdb.c
index
7a8f851
..
b670f3a
100644
(file)
--- a/
src/write_tsdb.c
+++ b/
src/write_tsdb.c
@@
-42,9
+42,9
@@
*/
#include "collectd.h"
*/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_cache.h"
#include "utils_cache.h"
@@
-155,9
+155,7
@@
static int wt_flush_nolock(cdtime_t timeout, struct wt_callback *cb)
static int wt_callback_init(struct wt_callback *cb)
{
static int wt_callback_init(struct wt_callback *cb)
{
- struct addrinfo ai_hints = { 0 };
struct addrinfo *ai_list;
struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
int status;
const char *node = cb->node ? cb->node : WT_DEFAULT_NODE;
int status;
const char *node = cb->node ? cb->node : WT_DEFAULT_NODE;
@@
-166,11
+164,11
@@
static int wt_callback_init(struct wt_callback *cb)
if (cb->sock_fd > 0)
return 0;
if (cb->sock_fd > 0)
return 0;
- ai_hints.ai_flags = AI_ADDRCONFIG;
- ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_socktype = SOCK_STREAM;
-
-
ai_list = NULL
;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_ADDRCONFIG,
+ .ai_socktype = SOCK_STREAM
+
}
;
status = getaddrinfo(node, service, &ai_hints, &ai_list);
if (status != 0)
status = getaddrinfo(node, service, &ai_hints, &ai_list);
if (status != 0)
@@
-181,13
+179,15
@@
static int wt_callback_init(struct wt_callback *cb)
}
assert (ai_list != NULL);
}
assert (ai_list != NULL);
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
cb->sock_fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype,
ai_ptr->ai_protocol);
if (cb->sock_fd < 0)
continue;
{
cb->sock_fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype,
ai_ptr->ai_protocol);
if (cb->sock_fd < 0)
continue;
+ set_sock_opts(cb->sock_fd);
+
status = connect(cb->sock_fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
if (status != 0)
{
status = connect(cb->sock_fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
if (status != 0)
{
@@
-503,7
+503,6
@@
static int wt_write_messages(const data_set_t *ds, const value_list_t *vl,
char values[512];
int status;
char values[512];
int status;
- size_t i;
if (0 != strcmp(ds->type, vl->type))
{
if (0 != strcmp(ds->type, vl->type))
{
@@
-512,7
+511,7
@@
static int wt_write_messages(const data_set_t *ds, const value_list_t *vl,
return -1;
}
return -1;
}
- for (i = 0; i < ds->ds_num; i++)
+ for (
size_t
i = 0; i < ds->ds_num; i++)
{
const char *ds_name = NULL;
{
const char *ds_name = NULL;
@@
-571,9
+570,7
@@
static int wt_write(const data_set_t *ds, const value_list_t *vl,
static int wt_config_tsd(oconfig_item_t *ci)
{
struct wt_callback *cb;
static int wt_config_tsd(oconfig_item_t *ci)
{
struct wt_callback *cb;
- user_data_t user_data = { 0 };
char callback_name[DATA_MAX_NAME_LEN];
char callback_name[DATA_MAX_NAME_LEN];
- int i;
cb = calloc(1, sizeof(*cb));
if (cb == NULL)
cb = calloc(1, sizeof(*cb));
if (cb == NULL)
@@
-589,7
+586,7
@@
static int wt_config_tsd(oconfig_item_t *ci)
pthread_mutex_init (&cb->send_lock, NULL);
pthread_mutex_init (&cb->send_lock, NULL);
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-614,8
+611,11
@@
static int wt_config_tsd(oconfig_item_t *ci)
cb->node != NULL ? cb->node : WT_DEFAULT_NODE,
cb->service != NULL ? cb->service : WT_DEFAULT_SERVICE);
cb->node != NULL ? cb->node : WT_DEFAULT_NODE,
cb->service != NULL ? cb->service : WT_DEFAULT_SERVICE);
- user_data.data = cb;
- user_data.free_func = wt_callback_free;
+ user_data_t user_data = {
+ .data = cb,
+ .free_func = wt_callback_free
+ };
+
plugin_register_write(callback_name, wt_write, &user_data);
user_data.free_func = NULL;
plugin_register_write(callback_name, wt_write, &user_data);
user_data.free_func = NULL;
@@
-626,9
+626,7
@@
static int wt_config_tsd(oconfig_item_t *ci)
static int wt_config(oconfig_item_t *ci)
{
static int wt_config(oconfig_item_t *ci)
{
- int i;
-
- for (i = 0; i < ci->children_num; i++)
+ for (int i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;