rbczmq 1.7.4 → 1.7.5

data/ext/zeromq/tests/test_conflate.cpp

@@ -45,7 +45,6 @@ int main (int argc, char *argv [])
     assert (rc == 0);
 
     int message_count = 20;
-
     for (int j = 0; j < message_count; ++j) {
         rc = zmq_send(s_out, (void*)&j, sizeof(int), 0);
         if (rc < 0) {
@@ -53,15 +52,13 @@ int main (int argc, char *argv [])
             return -1;
         }
     }
-
-    zmq_sleep (1);
+    msleep (SETTLE_TIME);
 
     int payload_recved = 0;
-    rc = zmq_recv(s_in, (void*)&payload_recved, sizeof(int), 0);
+    rc = zmq_recv (s_in, (void*)&payload_recved, sizeof(int), 0);
     assert (rc > 0);
     assert (payload_recved == message_count - 1);
 
-
     rc = zmq_close (s_in);
     assert (rc == 0);
 

data/ext/zeromq/tests/test_ctx_destroy.cpp

@@ -61,7 +61,7 @@ void test_ctx_shutdown()
     void *receiver_thread = zmq_threadstart (&receiver, socket);
 
     // Wait for thread to start up and block
-    zmq_sleep (1);
+    msleep (SETTLE_TIME);
 
     // Shutdown context, if we used destroy here we would deadlock.
     rc = zmq_ctx_shutdown (ctx);

data/ext/zeromq/tests/test_ctx_options.cpp

@@ -33,7 +33,7 @@ int main (void)
     assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 0);
     
     rc = zmq_ctx_set (ctx, ZMQ_IPV6, true);
-    assert (zmq_ctx_get (ctx, ZMQ_IPV6) == true);
+    assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 1);
     
     void *router = zmq_socket (ctx, ZMQ_ROUTER);
     int ipv6;

data/ext/zeromq/tests/test_immediate.cpp

@@ -193,8 +193,7 @@ int main (void)
     assert (rc == 0);
 
     //  Give time to process disconnect
-    //  There's no way to do this except with a sleep
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
     
     // Send a message, should fail
     rc = zmq_send (frontend, "Hello", 5, ZMQ_DONTWAIT);

data/ext/zeromq/tests/test_inproc_connect.cpp

@@ -142,7 +142,7 @@ void test_connect_before_bind_pub_sub()
     assert (rc == 0);
    
     // Wait for pub-sub connection to happen
-    zmq_sleep (1);
+    msleep (SETTLE_TIME);
 
     // Queue up some data, this not will be dropped
     rc = zmq_send_const (connectSocket, "after", 6, 0);

data/ext/zeromq/tests/test_iov.cpp

@@ -80,7 +80,7 @@ int main (void)
     rc = zmq_bind (sb, "inproc://a");
     assert (rc == 0);
 
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
     void *sc = zmq_socket (ctx, ZMQ_PUSH);
   
     rc = zmq_connect (sc, "inproc://a");

data/ext/zeromq/tests/test_many_sockets.cpp

@@ -0,0 +1,90 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "testutil.hpp"
+#include <zmq.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+
+void test_system_max ()
+{
+    // Keep allocating sockets until we run out of system resources
+    const int no_of_sockets = 2 * 65536;
+    void *ctx = zmq_ctx_new ();
+    zmq_ctx_set (ctx, ZMQ_MAX_SOCKETS, no_of_sockets);
+    std::vector <void*> sockets;
+
+    while (true) {
+        void *socket = zmq_socket (ctx, ZMQ_PAIR);
+        if (!socket)
+            break;
+        sockets.push_back (socket);
+    }
+    assert ((int) sockets.size () < no_of_sockets);
+
+    //  System is out of resources, further calls to zmq_socket should return NULL
+    for (unsigned int i = 0; i < 10; ++i) {
+        void *socket = zmq_socket (ctx, ZMQ_PAIR);
+        assert (socket == NULL);
+    }
+    // Clean up.
+    for (unsigned int i = 0; i < sockets.size (); ++i)
+        zmq_close (sockets [i]);
+
+    zmq_ctx_destroy (ctx);
+}
+
+void test_zmq_default_max ()
+{
+    //  Keep allocating sockets until we hit the default limit
+    void *ctx = zmq_ctx_new ();
+    std::vector<void*> sockets;
+
+    while (true) {
+        void *socket = zmq_socket (ctx, ZMQ_PAIR);
+        if (!socket)
+            break;
+        sockets.push_back (socket);
+    }
+    //  We may stop sooner if system has fewer available sockets
+    assert (sockets.size () <= ZMQ_MAX_SOCKETS_DFLT);
+
+    //  Further calls to zmq_socket should return NULL
+    for (unsigned int i = 0; i < 10; ++i) {
+        void *socket = zmq_socket (ctx, ZMQ_PAIR);
+        assert (socket == NULL);
+    }
+
+    //  Clean up
+    for (unsigned int i = 0; i < sockets.size (); ++i)
+        zmq_close (sockets [i]);
+
+    zmq_ctx_destroy (ctx);
+}
+
+int main (void)
+{
+    setup_test_environment ();
+
+    test_system_max ();
+    test_zmq_default_max ();
+
+    return 0;
+}

