From b9e2ad3ea11e84a0aa74ca49a6e233ba94481eac Mon Sep 17 00:00:00 2001 From: "Robert G. Jakabosky" Date: Sun, 10 Mar 2013 20:03:43 -0700 Subject: [PATCH] Add asserts to catch errors from zeromq (like bind errors). --- perf/local_lat.lua | 4 ++-- perf/local_multipart.lua | 4 ++-- perf/local_pull.lua | 4 ++-- perf/local_thr.lua | 6 +++--- perf/local_thr_poll.lua | 6 +++--- perf/local_thr_push_pull.lua | 4 ++-- perf/remote_lat.lua | 4 ++-- perf/remote_multipart.lua | 4 ++-- perf/remote_push.lua | 4 ++-- perf/remote_thr.lua | 6 +++--- perf/remote_thr_push_pull.lua | 4 ++-- perf/thread_lat.lua | 4 ++-- perf/thread_push_pull.lua | 10 +++++----- perf/thread_thr.lua | 12 ++++++------ 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/perf/local_lat.lua b/perf/local_lat.lua index 027c583..4417c46 100644 --- a/perf/local_lat.lua +++ b/perf/local_lat.lua @@ -30,8 +30,8 @@ local roundtrip_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.REP) -s:bind(bind_to) +local s = assert(ctx:socket(zmq.REP)) +assert(s:bind(bind_to)) local msg = zmq.zmq_msg_t() diff --git a/perf/local_multipart.lua b/perf/local_multipart.lua index 7d3ab99..69955dd 100644 --- a/perf/local_multipart.lua +++ b/perf/local_multipart.lua @@ -30,9 +30,9 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PULL) +local s = assert(ctx:socket(zmq.PULL)) --s:setopt(zmq.SUBSCRIBE, ""); -s:bind(bind_to) +assert(s:bind(bind_to)) local function recv_msg(s,msg) assert(s:recv_msg(msg)) diff --git a/perf/local_pull.lua b/perf/local_pull.lua index a515f60..2d52b1e 100644 --- a/perf/local_pull.lua +++ b/perf/local_pull.lua @@ -30,8 +30,8 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PULL) -s:bind(bind_to) +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)) diff --git a/perf/local_thr.lua b/perf/local_thr.lua index 572c4e0..c7ede4c 100644 --- a/perf/local_thr.lua +++ b/perf/local_thr.lua @@ -30,9 +30,9 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.SUB) -s:setopt(zmq.SUBSCRIBE, ""); -s:bind(bind_to) +local s = assert(ctx:socket(zmq.SUB)) +assert(s:setopt(zmq.SUBSCRIBE, "")) +assert(s:bind(bind_to)) print(string.format("message size: %i [B]", message_size)) print(string.format("message count: %i", message_count)) diff --git a/perf/local_thr_poll.lua b/perf/local_thr_poll.lua index bfe0d33..2c3b7a4 100644 --- a/perf/local_thr_poll.lua +++ b/perf/local_thr_poll.lua @@ -34,9 +34,9 @@ local z_NOBLOCK = zmq.NOBLOCK local poller = z_poller(64) local ctx = zmq.init(1) -local s = ctx:socket(zmq.SUB) -s:setopt(zmq.SUBSCRIBE, ""); -s:bind(bind_to) +local s = assert(ctx:socket(zmq.SUB)) +assert(s:setopt(zmq.SUBSCRIBE, "")) +assert(s:bind(bind_to)) print(string.format("message size: %i [B]", message_size)) print(string.format("message count: %i", message_count)) diff --git a/perf/local_thr_push_pull.lua b/perf/local_thr_push_pull.lua index 9b2dee2..727c94c 100644 --- a/perf/local_thr_push_pull.lua +++ b/perf/local_thr_push_pull.lua @@ -30,8 +30,8 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PULL) -s:bind(bind_to) +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)) diff --git a/perf/remote_lat.lua b/perf/remote_lat.lua index ebcc680..c426279 100644 --- a/perf/remote_lat.lua +++ b/perf/remote_lat.lua @@ -30,8 +30,8 @@ local roundtrip_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.REQ) -s:connect(connect_to) +local s = assert(ctx:socket(zmq.REQ)) +assert(s:connect(connect_to)) local data = ("0"):rep(message_size) local msg = zmq.zmq_msg_t.init_size(message_size) diff --git a/perf/remote_multipart.lua b/perf/remote_multipart.lua index f071555..004120e 100644 --- a/perf/remote_multipart.lua +++ b/perf/remote_multipart.lua @@ -31,8 +31,8 @@ local zmq = require"zmq" local z_SNDMORE = zmq.SNDMORE local ctx = zmq.init(1) -local s = ctx:socket(zmq.PUSH) -s:connect(connect_to) +local s = assert(ctx:socket(zmq.PUSH)) +assert(s:connect(connect_to)) local data = ("0"):rep(message_size/2) local msg = zmq.zmq_msg_t.init_size(message_size/2) diff --git a/perf/remote_push.lua b/perf/remote_push.lua index a37a189..ff26903 100644 --- a/perf/remote_push.lua +++ b/perf/remote_push.lua @@ -30,8 +30,8 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PUSH) -s:connect(connect_to) +local s = assert(ctx:socket(zmq.PUSH)) +assert(s:connect(connect_to)) local data = ("0"):rep(message_size) local msg = zmq.zmq_msg_t.init_size(message_size) diff --git a/perf/remote_thr.lua b/perf/remote_thr.lua index 5890508..74cccb4 100644 --- a/perf/remote_thr.lua +++ b/perf/remote_thr.lua @@ -30,10 +30,10 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PUB) +local s = assert(ctx:socket(zmq.PUB)) -- for ZeroMQ 3.x need to change HWM option. -s:set_hwm(0) -s:connect(connect_to) +assert(s:set_hwm(0)) +assert(s:connect(connect_to)) zmq.sleep(1) diff --git a/perf/remote_thr_push_pull.lua b/perf/remote_thr_push_pull.lua index 11be905..3604d6e 100644 --- a/perf/remote_thr_push_pull.lua +++ b/perf/remote_thr_push_pull.lua @@ -30,8 +30,8 @@ local message_count = tonumber(arg[3]) local zmq = require"zmq" local ctx = zmq.init(1) -local s = ctx:socket(zmq.PUSH) -s:connect(connect_to) +local s = assert(ctx:socket(zmq.PUSH)) +assert(s:connect(connect_to)) zmq.sleep(1) diff --git a/perf/thread_lat.lua b/perf/thread_lat.lua index f781e55..3f04689 100644 --- a/perf/thread_lat.lua +++ b/perf/thread_lat.lua @@ -52,8 +52,8 @@ local child_code = [[ ]] local ctx = zmq.init(1) -local s = ctx:socket(zmq.REQ) -s:bind(bind_to) +local s = assert(ctx:socket(zmq.REQ)) +assert(s:bind(bind_to)) local child_thread = zthreads.runstring(ctx, child_code, connect_to, message_size, roundtrip_count) child_thread:start() diff --git a/perf/thread_push_pull.lua b/perf/thread_push_pull.lua index b3d96cb..5030172 100644 --- a/perf/thread_push_pull.lua +++ b/perf/thread_push_pull.lua @@ -37,9 +37,9 @@ local child_code = [[ local zthreads = require"zmq.threads" local ctx = zthreads.get_parent_ctx() - local s = ctx:socket(zmq.PUSH) - s:setopt(zmq.HWM, message_count/4) - s:connect(connect_to) + local s = assert(ctx:socket(zmq.PUSH)) + assert(s:setopt(zmq.HWM, message_count/4)) + assert(s:connect(connect_to)) local data = ("0"):rep(message_size) local msg_data = zmq.zmq_msg_t.init_data(data) @@ -68,8 +68,8 @@ local child_code = [[ ]] local ctx = zmq.init(1) -local s = ctx:socket(zmq.PULL) -s:bind(bind_to) +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)) diff --git a/perf/thread_thr.lua b/perf/thread_thr.lua index d3958e8..e912155 100644 --- a/perf/thread_thr.lua +++ b/perf/thread_thr.lua @@ -37,10 +37,10 @@ local child_code = [[ local zthreads = require"zmq.threads" local ctx = zthreads.get_parent_ctx() - local s = ctx:socket(zmq.PUB) + local s = assert(ctx:socket(zmq.PUB)) -- for ZeroMQ 3.x need to change HWM option. - s:set_hwm(0) - s:connect(connect_to) + assert(s:set_hwm(0)) + assert(s:connect(connect_to)) local data = ("0"):rep(message_size) local msg_data = zmq.zmq_msg_t.init_data(data) @@ -69,9 +69,9 @@ local child_code = [[ ]] local ctx = zmq.init(1) -local s = ctx:socket(zmq.SUB) -s:setopt(zmq.SUBSCRIBE, ""); -s:bind(bind_to) +local s = assert(ctx:socket(zmq.SUB)) +assert(s:setopt(zmq.SUBSCRIBE, "")) +assert(s:bind(bind_to)) print(string.format("message size: %i [B]", message_size)) print(string.format("message count: %i", message_count))