From 943d04fcca5efd6f63012932c650f67854575e1e Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 16 Nov 2010 11:29:44 +0100
Subject: [PATCH] zeromq plugin: Fix shutdown code.

Wait for all the receive threads to shut down. This may actually need some
more work, since shutdown will not work if any socket doesn't receive any
values.
---
 src/zeromq.c | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/zeromq.c b/src/zeromq.c
index ea118a7d..e5e1836c 100644
--- a/src/zeromq.c
+++ b/src/zeromq.c
@@ -52,9 +52,7 @@ static pthread_t *receive_thread_ids = NULL;
 static size_t     receive_thread_num = 0;
 static int        sending_sockets_num = 0;
 
-// private data
-static int thread_running = 1;
-static pthread_t listen_thread_id;
+static _Bool thread_running = 1;
 
 static void cmq_close_callback (void *socket) /* {{{ */
 {
@@ -496,30 +494,36 @@ static int plugin_init (void) /* {{{ */
   return 0;
 } /* }}} int plugin_init */
 
-static int my_shutdown (void) /* {{{ */
+static int cmq_shutdown (void) /* {{{ */
 {
-  if( cmq_context ) {
-    
-    thread_running = 0;
-    
-    DEBUG("ZeroMQ: shutting down");
+  size_t i;
+
+  if (cmq_context == NULL)
+    return (0);
+
+  /* Signal thread to shut down */
+  thread_running = 0;
     
-    if( zmq_term(cmq_context) != 0 ) {
-      ERROR("zmq_term : %s", zmq_strerror(errno));
-      return 1;
-    }
+  DEBUG ("ZeroMQ plugin: Waiting for %zu receive thread(s) to shut down.",
+      receive_thread_num);
     
-    pthread_join(listen_thread_id, NULL);
+  for (i = 0; i < receive_thread_num; i++)
+    pthread_join (receive_thread_ids[i], /* return ptr = */ NULL);
+
+  if (zmq_term (cmq_context) != 0)
+  {
+    ERROR ("ZeroMQ plugin: zmq_term failed: %s", zmq_strerror (errno));
+    return 1;
   }
-  
+    
   return 0;
-} /* }}} int my_shutdown */
+} /* }}} int cmq_shutdown */
 
 void module_register (void)
 {
   plugin_register_complex_config("zeromq", cmq_config);
   plugin_register_init("zeromq", plugin_init);
-  plugin_register_shutdown ("zeromq", my_shutdown);
+  plugin_register_shutdown ("zeromq", cmq_shutdown);
 }
 
 /* vim: set sw=2 sts=2 et fdm=marker : */
-- 
2.11.0