rbczmq 1.7.1 → 1.7.2

data/ext/zeromq/tests/test_system.cpp

@@ -0,0 +1,82 @@
+/*
+    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"
+
+#if defined (ZMQ_HAVE_WINDOWS)
+#   include <winsock2.h>
+#   include <stdexcept>
+#else
+#   include <sys/socket.h>
+#   include <netinet/in.h>
+#   include <unistd.h>
+#endif
+
+#if defined (ZMQ_HAVE_WINDOWS)
+
+void initialise_network()
+{
+    WSADATA info;
+    if (WSAStartup(MAKEWORD(2,0), &info) != 0)
+    {
+        throw std::runtime_error("Could not start WSA");
+    }
+}
+
+int close(int fd)
+{
+    return closesocket(fd);
+}
+
+#else
+
+void initialise_network()
+{
+}
+
+#endif
+
+//  This test case stresses the system to shake out known configuration
+//  problems. We're not using libzmq here but direct system calls. Note
+//  that code may need wrapping to be properly portable.
+
+int main (void)
+{
+    initialise_network();
+
+    //  Check that we can create 1,000 sockets
+    int handle [1000];
+    int count;
+    for (count = 0; count < 1000; count++) {
+        handle [count] = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+        if (handle [count] == -1) {
+            printf ("W: Only able to create %d sockets on this box\n", count);
+            printf ("I: Tune your system to increase maximum allowed file handles\n");
+#if defined (ZMQ_HAVE_OSX)
+            printf ("I: On OS/X, run 'ulimit -n 1200' in bash");
+#elif defined (ZMQ_HAVE_LINUX)
+            printf ("I: On Linux, run 'ulimit -n 1200' in bash");
+#endif        
+            return -1;
+        }
+    }
+    //  Release the socket handles
+    while (count)
+        close (handle [count--]);
+}

data/ext/zeromq/tests/test_term_endpoint.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2011 iMatix Corporation
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,24 +17,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
-#include <string.h>
-#include <unistd.h>
-
-#undef NDEBUG
-#include <assert.h>
+#include "testutil.hpp"
 
 int main (void)
 {
+    setup_test_environment();
     int rc;
     char buf[32];
     const char *ep = "tcp://127.0.0.1:5560";
 
-    fprintf (stderr, "unbind endpoint test running...\n");
-
     //  Create infrastructure.
-    void *ctx = zmq_init (1);
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
     void *push = zmq_socket (ctx, ZMQ_PUSH);
     assert (push);
@@ -47,38 +38,33 @@ int main (void)
     rc = zmq_connect (pull, ep);
     assert (rc == 0);
 
-    //  Pass one message through to ensure the connection is established.
+    //  Pass one message through to ensure the connection is established
     rc = zmq_send (push, "ABC", 3, 0);
     assert (rc == 3);
     rc = zmq_recv (pull, buf, sizeof (buf), 0);
     assert (rc == 3);
 
-    // Unbind the lisnening endpoint
+    //  Unbind the listening endpoint
     rc = zmq_unbind (push, ep);
     assert (rc == 0);
 
-    // Let events some time
-    zmq_sleep (1);
+    //  Allow unbind to settle
+    zmq_sleep(1);
 
-    //  Check that sending would block (there's no outbound connection).
+    //  Check that sending would block (there's no outbound connection)
     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);
     assert (rc == -1 && zmq_errno () == EAGAIN);
 
-    //  Clean up.
+    //  Clean up
     rc = zmq_close (pull);
     assert (rc == 0);
     rc = zmq_close (push);
     assert (rc == 0);
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
-
-    //  Now the other way round.
-    fprintf (stderr, "disconnect endpoint test running...\n");
-
-
-    //  Create infrastructure.
-    ctx = zmq_init (1);
+    //  Create infrastructure
+    ctx = zmq_ctx_new ();
     assert (ctx);
     push = zmq_socket (ctx, ZMQ_PUSH);
     assert (push);
@@ -95,12 +81,12 @@ int main (void)
     rc = zmq_recv (pull, buf, sizeof (buf), 0);
     assert (rc == 3);
 
-    // Disconnect the bound endpoint
+    //  Disconnect the bound endpoint
     rc = zmq_disconnect (push, ep);
     assert (rc == 0);
 
-    // Let events some time
-    zmq_sleep (1);
+    //  Allow disconnect to settle
+    zmq_sleep(1);
 
     //  Check that sending would block (there's no inbound connections).
     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);
@@ -111,7 +97,7 @@ int main (void)
     assert (rc == 0);
     rc = zmq_close (push);
     assert (rc == 0);
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0;

data/ext/zeromq/tests/test_timeo.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -18,102 +17,59 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-
-#undef NDEBUG
-#include <assert.h>
-
-extern "C"
-{
-    void *worker(void *ctx)
-    {
-        //  Worker thread connects after delay of 1 second. Then it waits
-        //  for 1 more second, so that async connect has time to succeed.
-        zmq_sleep (1);
-        void *sc = zmq_socket (ctx, ZMQ_PUSH);
-        assert (sc);
-        int rc = zmq_connect (sc, "inproc://timeout_test");
-        assert (rc == 0);
-        zmq_sleep (1);
-        rc = zmq_close (sc);
-        assert (rc == 0);
-        return NULL;
-    }
-}
+#include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_timeo running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
-    //  Create a disconnected socket.
-    void *sb = zmq_socket (ctx, ZMQ_PULL);
-    assert (sb);
-    int rc = zmq_bind (sb, "inproc://timeout_test");
+    void *frontend = zmq_socket (ctx, ZMQ_DEALER);
+    assert (frontend);
+    int rc = zmq_bind (frontend, "inproc://timeout_test");
     assert (rc == 0);
 
-    //  Check whether non-blocking recv returns immediately.
-    char buf [] = "12345678ABCDEFGH12345678abcdefgh";
-    rc = zmq_recv (sb, buf, 32, ZMQ_DONTWAIT);
+    //  Receive on disconnected socket returns immediately
+    char buffer [32];
+    rc = zmq_recv (frontend, buffer, 32, ZMQ_DONTWAIT);
     assert (rc == -1);
     assert (zmq_errno() == EAGAIN);
+    
+    //  Check whether receive timeout is honored
+    int timeout = 250;
+    rc = zmq_setsockopt (frontend, ZMQ_RCVTIMEO, &timeout, sizeof (int));
+    assert (rc == 0);
 
-    //  Check whether recv timeout is honoured.
-    int timeout = 500;
-    size_t timeout_size = sizeof timeout;
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
-    assert (rc == 0);    
-    void *watch = zmq_stopwatch_start ();
-    rc = zmq_recv (sb, buf, 32, 0);
+    void* stopwatch = zmq_stopwatch_start();
+    rc = zmq_recv (frontend, buffer, 32, 0);
     assert (rc == -1);
     assert (zmq_errno () == EAGAIN);
-    unsigned long elapsed = zmq_stopwatch_stop (watch);
-    assert (elapsed > 440000 && elapsed < 550000);
+    unsigned int elapsed = zmq_stopwatch_stop(stopwatch) / 1000;
+    assert (elapsed > 200 && elapsed < 300);
 
-    //  Check whether connection during the wait doesn't distort the timeout.
-    timeout = 2000;
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
+    //  Check that normal message flow works as expected
+    void *backend = zmq_socket (ctx, ZMQ_DEALER);
+    assert (backend);
+    rc = zmq_connect (backend, "inproc://timeout_test");
     assert (rc == 0);
-    pthread_t thread;
-    rc = pthread_create (&thread, NULL, worker, ctx);
-    assert (rc == 0);
-    watch = zmq_stopwatch_start ();
-    rc = zmq_recv (sb, buf, 32, 0);
-    assert (rc == -1);
-    assert (zmq_errno () == EAGAIN);
-    elapsed = zmq_stopwatch_stop (watch);
-    assert (elapsed > 1900000 && elapsed < 2100000);
-    rc = pthread_join (thread, NULL);
+    rc = zmq_setsockopt (backend, ZMQ_SNDTIMEO, &timeout, sizeof (int));
     assert (rc == 0);
 
-    //  Check that timeouts don't break normal message transfer.
-    void *sc = zmq_socket (ctx, ZMQ_PUSH);
-    assert (sc);
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
-    assert (rc == 0);
-    rc = zmq_setsockopt(sb, ZMQ_SNDTIMEO, &timeout, timeout_size);
-    assert (rc == 0);
-    rc = zmq_connect (sc, "inproc://timeout_test");
-    assert (rc == 0);
-    rc = zmq_send (sc, buf, 32, 0);
-    assert (rc == 32);
-    rc = zmq_recv (sb, buf, 32, 0);
-    assert (rc == 32);
+    rc = zmq_send (backend, "Hello", 5, 0);
+    assert (rc == 5);
+    rc = zmq_recv (frontend, buffer, 32, 0);
+    assert (rc == 5);
 
-    //  Clean-up.
-    rc = zmq_close (sc);
+    //  Clean-up
+    rc = zmq_close (backend);
     assert (rc == 0);
-    rc = zmq_close (sb);
+    
+    rc = zmq_close (frontend);
     assert (rc == 0);
-    rc = zmq_term (ctx);
+    
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;
 }
-

data/ext/zeromq/tests/testutil.hpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,59 +17,246 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
-#define __ZMQ_TEST_TESTUTIL_HPP_INCLUDED__
+#ifndef __TESTUTIL_HPP_INCLUDED__
+#define __TESTUTIL_HPP_INCLUDED__
 
 #include "../include/zmq.h"
-#include <string.h>
+#include "../include/zmq_utils.h"
+#include "platform.hpp"
 
 #undef NDEBUG
+#include <time.h>
 #include <assert.h>
+#include <stdarg.h>
+#include <string>
 
-inline void bounce (void *sb, void *sc)
+#if defined _WIN32
+#   if defined _MSC_VER
+#       include <crtdbg.h>
+#       pragma warning(disable:4996)
+#   endif
+#else
+#   include <unistd.h>
+#   include <signal.h>
+#   include <stdlib.h>
+#   include <sys/wait.h>
+#endif
+
+//  Bounce a message from client to server and back
+//  For REQ/REP or DEALER/DEALER pairs only
+
+void
+bounce (void *server, void *client)
 {
     const char *content = "12345678ABCDEFGH12345678abcdefgh";
 
-    //  Send the message.
-    int rc = zmq_send (sc, content, 32, ZMQ_SNDMORE);
+    //  Send message from client to server
+    int rc = zmq_send (client, content, 32, ZMQ_SNDMORE);
     assert (rc == 32);
-    rc = zmq_send (sc, content, 32, 0);
+    rc = zmq_send (client, content, 32, 0);
     assert (rc == 32);
 
-    //  Bounce the message back.
-    char buf1 [32];
-    rc = zmq_recv (sb, buf1, 32, 0);
+    //  Receive message at server side
+    char buffer [32];
+    rc = zmq_recv (server, buffer, 32, 0);
     assert (rc == 32);
+    //  Check that message is still the same
+    assert (memcmp (buffer, content, 32) == 0);
     int rcvmore;
     size_t sz = sizeof (rcvmore);
-    rc = zmq_getsockopt (sb, ZMQ_RCVMORE, &rcvmore, &sz);
+    rc = zmq_getsockopt (server, ZMQ_RCVMORE, &rcvmore, &sz);
     assert (rc == 0);
     assert (rcvmore);
-    rc = zmq_recv (sb, buf1, 32, 0);
+    rc = zmq_recv (server, buffer, 32, 0);
     assert (rc == 32);
-    rc = zmq_getsockopt (sb, ZMQ_RCVMORE, &rcvmore, &sz);
+    //  Check that message is still the same
+    assert (memcmp (buffer, content, 32) == 0);
+    rc = zmq_getsockopt (server, ZMQ_RCVMORE, &rcvmore, &sz);
     assert (rc == 0);
     assert (!rcvmore);
-    rc = zmq_send (sb, buf1, 32, ZMQ_SNDMORE);
+    
+    //  Send two parts back to client
+    rc = zmq_send (server, buffer, 32, ZMQ_SNDMORE);
     assert (rc == 32);
-    rc = zmq_send (sb, buf1, 32, 0);
+    rc = zmq_send (server, buffer, 32, 0);
     assert (rc == 32);
 
-    //  Receive the bounced message.
-    char buf2 [32];
-    rc = zmq_recv (sc, buf2, 32, 0);
+    //  Receive the two parts at the client side
+    rc = zmq_recv (client, buffer, 32, 0);
     assert (rc == 32);
-    rc = zmq_getsockopt (sc, ZMQ_RCVMORE, &rcvmore, &sz);
+    //  Check that message is still the same
+    assert (memcmp (buffer, content, 32) == 0);
+    rc = zmq_getsockopt (client, ZMQ_RCVMORE, &rcvmore, &sz);
     assert (rc == 0);
     assert (rcvmore);
-    rc = zmq_recv (sc, buf2, 32, 0);
+    rc = zmq_recv (client, buffer, 32, 0);
     assert (rc == 32);
-    rc = zmq_getsockopt (sc, ZMQ_RCVMORE, &rcvmore, &sz);
+    //  Check that message is still the same
+    assert (memcmp (buffer, content, 32) == 0);
+    rc = zmq_getsockopt (client, ZMQ_RCVMORE, &rcvmore, &sz);
     assert (rc == 0);
     assert (!rcvmore);
+}
+
+//  Same as bounce, but expect messages to never arrive
+//  for security or subscriber reasons.
+
+void
+expect_bounce_fail (void *server, void *client)
+{
+    const char *content = "12345678ABCDEFGH12345678abcdefgh";
+    char buffer [32];
+
+    //  Send message from client to server
+    int rc = zmq_send (client, content, 32, ZMQ_SNDMORE);
+    assert (rc == 32);
+    rc = zmq_send (client, content, 32, 0);
+    assert (rc == 32);
+
+    //  Receive message at server side (should not succeed)
+    int timeout = 150;
+    rc = zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (int));
+    assert (rc == 0);
+    rc = zmq_recv (server, buffer, 32, 0);
+    assert (rc == -1);
+    assert (zmq_errno () == EAGAIN);
+
+    //  Send message from server to client to test other direction
+    rc = zmq_send (server, content, 32, ZMQ_SNDMORE);
+    assert (rc == 32);
+    rc = zmq_send (server, content, 32, 0);
+    assert (rc == 32);
+
+    //  Receive message at client side (should not succeed)
+    rc = zmq_setsockopt (client, ZMQ_RCVTIMEO, &timeout, sizeof (int));
+    assert (rc == 0);
+    rc = zmq_recv (client, buffer, 32, 0);
+    assert (rc == -1);
+    assert (zmq_errno () == EAGAIN);
+}
+
+//  Receive 0MQ string from socket and convert into C string
+//  Caller must free returned string. Returns NULL if the context
+//  is being terminated.
+char *
+s_recv (void *socket) {
+    char buffer [256];
+    int size = zmq_recv (socket, buffer, 255, 0);
+    if (size == -1)
+        return NULL;
+    if (size > 255)
+        size = 255;
+    buffer [size] = 0;
+    return strdup (buffer);
+}
+
+//  Convert C string to 0MQ string and send to socket
+int
+s_send (void *socket, const char *string) {
+    int size = zmq_send (socket, string, strlen (string), 0);
+    return size;
+}
+
+//  Sends string as 0MQ string, as multipart non-terminal
+int
+s_sendmore (void *socket, const char *string) {
+    int size = zmq_send (socket, string, strlen (string), ZMQ_SNDMORE);
+    return size;
+}
+
+#define streq(s1,s2)    (!strcmp ((s1), (s2)))
+#define strneq(s1,s2)   (strcmp ((s1), (s2)))
+
+const char *SEQ_END = (const char *) 1;
+
+//  Sends a message composed of frames that are C strings or null frames.
+//  The list must be terminated by SEQ_END.
+//  Example: s_send_seq (req, "ABC", 0, "DEF", SEQ_END);
+void s_send_seq (void *socket, ...)
+{
+    va_list ap;
+    va_start (ap, socket);
+    const char * data = va_arg (ap, const char *);
+    while (true)
+    {
+        const char * prev = data;
+        data = va_arg (ap, const char *);
+        bool end = data == SEQ_END;
+
+        if (!prev) {
+            int rc = zmq_send (socket, 0, 0, end ? 0 : ZMQ_SNDMORE);
+            assert (rc != -1);
+        }
+        else {
+            int rc = zmq_send (socket, prev, strlen (prev)+1, end ? 0 : ZMQ_SNDMORE);
+            assert (rc != -1);
+        }
+        if (end)
+            break;
+    }
+    va_end (ap);
+}
+
+//  Receives message a number of frames long and checks that the frames have
+//  the given data which can be either C strings or 0 for a null frame.
+//  The list must be terminated by SEQ_END.
+//  Example: s_recv_seq (rep, "ABC", 0, "DEF", SEQ_END);
+void s_recv_seq (void *socket, ...)
+{
+    zmq_msg_t msg;
+    zmq_msg_init (&msg);
+
+    int more;
+    size_t more_size = sizeof(more);
+
+    va_list ap;
+    va_start (ap, socket);
+    const char * data = va_arg (ap, const char *);
+    
+    while (true) {
+        int rc = zmq_msg_recv (&msg, socket, 0);
+        assert (rc != -1);
+
+        if (!data)
+            assert (zmq_msg_size (&msg) == 0);
+        else
+            assert (strcmp (data, (const char *)zmq_msg_data (&msg)) == 0);
 
-    //  Check whether the message is still the same.
-    assert (memcmp (buf2, content, 32) == 0);
+        data = va_arg (ap, const char *);
+        bool end = data == SEQ_END;
+
+        rc = zmq_getsockopt (socket, ZMQ_RCVMORE, &more, &more_size);
+        assert (rc == 0);
+
+        assert (!more == end);
+        if (end)
+            break;
+    }
+    va_end (ap);
+
+    zmq_msg_close (&msg);
+}
+
+
+// Sets a zero linger period on a socket and closes it.
+void close_zero_linger (void *socket)
+{
+    int linger = 0;
+    int rc = zmq_setsockopt (socket, ZMQ_LINGER, &linger, sizeof(linger));
+    assert (rc == 0 || errno == ETERM);
+    rc = zmq_close (socket);
+    assert (rc == 0);
+}
+
+void setup_test_environment()
+{
+#if defined _WIN32
+#   if defined _MSC_VER
+    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
+    _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
+    _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
+#   endif
+#endif
 }
 
 #endif