[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 19/29: Merge remote-tracking branch 'osh/zm
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 19/29: Merge remote-tracking branch 'osh/zmqtags' into zmq_tags |
|
Date: |
Tue, 13 Jan 2015 01:04:28 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit c13049f2fbe51dcb6e655b11e172514a3fc085b4
Merge: 5cb307e 18944a9
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 12 09:22:44 2015 -0800
Merge remote-tracking branch 'osh/zmqtags' into zmq_tags
gr-zeromq/grc/CMakeLists.txt | 6 +
gr-zeromq/grc/zeromq_pub_msg_sink.xml | 28 +++++
gr-zeromq/grc/zeromq_pub_sink.xml | 9 +-
gr-zeromq/grc/zeromq_pull_msg_source.xml | 28 +++++
gr-zeromq/grc/zeromq_pull_source.xml | 9 +-
gr-zeromq/grc/zeromq_push_msg_sink.xml | 28 +++++
gr-zeromq/grc/zeromq_push_sink.xml | 9 +-
gr-zeromq/grc/zeromq_rep_msg_sink.xml | 28 +++++
gr-zeromq/grc/zeromq_rep_sink.xml | 9 +-
gr-zeromq/grc/zeromq_req_msg_source.xml | 28 +++++
gr-zeromq/grc/zeromq_req_source.xml | 9 +-
gr-zeromq/grc/zeromq_sub_msg_source.xml | 28 +++++
gr-zeromq/grc/zeromq_sub_source.xml | 9 +-
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 6 +
.../gnuradio/zeromq/{pub_sink.h => pub_msg_sink.h} | 16 ++-
gr-zeromq/include/gnuradio/zeromq/pub_sink.h | 2 +-
.../zeromq/{pull_source.h => pull_msg_source.h} | 16 ++-
gr-zeromq/include/gnuradio/zeromq/pull_source.h | 2 +-
.../zeromq/{push_sink.h => push_msg_sink.h} | 16 ++-
gr-zeromq/include/gnuradio/zeromq/push_sink.h | 2 +-
.../gnuradio/zeromq/{rep_sink.h => rep_msg_sink.h} | 16 ++-
gr-zeromq/include/gnuradio/zeromq/rep_sink.h | 2 +-
.../zeromq/{req_source.h => req_msg_source.h} | 14 +--
gr-zeromq/include/gnuradio/zeromq/req_source.h | 2 +-
.../zeromq/{sub_source.h => sub_msg_source.h} | 16 ++-
gr-zeromq/include/gnuradio/zeromq/sub_source.h | 2 +-
gr-zeromq/lib/CMakeLists.txt | 7 ++
.../lib/{pub_sink_impl.cc => pub_msg_sink_impl.cc} | 41 ++++---
.../lib/{push_sink_impl.h => pub_msg_sink_impl.h} | 17 ++-
gr-zeromq/lib/pub_sink_impl.cc | 25 +++-
gr-zeromq/lib/pub_sink_impl.h | 5 +-
...pull_source_impl.cc => pull_msg_source_impl.cc} | 92 ++++++++------
.../{pull_source_impl.h => pull_msg_source_impl.h} | 21 ++--
gr-zeromq/lib/pull_source_impl.cc | 31 +++--
gr-zeromq/lib/pull_source_impl.h | 3 +-
.../{push_sink_impl.cc => push_msg_sink_impl.cc} | 61 +++++++---
.../lib/{push_sink_impl.h => push_msg_sink_impl.h} | 17 ++-
gr-zeromq/lib/push_sink_impl.cc | 30 +++--
gr-zeromq/lib/push_sink_impl.h | 3 +-
.../lib/{rep_sink_impl.cc => rep_msg_sink_impl.cc} | 95 ++++++++++-----
.../lib/{push_sink_impl.h => rep_msg_sink_impl.h} | 23 ++--
gr-zeromq/lib/rep_sink_impl.cc | 38 +++---
gr-zeromq/lib/rep_sink_impl.h | 5 +-
gr-zeromq/lib/req_msg_source_impl.cc | 132 +++++++++++++++++++++
.../{push_sink_impl.h => req_msg_source_impl.h} | 23 ++--
gr-zeromq/lib/req_source_impl.cc | 29 +++--
gr-zeromq/lib/req_source_impl.h | 5 +-
.../{sub_source_impl.cc => sub_msg_source_impl.cc} | 91 ++++++++------
.../{sub_source_impl.h => sub_msg_source_impl.h} | 22 ++--
gr-zeromq/lib/sub_source_impl.cc | 36 ++++--
gr-zeromq/lib/sub_source_impl.h | 3 +-
gr-zeromq/lib/tag_headers.cc | 101 ++++++++++++++++
gr-zeromq/lib/{pub_sink_impl.h => tag_headers.h} | 39 ++----
gr-zeromq/swig/zeromq_swig.i | 18 +++
54 files changed, 1003 insertions(+), 350 deletions(-)
- [Commit-gnuradio] [gnuradio] 07/29: zmq: all source blocks should now support tag headers, (continued)
- [Commit-gnuradio] [gnuradio] 07/29: zmq: all source blocks should now support tag headers, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 06/29: zmq: hoisting tag parsing into helper function, should now be easy to use in other zmq blocks, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 14/29: zmq: Adding zmq pub/sub blocks for message passing, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 21/29: zeromq: cleanup and convert sub_msg_source to derive from gr::block, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 22/29: zeromq: cleanup and converted push_msg_sink to derive from gr::block, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 01/29: zmq: encoding tags into zmq stream, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 10/29: zeromq: fixups and stylistic changes before merge, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 24/29: zeromq: cleanup and converted rep_msg_sink to derive from gr::block, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 08/29: zmq: sync blocks now all support tag headers, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 12/29: zmq: stream tag passing now works, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 19/29: Merge remote-tracking branch 'osh/zmqtags' into zmq_tags,
git <=
- [Commit-gnuradio] [gnuradio] 29/29: Merge branch 'maint', git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 26/29: zeromq: added msg passing example, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 03/29: zmq: default to not pass tags (compatible wire format), git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 02/29: zmq: tags should now be serializing and deserializing correctly for pub_sink/sub_source, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 27/29: zeromq: minor cleanup, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 25/29: zeromq: cleanup and made req_msg_source derive from gr::block, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 09/29: zmq: include pass_tags option default to false in all blocks' grc definitions, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 18/29: zmq: rep/req msg blocks now working, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 05/29: zmq: hoisting header encoding to helper function, git, 2015/01/12
- [Commit-gnuradio] [gnuradio] 04/29: zmq: adding pass tags option to zmq pub/sub block grc xml defs, git, 2015/01/12