added newly added socket options to all language bindings, P2P model changed to…

added newly added socket options to all language bindings, P2P model changed to PUB/SUB for throughput tests

c/zmq.h

@@ -53,7 +53,7 @@ extern "C" {
 #define ZMQ_UNSUBSCRIBE 7          //  string
 #define ZMQ_RATE 8                 //  int64_t
 #define ZMQ_RECOVERY_IVL 9         //  int64_t
-#define ZMQ_MCAST_LOOP 10          //  boolean
+#define ZMQ_MCAST_LOOP 10          //  int64_t
 
 //  The operation should be performed in non-blocking mode. I.e. if it cannot
 //  be processed immediately, error should be returned with errno set to EAGAIN.

java/Socket.cpp

@@ -98,6 +98,7 @@ JNIEXPORT void JNICALL Java_org_zmq_Socket_setsockopt__IJ (JNIEnv *env,
     case ZMQ_AFFINITY:
     case ZMQ_RATE:
     case ZMQ_RECOVERY_IVL:
+    case ZMQ_MCAST_LOOP:
         {
             void *s = (void*) env->GetLongField (obj, socket_handle_fid);
             assert (s);

java/org/zmq/Socket.java

@@ -44,6 +44,7 @@ public class Socket
     public static final int UNSUBSCRIBE = 7;
     public static final int RATE = 8;
     public static final int RECOVERY_IVL = 9;
+    public static final int MCAST_LOOP = 10;
 
     /**
      * Class constructor.

perf/c/local_thr.c

@@ -48,9 +48,15 @@ int main (int argc, char *argv [])
     ctx = zmq_init (1, 1);
     assert (ctx);
 
-    s = zmq_socket (ctx, ZMQ_P2P);
+    s = zmq_socket (ctx, ZMQ_SUB);
     assert (s);
 
+    rc = zmq_setsockopt (s, ZMQ_SUBSCRIBE , "*", 1);
+    assert (rc == 0);
+
+    //  Add your socket options here.
+    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     rc = zmq_bind (s, bind_to);
     assert (rc == 0);
 

perf/c/remote_thr.c

@@ -45,9 +45,12 @@ int main (int argc, char *argv [])
     ctx = zmq_init (1, 1);
     assert (ctx);
 
-    s = zmq_socket (ctx, ZMQ_P2P);
+    s = zmq_socket (ctx, ZMQ_PUB);
     assert (s);
 
+    //  Add your socket options here.
+    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     rc = zmq_connect (s, connect_to);
     assert (rc == 0);
 

perf/cpp/local_thr.cpp

@@ -36,7 +36,13 @@ int main (int argc, char *argv [])
 
     zmq::context_t ctx (1, 1);
 
-    zmq::socket_t s (ctx, ZMQ_P2P);
+    zmq::socket_t s (ctx, ZMQ_SUB);
+
+    s.setsockopt (ZMQ_SUBSCRIBE , "*", 1);
+
+    //  Add your socket options here.
+    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     s.bind (bind_to);
 
     zmq::message_t msg;

perf/cpp/remote_thr.cpp

@@ -36,7 +36,11 @@ int main (int argc, char *argv [])
 
     zmq::context_t ctx (1, 1);
 
-    zmq::socket_t s (ctx, ZMQ_P2P);
+    zmq::socket_t s (ctx, ZMQ_PUB);
+
+    //  Add your socket options here.
+    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     s.connect (connect_to);
 
     for (int i = 0; i != message_count; i++) {

perf/java/local_thr.java

@@ -35,7 +35,13 @@ class local_thr
 
         org.zmq.Context ctx = new org.zmq.Context (1, 1);
 
-         org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.P2P);
+        org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.SUB);
+
+        s.setsockopt (org.zmq.Socket.SUBSCRIBE , "*");
+
+        //  Add your socket options here.
+        //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
         s.bind (bindTo);
 
         byte [] data = s.recv (0);

perf/java/remote_thr.java

@@ -36,7 +36,11 @@ class remote_thr
 
         org.zmq.Context ctx = new org.zmq.Context (1, 1);
 
-         org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.P2P);
+        org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.PUB);
+
+       //  Add your socket options here.
+       //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
         s.connect (connectTo);
 
         byte msg [] = new byte [messageSize];

perf/python/local_thr.py

@@ -35,7 +35,13 @@ def main ():
         sys.exit (1)
 
     ctx = libpyzmq.Context (1, 1);   
-    s = libpyzmq.Socket (ctx, libpyzmq.P2P)
+    s = libpyzmq.Socket (ctx, libpyzmq.SUB)
+
+    s.setsockopt (libpyzmq.SUBSCRIBE , "*");
+
+    #  Add your socket options here.
+    #  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     s.bind (bind_to)
 
     msg = s.recv ()

perf/python/remote_thr.py

@@ -35,7 +35,11 @@ def main ():
         sys.exit (1)
 
     ctx = libpyzmq.Context (1, 1);   
-    s = libpyzmq.Socket (ctx, libpyzmq.P2P)
+    s = libpyzmq.Socket (ctx, libpyzmq.PUB)
+
+    #  Add your socket options here.
+    #  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
     s.connect (connect_to)
 
     msg = ''.join ([' ' for n in range (0, message_size)])

perf/ruby/local_thr.rb

@@ -28,7 +28,12 @@ message_size = ARGV[1].to_i
 message_count = ARGV[2].to_i
 					
 ctx = Context.new(1, 1)
-s = Socket.new(ctx, P2P);
+s = Socket.new(ctx, SUB);
+s.setsockopt (SUBSCRIBE, "*");
+
+#  Add your socket options here.
+#  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
 s.bind(bind_to);
 
 msg = s.recv(0)

perf/ruby/remote_thr.rb

@@ -28,7 +28,11 @@ message_size = ARGV[1].to_i
 message_count = ARGV[2].to_i
 			
 ctx = Context.new(1, 1)
-s = Socket.new(ctx, P2P);
+s = Socket.new(ctx, PUB);
+
+#  Add your socket options here.
+#  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
+
 s.connect(connect_to);
 
 msg = "#{'0'*message_size}"

python/pyzmq.cpp

@@ -490,6 +490,22 @@ PyMODINIT_FUNC initlibpyzmq ()
     t = PyInt_FromLong (ZMQ_IDENTITY);
     PyDict_SetItemString (dict, "IDENTITY", t);
     Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_SUBSCRIBE);
+    PyDict_SetItemString (dict, "SUBSCRIBE", t);
+    Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_UNSUBSCRIBE);
+    PyDict_SetItemString (dict, "UNSUBSCRIBE", t);
+    Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_RATE);
+    PyDict_SetItemString (dict, "RATE", t);
+    Py_DECREF (t);    
+    t = PyInt_FromLong (ZMQ_RECOVERY_IVL);
+    PyDict_SetItemString (dict, "RECOVERY_IVL", t);
+    Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_MCAST_LOOP);
+    PyDict_SetItemString (dict, "MCAST_LOOP", t);
+    Py_DECREF (t);
+
 }
 
 #if defined _MSC_VER

ruby/rbzmq.cpp

@@ -282,6 +282,11 @@ extern "C" void Init_librbzmq ()
     rb_define_global_const ("SWAP", INT2NUM (ZMQ_SWAP));
     rb_define_global_const ("AFFINITY", INT2NUM (ZMQ_AFFINITY));
     rb_define_global_const ("IDENTITY", INT2NUM (ZMQ_IDENTITY));
+    rb_define_global_const ("SUBSCRIBE", INT2NUM (ZMQ_SUBSCRIBE));
+    rb_define_global_const ("UNSUBSCRIBE", INT2NUM (ZMQ_UNSUBSCRIBE));
+    rb_define_global_const ("RATE", INT2NUM (ZMQ_RATE));
+    rb_define_global_const ("RECOVERY_IVL", INT2NUM (ZMQ_RECOVERY_IVL));
+    rb_define_global_const ("MCAST_LOOP", INT2NUM (ZMQ_MCAST_LOOP));
 
     rb_define_global_const ("NOBLOCK", INT2NUM (ZMQ_NOBLOCK));
     rb_define_global_const ("NOFLUSH", INT2NUM (ZMQ_NOFLUSH));

src/socket_base.cpp

@@ -158,11 +158,18 @@ int zmq::socket_base_t::setsockopt (int option_, const void *optval_,
         return 0;
 
     case ZMQ_MCAST_LOOP:
-        if (optvallen_ != sizeof (bool)) {
+        if (optvallen_ != sizeof (int64_t)) {
+            errno = EINVAL;
+            return -1;
+        }
+
+        if ((int64_t) *((int64_t*) optval_) == 0 ||
+              (int64_t) *((int64_t*) optval_) == 1) {
+            options.use_multicast_loop = (bool) *((int64_t*) optval_);
+        } else {
             errno = EINVAL;
             return -1;
         }
-        options.use_multicast_loop = optval_;
         return 0;
 
     default: