rbczmq 1.7.4 → 1.7.5

data/ext/zeromq/CMakeLists.txt

@@ -611,7 +611,9 @@ set(tests
         test_term_endpoint
         test_timeo
         test_inproc_connect
-        test_issue_566)
+        test_issue_566
+        test_many_sockets
+)
 if(NOT WIN32)
 list(APPEND tests
         test_monitor

data/ext/zeromq/NEWS

@@ -1,3 +1,31 @@
+0MQ version 4.0.3 stable, released on 2013/11/24
+================================================
+
+Bug Fixes
+---------
+
+* Fixed test_many_sockets case, which failed when process socket limit
+  was 1024.
+
+
+0MQ version 4.0.2 stable, released on 2013/11/24
+================================================
+
+Bug Fixes
+---------
+
+* Fixed LIBZMQ-583 - improved low-res timer for Windows 
+* Fixed LIBZMQ-578 - z85_decode was extremely slow
+* Fixed LIBZMQ-577 - fault in man pages.
+* Fixed LIBZMQ-574 - assertion failure when ran out of system file handles
+* Fixed LIBZMQ-571 - test_stream failing in some cases
+* Fixed LIBZMQ-569 - Socket server crashes with random client data and when
+  talking to 2.2 versions
+* Fixed LIBZMQ-39 - Bad file descriptor during shutdown
+* Pulled expected failing test_linger.cpp from release
+* Reduced pause time in tests to allow "make check" to run faster
+
+
 0MQ version 4.0.1 stable, released on 2013/10/08
 ================================================
 
@@ -23,9 +51,6 @@ Changes
 
 * Added zmq_curve_keypair to core libzmq API.
 
-* Replaced macro constants in zmq.h with enum types for user-facing
-  constants (except ZMQ version numbers).
-
 * Bumped library ABI version to 4:0:1.
 
 Bug fixes

data/ext/zeromq/doc/zmq.txt

@@ -44,9 +44,6 @@ Work with context properties::
 Destroy a 0MQ context::
     linkzmq:zmq_ctx_term[3]
 
-Monitor a 0MQ context::
-    linkzmq:zmq_ctx_set_monitor[3]
-
 These deprecated functions let you create and destroy 'contexts':
 
 Initialise 0MQ context::
@@ -142,6 +139,9 @@ Sending and receiving messages::
     linkzmq:zmq_recv[3]
     linkzmq:zmq_send_const[3]
 
+Monitoring socket events:
+    linkzmq:zmq_socket_monitor[3]
+
 .Input/output multiplexing
 0MQ provides a mechanism for applications to multiplex input/output events over
 a set containing both 0MQ sockets and standard sockets. This mechanism mirrors

data/ext/zeromq/doc/zmq_getsockopt.txt

@@ -120,8 +120,8 @@ Default value:: 0
 Applicable socket types:: N/A
 
 
-ZMQ_IDENTITY: Set socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ZMQ_IDENTITY: Retrieve socket identity
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_IDENTITY' option shall retrieve the identity of the specified 'socket'.
 Socket identity is used only by request/reply pattern. Namely, it can be used
 in tandem with ROUTER socket to route messages to the peer with specific
@@ -134,7 +134,7 @@ starting with binary zero are reserved for use by 0MQ infrastructure.
 Option value type:: binary data
 Option value unit:: N/A
 Default value:: NULL
-Applicable socket types:: all
+Applicable socket types:: ZMQ_REP, ZMQ_REQ, ZMQ_ROUTER, ZMQ_DEALER.
 
 
 ZMQ_RATE: Retrieve multicast data rate

data/ext/zeromq/doc/zmq_msg_get.txt

@@ -40,6 +40,7 @@ EXAMPLE
 -------
 .Receiving a multi-frame message
 ----
+zmq_msg_t frame;
 while (true) {
     //  Create an empty 0MQ message to hold the message frame
     int rc = zmq_msg_init (&frame);
@@ -53,7 +54,7 @@ while (true) {
         fprintf (stderr, "end\n");
         break;
     }
-    zmq_msg_close (frame);
+    zmq_msg_close (&frame);
 }
 ----
 

data/ext/zeromq/doc/zmq_msg_more.txt

@@ -45,7 +45,7 @@ while (true) {
         fprintf (stderr, "end\n");
         break;
     }
-    zmq_msg_close (part);
+    zmq_msg_close (&part);
 }
 ----
 

data/ext/zeromq/doc/zmq_setsockopt.txt

@@ -150,7 +150,7 @@ results shall be undefined.
 Option value type:: binary data
 Option value unit:: N/A
 Default value:: NULL
