[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
Date: |
Wed, 15 Apr 2015 21:08:00 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 527c21cb6a3b1b32610c4acf0bec8956ace2c5bf
Merge: 7765798 b092142
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 15 14:03:44 2015 -0700
Merge branch 'master' into next
CMakeLists.txt | 8 +
cmake/Modules/FindThrift.cmake | 79 ++
cmake/Modules/GrTest.cmake | 3 +-
config.h.in | 6 +
docs/doxygen/other/build_guide.dox | 13 +-
docs/doxygen/other/ctrlport.dox | 425 +++++++++-
docs/doxygen/other/perf_counters.dox | 10 +
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 10 +
gnuradio-runtime/include/gnuradio/prefs.h | 32 +-
gnuradio-runtime/include/gnuradio/rpcbufferedget.h | 65 ++
gnuradio-runtime/include/gnuradio/rpcmanager.h | 2 +-
.../include/gnuradio/rpcpmtconverters_thrift.h | 74 ++
.../include/gnuradio/rpcregisterhelpers.h | 22 +-
.../include/gnuradio/rpcserver_booter_thrift.h | 52 ++
.../include/gnuradio/rpcserver_selector.h | 10 +-
.../include/gnuradio/rpcserver_thrift.h | 230 ++++++
.../include/gnuradio/thrift_application_base.h | 253 ++++++
.../include/gnuradio/thrift_server_template.h | 160 ++++
gnuradio-runtime/lib/block.cc | 12 +-
gnuradio-runtime/lib/controlport/CMakeLists.txt | 70 +-
gnuradio-runtime/lib/controlport/rpcmanager.cc | 14 +-
.../lib/controlport/rpcserver_booter_aggregator.cc | 3 +-
.../lib/controlport/rpcserver_selector.cc | 15 +-
.../lib/controlport/thrift/gnuradio.thrift | 108 +++
.../controlport/thrift/rpcpmtconverters_thrift.cc | 303 ++++++++
.../controlport/thrift/rpcserver_booter_thrift.cc | 137 ++++
.../lib/controlport/thrift/rpcserver_thrift.cc | 194 +++++
.../lib/controlport/thrift/thrift.conf.example | 4 +
.../controlport/thrift/thrift_application_base.cc} | 13 +-
gnuradio-runtime/lib/prefs.cc | 28 +-
.../python/gnuradio/ctrlport/CMakeLists.txt | 43 ++
.../gnuradio/ctrlport/GNURadioControlPortClient.py | 132 ++++
.../python/gnuradio/ctrlport/GrDataPlotter.py | 6 +-
.../python/gnuradio/ctrlport/RPCConnection.py | 115 +++
.../gnuradio/ctrlport/RPCConnectionThrift.py | 208 +++++
.../python/gnuradio/ctrlport/gr-ctrlport-monitor | 771 +++++++++++++++++++
.../python/gnuradio/ctrlport/gr-perf-monitorx | 856 +++++++++++++++++++++
.../python/gnuradio/ctrlport/monitor.py | 6 +-
gnuradio-runtime/swig/prefs.i | 4 +-
gr-blocks/grc/blocks_block_tree.xml | 2 +
gr-blocks/grc/blocks_ctrlport_performance.xml | 48 ++
gr-blocks/grc/blocks_ctrlport_viewer.xml | 48 ++
gr-blocks/lib/ctrlport_probe2_b_impl.cc | 31 +-
gr-blocks/lib/ctrlport_probe2_b_impl.h | 6 +-
gr-blocks/lib/ctrlport_probe2_c_impl.cc | 31 +-
gr-blocks/lib/ctrlport_probe2_c_impl.h | 7 +-
gr-blocks/lib/ctrlport_probe2_f_impl.cc | 32 +-
gr-blocks/lib/ctrlport_probe2_f_impl.h | 7 +-
gr-blocks/lib/ctrlport_probe2_i_impl.cc | 32 +-
gr-blocks/lib/ctrlport_probe2_i_impl.h | 7 +-
gr-blocks/lib/ctrlport_probe2_s_impl.cc | 31 +-
gr-blocks/lib/ctrlport_probe2_s_impl.h | 7 +-
gr-blocks/python/blocks/CMakeLists.txt | 6 +-
gr-blocks/python/blocks/qa_cpp_py_binding.py | 173 +++++
gr-blocks/python/blocks/qa_cpp_py_binding_set.py | 151 ++++
gr-blocks/python/blocks/qa_ctrlport_probes.py | 210 ++++-
56 files changed, 5091 insertions(+), 234 deletions(-)