ZeroMQ renamed to Crossroads

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

7 files changed, 222 insertions, 222 deletions

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 4053ba5..3a4f629 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -3,20 +3,20 @@ INCLUDES = -I$(top_builddir)/include \
 
 noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr inproc_lat inproc_thr
 
-local_lat_LDADD = $(top_builddir)/src/libzmq.la
+local_lat_LDADD = $(top_builddir)/src/libxs.la
 local_lat_SOURCES = local_lat.cpp
 
-remote_lat_LDADD = $(top_builddir)/src/libzmq.la
+remote_lat_LDADD = $(top_builddir)/src/libxs.la
 remote_lat_SOURCES = remote_lat.cpp
 
-local_thr_LDADD = $(top_builddir)/src/libzmq.la
+local_thr_LDADD = $(top_builddir)/src/libxs.la
 local_thr_SOURCES = local_thr.cpp
 
-remote_thr_LDADD = $(top_builddir)/src/libzmq.la
+remote_thr_LDADD = $(top_builddir)/src/libxs.la
 remote_thr_SOURCES = remote_thr.cpp
 
-inproc_lat_LDADD = $(top_builddir)/src/libzmq.la
+inproc_lat_LDADD = $(top_builddir)/src/libxs.la
 inproc_lat_SOURCES = inproc_lat.cpp
 
-inproc_thr_LDADD = $(top_builddir)/src/libzmq.la
+inproc_thr_LDADD = $(top_builddir)/src/libxs.la
 inproc_thr_SOURCES = inproc_thr.cpp
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
index 5b6a830..d511706 100644
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +28,7 @@
 
 #include "../src/platform.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
 #include <windows.h>
 #include <process.h>
 #else
@@ -38,7 +38,7 @@
 static size_t message_size;
 static int roundtrip_count;
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
 static unsigned int __stdcall worker (void *ctx_)
 #else
 static void *worker (void *ctx_)
@@ -47,52 +47,52 @@ static void *worker (void *ctx_)
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
 
-    s = zmq_socket (ctx_, ZMQ_REP);
+    s = xs_socket (ctx_, XS_REP);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-    rc = zmq_connect (s, "inproc://lat_test");
+    rc = xs_connect (s, "inproc://lat_test");
     if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
+        printf ("error in xs_connect: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-    rc = zmq_msg_init (&msg);
+    rc = xs_msg_init (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init: %s\n", xs_strerror (errno));
         exit (1);
     }
 
     for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             exit (1);
         }
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             exit (1);
         }
     }
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     return 0;
 #else
     return NULL;
@@ -101,7 +101,7 @@ static void *worker (void *ctx_)
 
 int main (int argc, char *argv [])
 {
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     HANDLE local_thread;
 #else
     pthread_t local_thread;
@@ -110,7 +110,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
     void *watch;
     unsigned long elapsed;
     double latency;
@@ -123,25 +123,25 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [1]);
     roundtrip_count = atoi (argv [2]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_REQ);
+    s = xs_socket (ctx, XS_REQ);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_bind (s, "inproc://lat_test");
+    rc = xs_bind (s, "inproc://lat_test");
     if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
+        printf ("error in xs_bind: %s\n", xs_strerror (errno));
         return -1;
     }
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     local_thread = (HANDLE) _beginthreadex (NULL, 0,
         worker, ctx, 0 , NULL);
     if (local_thread == 0) {
@@ -151,51 +151,51 @@ int main (int argc, char *argv [])
 #else
     rc = pthread_create (&local_thread, NULL, worker, ctx);
     if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
+        printf ("error in pthread_create: %s\n", xs_strerror (rc));
         return -1;
     }
 #endif
 
-    rc = zmq_msg_init_size (&msg, message_size);
+    rc = xs_msg_init_size (&msg, message_size);
     if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init_size: %s\n", xs_strerror (errno));
         return -1;
     }
-    memset (zmq_msg_data (&msg), 0, message_size);
+    memset (xs_msg_data (&msg), 0, message_size);
 
     printf ("message size: %d [B]\n", (int) message_size);
     printf ("roundtrip count: %d\n", (int) roundtrip_count);
 
