From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 16 Nov 2010 11:06:37 +0000 (+0100)
Subject: zeromq plugin: Make sure the receive threads shut down cleanly.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=12d10761f908e6d4d23cb74848d35a7c761dc71b;p=collectd.git

zeromq plugin: Make sure the receive threads shut down cleanly.

zmq_poll() is used to have the threads check the shutdown condition
at least twice per second.
---

diff --git a/src/zeromq.c b/src/zeromq.c
index e5e1836c..ab642a69 100644
--- a/src/zeromq.c
+++ b/src/zeromq.c
@@ -75,13 +75,31 @@ static void *receive_thread (void *cmq_socket) /* {{{ */
 
   while (thread_running)
   {
+    zmq_pollitem_t pollitem;
     zmq_msg_t msg;
 
+    memset (&pollitem, 0, sizeof (pollitem));
+    pollitem.socket = cmq_socket;
+    pollitem.events = ZMQ_POLLIN;
+
+    /* Check "thread_running" at least twice times per second. */
+    status = zmq_poll (&pollitem, /* nitems = */ 1,
+        /* timeout = */ 500000 /* us */);
+    if (status < 0)
+    {
+      ERROR ("zeromq plugin: zmq_poll failed: %s", zmq_strerror (errno));
+      continue;
+    }
+    else if (status == 0) /* timeout */
+      continue;
+
     (void) zmq_msg_init (&msg);
 
     status = zmq_recv (cmq_socket, &msg, /* flags = */ 0);
     if (status != 0)
     {
+      (void) zmq_msg_close (&msg);
+
       if ((errno == EAGAIN) || (errno == EINTR))
         continue;