From: Adam Romanek <aromanek.contractor@libertyglobal.com>
Date: Fri, 17 Aug 2018 09:24:22 +0000 (+0200)
Subject: daemon: make plugin_dispatch_multivalue() obey write queue limits (#2897)
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ed749136d186ae3cb9664e60064b841eaaf45b01;p=collectd.git

daemon: make plugin_dispatch_multivalue() obey write queue limits (#2897)
---

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index b93e9cc9..a99e1cd1 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -146,6 +146,7 @@ static bool plugin_ctx_key_initialized;
 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;
 
@@ -2076,7 +2077,6 @@ static bool check_drop_value(void) /* {{{ */
 
 EXPORT int plugin_dispatch_values(value_list_t const *vl) {
   int status;
-  static pthread_mutex_t statistics_lock = PTHREAD_MUTEX_INITIALIZER;
 
   if (check_drop_value()) {
     if (record_statistics) {
@@ -2106,6 +2106,15 @@ plugin_dispatch_multivalue(value_list_t const *template, /* {{{ */
   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 */