data/ext/zeromq/tests/test_monitor.cpp

@@ -211,7 +211,7 @@ int main (void)
     rc = zmq_socket_monitor (req, "inproc://monitor.req", ZMQ_EVENT_ALL);
     assert (rc == 0);
     threads [1] = zmq_threadstart(&req_socket_monitor, ctx);
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
 
     // Bind REQ and REP
     rc = zmq_bind (rep, addr.c_str());
@@ -238,8 +238,8 @@ int main (void)
     rc = zmq_close (rep);
     assert (rc == 0);
 
-    // Allow some time for detecting error states
-    zmq_sleep(1);
+    // Allow enough time for detecting error states
+    msleep (250);
 
     //  Close the REQ socket
     rc = zmq_close (req);

data/ext/zeromq/tests/test_req_relaxed.cpp

@@ -54,7 +54,7 @@ int main (void)
     //  We have to give the connects time to finish otherwise the requests
     //  will not properly round-robin. We could alternatively connect the
     //  REQ sockets to the REP sockets.
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
 
     //  Case 1: Second send() before a reply arrives in a pipe.
 

data/ext/zeromq/tests/test_router_raw_empty.cpp

@@ -0,0 +1,65 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "testutil.hpp"
+
+int main (void) {
+    setup_test_environment();
+    void *ctx = zmq_ctx_new();
+    assert(ctx);
+    
+    void *router = zmq_socket(ctx, ZMQ_ROUTER);
+    assert(router);
+    void *dealer = zmq_socket(ctx, ZMQ_DEALER);
+    assert(dealer);
+    
+    int one=1;
+    int rc = zmq_setsockopt(router, ZMQ_ROUTER_RAW, &one, sizeof(int));
+    assert(rc >= 0);
+    rc = zmq_setsockopt(router, ZMQ_ROUTER_MANDATORY, &one, sizeof(int));
+    assert(rc >= 0);
+    
+    rc = zmq_bind(router, "tcp://127.0.0.1:5555");
+    rc = zmq_connect(dealer, "tcp://127.0.0.1:5555");
+    zmq_send(dealer, "", 0, 0);
+    
+    
+    zmq_msg_t ident, empty;
+    zmq_msg_init(&ident);
+    rc = zmq_msg_recv(&ident, router, 0);
+    assert(rc >= 0);
+    rc = zmq_msg_init_data(&empty, (void*)"", 0, NULL, NULL);
+    assert(rc >= 0);
+    
+    rc = zmq_msg_send(&ident, router, ZMQ_SNDMORE);
+    assert(rc >= 0);
+    rc = zmq_msg_close(&ident);
+    assert(rc >= 0);
+    
+    rc = zmq_msg_send(&empty, router, 0);
+    assert(rc >= 0);
+    
+    // This close used to fail with Bad Address
+    rc = zmq_msg_close(&empty);
+    assert(rc >= 0);
+    
+    close_zero_linger(dealer);
+    close_zero_linger(router);
+    zmq_ctx_term(ctx);
+}

data/ext/zeromq/tests/test_spec_req.cpp

@@ -46,7 +46,7 @@ void test_round_robin_out (void *ctx)
     //  We have to give the connects time to finish otherwise the requests 
     //  will not properly round-robin. We could alternatively connect the
     //  REQ sockets to the REP sockets.
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
     
     // Send our peer-replies, and expect every REP it used once in order
     for (size_t peer = 0; peer < services; peer++) {

data/ext/zeromq/tests/test_stream.cpp

@@ -89,15 +89,14 @@ test_stream_to_dealer (void)
     assert (rc == sizeof (greeting));
 
     //  Now we expect the data from the DEALER socket
-    //  First frame is, again, the identity of the connection
-    rc = zmq_msg_recv (&identity, stream, 0);
-    assert (rc > 0);
-    assert (zmq_msg_more (&identity));
-
-    //  Second frame contains the rest of greeting along with
-    //  the Ready command
+    //  We want the rest of greeting along with the Ready command
     int bytes_read = 0;
     while (bytes_read < 97) {
+        //  First frame is the identity of the connection (each time)
+        rc = zmq_msg_recv (&identity, stream, 0);
+        assert (rc > 0);
+        assert (zmq_msg_more (&identity));
+        //  Second frame contains the next chunk of data
         rc = zmq_recv (stream, buffer + bytes_read, 255 - bytes_read, 0);
         assert (rc >= 0);
         bytes_read += rc;

data/ext/zeromq/tests/test_sub_forward.cpp

@@ -59,7 +59,7 @@ int main (void)
     assert (rc >= 0);
 
     //  Wait a bit till the subscription gets to the publisher
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
 
     //  Send an empty message
     rc = zmq_send (pub, NULL, 0, 0);

data/ext/zeromq/tests/test_term_endpoint.cpp

@@ -49,7 +49,7 @@ int main (void)
     assert (rc == 0);
 
     //  Allow unbind to settle
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
 
     //  Check that sending would block (there's no outbound connection)
     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);
@@ -86,7 +86,7 @@ int main (void)
     assert (rc == 0);
 
     //  Allow disconnect to settle
-    zmq_sleep(1);
+    msleep (SETTLE_TIME);
 
     //  Check that sending would block (there's no inbound connections).
     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);