-    watch = zmq_stopwatch_start ();
+    watch = xs_stopwatch_start ();
 
     for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        if (zmq_msg_size (&msg) != message_size) {
+        if (xs_msg_size (&msg) != message_size) {
             printf ("message of incorrect size received\n");
             return -1;
         }
     }
 
-    elapsed = zmq_stopwatch_stop (watch);
+    elapsed = xs_stopwatch_stop (watch);
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
     latency = (double) elapsed / (roundtrip_count * 2);
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
     if (rc2 == WAIT_FAILED) {
         printf ("error in WaitForSingleObject\n");
@@ -209,22 +209,22 @@ int main (int argc, char *argv [])
 #else
     rc = pthread_join (local_thread, NULL);
     if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
+        printf ("error in pthread_join: %s\n", xs_strerror (rc));
         return -1;
     }
 #endif
 
     printf ("average latency: %.3f [us]\n", (double) latency);
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }
 
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
index b4cadfc..a103833 100644
--- a/perf/inproc_thr.cpp
+++ b/perf/inproc_thr.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +28,7 @@
 
 #include "../src/platform.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
 #include <windows.h>
 #include <process.h>
 #else
@@ -38,7 +38,7 @@
 static int message_count;
 static size_t message_size;
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
 static unsigned int __stdcall worker (void *ctx_)
 #else
 static void *worker (void *ctx_)
@@ -47,50 +47,50 @@ static void *worker (void *ctx_)
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
 
-    s = zmq_socket (ctx_, ZMQ_PUSH);
+    s = xs_socket (ctx_, XS_PUSH);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-    rc = zmq_connect (s, "inproc://thr_test");
+    rc = xs_connect (s, "inproc://thr_test");
     if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
+        printf ("error in xs_connect: %s\n", xs_strerror (errno));
         exit (1);
     }
 
     for (i = 0; i != message_count; i++) {
 
-        rc = zmq_msg_init_size (&msg, message_size);
+        rc = xs_msg_init_size (&msg, message_size);
         if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
+            printf ("error in xs_msg_init_size: %s\n", xs_strerror (errno));
             exit (1);
         }
-#if defined ZMQ_MAKE_VALGRIND_HAPPY
-        memset (zmq_msg_data (&msg), 0, message_size);
+#if defined XS_MAKE_VALGRIND_HAPPY
+        memset (xs_msg_data (&msg), 0, message_size);
 #endif
 
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             exit (1);
         }
-        rc = zmq_msg_close (&msg);
+        rc = xs_msg_close (&msg);
         if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+            printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
             exit (1);
         }
     }
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         exit (1);
     }
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     return 0;
 #else
     return NULL;
@@ -99,7 +99,7 @@ static void *worker (void *ctx_)
 
 int main (int argc, char *argv [])
 {
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     HANDLE local_thread;
 #else
     pthread_t local_thread;
@@ -108,7 +108,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
     void *watch;
     unsigned long elapsed;
     unsigned long throughput;
@@ -122,25 +122,25 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [1]);
     message_count = atoi (argv [2]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_PULL);
+    s = xs_socket (ctx, XS_PULL);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_bind (s, "inproc://thr_test");
+    rc = xs_bind (s, "inproc://thr_test");
     if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
+        printf ("error in xs_bind: %s\n", xs_strerror (errno));
         return -1;
     }
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     local_thread = (HANDLE) _beginthreadex (NULL, 0,
         worker, ctx, 0 , NULL);
     if (local_thread == 0) {
@@ -150,55 +150,55 @@ int main (int argc, char *argv [])
 #else
     rc = pthread_create (&local_thread, NULL, worker, ctx);
     if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
+        printf ("error in pthread_create: %s\n", xs_strerror (rc));
         return -1;
     }
 #endif
 
-    rc = zmq_msg_init (&msg);
+    rc = xs_msg_init (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
     printf ("message size: %d [B]\n", (int) message_size);
     printf ("message count: %d\n", (int) message_count);
 
-    rc = zmq_recvmsg (s, &msg, 0);
+    rc = xs_recvmsg (s, &msg, 0);
     if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+        printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
         return -1;
     }
