1 files changed, 35 insertions, 35 deletions

diff --git a/tests/test_timeo.cpp b/tests/test_timeo.cpp
index e5ce0ac..79b4d39 100644
--- a/tests/test_timeo.cpp
+++ b/tests/test_timeo.cpp
@@ -1,15 +1,15 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
+    Copyright (c) 2010-2012 250bpm s.r.o.
     Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
 
-    This file is part of 0MQ.
+    This file is part of Crossroads project.
 
-    0MQ is free software; you can redistribute it and/or modify it under
+    Crossroads 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,
+    Crossroads 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.
@@ -23,8 +23,8 @@
 #include <pthread.h>
 #include <stdio.h>
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 
 extern "C"
 {
@@ -32,13 +32,13 @@ extern "C"
     {
         //  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);
+        xs_sleep (1);
+        void *sc = xs_socket (ctx, XS_PUSH);
         assert (sc);
-        int rc = zmq_connect (sc, "inproc://timeout_test");
+        int rc = xs_connect (sc, "inproc://timeout_test");
         assert (rc == 0);
-        zmq_sleep (1);
-        rc = zmq_close (sc);
+        xs_sleep (1);
+        rc = xs_close (sc);
         assert (rc == 0);
         return NULL;
     }
@@ -48,69 +48,69 @@ int main (int argc, char *argv [])
 {
     fprintf (stderr, "test_timeo running...\n");
 
-    void *ctx = zmq_init (1);
+    void *ctx = xs_init (1);
     assert (ctx);
 
     //  Create a disconnected socket.
-    void *sb = zmq_socket (ctx, ZMQ_PULL);
+    void *sb = xs_socket (ctx, XS_PULL);
     assert (sb);
-    int rc = zmq_bind (sb, "inproc://timeout_test");
+    int rc = xs_bind (sb, "inproc://timeout_test");
     assert (rc == 0);
 
     //  Check whether non-blocking recv returns immediately.
     char buf [] = "12345678ABCDEFGH12345678abcdefgh";
-    rc = zmq_recv (sb, buf, 32, ZMQ_DONTWAIT);
+    rc = xs_recv (sb, buf, 32, XS_DONTWAIT);
     assert (rc == -1);
-    assert (zmq_errno() == EAGAIN);
+    assert (xs_errno() == EAGAIN);
 
     //  Check whether recv timeout is honoured.
     int timeout = 500;
     size_t timeout_size = sizeof timeout;
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
+    rc = xs_setsockopt(sb, XS_RCVTIMEO, &timeout, timeout_size);
     assert (rc == 0);    
-    void *watch = zmq_stopwatch_start ();
-    rc = zmq_recv (sb, buf, 32, 0);
+    void *watch = xs_stopwatch_start ();
+    rc = xs_recv (sb, buf, 32, 0);
     assert (rc == -1);
-    assert (zmq_errno () == EAGAIN);
-    unsigned long elapsed = zmq_stopwatch_stop (watch);
+    assert (xs_errno () == EAGAIN);
+    unsigned long elapsed = xs_stopwatch_stop (watch);
     assert (elapsed > 440000 && elapsed < 550000);
 
     //  Check whether connection during the wait doesn't distort the timeout.
     timeout = 2000;
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
+    rc = xs_setsockopt(sb, XS_RCVTIMEO, &timeout, timeout_size);
     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);
+    watch = xs_stopwatch_start ();
+    rc = xs_recv (sb, buf, 32, 0);
     assert (rc == -1);
-    assert (zmq_errno () == EAGAIN);
-    elapsed = zmq_stopwatch_stop (watch);
+    assert (xs_errno () == EAGAIN);
+    elapsed = xs_stopwatch_stop (watch);
     assert (elapsed > 1900000 && elapsed < 2100000);
     rc = pthread_join (thread, NULL);
     assert (rc == 0);
 
     //  Check that timeouts don't break normal message transfer.
-    void *sc = zmq_socket (ctx, ZMQ_PUSH);
+    void *sc = xs_socket (ctx, XS_PUSH);
     assert (sc);
-    rc = zmq_setsockopt(sb, ZMQ_RCVTIMEO, &timeout, timeout_size);
+    rc = xs_setsockopt(sb, XS_RCVTIMEO, &timeout, timeout_size);
     assert (rc == 0);
-    rc = zmq_setsockopt(sb, ZMQ_SNDTIMEO, &timeout, timeout_size);
+    rc = xs_setsockopt(sb, XS_SNDTIMEO, &timeout, timeout_size);
     assert (rc == 0);
-    rc = zmq_connect (sc, "inproc://timeout_test");
+    rc = xs_connect (sc, "inproc://timeout_test");
     assert (rc == 0);
-    rc = zmq_send (sc, buf, 32, 0);
+    rc = xs_send (sc, buf, 32, 0);
     assert (rc == 32);
-    rc = zmq_recv (sb, buf, 32, 0);
+    rc = xs_recv (sb, buf, 32, 0);
     assert (rc == 32);
 
     //  Clean-up.
-    rc = zmq_close (sc);
+    rc = xs_close (sc);
     assert (rc == 0);
-    rc = zmq_close (sb);
+    rc = xs_close (sb);
     assert (rc == 0);
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     assert (rc == 0);
 
     return 0 ;