diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-04-21 10:48:29 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-04-22 15:07:42 -0700 |
| commit | 687b81073d4997a73183cd69b2c467ea728a5ef1 (patch) | |
| tree | dc8a50c50701f630a9fd16f6b74897c56bfbf503 | |
| parent | 9c4cf2b829f05d58d5089cf90a75d3f3f98513dc (diff) | |
zeromq: renamed sink_pushpull push_sink
| -rwxr-xr-x | gr-zeromq/examples/client.py | 2 | ||||
| -rwxr-xr-x | gr-zeromq/examples/loop.py | 4 | ||||
| -rwxr-xr-x | gr-zeromq/examples/server.py | 4 | ||||
| -rw-r--r-- | gr-zeromq/grc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-zeromq/grc/zeromq_push_sink.xml (renamed from gr-zeromq/grc/zeromq_sink_pushpull.xml) | 6 | ||||
| -rw-r--r-- | gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-zeromq/include/gnuradio/zeromq/push_sink.h (renamed from gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h) | 12 | ||||
| -rw-r--r-- | gr-zeromq/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-zeromq/lib/push_sink_impl.cc (renamed from gr-zeromq/lib/sink_pushpull_impl.cc) | 0 | ||||
| -rw-r--r-- | gr-zeromq/lib/push_sink_impl.h (renamed from gr-zeromq/lib/sink_pushpull_impl.h) | 0 | ||||
| -rw-r--r-- | gr-zeromq/swig/zeromq_swig.i | 6 |
11 files changed, 20 insertions, 20 deletions
diff --git a/gr-zeromq/examples/client.py b/gr-zeromq/examples/client.py index 5c1a8e2507..2abb7dc676 100755 --- a/gr-zeromq/examples/client.py +++ b/gr-zeromq/examples/client.py @@ -55,7 +55,7 @@ class top_block(gr.top_block): #self.zmq_source = zeromq.source_reqrep_nopoll(gr.sizeof_float,source_adr) self.zmq_source = zeromq.source_reqrep(gr.sizeof_float,source_adr) #self.zmq_source = zeromq.source_pushpull(gr.sizeof_float,source_adr) - #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float,probe_adr) + #self.zmq_probe = zeromq.push_sink(gr.sizeof_float,probe_adr) self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float,probe_adr) # connects diff --git a/gr-zeromq/examples/loop.py b/gr-zeromq/examples/loop.py index 2d6d750e99..1f76b47a04 100755 --- a/gr-zeromq/examples/loop.py +++ b/gr-zeromq/examples/loop.py @@ -77,8 +77,8 @@ class top_block(gr.top_block): self.add = blocks.add_ff(1) #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr) #self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr) - self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr) - self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr_fg) + self.zmq_sink = zeromq.push_sink(gr.sizeof_float, sink_adr) + self.zmq_probe = zeromq.push_sink(gr.sizeof_float, probe_adr_fg) #self.null_sink = blocks.null_sink(gr.sizeof_float) # connects diff --git a/gr-zeromq/examples/server.py b/gr-zeromq/examples/server.py index 34823ea024..70fe3a5d99 100755 --- a/gr-zeromq/examples/server.py +++ b/gr-zeromq/examples/server.py @@ -60,8 +60,8 @@ class top_block(gr.top_block): self.mult = blocks.multiply_const_ff(1) #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr) self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr) - #self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr) - #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr) + #self.zmq_sink = zeromq.push_sink(gr.sizeof_float, sink_adr) + #self.zmq_probe = zeromq.push_sink(gr.sizeof_float, probe_adr) self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float, probe_adr) #self.null_sink = blocks.null_sink(gr.sizeof_float) diff --git a/gr-zeromq/grc/CMakeLists.txt b/gr-zeromq/grc/CMakeLists.txt index 42ccfa5ca4..4bb51402b7 100644 --- a/gr-zeromq/grc/CMakeLists.txt +++ b/gr-zeromq/grc/CMakeLists.txt @@ -19,7 +19,7 @@ install(FILES zeromq_sink_pubsub.xml - zeromq_sink_pushpull.xml + zeromq_push_sink.xml zeromq_source_pushpull.xml DESTINATION share/gnuradio/grc/blocks diff --git a/gr-zeromq/grc/zeromq_sink_pushpull.xml b/gr-zeromq/grc/zeromq_push_sink.xml index 173f4a5e32..15069c714a 100644 --- a/gr-zeromq/grc/zeromq_sink_pushpull.xml +++ b/gr-zeromq/grc/zeromq_push_sink.xml @@ -1,10 +1,10 @@ <?xml version="1.0"?> <block> - <name>ZMQ PUSH/PULL Sink</name> - <key>zeromq_sink_pushpull</key> + <name>ZMQ PUSH Sink</name> + <key>zeromq_push_sink</key> <category>ZeroMQ Interfaces</category> <import>from gnuradio import zeromq</import> - <make>zeromq.sink_pushpull($type.itemsize, $address, $blocking)</make> + <make>zeromq.push_sink($type.itemsize, $address, $blocking)</make> <param> <name>IO Type</name> diff --git a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt index c23b9d60b0..767a547cc8 100644 --- a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt +++ b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt @@ -23,7 +23,7 @@ install(FILES api.h sink_pubsub.h - sink_pushpull.h + push_sink.h sink_reqrep.h sink_reqrep_nopoll.h source_pushpull_feedback.h diff --git a/gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h b/gr-zeromq/include/gnuradio/zeromq/push_sink.h index 1ca8a15b38..cffe2d3154 100644 --- a/gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h +++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_ZEROMQ_SINK_PUSHPULL_H -#define INCLUDED_ZEROMQ_SINK_PUSHPULL_H +#ifndef INCLUDED_ZEROMQ_PUSH_SINK_H +#define INCLUDED_ZEROMQ_PUSH_SINK_H #include <gnuradio/zeromq/api.h> #include <gnuradio/sync_block.h> @@ -41,13 +41,13 @@ namespace gr { * non-GNU Radio ZMQ socket. * */ - class ZEROMQ_API sink_pushpull : virtual public gr::sync_block + class ZEROMQ_API push_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<sink_pushpull> sptr; + typedef boost::shared_ptr<push_sink> sptr; /*! - * \brief Return a shared_ptr to a new instance of gr::zeromq::sink_pushpull + * \brief Return a shared_ptr to a new instance of gr::zeromq::push_sink * * \param itemsize Size of a stream item in bytes * \param address ZMQ socket address specifier @@ -60,4 +60,4 @@ namespace gr { } // namespace zeromq } // namespace gr -#endif /* INCLUDED_ZEROMQ_SINK_PUSHPULL_H */ +#endif /* INCLUDED_ZEROMQ_PUSH_SINK_H */ diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt index 54c87c6036..a285beacb2 100644 --- a/gr-zeromq/lib/CMakeLists.txt +++ b/gr-zeromq/lib/CMakeLists.txt @@ -39,7 +39,7 @@ endif(ENABLE_GR_CTRLPORT) ######################################################################## list(APPEND zeromq_sources sink_pubsub_impl.cc - sink_pushpull_impl.cc + push_sink_impl.cc sink_reqrep_impl.cc sink_reqrep_nopoll_impl.cc source_pushpull_feedback_impl.cc diff --git a/gr-zeromq/lib/sink_pushpull_impl.cc b/gr-zeromq/lib/push_sink_impl.cc index 784b4e3035..784b4e3035 100644 --- a/gr-zeromq/lib/sink_pushpull_impl.cc +++ b/gr-zeromq/lib/push_sink_impl.cc diff --git a/gr-zeromq/lib/sink_pushpull_impl.h b/gr-zeromq/lib/push_sink_impl.h index 1a84a9494d..1a84a9494d 100644 --- a/gr-zeromq/lib/sink_pushpull_impl.h +++ b/gr-zeromq/lib/push_sink_impl.h diff --git a/gr-zeromq/swig/zeromq_swig.i b/gr-zeromq/swig/zeromq_swig.i index 780f9d9896..1c4d92594e 100644 --- a/gr-zeromq/swig/zeromq_swig.i +++ b/gr-zeromq/swig/zeromq_swig.i @@ -29,7 +29,7 @@ %{ #include "gnuradio/zeromq/sink_pubsub.h" -#include "gnuradio/zeromq/sink_pushpull.h" +#include "gnuradio/zeromq/push_sink.h" #include "gnuradio/zeromq/sink_reqrep.h" #include "gnuradio/zeromq/sink_reqrep_nopoll.h" #include "gnuradio/zeromq/source_pushpull_feedback.h" @@ -39,7 +39,7 @@ %} %include "gnuradio/zeromq/sink_pubsub.h" -%include "gnuradio/zeromq/sink_pushpull.h" +%include "gnuradio/zeromq/push_sink.h" %include "gnuradio/zeromq/sink_reqrep.h" %include "gnuradio/zeromq/sink_reqrep_nopoll.h" %include "gnuradio/zeromq/source_pushpull_feedback.h" @@ -48,7 +48,7 @@ %include "gnuradio/zeromq/source_reqrep_nopoll.h" GR_SWIG_BLOCK_MAGIC2(zeromq, sink_pubsub); -GR_SWIG_BLOCK_MAGIC2(zeromq, sink_pushpull); +GR_SWIG_BLOCK_MAGIC2(zeromq, push_sink); GR_SWIG_BLOCK_MAGIC2(zeromq, sink_reqrep); GR_SWIG_BLOCK_MAGIC2(zeromq, sink_reqrep_nopoll); GR_SWIG_BLOCK_MAGIC2(zeromq, source_pushpull_feedback); |