-    if (zmq_msg_size (&msg) != message_size) {
+    if (xs_msg_size (&msg) != message_size) {
         printf ("message of incorrect size received\n");
         return -1;
     }
 
-    watch = zmq_stopwatch_start ();
+    watch = xs_stopwatch_start ();
 
     for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        if (zmq_msg_size (&msg) != message_size) {
+        if (xs_msg_size (&msg) != message_size) {
             printf ("message of incorrect size received\n");
             return -1;
         }
     }
 
-    elapsed = zmq_stopwatch_stop (watch);
+    elapsed = xs_stopwatch_stop (watch);
     if (elapsed == 0)
         elapsed = 1;
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-#if defined ZMQ_HAVE_WINDOWS
+#if defined XS_HAVE_WINDOWS
     DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
     if (rc2 == WAIT_FAILED) {
         printf ("error in WaitForSingleObject\n");
@@ -212,20 +212,20 @@ int main (int argc, char *argv [])
 #else
     rc = pthread_join (local_thread, NULL);
     if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
+        printf ("error in pthread_join: %s\n", xs_strerror (rc));
         return -1;
     }
 #endif
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }
 
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
index 714b8c0..7287453 100644
--- a/perf/local_lat.cpp
+++ b/perf/local_lat.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
 
     if (argc != 4) {
         printf ("usage: local_lat <bind-to> <message-size> "
@@ -44,64 +44,64 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [2]);
     roundtrip_count = atoi (argv [3]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_REP);
+    s = xs_socket (ctx, XS_REP);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_bind (s, bind_to);
+    rc = xs_bind (s, bind_to);
     if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
+        printf ("error in xs_bind: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_msg_init (&msg);
+    rc = xs_msg_init (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
     for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        if (zmq_msg_size (&msg) != message_size) {
+        if (xs_msg_size (&msg) != message_size) {
             printf ("message of incorrect size received\n");
             return -1;
         }
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             return -1;
         }
     }
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    zmq_sleep (1);
+    xs_sleep (1);
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }
 
diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
index 5c495d8..6dcc810 100644
--- a/perf/local_thr.cpp
+++ b/perf/local_thr.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
     void *watch;
     unsigned long elapsed;
     unsigned long throughput;
@@ -47,64 +47,64 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [2]);
     message_count = atoi (argv [3]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_PULL);
+    s = xs_socket (ctx, XS_PULL);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
     //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+    //  For example XS_RATE, XS_RECOVERY_IVL and XS_MCAST_LOOP for PGM.
 
-    rc = zmq_bind (s, bind_to);
+    rc = xs_bind (s, bind_to);
     if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
+        printf ("error in xs_bind: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_msg_init (&msg);
+    rc = xs_msg_init (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_recvmsg (s, &msg, 0);
+    rc = xs_recvmsg (s, &msg, 0);
     if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+        printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
         return -1;
     }
-    if (zmq_msg_size (&msg) != message_size) {
+    if (xs_msg_size (&msg) != message_size) {
         printf ("message of incorrect size received\n");
         return -1;
     }
 
-    watch = zmq_stopwatch_start ();
+    watch = xs_stopwatch_start ();
 
     for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        if (zmq_msg_size (&msg) != message_size) {
+        if (xs_msg_size (&msg) != message_size) {
             printf ("message of incorrect size received\n");
             return -1;
         }
     }
 
-    elapsed = zmq_stopwatch_stop (watch);
+    elapsed = xs_stopwatch_stop (watch);
     if (elapsed == 0)
         elapsed = 1;
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
@@ -117,15 +117,15 @@ int main (int argc, char *argv [])
     printf ("mean throughput: %d [msg/s]\n", (int) throughput);
     printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }
 
diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
index 9eb76b0..0ddddd5 100644
--- a/perf/remote_lat.cpp
+++ b/perf/remote_lat.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +34,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
     void *watch;
     unsigned long elapsed;
     double latency;
@@ -48,55 +48,55 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [2]);
     roundtrip_count = atoi (argv [3]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_REQ);
+    s = xs_socket (ctx, XS_REQ);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_connect (s, connect_to);
+    rc = xs_connect (s, connect_to);
     if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
