projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e4ad44
)
rrdcached: a few minor cleanups
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Mon, 18 Feb 2019 11:09:46 +0000
(12:09 +0100)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Mon, 18 Feb 2019 11:14:26 +0000
(12:14 +0100)
src/rrdcached.c
patch
|
blob
|
history
diff --git
a/src/rrdcached.c
b/src/rrdcached.c
index
665e2c8
..
125a317
100644
(file)
--- a/
src/rrdcached.c
+++ b/
src/rrdcached.c
@@
-62,19
+62,15
@@
static int rc_flush(__attribute__((unused)) cdtime_t timeout,
static int value_list_to_string(char *buffer, int buffer_len,
const data_set_t *ds, const value_list_t *vl) {
static int value_list_to_string(char *buffer, int buffer_len,
const data_set_t *ds, const value_list_t *vl) {
- int offset;
- int status;
- time_t t;
-
- assert(0 == strcmp(ds->type, vl->type));
+ assert(strcmp(ds->type, vl->type) == 0);
memset(buffer, '\0', buffer_len);
memset(buffer, '\0', buffer_len);
- t = CDTIME_T_TO_TIME_T(vl->time);
- status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t);
+ t
ime_t t
= CDTIME_T_TO_TIME_T(vl->time);
+
int
status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t);
if ((status < 1) || (status >= buffer_len))
return -1;
if ((status < 1) || (status >= buffer_len))
return -1;
- offset = status;
+
int
offset = status;
for (size_t i = 0; i < ds->ds_num; i++) {
if ((ds->ds[i].type != DS_TYPE_COUNTER) &&
for (size_t i = 0; i < ds->ds_num; i++) {
if ((ds->ds[i].type != DS_TYPE_COUNTER) &&
@@
-109,8
+105,6
@@
static int value_list_to_string(char *buffer, int buffer_len,
static int value_list_to_filename(char *buffer, size_t buffer_size,
value_list_t const *vl) {
char const suffix[] = ".rrd";
static int value_list_to_filename(char *buffer, size_t buffer_size,
value_list_t const *vl) {
char const suffix[] = ".rrd";
- int status;
- size_t len;
if (datadir != NULL) {
size_t datadir_len = strlen(datadir) + 1;
if (datadir != NULL) {
size_t datadir_len = strlen(datadir) + 1;
@@
-120,17
+114,17
@@
static int value_list_to_filename(char *buffer, size_t buffer_size,
sstrncpy(buffer, datadir, buffer_size);
buffer[datadir_len - 1] = '/';
sstrncpy(buffer, datadir, buffer_size);
buffer[datadir_len - 1] = '/';
- buffer[datadir_len] =
0
;
+ buffer[datadir_len] =
'\0'
;
buffer += datadir_len;
buffer_size -= datadir_len;
}
buffer += datadir_len;
buffer_size -= datadir_len;
}
- status = FORMAT_VL(buffer, buffer_size, vl);
+
int
status = FORMAT_VL(buffer, buffer_size, vl);
if (status != 0)
return status;
if (status != 0)
return status;
- len = strlen(buffer);
+
size_t
len = strlen(buffer);
assert(len < buffer_size);
buffer += len;
buffer_size -= len;
assert(len < buffer_size);
buffer += len;
buffer_size -= len;
@@
-143,10
+137,9
@@
static int value_list_to_filename(char *buffer, size_t buffer_size,
} /* int value_list_to_filename */
static int rc_config_get_int_positive(oconfig_item_t const *ci, int *ret) {
} /* int value_list_to_filename */
static int rc_config_get_int_positive(oconfig_item_t const *ci, int *ret) {
- int status;
int tmp = 0;
int tmp = 0;
- status = cf_util_get_int(ci, &tmp);
+
int
status = cf_util_get_int(ci, &tmp);
if (status != 0)
return status;
if (tmp < 0)
if (status != 0)
return status;
if (tmp < 0)
@@
-157,8
+150,6
@@
static int rc_config_get_int_positive(oconfig_item_t const *ci, int *ret) {
} /* int rc_config_get_int_positive */
static int rc_config_get_xff(oconfig_item_t const *ci, double *ret) {
} /* int rc_config_get_int_positive */
static int rc_config_get_xff(oconfig_item_t const *ci, double *ret) {
- double value;
-
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) {
ERROR("rrdcached plugin: The \"%s\" needs exactly one numeric argument "
"in the range [0.0, 1.0)",
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) {
ERROR("rrdcached plugin: The \"%s\" needs exactly one numeric argument "
"in the range [0.0, 1.0)",
@@
-166,7
+157,7
@@
static int rc_config_get_xff(oconfig_item_t const *ci, double *ret) {
return EINVAL;
}
return EINVAL;
}
- value = ci->values[0].value.number;
+
double
value = ci->values[0].value.number;
if ((value >= 0.0) && (value < 1.0)) {
*ret = value;
return 0;
if ((value >= 0.0) && (value < 1.0)) {
*ret = value;
return 0;
@@
-179,14
+170,12
@@
static int rc_config_get_xff(oconfig_item_t const *ci, double *ret) {
} /* int rc_config_get_xff */
static int rc_config_add_timespan(int timespan) {
} /* int rc_config_get_xff */
static int rc_config_add_timespan(int timespan) {
- int *tmp;
-
if (timespan <= 0)
return EINVAL;
if (timespan <= 0)
return EINVAL;
- tmp = realloc(rrdcreate_config.timespans,
- sizeof(*rrdcreate_config.timespans) *
- (rrdcreate_config.timespans_num + 1));
+
int *
tmp = realloc(rrdcreate_config.timespans,
+
sizeof(*rrdcreate_config.timespans) *
+
(rrdcreate_config.timespans_num + 1));
if (tmp == NULL)
return ENOMEM;
rrdcreate_config.timespans = tmp;
if (tmp == NULL)
return ENOMEM;
rrdcreate_config.timespans = tmp;
@@
-258,12
+247,10
@@
static int rc_config(oconfig_item_t *ci) {
} /* int rc_config */
static int try_reconnect(void) {
} /* int rc_config */
static int try_reconnect(void) {
- int status;
-
rrdc_disconnect();
rrd_clear_error();
rrdc_disconnect();
rrd_clear_error();
- status = rrdc_connect(daemon_address);
+
int
status = rrdc_connect(daemon_address);
if (status != 0) {
ERROR("rrdcached plugin: Failed to reconnect to RRDCacheD "
"at %s: %s (status=%d)",
if (status != 0) {
ERROR("rrdcached plugin: Failed to reconnect to RRDCacheD "
"at %s: %s (status=%d)",
@@
-278,9
+265,6
@@
static int try_reconnect(void) {
} /* int try_reconnect */
static int rc_read(void) {
} /* int try_reconnect */
static int rc_read(void) {
- int status;
- rrdc_stats_t *head;
- bool retried = false;
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = NAN};
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = NAN};
@@
-298,7
+282,7
@@
static int rc_read(void) {
sstrncpy(vl.plugin, "rrdcached", sizeof(vl.plugin));
rrd_clear_error();
sstrncpy(vl.plugin, "rrdcached", sizeof(vl.plugin));
rrd_clear_error();
- status = rrdc_connect(daemon_address);
+
int
status = rrdc_connect(daemon_address);
if (status != 0) {
ERROR("rrdcached plugin: Failed to connect to RRDCacheD "
"at %s: %s (status=%d)",
if (status != 0) {
ERROR("rrdcached plugin: Failed to connect to RRDCacheD "
"at %s: %s (status=%d)",
@@
-306,6
+290,9
@@
static int rc_read(void) {
return -1;
}
return -1;
}
+ rrdc_stats_t *head;
+ bool retried = false;
+
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */
@@
-386,7
+373,6
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
user_data_t __attribute__((unused)) * user_data) {
char filename[PATH_MAX];
char values[512];
user_data_t __attribute__((unused)) * user_data) {
char filename[PATH_MAX];
char values[512];
- char *values_array[2];
int status;
bool retried = false;
int status;
bool retried = false;
@@
-411,9
+397,6
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
return -1;
}
return -1;
}
- values_array[0] = values;
- values_array[1] = NULL;
-
if (config_create_files) {
struct stat statbuf;
if (config_create_files) {
struct stat statbuf;
@@
-442,6
+425,10
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
return -1;
}
return -1;
}
+ char *values_array[2] = {
+ [0] = values, [1] = NULL,
+ };
+
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */
@@
-468,20
+455,18
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
const char *identifier,
__attribute__((unused)) user_data_t *ud) {
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
const char *identifier,
__attribute__((unused)) user_data_t *ud) {
- char filename[PATH_MAX + 1];
- int status;
- bool retried = false;
-
if (identifier == NULL)
return EINVAL;
if (identifier == NULL)
return EINVAL;
+ char filename[PATH_MAX + 1];
+
if (datadir != NULL)
snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
else
snprintf(filename, sizeof(filename), "%s.rrd", identifier);
rrd_clear_error();
if (datadir != NULL)
snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
else
snprintf(filename, sizeof(filename), "%s.rrd", identifier);
rrd_clear_error();
- status = rrdc_connect(daemon_address);
+
int
status = rrdc_connect(daemon_address);
if (status != 0) {
ERROR("rrdcached plugin: Failed to connect to RRDCacheD "
"at %s: %s (status=%d)",
if (status != 0) {
ERROR("rrdcached plugin: Failed to connect to RRDCacheD "
"at %s: %s (status=%d)",
@@
-489,6
+474,8
@@
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
return -1;
}
return -1;
}
+ bool retried = false;
+
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */
while (42) {
/* The RRD client lib does not provide any means for checking a
* connection, hence we'll have to retry upon failed operations. */