diff options
| author | Jacob Gilbert <mrjacobagilbert@gmail.com> | 2020-04-10 18:54:14 -0600 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-04-10 21:45:25 +0200 |
| commit | c17b2dabf050698532ab38c5460d44bab853ee76 (patch) | |
| tree | 62937133ba1ecaf8769d4cb6b86195a16b87379e /gr-zeromq/include/gnuradio | |
| parent | daf936e44c85a36e76663f4bb82c6a8756e13812 (diff) | |
zeromq: Add bind argument for message based zeromq blocks.
This is needed to support N:1 patterns. To avoid confusion, since this
is probably a feature only needed by those who Know What They Are Doing,
the option is added to the Advanced block property tab.
Diffstat (limited to 'gr-zeromq/include/gnuradio')
6 files changed, 19 insertions, 6 deletions
diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h index 6bccc19001..a1dbdd53e0 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h @@ -38,8 +38,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to bind + * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = true); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h index 5a4e1a88a2..ec6ec3c5ae 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h @@ -35,9 +35,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to connect * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = false); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. diff --git a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h index 41c5fba042..5cd3218015 100644 --- a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h @@ -37,9 +37,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to bind * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = true); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h index 4c3d54adac..1bcac43c26 100644 --- a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h @@ -37,9 +37,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to bind * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = true); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. diff --git a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h index 09d316004a..908229a1d8 100644 --- a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h @@ -35,9 +35,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to connect * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = false); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. diff --git a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h index 3d0cdc525b..c3e82d825a 100644 --- a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h @@ -35,9 +35,11 @@ public: * * \param address ZMQ socket address specifier * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments + * \param bind If true this block will bind to the address, otherwise it will + * connect; the default is to connect * */ - static sptr make(char* address, int timeout = 100); + static sptr make(char* address, int timeout = 100, bool bind = false); /*! * \brief Return a std::string of ZMQ_LAST_ENDPOINT from the underlying ZMQ socket. |