diff --git a/perf/local_thr.lua b/perf/local_thr.lua index c7ede4c..727c94c 100644 --- a/perf/local_thr.lua +++ b/perf/local_thr.lua @@ -30,8 +30,7 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = assert(ctx:socket(zmq.SUB)) -assert(s:setopt(zmq.SUBSCRIBE, "")) +local s = assert(ctx:socket(zmq.PULL)) assert(s:bind(bind_to)) print(string.format("message size: %i [B]", message_size)) diff --git a/perf/local_thr_push_pull.lua b/perf/local_thr_push_pull.lua deleted file mode 100644 index 727c94c..0000000 --- a/perf/local_thr_push_pull.lua +++ /dev/null @@ -1,62 +0,0 @@ --- Copyright (c) 2010 Aleksey Yeschenko --- --- Permission is hereby granted, free of charge, to any person obtaining a copy --- of this software and associated documentation files (the "Software"), to deal --- in the Software without restriction, including without limitation the rights --- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --- copies of the Software, and to permit persons to whom the Software is --- furnished to do so, subject to the following conditions: --- --- The above copyright notice and this permission notice shall be included in --- all copies or substantial portions of the Software. --- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN --- THE SOFTWARE. - -if not arg[3] then - print("usage: lua local_thr.lua ") - os.exit() -end - -local bind_to = arg[1] -local message_size = tonumber(arg[2]) -local message_count = tonumber(arg[3]) - -local zmq = require"zmq" - -local ctx = zmq.init(1) -local s = assert(ctx:socket(zmq.PULL)) -assert(s:bind(bind_to)) - -print(string.format("message size: %i [B]", message_size)) -print(string.format("message count: %i", message_count)) - -local msg -msg = zmq.zmq_msg_t() -assert(s:recv_msg(msg)) - -local timer = zmq.stopwatch_start() - -for i = 1, message_count - 1 do - assert(s:recv_msg(msg)) - assert(msg:size() == message_size, "Invalid message size") -end - -local elapsed = timer:stop() - -s:close() -ctx:term() - -if elapsed == 0 then elapsed = 1 end - -local throughput = message_count / (elapsed / 1000000) -local megabits = throughput * message_size * 8 / 1000000 - -print(string.format("mean throughput: %i [msg/s]", throughput)) -print(string.format("mean throughput: %.3f [Mb/s]", megabits)) - diff --git a/perf/remote_thr.lua b/perf/remote_thr.lua index 74cccb4..3604d6e 100644 --- a/perf/remote_thr.lua +++ b/perf/remote_thr.lua @@ -30,9 +30,7 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = assert(ctx:socket(zmq.PUB)) --- for ZeroMQ 3.x need to change HWM option. -assert(s:set_hwm(0)) +local s = assert(ctx:socket(zmq.PUSH)) assert(s:connect(connect_to)) zmq.sleep(1) diff --git a/perf/remote_thr_push_pull.lua b/perf/remote_thr_push_pull.lua deleted file mode 100644 index 3604d6e..0000000 --- a/perf/remote_thr_push_pull.lua +++ /dev/null @@ -1,49 +0,0 @@ --- Copyright (c) 2010 Aleksey Yeschenko --- --- Permission is hereby granted, free of charge, to any person obtaining a copy --- of this software and associated documentation files (the "Software"), to deal --- in the Software without restriction, including without limitation the rights --- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --- copies of the Software, and to permit persons to whom the Software is --- furnished to do so, subject to the following conditions: --- --- The above copyright notice and this permission notice shall be included in --- all copies or substantial portions of the Software. --- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN --- THE SOFTWARE. - -if not arg[3] then - print("usage: lua remote_thr.lua ") - os.exit() -end - -local connect_to = arg[1] -local message_size = tonumber(arg[2]) -local message_count = tonumber(arg[3]) - -local zmq = require"zmq" - -local ctx = zmq.init(1) -local s = assert(ctx:socket(zmq.PUSH)) -assert(s:connect(connect_to)) - -zmq.sleep(1) - -local data = ("0"):rep(message_size) -local msg_data = zmq.zmq_msg_t.init_data(data) -local msg = zmq.zmq_msg_t.init() - -for i = 1, message_count do - msg:copy(msg_data) - assert(s:send_msg(msg)) -end - -s:close() -ctx:term() - diff --git a/perf/thread_thr.lua b/perf/thread_thr.lua index a7a5d11..22ed653 100644 --- a/perf/thread_thr.lua +++ b/perf/thread_thr.lua @@ -37,9 +37,7 @@ local child_code = [[ local zthreads = require"zmq.threads" local ctx = zthreads.get_parent_ctx() - local s = assert(ctx:socket(zmq.PUB)) - -- for ZeroMQ 3.x need to change HWM option. - assert(s:set_hwm(0)) + local s = assert(ctx:socket(zmq.PUSH)) assert(s:connect(connect_to)) local data = ("0"):rep(message_size) @@ -69,8 +67,7 @@ local child_code = [[ ]] local ctx = zmq.init(1) -local s = assert(ctx:socket(zmq.SUB)) -assert(s:setopt(zmq.SUBSCRIBE, "")) +local s = assert(ctx:socket(zmq.PULL)) assert(s:bind(bind_to)) print(string.format("message size: %i [B]", message_size))