#include "collectd.h"
-#include "common.h"
-#include "meta_data.h"
#include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/lookup/vl_lookup.h"
+#include "utils/metadata/meta_data.h"
#include "utils_cache.h" /* for uc_get_rate() */
#include "utils_subst.h"
-#include "utils_vl_lookup.h"
#define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0)
#define AGG_FUNC_PLACEHOLDER "%{aggregation}"
agg_instance_t *next;
}; /* }}} */
-static lookup_t *lookup = NULL;
+static lookup_t *lookup;
static pthread_mutex_t agg_instance_list_lock = PTHREAD_MUTEX_INITIALIZER;
-static agg_instance_t *agg_instance_list_head = NULL;
+static agg_instance_t *agg_instance_list_head;
static bool agg_is_regex(char const *str) /* {{{ */
{
sstrncpy(inst->ident.plugin_instance, AGG_FUNC_PLACEHOLDER,
sizeof(inst->ident.plugin_instance));
else if (strcmp("", tmp_plugin) != 0)
- snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+ ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
"%s-%s", tmp_plugin, AGG_FUNC_PLACEHOLDER);
else if (strcmp("", tmp_plugin_instance) != 0)
- snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+ ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
"%s-%s", tmp_plugin_instance, AGG_FUNC_PLACEHOLDER);
else
- snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+ ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
"%s-%s-%s", tmp_plugin, tmp_plugin_instance,
AGG_FUNC_PLACEHOLDER);
}