diff options
| author | Johannes Schmitz <schmitz@ti.rwth-aachen.de> | 2014-05-09 16:34:13 +0200 |
|---|---|---|
| committer | Johannes Schmitz <schmitz@ti.rwth-aachen.de> | 2014-05-09 16:34:13 +0200 |
| commit | 49466c73743d1acf70a3e2d24e6dbc2a954f7271 (patch) | |
| tree | b883f113a034b8331168e155355a9d524af7922f /gr-zeromq/lib/rep_sink_impl.cc | |
| parent | 84444acb7a239626d11c4d06f7b6342c18180e0c (diff) | |
zeromq: Remove ZMQ_NOBLOCK as we are using polling
Diffstat (limited to 'gr-zeromq/lib/rep_sink_impl.cc')
| -rw-r--r-- | gr-zeromq/lib/rep_sink_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc index 35efffa7f4..9f73fb1f99 100644 --- a/gr-zeromq/lib/rep_sink_impl.cc +++ b/gr-zeromq/lib/rep_sink_impl.cc @@ -31,17 +31,17 @@ namespace gr { namespace zeromq { rep_sink::sptr - rep_sink::make(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking) + rep_sink::make(size_t itemsize, size_t vlen, char *address, int timeout) { return gnuradio::get_initial_sptr - (new rep_sink_impl(itemsize, vlen, address, timeout, blocking)); + (new rep_sink_impl(itemsize, vlen, address, timeout)); } - rep_sink_impl::rep_sink_impl(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking) + rep_sink_impl::rep_sink_impl(size_t itemsize, size_t vlen, char *address, int timeout) : gr::sync_block("rep_sink", gr::io_signature::make(1, 1, itemsize * vlen), gr::io_signature::make(0, 0, 0)), - d_itemsize(itemsize), d_vlen(vlen), d_timeout(timeout), d_blocking(blocking) + d_itemsize(itemsize), d_vlen(vlen), d_timeout(timeout) { d_context = new zmq::context_t(1); d_socket = new zmq::socket_t(*d_context, ZMQ_REP); @@ -79,14 +79,14 @@ namespace gr { if (noutput_items < req_output_items) { zmq::message_t msg(d_itemsize*d_vlen*noutput_items); memcpy((void *)msg.data(), in, d_itemsize*d_vlen*noutput_items); - d_socket->send(msg, d_blocking ? 0 : ZMQ_NOBLOCK); + d_socket->send(msg); return noutput_items; } else { zmq::message_t msg(d_itemsize*d_vlen*req_output_items); memcpy((void *)msg.data(), in, d_itemsize*d_vlen*req_output_items); - d_socket->send(msg, d_blocking ? 0 : ZMQ_NOBLOCK); + d_socket->send(msg); return req_output_items; } |