+        printf ("error in xs_connect: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_msg_init_size (&msg, message_size);
+    rc = xs_msg_init_size (&msg, message_size);
     if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_init_size: %s\n", xs_strerror (errno));
         return -1;
     }
-    memset (zmq_msg_data (&msg), 0, message_size);
+    memset (xs_msg_data (&msg), 0, message_size);
 
-    watch = zmq_stopwatch_start ();
+    watch = xs_stopwatch_start ();
 
     for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        rc = zmq_recvmsg (s, &msg, 0);
+        rc = xs_recvmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_recvmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        if (zmq_msg_size (&msg) != message_size) {
+        if (xs_msg_size (&msg) != message_size) {
             printf ("message of incorrect size received\n");
             return -1;
         }
     }
 
-    elapsed = zmq_stopwatch_stop (watch);
+    elapsed = xs_stopwatch_stop (watch);
 
-    rc = zmq_msg_close (&msg);
+    rc = xs_msg_close (&msg);
     if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
@@ -106,15 +106,15 @@ int main (int argc, char *argv [])
     printf ("roundtrip count: %d\n", (int) roundtrip_count);
     printf ("average latency: %.3f [us]\n", (double) latency);
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }
 
diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
index 328bdce..5e825e9 100644
--- a/perf/remote_thr.cpp
+++ b/perf/remote_thr.cpp
@@ -1,16 +1,16 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2009-2012 250bpm s.r.o.
     Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2007-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.
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include "../include/zmq_utils.h"
+#include "../include/xs.h"
+#include "../include/xs_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +34,7 @@ int main (int argc, char *argv [])
     void *s;
     int rc;
     int i;
-    zmq_msg_t msg;
+    xs_msg_t msg;
 
     if (argc != 4) {
         printf ("usage: remote_thr <connect-to> <message-size> "
@@ -45,59 +45,59 @@ int main (int argc, char *argv [])
     message_size = atoi (argv [2]);
     message_count = atoi (argv [3]);
 
-    ctx = zmq_init (1);
+    ctx = xs_init (1);
     if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
+        printf ("error in xs_init: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    s = zmq_socket (ctx, ZMQ_PUSH);
+    s = xs_socket (ctx, XS_PUSH);
     if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
+        printf ("error in xs_socket: %s\n", xs_strerror (errno));
         return -1;
     }
 
     //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+    //  For example XS_RATE, XS_RECOVERY_IVL and XS_MCAST_LOOP for PGM.
 
-    rc = zmq_connect (s, connect_to);
+    rc = xs_connect (s, connect_to);
     if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
+        printf ("error in xs_connect: %s\n", xs_strerror (errno));
         return -1;
     }
 
     for (i = 0; i != message_count; i++) {
 
-        rc = zmq_msg_init_size (&msg, message_size);
+        rc = xs_msg_init_size (&msg, message_size);
         if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
+            printf ("error in xs_msg_init_size: %s\n", xs_strerror (errno));
             return -1;
         }
-#if defined ZMQ_MAKE_VALGRIND_HAPPY
-        memset (zmq_msg_data (&msg), 0, message_size);
+#if defined XS_MAKE_VALGRIND_HAPPY
+        memset (xs_msg_data (&msg), 0, message_size);
 #endif
 
-        rc = zmq_sendmsg (s, &msg, 0);
+        rc = xs_sendmsg (s, &msg, 0);
         if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            printf ("error in xs_sendmsg: %s\n", xs_strerror (errno));
             return -1;
         }
-        rc = zmq_msg_close (&msg);
+        rc = xs_msg_close (&msg);
         if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+            printf ("error in xs_msg_close: %s\n", xs_strerror (errno));
             return -1;
         }
     }
 
-    rc = zmq_close (s);
+    rc = xs_close (s);
     if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
+        printf ("error in xs_close: %s\n", xs_strerror (errno));
         return -1;
     }
 
-    rc = zmq_term (ctx);
+    rc = xs_term (ctx);
     if (rc != 0) {
-        printf ("error in zmq_term: %s\n", zmq_strerror (errno));
+        printf ("error in xs_term: %s\n", xs_strerror (errno));
         return -1;
     }