-Applicable socket types:: all
+Applicable socket types:: ZMQ_REQ, ZMQ_REP, ZMQ_ROUTER, ZMQ_DEALER.
 
 
 ZMQ_RATE: Set multicast data rate
@@ -624,7 +624,9 @@ linkzmq:zmq_curve[7]. A value of '1' means the socket will act as
 CURVE server. A value of '0' means the socket will not act as CURVE
 server, and its security role then depends on other option settings.
 Setting this to '0' shall reset the socket security to NULL. When you
-set this you must also set the ZMQ_CURVE_PUBLICKEY option.
+set this you must also set the server's secret key using the
+ZMQ_CURVE_SECRETKEY option. A server socket does not need to know
+its own public key.
 
 [horizontal]
 Option value type:: int
@@ -636,14 +638,11 @@ Applicable socket types:: all, when using TCP transport
 ZMQ_CURVE_PUBLICKEY: Set CURVE public key
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sets the socket's long term public key. You must set this on a CURVE
-client or server socket, see linkzmq:zmq_curve[7]. You can provide the
-key as 32 binary bytes, or as a 40-character string encoded in the Z85
-encoding format. For servers, the public key must be persisted and
-shared through some unspecified but secure mechanism to clients. The
-public key must always be used with the matching secret key generated
-at the same time. To generate a public/secret key pair, use the
-tools/curve_keygen tool.
+Sets the socket's long term public key. You must set this on CURVE client
+sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
+bytes, or as a 40-character string encoded in the Z85 encoding format.
+The public key must always be used with the matching secret key. To
+generate a public/secret key pair, use linkzmq:zmq_curve_keypair[3].
 
 [horizontal]
 Option value type:: binary data or Z85 text string
@@ -655,10 +654,11 @@ Applicable socket types:: all, when using TCP transport
 ZMQ_CURVE_SECRETKEY: Set CURVE secret key
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sets the socket's long term secret key. You must set this on a CURVE
-client socket, see linkzmq:zmq_curve[7]. You can provide the key as
-32 binary bytes, or as a 40-character string encoded in the Z85 encoding
-format.
+Sets the socket's long term secret key. You must set this on both CURVE
+client and server sockets, see linkzmq:zmq_curve[7]. You can provide the
+key as 32 binary bytes, or as a 40-character string encoded in the Z85
+encoding format. To generate a public/secret key pair, use
+linkzmq:zmq_curve_keypair[3].
 
 [horizontal]
 Option value type:: binary data or Z85 text string
@@ -670,11 +670,10 @@ Applicable socket types:: all, when using TCP transport
 ZMQ_CURVE_SERVERKEY: Set CURVE server key
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sets the socket's long term server key. You must set this on a CURVE
-client socket, see linkzmq:zmq_curve[7]. You can provide the key as
-32 binary bytes, or as a 40-character string encoded in the Z85 encoding
-format. This key must be the same as the public key set on the server
-socket.
+Sets the socket's long term server key. You must set this on CURVE client
+sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
+bytes, or as a 40-character string encoded in the Z85 encoding format.
+This key must have been generated together with the server's secret key.
 
 [horizontal]
 Option value type:: binary data or Z85 text string

data/ext/zeromq/doc/zmq_socket.txt

@@ -62,6 +62,7 @@ The request-reply pattern is used for sending requests from a ZMQ_REQ _client_
 to one or more ZMQ_REP _services_, and receiving subsequent replies to each
 request sent.
 
+The request-reply pattern is formally defined by http://rfc.zeromq.org/spec:28.
 
 ZMQ_REQ
 ^^^^^^^
@@ -168,6 +169,7 @@ Publish-subscribe pattern
 The publish-subscribe pattern is used for one-to-many distribution of data from
 a single _publisher_ to multiple _subscribers_ in a fan out fashion.
 
+The publish-subscribe pattern is formally defined by http://rfc.zeromq.org/spec:29.
 
 ZMQ_PUB
 ^^^^^^^
@@ -249,6 +251,7 @@ a pipeline. Data always flows down the pipeline, and each stage of the pipeline
 is connected to at least one _node_. When a pipeline stage is connected to
 multiple _nodes_ data is round-robined among all connected _nodes_.
 
+The pipeline pattern is formally defined by http://rfc.zeromq.org/spec:30.
 
 ZMQ_PUSH
 ^^^^^^^^
@@ -296,6 +299,7 @@ The exclusive pair pattern is used to connect a peer to precisely one other
 peer. This pattern is used for inter-thread communication across the inproc
 transport.
 
+The exclusive pair pattern is formally defined by http://rfc.zeromq.org/spec:31.
 
 ZMQ_PAIR
 ^^^^^^^^

data/ext/zeromq/include/zmq.h

