From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Mon, 9 May 2016 09:15:26 +0000 (+0600)
Subject: statsd plugin: Fix deadlock on plugin shutdown (Issue #1703)
X-Git-Tag: collectd-5.5.2~6^2~9
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=961ead7ebf855bcb53728734c828378c187f23ce;p=collectd.git

statsd plugin: Fix deadlock on plugin shutdown (Issue #1703)
---

diff --git a/src/statsd.c b/src/statsd.c
index 7336d37a..ba8901b9 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -936,8 +936,6 @@ static int statsd_shutdown (void) /* {{{ */
   void *key;
   void *value;
 
-  pthread_mutex_lock (&metrics_lock);
-
   if (network_thread_running)
   {
     network_thread_shutdown = 1;
@@ -946,6 +944,8 @@ static int statsd_shutdown (void) /* {{{ */
   }
   network_thread_running = 0;
 
+  pthread_mutex_lock (&metrics_lock);
+
   while (c_avl_pick (metrics_tree, &key, &value) == 0)
   {
     sfree (key);