diff options
| author | Johannes Schmitz <schmitz@ti.rwth-aachen.de> | 2014-05-09 16:24:21 +0200 |
|---|---|---|
| committer | Johannes Schmitz <schmitz@ti.rwth-aachen.de> | 2014-05-09 16:24:21 +0200 |
| commit | 84444acb7a239626d11c4d06f7b6342c18180e0c (patch) | |
| tree | 446ee6aa5bddbf3b14ff787eed386cba66d84a8a /gr-zeromq/lib/req_source_impl.cc | |
| parent | b177145c4b80a67d2642638648b0a977e4c7025f (diff) | |
zeromq: Timeout needs to be in milliseconds for zmq 3.0, close sockets
correctly, cleanup
Diffstat (limited to 'gr-zeromq/lib/req_source_impl.cc')
| -rw-r--r-- | gr-zeromq/lib/req_source_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc index 84cbcc7c8f..121d2e37fb 100644 --- a/gr-zeromq/lib/req_source_impl.cc +++ b/gr-zeromq/lib/req_source_impl.cc @@ -31,19 +31,18 @@ namespace gr { namespace zeromq { req_source::sptr - req_source::make(size_t itemsize, size_t vlen, char *address, float timeout, bool blocking) + req_source::make(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking) { return gnuradio::get_initial_sptr (new req_source_impl(itemsize, vlen, address, timeout, blocking)); } - req_source_impl::req_source_impl(size_t itemsize, size_t vlen, char *address, float timeout, bool blocking) + req_source_impl::req_source_impl(size_t itemsize, size_t vlen, char *address, int timeout, bool blocking) : gr::sync_block("req_source", - gr::io_signature::make(0, 0, 0), - gr::io_signature::make(1, 1, itemsize * vlen)), + 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_timeout = timeout >= 0 ? (int)(timeout*1e6) : 0; d_context = new zmq::context_t(1); d_socket = new zmq::socket_t(*d_context, ZMQ_REQ); int time = 0; @@ -53,6 +52,8 @@ namespace gr { req_source_impl::~req_source_impl() { + d_socket->close(); + d_context->close(); delete d_socket; delete d_context; } @@ -65,7 +66,7 @@ namespace gr { char *out = (char*)output_items[0]; zmq::pollitem_t itemsout[] = { { *d_socket, 0, ZMQ_POLLOUT, 0 } }; - zmq::poll (&itemsout[0], 1, 0); + zmq::poll (&itemsout[0], 1, d_timeout); // If we got a reply, process if (itemsout[0].revents & ZMQ_POLLOUT) { @@ -73,7 +74,6 @@ namespace gr { zmq::message_t request(sizeof(int)); memcpy ((void *) request.data (), &noutput_items, sizeof(int)); d_socket->send(request, d_blocking ? 0 : ZMQ_NOBLOCK); - } zmq::pollitem_t itemsin[] = { { *d_socket, 0, ZMQ_POLLIN, 0 } }; |