@@ -28,6 +28,16 @@
 #ifndef __ZMQ_H_INCLUDED__
 #define __ZMQ_H_INCLUDED__
 
+/*  Version macros for compile-time API version detection                     */
+#define ZMQ_VERSION_MAJOR 4
+#define ZMQ_VERSION_MINOR 0
+#define ZMQ_VERSION_PATCH 3
+
+#define ZMQ_MAKE_VERSION(major, minor, patch) \
+    ((major) * 10000 + (minor) * 100 + (patch))
+#define ZMQ_VERSION \
+    ZMQ_MAKE_VERSION(ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -78,23 +88,6 @@ typedef unsigned __int8 uint8_t;
 #endif
 
 
-/******************************************************************************/
-/*  0MQ versioning support.                                                   */
-/******************************************************************************/
-
-/*  Version macros for compile-time API version detection                     */
-#define ZMQ_VERSION_MAJOR 4
-#define ZMQ_VERSION_MINOR 0
-#define ZMQ_VERSION_PATCH 1
-
-#define ZMQ_MAKE_VERSION(major, minor, patch) \
-    ((major) * 10000 + (minor) * 100 + (patch))
-#define ZMQ_VERSION \
-    ZMQ_MAKE_VERSION(ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
-
-/*  Run-time API version detection                                            */
-ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
-
 /******************************************************************************/
 /*  0MQ errors.                                                               */
 /******************************************************************************/
@@ -165,6 +158,9 @@ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
 #define ETERM (ZMQ_HAUSNUMERO + 53)
 #define EMTHREAD (ZMQ_HAUSNUMERO + 54)
 
+/*  Run-time API version detection                                            */
+ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
+
 /*  This function retrieves the errno as it is known to 0MQ library. The goal */
 /*  of this function is to make the code 100% portable, including where 0MQ   */
 /*  compiled with certain CRT library (on Windows) is linked to an            */
@@ -185,7 +181,7 @@ ZMQ_EXPORT const char *zmq_strerror (int errnum);
 
 /*  Default for new contexts                                                  */
 #define ZMQ_IO_THREADS_DFLT  1
-#define ZMQ_MAX_SOCKETS_DFLT 1024
+#define ZMQ_MAX_SOCKETS_DFLT 1023
 
 ZMQ_EXPORT void *zmq_ctx_new (void);
 ZMQ_EXPORT int zmq_ctx_term (void *context);

data/ext/zeromq/src/clock.cpp

@@ -22,6 +22,7 @@
 #include "likely.hpp"
 #include "config.hpp"
 #include "err.hpp"
+#include "mutex.hpp"
 
 #include <stddef.h>
 
@@ -41,9 +42,49 @@
 #include <time.h>
 #endif
 
+#ifdef ZMQ_HAVE_WINDOWS
+typedef ULONGLONG (*f_compatible_get_tick_count64)();
+
+static zmq::mutex_t compatible_get_tick_count64_mutex;
+
+ULONGLONG compatible_get_tick_count64()
+{
+  compatible_get_tick_count64_mutex.lock();
+  static DWORD s_wrap = 0;
+  static DWORD s_last_tick = 0;
+  const DWORD current_tick = ::GetTickCount();
+  if (current_tick < s_last_tick)
+    ++s_wrap;
+
+  s_last_tick = current_tick;
+  const ULONGLONG result = (static_cast<ULONGLONG>(s_wrap) << 32) + static_cast<ULONGLONG>(current_tick);
+  compatible_get_tick_count64_mutex.unlock();
+  return result;
+}
+
+f_compatible_get_tick_count64 init_compatible_get_tick_count64()
+{
+  f_compatible_get_tick_count64 func = NULL;
+  HMODULE module = ::LoadLibraryA("Kernel32.dll");
+  if (module != NULL)
+    func = reinterpret_cast<f_compatible_get_tick_count64>(::GetProcAddress(module, "GetTickCount64"));
+
+  if (func == NULL)
+    func = compatible_get_tick_count64;
+
+  return func;
+}
+
+static f_compatible_get_tick_count64 my_get_tick_count64 = init_compatible_get_tick_count64();
+#endif
+
 zmq::clock_t::clock_t () :
     last_tsc (rdtsc ()),
+#ifdef ZMQ_HAVE_WINDOWS
+    last_time (static_cast<uint64_t>((*my_get_tick_count64)()))
+#else
     last_time (now_us () / 1000)
+#endif
 {
 }
 
@@ -65,7 +106,7 @@ uint64_t zmq::clock_t::now_us ()
 
     //  Convert the tick number into the number of seconds
     //  since the system was started.
-    double ticks_div = ticksPerSecond.QuadPart / 1000000.0;     
+    double ticks_div = ticksPerSecond.QuadPart / 1000000.0;
     return (uint64_t) (tick.QuadPart / ticks_div);
 
 #elif defined HAVE_CLOCK_GETTIME && defined CLOCK_MONOTONIC
@@ -74,7 +115,7 @@ uint64_t zmq::clock_t::now_us ()
     struct timespec tv;
     int rc = clock_gettime (CLOCK_MONOTONIC, &tv);
 		// Fix case where system has clock_gettime but CLOCK_MONOTONIC is not supported.
-		// This should be a configuration check, but I looked into it and writing an 
+		// This should be a configuration check, but I looked into it and writing an
 		// AC_FUNC_CLOCK_MONOTONIC seems beyond my powers.
 		if( rc != 0) {
 			//  Use POSIX gettimeofday function to get precise time.
@@ -106,7 +147,17 @@ uint64_t zmq::clock_t::now_ms ()
 
     //  If TSC is not supported, get precise time and chop off the microseconds.
     if (!tsc)
+    {
+#ifdef ZMQ_HAVE_WINDOWS
+        // Under Windows, now_us is not so reliable since QueryPerformanceCounter
+        // does not guarantee that it will use a hardware that offers a monotonic timer.
+        // So, lets use GetTickCount when GetTickCount64 is not available with an workaround
+        // to its 32 bit limitation.
+        return static_cast<uint64_t>((*my_get_tick_count64)());
+#else
         return now_us () / 1000;
+#endif
+    }
 
     //  If TSC haven't jumped back (in case of migration to a different
     //  CPU core) and if not too much time elapsed since last measurement,
@@ -115,7 +166,11 @@ uint64_t zmq::clock_t::now_ms ()
         return last_time;
 
     last_tsc = tsc;
+#ifdef ZMQ_HAVE_WINDOWS
+    last_time = static_cast<uint64_t>((*my_get_tick_count64)());
+#else
     last_time = now_us () / 1000;
+#endif
     return last_time;
 }
 

data/ext/zeromq/src/ctx.cpp

@@ -38,6 +38,14 @@
 #define ZMQ_CTX_TAG_VALUE_GOOD 0xabadcafe
 #define ZMQ_CTX_TAG_VALUE_BAD  0xdeadbeef
 
+int clipped_maxsocket(int max_requested)
+{
+    if (max_requested >= zmq::poller_t::max_fds () && zmq::poller_t::max_fds () != -1)
+        max_requested = zmq::poller_t::max_fds () - 1;		// -1 because we need room for the repear mailbox.
+    
+    return max_requested;
+}
+
 zmq::ctx_t::ctx_t () :
     tag (ZMQ_CTX_TAG_VALUE_GOOD),
     starting (true),
@@ -45,7 +53,7 @@ zmq::ctx_t::ctx_t () :
     reaper (NULL),
     slot_count (0),
     slots (NULL),
-    max_sockets (ZMQ_MAX_SOCKETS_DFLT),
+    max_sockets (clipped_maxsocket (ZMQ_MAX_SOCKETS_DFLT)),
     io_thread_count (ZMQ_IO_THREADS_DFLT),
     ipv6 (false)
 {
@@ -107,7 +115,6 @@ int zmq::ctx_t::terminate ()
         //  restarted.
         bool restarted = terminating;
         terminating = true;
-        slot_sync.unlock ();
 
         //  First attempt to terminate the context.
         if (!restarted) {
@@ -115,13 +122,12 @@ int zmq::ctx_t::terminate ()
             //  First send stop command to sockets so that any blocking calls
             //  can be interrupted. If there are no sockets we can ask reaper
             //  thread to stop.
-            slot_sync.lock ();
             for (sockets_t::size_type i = 0; i != sockets.size (); i++)
                 sockets [i]->stop ();
             if (sockets.empty ())
                 reaper->stop ();
-            slot_sync.unlock ();
         }
+        slot_sync.unlock();
 
         //  Wait till reaper thread closes all the sockets.
         command_t cmd;
@@ -163,7 +169,7 @@ int zmq::ctx_t::shutdown ()
 int zmq::ctx_t::set (int option_, int optval_)
 {
     int rc = 0;
-    if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1) {
+    if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1 && optval_ == clipped_maxsocket (optval_)) {
         opt_sync.lock ();
         max_sockets = optval_;
         opt_sync.unlock ();

data/ext/zeromq/src/devpoll.cpp

@@ -133,6 +133,11 @@ void zmq::devpoll_t::stop ()
     stopping = true;
 }
 
+int zmq::devpoll_t::max_fds ()
+{
+    return -1;
+}
+
 void zmq::devpoll_t::loop ()
 {
     while (!stopping) {