From 49466c73743d1acf70a3e2d24e6dbc2a954f7271 Mon Sep 17 00:00:00 2001
From: Johannes Schmitz <schmitz@ti.rwth-aachen.de>
Date: Fri, 9 May 2014 16:34:13 +0200
Subject: zeromq: Remove ZMQ_NOBLOCK as we are using polling
---
gr-zeromq/lib/req_source_impl.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'gr-zeromq/lib/req_source_impl.cc')
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc
index 121d2e37fb..3cbe6edbf1 100644
--- a/gr-zeromq/lib/req_source_impl.cc
+++ b/gr-zeromq/lib/req_source_impl.cc
@@ -31,17 +31,17 @@ namespace gr {
namespace zeromq {
req_source::sptr
- req_source::make(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking)
+ req_source::make(size_t itemsize, size_t vlen, char *address, int timeout)
{
return gnuradio::get_initial_sptr
- (new req_source_impl(itemsize, vlen, address, timeout, blocking));
+ (new req_source_impl(itemsize, vlen, address, timeout));
}
- req_source_impl::req_source_impl(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking)
+ req_source_impl::req_source_impl(size_t itemsize, size_t vlen, char *address, int timeout)
: gr::sync_block("req_source",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(1, 1, itemsize * vlen)),
- 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_REQ);
@@ -73,7 +73,7 @@ namespace gr {
// Request data, FIXME non portable?
zmq::message_t request(sizeof(int));
memcpy ((void *) request.data (), &noutput_items, sizeof(int));
- d_socket->send(request, d_blocking ? 0 : ZMQ_NOBLOCK);
+ d_socket->send(request);
}
zmq::pollitem_t itemsin[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } };
--
cgit v1.2.3