data/ext/zeromq/tests/testutil.hpp

@@ -22,7 +22,12 @@
 
 #include "../include/zmq.h"
 #include "../include/zmq_utils.h"
-#include "platform.hpp"
+#include "../src/platform.hpp"
+
+//  This defines the settle time used in tests; raise this if we
+//  get test failures on slower systems due to binds/connects not
+//  settled. Tested to work reliably at 1 msec on a fast PC.
+#define SETTLE_TIME 10         //  In msec
 
 #undef NDEBUG
 #include <time.h>
@@ -259,4 +264,16 @@ void setup_test_environment()
 #endif
 }
 
+//  Provide portable millisecond sleep
+// http://www.cplusplus.com/forum/unices/60161/    http://en.cppreference.com/w/cpp/thread/sleep_for
+void msleep (int milliseconds)
+{
+#ifdef ZMQ_HAVE_WINDOWS
+    Sleep (milliseconds);
+#else
+    usleep (static_cast <useconds_t> (milliseconds) * 1000);
+#endif
+}
+
+
 #endif

data/ext/zeromq/tools/Makefile.am

@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = curve_keygen
 
-curve_keygen_LDADD = $(top_srcdir)/src/libzmq.la
+curve_keygen_LDADD = $(top_builddir)/src/libzmq.la
 curve_keygen_SOURCES = curve_keygen.c
 

data/lib/zmq/socket.rb

@@ -213,3 +213,4 @@ require "zmq/socket/req"
 require "zmq/socket/rep"
 require "zmq/socket/router"
 require "zmq/socket/dealer"
+require "zmq/socket/stream"

data/lib/zmq/socket/stream.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+class ZMQ::Socket::Stream
+
+# == ZMQ::Socket::Stream
+# A socket of type ZMQ::Socket::Stream is used to send and receive TCP data from a non-ØMQ peer,
+# when using the tcp:// transport. A ZMQ::Socket::Stream socket can act as client and/or server,
+# sending and/or receiving TCP data asynchronously.
+#
+# When receiving TCP data, a ZMQ::Socket::Stream socket shall prepend a message part containing
+# the identity of the originating peer to the message before passing it to the application.
+# Messages received are fair-queued from among all connected peers.
+#
+# When sending TCP data, a ZMQ::Socket::Stream socket shall remove the first part of the message
+# and use it to determine the identity of the peer the message shall be routed to, and unroutable
+# messages shall cause an EHOSTUNREACH or EAGAIN error.
+#
+# To open a connection to a server, use the zmq_connect call, and then fetch the socket identity
+# using the ZMQ_IDENTITY zmq_getsockopt call.
+#
+# To close a specific client connection, as a server, send the identity frame followed by a zero-
+# length message (see EXAMPLE section).
+#
+# The ZMQ_MSGMORE flag is ignored on data frames. You must send one identity frame followed by
+# one data frame.
+#
+# Also, please note that omitting the ZMQ_MSGMORE flag will prevent sending further data (from
+# any client) on the same socket.
+#
+# === Summary of ZMQ_STREAM characteristics
+#
+# [Compatible peer sockets]  none.
+# [Direction] Bidirectional
+# [Send/receive pattern] Unrestricted
+# [Outgoing routing strategy] See text
+# [Incoming routing strategy] Fair-queued
+# [ZMQ::Socket#hwm option action] EAGAIN
+
+  TYPE_STR = "STREAM"
+
+  def type
+    ZMQ::STREAM
+  end
+end

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
 end

data/test/socket/test_dealer_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestDealerSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_pair_socket.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPairSocket < ZmqTestCase
   def test_behavior

data/test/socket/test_pair_sockets.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.expand_path("../../helper.rb", __FILE__)
 
 class TestPairSockets < ZmqTestCase
   def test_flow