projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2725 from RafaelMarinheiro/fix_grpc_query_values
[collectd.git]
/
src
/
daemon
/
plugin.c
diff --git
a/src/daemon/plugin.c
b/src/daemon/plugin.c
index
73d7c84
..
b4e5ae7
100644
(file)
--- a/
src/daemon/plugin.c
+++ b/
src/daemon/plugin.c
@@
-30,18
+30,26
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "configfile.h"
#include "filter_chain.h"
#include "plugin.h"
#include "configfile.h"
#include "filter_chain.h"
#include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/heap/heap.h"
#include "utils_cache.h"
#include "utils_complain.h"
#include "utils_cache.h"
#include "utils_complain.h"
-#include "utils_heap.h"
#include "utils_llist.h"
#include "utils_random.h"
#include "utils_time.h"
#include "utils_llist.h"
#include "utils_random.h"
#include "utils_time.h"
+#ifdef WIN32
+#define EXPORT __declspec(dllexport)
+#include <sys/stat.h>
+#include <unistd.h>
+#else
+#define EXPORT
+#endif
+
#if HAVE_PTHREAD_NP_H
#include <pthread_np.h> /* for pthread_set_name_np(3) */
#endif
#if HAVE_PTHREAD_NP_H
#include <pthread_np.h> /* for pthread_set_name_np(3) */
#endif
@@
-138,6
+146,7
@@
static bool plugin_ctx_key_initialized;
static long write_limit_high;
static long write_limit_low;
static long write_limit_high;
static long write_limit_low;
+static pthread_mutex_t statistics_lock = PTHREAD_MUTEX_INITIALIZER;
static derive_t stats_values_dropped;
static bool record_statistics;
static derive_t stats_values_dropped;
static bool record_statistics;
@@
-311,7
+320,6
@@
static void log_list_callbacks(llist_t **list, /* {{{ */
int i;
llentry_t *le;
int n;
int i;
llentry_t *le;
int n;
- char **keys;
n = llist_size(*list);
if (n == 0) {
n = llist_size(*list);
if (n == 0) {
@@
-319,11
+327,9
@@
static void log_list_callbacks(llist_t **list, /* {{{ */
return;
}
return;
}
- keys = calloc(n, sizeof(char *));
-
+ char **keys = calloc(n, sizeof(*keys));
if (keys == NULL) {
ERROR("%s: failed to allocate memory for list of callbacks", comment);
if (keys == NULL) {
ERROR("%s: failed to allocate memory for list of callbacks", comment);
-
return;
}
return;
}
@@
-621,7
+627,7
@@
static void start_read_threads(size_t num) /* {{{ */
if (read_threads != NULL)
return;
if (read_threads != NULL)
return;
- read_threads =
(pthread_t *)calloc(num, sizeof(pthread_t
));
+ read_threads =
calloc(num, sizeof(*read_threads
));
if (read_threads == NULL) {
ERROR("plugin: start_read_threads: calloc failed.");
return;
if (read_threads == NULL) {
ERROR("plugin: start_read_threads: calloc failed.");
return;
@@
-640,7
+646,7
@@
static void start_read_threads(size_t num) /* {{{ */
}
char name[THREAD_NAME_MAX];
}
char name[THREAD_NAME_MAX];
- snprintf(name, sizeof(name), "reader#%" PRI
sz,
read_threads_num);
+ snprintf(name, sizeof(name), "reader#%" PRI
u64, (uint64_t)
read_threads_num);
set_thread_name(read_threads[read_threads_num], name);
read_threads_num++;
set_thread_name(read_threads[read_threads_num], name);
read_threads_num++;
@@
-810,7
+816,7
@@
static void start_write_threads(size_t num) /* {{{ */
if (write_threads != NULL)
return;
if (write_threads != NULL)
return;
- write_threads =
(pthread_t *)calloc(num, sizeof(pthread_t
));
+ write_threads =
calloc(num, sizeof(*write_threads
));
if (write_threads == NULL) {
ERROR("plugin: start_write_threads: calloc failed.");
return;
if (write_threads == NULL) {
ERROR("plugin: start_write_threads: calloc failed.");
return;
@@
-829,7
+835,8
@@
static void start_write_threads(size_t num) /* {{{ */
}
char name[THREAD_NAME_MAX];
}
char name[THREAD_NAME_MAX];
- snprintf(name, sizeof(name), "writer#%" PRIsz, write_threads_num);
+ snprintf(name, sizeof(name), "writer#%" PRIu64,
+ (uint64_t)write_threads_num);
set_thread_name(write_threads[write_threads_num], name);
write_threads_num++;
set_thread_name(write_threads[write_threads_num], name);
write_threads_num++;
@@
-940,6
+947,11
@@
static void plugin_free_loaded(void) {
}
#define BUFSIZE 512
}
#define BUFSIZE 512
+#ifdef WIN32
+#define SHLIB_SUFFIX ".dll"
+#else
+#define SHLIB_SUFFIX ".so"
+#endif
int plugin_load(char const *plugin_name, bool global) {
DIR *dh;
const char *dir;
int plugin_load(char const *plugin_name, bool global) {
DIR *dh;
const char *dir;
@@
-976,11
+988,12
@@
int plugin_load(char const *plugin_name, bool global) {
(strcasecmp("python", plugin_name) == 0))
global = true;
(strcasecmp("python", plugin_name) == 0))
global = true;
- /* `cpu' should not match `cpufreq'. To solve this we add
`.so'
to the
+ /* `cpu' should not match `cpufreq'. To solve this we add
SHLIB_SUFFIX
to the
* type when matching the filename */
* type when matching the filename */
- status = snprintf(typename, sizeof(typename), "%s
.so"
, plugin_name);
+ status = snprintf(typename, sizeof(typename), "%s
" SHLIB_SUFFIX
, plugin_name);
if ((status < 0) || ((size_t)status >= sizeof(typename))) {
if ((status < 0) || ((size_t)status >= sizeof(typename))) {
- WARNING("plugin_load: Filename too long: \"%s.so\"", plugin_name);
+ WARNING("plugin_load: Filename too long: \"%s" SHLIB_SUFFIX "\"",
+ plugin_name);
return -1;
}
return -1;
}
@@
-1033,19
+1046,20
@@
int plugin_load(char const *plugin_name, bool global) {
/*
* The `register_*' functions follow
*/
/*
* The `register_*' functions follow
*/
-int plugin_register_config(const char *name,
- int (*callback)(const char *key, const char *val),
- const char **keys, int keys_num) {
+EXPORT int plugin_register_config(const char *name,
+ int (*callback)(const char *key,
+ const char *val),
+ const char **keys, int keys_num) {
cf_register(name, callback, keys, keys_num);
return 0;
} /* int plugin_register_config */
cf_register(name, callback, keys, keys_num);
return 0;
} /* int plugin_register_config */
-int plugin_register_complex_config(const char *type,
- int (*callback)(oconfig_item_t *)) {
+
EXPORT
int plugin_register_complex_config(const char *type,
+
int (*callback)(oconfig_item_t *)) {
return cf_register_complex(type, callback);
} /* int plugin_register_complex_config */
return cf_register_complex(type, callback);
} /* int plugin_register_complex_config */
-int plugin_register_init(const char *name, int (*callback)(void)) {
+
EXPORT
int plugin_register_init(const char *name, int (*callback)(void)) {
return create_register_callback(&list_init, name, (void *)callback, NULL);
} /* plugin_register_init */
return create_register_callback(&list_init, name, (void *)callback, NULL);
} /* plugin_register_init */
@@
-1127,7
+1141,7
@@
static int plugin_insert_read(read_func_t *rf) {
return 0;
} /* int plugin_insert_read */
return 0;
} /* int plugin_insert_read */
-int plugin_register_read(const char *name, int (*callback)(void)) {
+
EXPORT
int plugin_register_read(const char *name, int (*callback)(void)) {
read_func_t *rf;
int status;
read_func_t *rf;
int status;
@@
-1156,9
+1170,10
@@
int plugin_register_read(const char *name, int (*callback)(void)) {
return status;
} /* int plugin_register_read */
return status;
} /* int plugin_register_read */
-int plugin_register_complex_read(const char *group, const char *name,
- plugin_read_cb callback, cdtime_t interval,
- user_data_t const *user_data) {
+EXPORT int plugin_register_complex_read(const char *group, const char *name,
+ plugin_read_cb callback,
+ cdtime_t interval,
+ user_data_t const *user_data) {
read_func_t *rf;
int status;
read_func_t *rf;
int status;
@@
-1199,8
+1214,8
@@
int plugin_register_complex_read(const char *group, const char *name,
return status;
} /* int plugin_register_complex_read */
return status;
} /* int plugin_register_complex_read */
-int plugin_register_write(const char *name, plugin_write_cb callback,
- user_data_t const *ud) {
+
EXPORT
int plugin_register_write(const char *name, plugin_write_cb callback,
+
user_data_t const *ud) {
return create_register_callback(&list_write, name, (void *)callback, ud);
} /* int plugin_register_write */
return create_register_callback(&list_write, name, (void *)callback, ud);
} /* int plugin_register_write */
@@
-1241,8
+1256,8
@@
static char *plugin_flush_callback_name(const char *name) {
return flush_name;
} /* static char *plugin_flush_callback_name */
return flush_name;
} /* static char *plugin_flush_callback_name */
-int plugin_register_flush(const char *name, plugin_flush_cb callback,
- user_data_t const *ud) {
+
EXPORT
int plugin_register_flush(const char *name, plugin_flush_cb callback,
+
user_data_t const *ud) {
int status;
plugin_ctx_t ctx = plugin_get_ctx();
int status;
plugin_ctx_t ctx = plugin_get_ctx();
@@
-1290,12
+1305,12
@@
int plugin_register_flush(const char *name, plugin_flush_cb callback,
return 0;
} /* int plugin_register_flush */
return 0;
} /* int plugin_register_flush */
-int plugin_register_missing(const char *name, plugin_missing_cb callback,
- user_data_t const *ud) {
+
EXPORT
int plugin_register_missing(const char *name, plugin_missing_cb callback,
+
user_data_t const *ud) {
return create_register_callback(&list_missing, name, (void *)callback, ud);
} /* int plugin_register_missing */
return create_register_callback(&list_missing, name, (void *)callback, ud);
} /* int plugin_register_missing */
-int plugin_register_shutdown(const char *name, int (*callback)(void)) {
+
EXPORT
int plugin_register_shutdown(const char *name, int (*callback)(void)) {
return create_register_callback(&list_shutdown, name, (void *)callback, NULL);
} /* int plugin_register_shutdown */
return create_register_callback(&list_shutdown, name, (void *)callback, NULL);
} /* int plugin_register_shutdown */
@@
-1318,7
+1333,7
@@
static void plugin_free_data_sets(void) {
data_sets = NULL;
} /* void plugin_free_data_sets */
data_sets = NULL;
} /* void plugin_free_data_sets */
-int plugin_register_data_set(const data_set_t *ds) {
+
EXPORT
int plugin_register_data_set(const data_set_t *ds) {
data_set_t *ds_copy;
if ((data_sets != NULL) && (c_avl_get(data_sets, ds->type, NULL) == 0)) {
data_set_t *ds_copy;
if ((data_sets != NULL) && (c_avl_get(data_sets, ds->type, NULL) == 0)) {
@@
-1347,33
+1362,33
@@
int plugin_register_data_set(const data_set_t *ds) {
return c_avl_insert(data_sets, (void *)ds_copy->type, (void *)ds_copy);
} /* int plugin_register_data_set */
return c_avl_insert(data_sets, (void *)ds_copy->type, (void *)ds_copy);
} /* int plugin_register_data_set */
-int plugin_register_log(const char *name, plugin_log_cb callback,
- user_data_t const *ud) {
+
EXPORT
int plugin_register_log(const char *name, plugin_log_cb callback,
+
user_data_t const *ud) {
return create_register_callback(&list_log, name, (void *)callback, ud);
} /* int plugin_register_log */
return create_register_callback(&list_log, name, (void *)callback, ud);
} /* int plugin_register_log */
-int plugin_register_notification(const char *name,
- plugin_notification_cb callback,
- user_data_t const *ud) {
+
EXPORT
int plugin_register_notification(const char *name,
+
plugin_notification_cb callback,
+
user_data_t const *ud) {
return create_register_callback(&list_notification, name, (void *)callback,
ud);
} /* int plugin_register_log */
return create_register_callback(&list_notification, name, (void *)callback,
ud);
} /* int plugin_register_log */
-int plugin_unregister_config(const char *name) {
+
EXPORT
int plugin_unregister_config(const char *name) {
cf_unregister(name);
return 0;
} /* int plugin_unregister_config */
cf_unregister(name);
return 0;
} /* int plugin_unregister_config */
-int plugin_unregister_complex_config(const char *name) {
+
EXPORT
int plugin_unregister_complex_config(const char *name) {
cf_unregister_complex(name);
return 0;
} /* int plugin_unregister_complex_config */
cf_unregister_complex(name);
return 0;
} /* int plugin_unregister_complex_config */
-int plugin_unregister_init(const char *name) {
+
EXPORT
int plugin_unregister_init(const char *name) {
return plugin_unregister(list_init, name);
}
return plugin_unregister(list_init, name);
}
-int plugin_unregister_read(const char *name) /* {{{ */
+
EXPORT
int plugin_unregister_read(const char *name) /* {{{ */
{
llentry_t *le;
read_func_t *rf;
{
llentry_t *le;
read_func_t *rf;
@@
-1410,7
+1425,7
@@
int plugin_unregister_read(const char *name) /* {{{ */
return 0;
} /* }}} int plugin_unregister_read */
return 0;
} /* }}} int plugin_unregister_read */
-void plugin_log_available_writers(void) {
+
EXPORT
void plugin_log_available_writers(void) {
log_list_callbacks(&list_write, "Available write targets:");
}
log_list_callbacks(&list_write, "Available write targets:");
}
@@
-1422,7
+1437,7
@@
static int compare_read_func_group(llentry_t *e, void *ud) /* {{{ */
return strcmp(rf->rf_group, (const char *)group);
} /* }}} int compare_read_func_group */
return strcmp(rf->rf_group, (const char *)group);
} /* }}} int compare_read_func_group */
-int plugin_unregister_read_group(const char *group) /* {{{ */
+
EXPORT
int plugin_unregister_read_group(const char *group) /* {{{ */
{
llentry_t *le;
read_func_t *rf;
{
llentry_t *le;
read_func_t *rf;
@@
-1472,11
+1487,11
@@
int plugin_unregister_read_group(const char *group) /* {{{ */
return 0;
} /* }}} int plugin_unregister_read_group */
return 0;
} /* }}} int plugin_unregister_read_group */
-int plugin_unregister_write(const char *name) {
+
EXPORT
int plugin_unregister_write(const char *name) {
return plugin_unregister(list_write, name);
}
return plugin_unregister(list_write, name);
}
-int plugin_unregister_flush(const char *name) {
+
EXPORT
int plugin_unregister_flush(const char *name) {
plugin_ctx_t ctx = plugin_get_ctx();
if (ctx.flush_interval != 0) {
plugin_ctx_t ctx = plugin_get_ctx();
if (ctx.flush_interval != 0) {
@@
-1492,15
+1507,15
@@
int plugin_unregister_flush(const char *name) {
return plugin_unregister(list_flush, name);
}
return plugin_unregister(list_flush, name);
}
-int plugin_unregister_missing(const char *name) {
+
EXPORT
int plugin_unregister_missing(const char *name) {
return plugin_unregister(list_missing, name);
}
return plugin_unregister(list_missing, name);
}
-int plugin_unregister_shutdown(const char *name) {
+
EXPORT
int plugin_unregister_shutdown(const char *name) {
return plugin_unregister(list_shutdown, name);
}
return plugin_unregister(list_shutdown, name);
}
-int plugin_unregister_data_set(const char *name) {
+
EXPORT
int plugin_unregister_data_set(const char *name) {
data_set_t *ds;
if (data_sets == NULL)
data_set_t *ds;
if (data_sets == NULL)
@@
-1515,15
+1530,15
@@
int plugin_unregister_data_set(const char *name) {
return 0;
} /* int plugin_unregister_data_set */
return 0;
} /* int plugin_unregister_data_set */
-int plugin_unregister_log(const char *name) {
+
EXPORT
int plugin_unregister_log(const char *name) {
return plugin_unregister(list_log, name);
}
return plugin_unregister(list_log, name);
}
-int plugin_unregister_notification(const char *name) {
+
EXPORT
int plugin_unregister_notification(const char *name) {
return plugin_unregister(list_notification, name);
}
return plugin_unregister(list_notification, name);
}
-int plugin_init_all(void) {
+
EXPORT
int plugin_init_all(void) {
char const *chain_name;
llentry_t *le;
int status;
char const *chain_name;
llentry_t *le;
int status;
@@
-1622,14
+1637,14
@@
int plugin_init_all(void) {
} /* void plugin_init_all */
/* TODO: Rename this function. */
} /* void plugin_init_all */
/* TODO: Rename this function. */
-void plugin_read_all(void) {
+
EXPORT
void plugin_read_all(void) {
uc_check_timeout();
return;
} /* void plugin_read_all */
/* Read function called when the `-T' command line argument is given. */
uc_check_timeout();
return;
} /* void plugin_read_all */
/* Read function called when the `-T' command line argument is given. */
-int plugin_read_all_once(void) {
+
EXPORT
int plugin_read_all_once(void) {
int status;
int return_status = 0;
int status;
int return_status = 0;
@@
-1674,8
+1689,8
@@
int plugin_read_all_once(void) {
return return_status;
} /* int plugin_read_all_once */
return return_status;
} /* int plugin_read_all_once */
-int plugin_write(const char *plugin, /* {{{ */
- const data_set_t *ds, const value_list_t *vl) {
+
EXPORT
int plugin_write(const char *plugin, /* {{{ */
+
const data_set_t *ds, const value_list_t *vl) {
llentry_t *le;
int status;
llentry_t *le;
int status;
@@
-1754,7
+1769,8
@@
int plugin_write(const char *plugin, /* {{{ */
return status;
} /* }}} int plugin_write */
return status;
} /* }}} int plugin_write */
-int plugin_flush(const char *plugin, cdtime_t timeout, const char *identifier) {
+EXPORT int plugin_flush(const char *plugin, cdtime_t timeout,
+ const char *identifier) {
llentry_t *le;
if (list_flush == NULL)
llentry_t *le;
if (list_flush == NULL)
@@
-1784,7
+1800,7
@@
int plugin_flush(const char *plugin, cdtime_t timeout, const char *identifier) {
return 0;
} /* int plugin_flush */
return 0;
} /* int plugin_flush */
-int plugin_shutdown_all(void) {
+
EXPORT
int plugin_shutdown_all(void) {
llentry_t *le;
int ret = 0; // Assume success.
llentry_t *le;
int ret = 0; // Assume success.
@@
-1850,7
+1866,7
@@
int plugin_shutdown_all(void) {
return ret;
} /* void plugin_shutdown_all */
return ret;
} /* void plugin_shutdown_all */
-int plugin_dispatch_missing(const value_list_t *vl) /* {{{ */
+
EXPORT
int plugin_dispatch_missing(const value_list_t *vl) /* {{{ */
{
if (list_missing == NULL)
return 0;
{
if (list_missing == NULL)
return 0;
@@
-2056,9
+2072,8
@@
static bool check_drop_value(void) /* {{{ */
return false;
} /* }}} bool check_drop_value */
return false;
} /* }}} bool check_drop_value */
-int plugin_dispatch_values(value_list_t const *vl) {
+
EXPORT
int plugin_dispatch_values(value_list_t const *vl) {
int status;
int status;
- static pthread_mutex_t statistics_lock = PTHREAD_MUTEX_INITIALIZER;
if (check_drop_value()) {
if (record_statistics) {
if (check_drop_value()) {
if (record_statistics) {
@@
-2088,6
+2103,15
@@
plugin_dispatch_multivalue(value_list_t const *template, /* {{{ */
gauge_t sum = 0.0;
va_list ap;
gauge_t sum = 0.0;
va_list ap;
+ if (check_drop_value()) {
+ if (record_statistics) {
+ pthread_mutex_lock(&statistics_lock);
+ stats_values_dropped++;
+ pthread_mutex_unlock(&statistics_lock);
+ }
+ return 0;
+ }
+
assert(template->values_len == 1);
/* Calculate sum for Gauge to calculate percent if needed */
assert(template->values_len == 1);
/* Calculate sum for Gauge to calculate percent if needed */
@@
-2155,7
+2179,7
@@
plugin_dispatch_multivalue(value_list_t const *template, /* {{{ */
return failed;
} /* }}} int plugin_dispatch_multivalue */
return failed;
} /* }}} int plugin_dispatch_multivalue */
-int plugin_dispatch_notification(const notification_t *notif) {
+
EXPORT
int plugin_dispatch_notification(const notification_t *notif) {
llentry_t *le;
/* Possible TODO: Add flap detection here */
llentry_t *le;
/* Possible TODO: Add flap detection here */
@@
-2192,7
+2216,7
@@
int plugin_dispatch_notification(const notification_t *notif) {
return 0;
} /* int plugin_dispatch_notification */
return 0;
} /* int plugin_dispatch_notification */
-void plugin_log(int level, const char *format, ...) {
+
EXPORT
void plugin_log(int level, const char *format, ...) {
char msg[1024];
va_list ap;
llentry_t *le;
char msg[1024];
va_list ap;
llentry_t *le;
@@
-2265,7
+2289,7
@@
int parse_log_severity(const char *severity) {
return log_level;
} /* int parse_log_severity */
return log_level;
} /* int parse_log_severity */
-int parse_notif_severity(const char *severity) {
+
EXPORT
int parse_notif_severity(const char *severity) {
int notif_severity = -1;
if (strcasecmp(severity, "FAILURE") == 0)
int notif_severity = -1;
if (strcasecmp(severity, "FAILURE") == 0)
@@
-2279,7
+2303,7
@@
int parse_notif_severity(const char *severity) {
return notif_severity;
} /* int parse_notif_severity */
return notif_severity;
} /* int parse_notif_severity */
-const data_set_t *plugin_get_ds(const char *name) {
+
EXPORT
const data_set_t *plugin_get_ds(const char *name) {
data_set_t *ds;
if (data_sets == NULL) {
data_set_t *ds;
if (data_sets == NULL) {
@@
-2466,12
+2490,12
@@
static plugin_ctx_t *plugin_ctx_create(void) {
return ctx;
} /* int plugin_ctx_create */
return ctx;
} /* int plugin_ctx_create */
-void plugin_init_ctx(void) {
+
EXPORT
void plugin_init_ctx(void) {
pthread_key_create(&plugin_ctx_key, plugin_ctx_destructor);
plugin_ctx_key_initialized = true;
} /* void plugin_init_ctx */
pthread_key_create(&plugin_ctx_key, plugin_ctx_destructor);
plugin_ctx_key_initialized = true;
} /* void plugin_init_ctx */
-plugin_ctx_t plugin_get_ctx(void) {
+
EXPORT
plugin_ctx_t plugin_get_ctx(void) {
plugin_ctx_t *ctx;
assert(plugin_ctx_key_initialized);
plugin_ctx_t *ctx;
assert(plugin_ctx_key_initialized);
@@
-2487,7
+2511,7
@@
plugin_ctx_t plugin_get_ctx(void) {
return *ctx;
} /* plugin_ctx_t plugin_get_ctx */
return *ctx;
} /* plugin_ctx_t plugin_get_ctx */
-plugin_ctx_t plugin_set_ctx(plugin_ctx_t ctx) {
+
EXPORT
plugin_ctx_t plugin_set_ctx(plugin_ctx_t ctx) {
plugin_ctx_t *c;
plugin_ctx_t old;
plugin_ctx_t *c;
plugin_ctx_t old;
@@
-2507,7
+2531,7
@@
plugin_ctx_t plugin_set_ctx(plugin_ctx_t ctx) {
return old;
} /* void plugin_set_ctx */
return old;
} /* void plugin_set_ctx */
-cdtime_t plugin_get_interval(void) {
+
EXPORT
cdtime_t plugin_get_interval(void) {
cdtime_t interval;
interval = plugin_get_ctx().interval;
cdtime_t interval;
interval = plugin_get_ctx().interval;