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

[collectd.git] / src / statsd.c

diff --git a/src/statsd.c b/src/statsd.c
index 7336d37..ba8901b 100644 (file)
--- 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);