Fix building with libxs or libzmq only

src/handle_xs.c

@@ -4,19 +4,18 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <xs.h>
-
 #include "handle_xs.h"
 
 #ifndef HAVE_XS
 
+
 int open_xs_socket(context *ctx, config_socket_t *sock) {
     fprintf(stderr, "Paperjam was compiled without libxs support\n");
     errno = ENOTSUP;
     return -1;
 }
 
-#else
+#else  // HAVE_XS
 
 #define XS_MORENWAIT (XS_DONTWAIT|XS_SNDMORE)
 

src/handle_xs.h

@@ -18,15 +18,23 @@
 #define XS_SOCKETERR(sock, val) if((val) == -1) { \
     fprintf(stderr, "Error on ``%s.%s'' at %s:%d: %s\n", \
         (sock)->_name, (sock)->_type, __FILE__, __LINE__, \
-        zmq_strerror(errno)); \
+        xs_strerror(errno)); \
     abort(); \
     }
 
 
 #else
 
-#define XS_ASSERTERR(val) assert(0);
-#define XS_SOCKETERR(sock, val) assert(0);
+#define XS_ASSERTERR(val) if((val) == -1) { \
+    fprintf(stderr, "Assertion error" #val ": %s\n", strerror(errno)); \
+    abort(); \
+    }
+#define XS_SOCKETERR(sock, val) if((val) == -1) { \
+    fprintf(stderr, "Error on ``%s.%s'' at %s:%d: %s\n", \
+        (sock)->_name, (sock)->_type, __FILE__, __LINE__, \
+        strerror(errno)); \
+    abort(); \
+    }
 
 #endif
 

src/handle_zmq.c

@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <zmq.h>
-
 #include "handle_zmq.h"
 
 #ifndef HAVE_ZMQ

src/handle_zmq.h

@@ -25,8 +25,18 @@
 
 #else
 
-#define ZMQ_ASSERTERR(val) assert(0);
-#define ZMQ_SOCKETERR(sock, val) assert(0);
+#define ZMQ_SOCKETERR(sock, val) if((val) == -1) { \
+    fprintf(stderr, "Error on ``%s.%s'' at %s:%d: %s\n", \
+        (sock)->_name, (sock)->_type, __FILE__, __LINE__, \
+        strerror(errno)); \
+    abort(); \
+    }
+#define ZMQ_ASSERTERR(val) if((val) == -1) { \
+    fprintf(stderr, "Assertion error at %s:%d: %s\n", \
+        __FILE__, __LINE__, \
+        strerror(errno)); \
+    abort(); \
+    }
 
 #endif
 

src/main.c

@@ -12,7 +12,7 @@
 #define ASSERTERR(val) if((val) == -1) { \
     fprintf(stderr, "Assertion error at %s:%d: %s\n", \
         __FILE__, __LINE__, \
-        zmq_strerror(errno)); \
+        strerror(errno)); \
     abort(); \
     }
 
@@ -43,7 +43,7 @@ static int close_message(message *msg) {
 #endif
     }
     if(msg->xs) {
-#ifdef HAVE_ZMQ
+#ifdef HAVE_XS
         XS_ASSERTERR(xs_msg_close(&msg->xs_msg));
 #else
         assert(0);
@@ -202,7 +202,7 @@ int main(int argc, char **argv) {
                 open_xs_socket(&ctx, &item->value.frontend));
         } else {
             zmq_socks += 1;
-            XS_SOCKETERR(&item->value.frontend,
+            ZMQ_SOCKETERR(&item->value.frontend,
                 open_zmq_socket(&ctx, &item->value.frontend));
         }
 
@@ -214,7 +214,7 @@ int main(int argc, char **argv) {
                 open_xs_socket(&ctx, &item->value.backend));
         } else {
             zmq_socks += 1;
-            XS_SOCKETERR(&item->value.backend,
+            ZMQ_SOCKETERR(&item->value.backend,
                 open_zmq_socket(&ctx, &item->value.backend));
         }
         device_check(&item->value.frontend, &item->value.backend);
@@ -228,7 +228,7 @@ int main(int argc, char **argv) {
                     open_xs_socket(&ctx, &item->value.monitor));
             } else {
                 zmq_socks += 1;
-                XS_SOCKETERR(&item->value.monitor,
+                ZMQ_SOCKETERR(&item->value.monitor,
                     open_zmq_socket(&ctx, &item->value.monitor));
             }
             monitor_check(&item->value.monitor);

test/base.py

@@ -10,6 +10,7 @@ class Wrapper(object):
 
     def __init__(self, sock):
         self.sock = sock
+        sock.setsockopt(zmq.LINGER, 0)
 
     def send_multipart(self, data):
         self.sock.send_multipart(data, zmq.DONTWAIT)
@@ -39,6 +40,6 @@ def setUp(self):
 
     def socket(self, kind, addr):
         res = self.ctx.socket(getattr(zmq, kind.upper()))
-        res.connect(addr)
         self.addCleanup(res.close)
+        res.connect(addr)
         return Wrapper(res)

wscript

@@ -27,8 +27,8 @@ def configure(conf):
     conf.check(header_name='xs.h',
                define_name='HAVE_XS',
                mandatory=False)
-    conf.check(lib='xs', uselib_store='XS')
-    conf.check(lib='zmq', uselib_store='XS')
+    conf.check(lib='xs', uselib_store='XS', mandatory=False)
+    conf.check(lib='zmq', uselib_store='XS', mandatory=False)
     if not conf.env['HAVE_ZMQ'] and not conf.env['HAVE_XS']:
         raise Errors.ConfigurationError(
             "Either libzmq or libxs is required, none found")