Merge branch 'collectd-4.6' into collectd-4.7

diff --git a/configure.in b/configure.in
index 47e7291..af56e3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3777,6 +3777,11 @@ else
        enable_perl="no (needs libperl)"
 fi
 
+if test "x$enable_perl" = "xno" && test "x$c_cv_have_perl_ithreads" = "xno"
+then
+       enable_perl="no (libperl doesn't support ithreads)"
+fi
+
 if test "x$with_perl_bindings" = "xyes" \
        && test "x$PERL_BINDINGS_OPTIONS" != "x"
 then

diff --git a/src/plugin.c b/src/plugin.c
index b120e7b..6139baf 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1257,6 +1257,9 @@ int plugin_dispatch_values (value_list_t *vl)
        /* Update the value cache */
        uc_update (ds, vl);
 
+       /* Initiate threshold checking */
+       ut_check_threshold (ds, vl);
+
        if (post_cache_chain != NULL)
        {
                status = fc_process_chain (ds, vl, post_cache_chain);

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 98ec666..780b2e5 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1025,8 +1025,13 @@ static int rrd_shutdown (void)
 
 static int rrd_init (void)
 {
+       static int init_once = 0;
        int status;
 
+       if (init_once != 0)
+               return (0);
+       init_once = 1;
+
        if (rrdcreate_config.stepsize < 0)
                rrdcreate_config.stepsize = 0;
        if (rrdcreate_config.heartbeat <= 0)