#include "collectd.h"
-#include "common.h"
#include "plugin.h"
-#include "utils_rrdcreate.h"
+#include "utils/common/common.h"
+#include "utils/rrdcreate/rrdcreate.h"
#undef HAVE_CONFIG_H
#include <rrd.h>
static char *daemon_address;
static bool config_create_files = true;
static bool config_collect_stats = true;
-static rrdcreate_config_t rrdcreate_config = {
- /* stepsize = */ 0,
- /* heartbeat = */ 0,
- /* rrarows = */ 1200,
- /* xff = */ 0.1,
-
- /* timespans = */ NULL,
- /* timespans_num = */ 0,
-
- /* consolidation_functions = */ NULL,
- /* consolidation_functions_num = */ 0,
-
- /* async = */ 0};
+static rrdcreate_config_t rrdcreate_config = {.stepsize = 0,
+ .heartbeat = 0,
+ .rrarows = 1200,
+ .xff = 0.1,
+ .timespans = NULL,
+ .timespans_num = 0,
+ .consolidation_functions = NULL,
+ .consolidation_functions_num = 0,
+ .async = 0};
/*
* Prototypes.
*/
static int rc_write(const data_set_t *ds, const value_list_t *vl,
- user_data_t __attribute__((unused)) * user_data);
+ __attribute__((unused)) user_data_t *ud);
static int rc_flush(__attribute__((unused)) cdtime_t timeout,
const char *identifier,
__attribute__((unused)) user_data_t *ud);
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);
- t = CDTIME_T_TO_TIME_T(vl->time);
- status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t);
+ int status =
+ ssnprintf(buffer, buffer_len, "%.6f", CDTIME_T_TO_DOUBLE(vl->time));
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) &&
return -1;
if (ds->ds[i].type == DS_TYPE_COUNTER) {
- status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
- (uint64_t)vl->values[i].counter);
+ status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+ (uint64_t)vl->values[i].counter);
} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
- status = snprintf(buffer + offset, buffer_len - offset, ":%f",
- vl->values[i].gauge);
+ status = ssnprintf(buffer + offset, buffer_len - offset, ":%f",
+ vl->values[i].gauge);
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
- status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
- vl->values[i].derive);
+ status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
+ vl->values[i].derive);
} else /* if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */ {
- status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
- vl->values[i].absolute);
+ status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+ vl->values[i].absolute);
}
if ((status < 1) || (status >= (buffer_len - offset)))
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;
sstrncpy(buffer, datadir, buffer_size);
buffer[datadir_len - 1] = '/';
- buffer[datadir_len] = 0;
+ buffer[datadir_len] = '\0';
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;
- len = strlen(buffer);
+ size_t len = strlen(buffer);
assert(len < buffer_size);
buffer += len;
buffer_size -= len;
} /* int value_list_to_filename */
static int rc_config_get_int_positive(oconfig_item_t const *ci, int *ret) {
- int status;
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)
} /* 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)",
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;
} /* int rc_config_get_xff */
static int rc_config_add_timespan(int timespan) {
- int *tmp;
-
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;
} /* int rc_config */
static int try_reconnect(void) {
- int status;
-
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)",
} /* 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};
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)",
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. */
user_data_t __attribute__((unused)) * user_data) {
char filename[PATH_MAX];
char values[512];
- char *values_array[2];
int status;
bool retried = false;
return -1;
}
- values_array[0] = values;
- values_array[1] = NULL;
-
if (config_create_files) {
struct stat statbuf;
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. */
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;
+ char filename[PATH_MAX + 1];
+
if (datadir != NULL)
- snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
+ ssnprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
else
- snprintf(filename, sizeof(filename), "%s.rrd", identifier);
+ ssnprintf(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)",
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. */
projects / collectd.git / blobdiff