From 93e70ee583489034c9f3b92fb87b374707afd5d5 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 10 Sep 2009 15:20:54 +0200 Subject: throughput tests use P2P sockets consistently --- perf/cpp/remote_thr.cpp | 2 +- perf/java/local_thr.java | 2 +- perf/java/remote_thr.java | 2 +- perf/ruby/local_thr.rb | 2 +- perf/ruby/remote_thr.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp index a4008df..15a4ed1 100644 --- a/perf/cpp/remote_thr.cpp +++ b/perf/cpp/remote_thr.cpp @@ -36,7 +36,7 @@ int main (int argc, char *argv []) zmq::context_t ctx (1, 1); - zmq::socket_t s (ctx, ZMQ_REQ); + zmq::socket_t s (ctx, ZMQ_P2P); s.connect (connect_to); for (int i = 0; i != message_count; i++) { diff --git a/perf/java/local_thr.java b/perf/java/local_thr.java index 4a03f1d..f5d3718 100644 --- a/perf/java/local_thr.java +++ b/perf/java/local_thr.java @@ -35,7 +35,7 @@ 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.SUB); + org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.P2P); s.bind (bindTo); byte [] data = s.recv (0); diff --git a/perf/java/remote_thr.java b/perf/java/remote_thr.java index 25406ea..f505600 100644 --- a/perf/java/remote_thr.java +++ b/perf/java/remote_thr.java @@ -36,7 +36,7 @@ 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.PUB); + org.zmq.Socket s = new org.zmq.Socket (ctx, org.zmq.Socket.P2P); s.connect (connectTo); byte msg [] = new byte [messageSize]; diff --git a/perf/ruby/local_thr.rb b/perf/ruby/local_thr.rb index 4d9357b..117e54b 100644 --- a/perf/ruby/local_thr.rb +++ b/perf/ruby/local_thr.rb @@ -28,7 +28,7 @@ message_size = ARGV[1].to_i message_count = ARGV[2].to_i ctx = Context.new(1, 1) -s = Socket.new(ctx, SUB); +s = Socket.new(ctx, P2P); s.bind(bind_to); msg = s.recv(0) diff --git a/perf/ruby/remote_thr.rb b/perf/ruby/remote_thr.rb index 7d55f86..8d98848 100644 --- a/perf/ruby/remote_thr.rb +++ b/perf/ruby/remote_thr.rb @@ -28,7 +28,7 @@ message_size = ARGV[1].to_i message_count = ARGV[2].to_i ctx = Context.new(1, 1) -s = Socket.new(ctx, PUB); +s = Socket.new(ctx, P2P); s.connect(connect_to); msg = "#{'0'*message_size}" -- cgit v1.2.3