summaryrefslogtreecommitdiff
path: root/gr-zeromq/include/gnuradio
diff options
context:
space:
mode:
authorCamilo Solano <solano@ti.rwth-aachen.de>2014-05-13 16:32:04 +0200
committerCamilo Solano <solano@ti.rwth-aachen.de>2014-05-13 16:39:36 +0200
commit2698130b46bb739b3bd2e42d68ec3e95e3ebf18f (patch)
treed027d5696a70843b354b31cf8489e95836ce3523 /gr-zeromq/include/gnuradio
parent9970854f8938fcc015608dc163442467427cb9a6 (diff)
zeromq: Remove blocking Add timeout in xml, fix doxygen
Diffstat (limited to 'gr-zeromq/include/gnuradio')
-rw-r--r--gr-zeromq/include/gnuradio/zeromq/pub_sink.h2
-rw-r--r--gr-zeromq/include/gnuradio/zeromq/push_sink.h2
-rw-r--r--gr-zeromq/include/gnuradio/zeromq/rep_sink.h3
3 files changed, 3 insertions, 4 deletions
diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
index 31a53648fa..a60fb15c88 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
@@ -51,7 +51,7 @@ namespace gr {
* \param itemsize Size of a stream item in bytes
* \param vlen Vector length of the input items. Note that one vector is one item.
* \param address ZMQ socket address specifier
- * \param blocking Indicate whether blocking sends should be used, default true.
+ * \param timeout Receive timeout in seconds, default is 100ms, 1us increments
*/
static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);
};
diff --git a/gr-zeromq/include/gnuradio/zeromq/push_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
index 541993d080..b54a1e40d8 100644
--- a/gr-zeromq/include/gnuradio/zeromq/push_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
@@ -52,7 +52,7 @@ namespace gr {
* \param itemsize Size of a stream item in bytes
* \param vlen Vector length of the input items. Note that one vector is one item.
* \param address ZMQ socket address specifier
- * \param blocking Indicate whether blocking sends should be used, default true.
+ * \param timeout Receive timeout in seconds, default is 100ms, 1us increments
*
*/
static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);
diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
index ab92c4d168..1da325257f 100644
--- a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
@@ -50,8 +50,7 @@ namespace gr {
* \param itemsize Size of a stream item in bytes
* \param vlen Vector length of the input items. Note that one vector is one item.
* \param address ZMQ socket address specifier
- * \param timeout Timeout for request poll, in seconds
- * \param blocking Indicate whether blocking sends should be used, default true.
+ * \param timeout Receive timeout in seconds, default is 100ms, 1us increments
*
*/
static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);