From 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Mon, 15 Apr 2013 21:16:52 -0400
Subject: blocks: fix file meta data source to handle repeat of files.
---
gr-blocks/lib/file_meta_source_impl.cc | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
(limited to 'gr-blocks/lib/file_meta_source_impl.cc')
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index 5d64e40a26..2b16b9066b 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -376,7 +376,15 @@ namespace gr {
parse_extras(extras, nitems_written(0), d_tags);
}
else {
- return -1;
+ if(!d_repeat)
+ return -1;
+ else {
+ if(fseek(d_fp, 0, SEEK_SET) == -1) {
+ std::stringstream s;
+ s << "[" << __FILE__ << "]" << " fseek failed" << std::endl;
+ throw std::runtime_error(s.str());
+ }
+ }
}
}
@@ -404,7 +412,7 @@ namespace gr {
out += i * d_itemsize;
if(size == 0) // done
- break;
+ break;
if(i > 0) // short read, try again
continue;
@@ -424,7 +432,7 @@ namespace gr {
}
if(size > 0) { // EOF or error
- if(size == seg_size) // we didn't read anything; say we're done
+ if(size == seg_size) // we didn't read anything; say we're done
return -1;
return seg_size - size; // else return partial result
}
--
cgit v1.2.3
From f3e2e07201c50033bf6c9d0c6a6f068557b4f17f Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 17 Apr 2013 13:43:52 -0400
Subject: runtime: converting runtime core to gr namespace, gnuradio include
dir.
---
docs/doxygen/other/logger.dox | 36 +-
docs/doxygen/other/main_page.dox | 4 +-
gnuradio-runtime/apps/gnuradio-config-info.cc | 24 +-
gnuradio-runtime/include/CMakeLists.txt | 81 +-
gnuradio-runtime/include/IcePy_Communicator.h | 35 -
gnuradio-runtime/include/attributes.h | 74 --
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 105 ++
.../include/gnuradio/IcePy_Communicator.h | 35 +
gnuradio-runtime/include/gnuradio/api.h | 33 +
gnuradio-runtime/include/gnuradio/attributes.h | 74 ++
gnuradio-runtime/include/gnuradio/basic_block.h | 354 +++++++
gnuradio-runtime/include/gnuradio/block.h | 714 ++++++++++++++
gnuradio-runtime/include/gnuradio/block_detail.h | 261 +++++
gnuradio-runtime/include/gnuradio/block_gateway.h | 271 ++++++
gnuradio-runtime/include/gnuradio/block_registry.h | 68 ++
gnuradio-runtime/include/gnuradio/buffer.h | 302 ++++++
gnuradio-runtime/include/gnuradio/constants.h | 58 ++
gnuradio-runtime/include/gnuradio/dispatcher.h | 73 ++
gnuradio-runtime/include/gnuradio/endianness.h | 32 +
gnuradio-runtime/include/gnuradio/error_handler.h | 125 +++
gnuradio-runtime/include/gnuradio/expj.h | 38 +
gnuradio-runtime/include/gnuradio/feval.h | 187 ++++
gnuradio-runtime/include/gnuradio/flowgraph.h | 256 +++++
gnuradio-runtime/include/gnuradio/fxpt.h | 108 +++
gnuradio-runtime/include/gnuradio/fxpt_nco.h | 160 +++
gnuradio-runtime/include/gnuradio/fxpt_vco.h | 80 ++
gnuradio-runtime/include/gnuradio/gr_complex.h | 45 +
gnuradio-runtime/include/gnuradio/hier_block2.h | 221 +++++
gnuradio-runtime/include/gnuradio/high_res_timer.h | 126 +++
.../include/gnuradio/ice_application_base.h | 231 +++++
.../include/gnuradio/ice_server_template.h | 97 ++
gnuradio-runtime/include/gnuradio/io_signature.h | 111 +++
gnuradio-runtime/include/gnuradio/logger.h.in | 747 ++++++++++++++
gnuradio-runtime/include/gnuradio/math.h | 226 +++++
gnuradio-runtime/include/gnuradio/message.h | 91 ++
.../include/gnuradio/messages/CMakeLists.txt | 31 +
.../include/gnuradio/messages/msg_accepter.h | 56 ++
.../include/gnuradio/messages/msg_accepter_msgq.h | 53 +
.../include/gnuradio/messages/msg_passing.h | 123 +++
.../include/gnuradio/messages/msg_producer.h | 52 +
.../include/gnuradio/messages/msg_queue.h | 95 ++
gnuradio-runtime/include/gnuradio/misc.h | 39 +
gnuradio-runtime/include/gnuradio/msg_accepter.h | 46 +
gnuradio-runtime/include/gnuradio/msg_handler.h | 49 +
gnuradio-runtime/include/gnuradio/msg_queue.h | 95 ++
gnuradio-runtime/include/gnuradio/nco.h | 199 ++++
gnuradio-runtime/include/gnuradio/prefs.h | 152 +++
gnuradio-runtime/include/gnuradio/py_feval.h | 77 ++
.../include/gnuradio/pycallback_object.h | 206 ++++
gnuradio-runtime/include/gnuradio/random.h | 81 ++
gnuradio-runtime/include/gnuradio/realtime.h | 41 +
gnuradio-runtime/include/gnuradio/realtime_impl.h | 97 ++
.../include/gnuradio/rpccallbackregister_base.h | 105 ++
gnuradio-runtime/include/gnuradio/rpcmanager.h | 61 ++
.../include/gnuradio/rpcmanager_base.h | 46 +
.../include/gnuradio/rpcpmtconverters_ice.h | 35 +
.../include/gnuradio/rpcregisterhelpers.h | 659 +++++++++++++
.../include/gnuradio/rpcserver_aggregator.h | 100 ++
gnuradio-runtime/include/gnuradio/rpcserver_base.h | 47 +
.../include/gnuradio/rpcserver_booter_aggregator.h | 56 ++
.../include/gnuradio/rpcserver_booter_base.h | 44 +
.../include/gnuradio/rpcserver_booter_ice.h | 49 +
gnuradio-runtime/include/gnuradio/rpcserver_ice.h | 226 +++++
.../include/gnuradio/rpcserver_selector.h | 32 +
gnuradio-runtime/include/gnuradio/runtime_types.h | 56 ++
gnuradio-runtime/include/gnuradio/select_handler.h | 90 ++
gnuradio-runtime/include/gnuradio/sincos.h | 35 +
.../include/gnuradio/single_threaded_scheduler.h | 65 ++
gnuradio-runtime/include/gnuradio/sptr_magic.h | 57 ++
gnuradio-runtime/include/gnuradio/sync_block.h | 69 ++
gnuradio-runtime/include/gnuradio/sync_decimator.h | 72 ++
.../include/gnuradio/sync_interpolator.h | 74 ++
gnuradio-runtime/include/gnuradio/sys_paths.h | 37 +
gnuradio-runtime/include/gnuradio/sys_pri.h | 42 +
.../include/gnuradio/tagged_stream_block.h | 144 +++
gnuradio-runtime/include/gnuradio/tags.h | 64 ++
.../include/gnuradio/thread/CMakeLists.txt | 29 +
gnuradio-runtime/include/gnuradio/thread/thread.h | 144 +++
.../include/gnuradio/thread/thread_body_wrapper.h | 72 ++
.../include/gnuradio/thread/thread_group.h | 48 +
gnuradio-runtime/include/gnuradio/timer.h | 84 ++
gnuradio-runtime/include/gnuradio/top_block.h | 146 +++
gnuradio-runtime/include/gnuradio/tpb_detail.h | 93 ++
gnuradio-runtime/include/gnuradio/types.h | 65 ++
gnuradio-runtime/include/gnuradio/unittests.h | 39 +
gnuradio-runtime/include/gr_basic_block.h | 344 -------
gnuradio-runtime/include/gr_block.h | 700 -------------
gnuradio-runtime/include/gr_block_detail.h | 248 -----
gnuradio-runtime/include/gr_block_registry.h | 44 -
gnuradio-runtime/include/gr_buffer.h | 309 ------
gnuradio-runtime/include/gr_complex.h | 44 -
gnuradio-runtime/include/gr_constants.h | 53 -
gnuradio-runtime/include/gr_dispatcher.h | 69 --
gnuradio-runtime/include/gr_endianness.h | 27 -
gnuradio-runtime/include/gr_error_handler.h | 117 ---
gnuradio-runtime/include/gr_expj.h | 38 -
gnuradio-runtime/include/gr_feval.h | 177 ----
gnuradio-runtime/include/gr_flowgraph.h | 251 -----
gnuradio-runtime/include/gr_fxpt.h | 104 --
gnuradio-runtime/include/gr_fxpt_nco.h | 153 ---
gnuradio-runtime/include/gr_fxpt_vco.h | 73 --
gnuradio-runtime/include/gr_hier_block2.h | 208 ----
gnuradio-runtime/include/gr_io_signature.h | 117 ---
gnuradio-runtime/include/gr_logger.h | 648 -------------
gnuradio-runtime/include/gr_math.h | 209 ----
gnuradio-runtime/include/gr_message.h | 91 --
gnuradio-runtime/include/gr_misc.h | 39 -
gnuradio-runtime/include/gr_msg_accepter.h | 43 -
gnuradio-runtime/include/gr_msg_handler.h | 43 -
gnuradio-runtime/include/gr_msg_queue.h | 92 --
gnuradio-runtime/include/gr_nco.h | 198 ----
gnuradio-runtime/include/gr_preferences.h | 34 -
gnuradio-runtime/include/gr_prefs.h | 143 ---
gnuradio-runtime/include/gr_py_feval.h | 51 -
gnuradio-runtime/include/gr_random.h | 65 --
gnuradio-runtime/include/gr_realtime.h | 37 -
gnuradio-runtime/include/gr_runtime_api.h | 33 -
gnuradio-runtime/include/gr_runtime_types.h | 56 --
gnuradio-runtime/include/gr_select_handler.h | 85 --
gnuradio-runtime/include/gr_sincos.h | 41 -
.../include/gr_single_threaded_scheduler.h | 62 --
gnuradio-runtime/include/gr_sptr_magic.h | 52 -
gnuradio-runtime/include/gr_sync_block.h | 66 --
gnuradio-runtime/include/gr_sync_decimator.h | 69 --
gnuradio-runtime/include/gr_sync_interpolator.h | 70 --
gnuradio-runtime/include/gr_sys_paths.h | 33 -
gnuradio-runtime/include/gr_tagged_stream_block.h | 142 ---
gnuradio-runtime/include/gr_tags.h | 55 --
gnuradio-runtime/include/gr_timer.h | 84 --
gnuradio-runtime/include/gr_top_block.h | 141 ---
gnuradio-runtime/include/gr_tpb_detail.h | 89 --
gnuradio-runtime/include/gr_types.h | 65 --
gnuradio-runtime/include/gr_unittests.h | 39 -
gnuradio-runtime/include/high_res_timer.h | 126 ---
gnuradio-runtime/include/ice_application_base.h | 231 -----
gnuradio-runtime/include/ice_server_template.h | 97 --
gnuradio-runtime/include/messages/CMakeLists.txt | 31 -
gnuradio-runtime/include/messages/msg_accepter.h | 56 --
.../include/messages/msg_accepter_msgq.h | 53 -
gnuradio-runtime/include/messages/msg_passing.h | 123 ---
gnuradio-runtime/include/messages/msg_producer.h | 52 -
gnuradio-runtime/include/messages/msg_queue.h | 95 --
gnuradio-runtime/include/pmt/api.h | 2 +-
gnuradio-runtime/include/pmt/pmt_sugar.h | 2 +-
gnuradio-runtime/include/pycallback_object.h | 206 ----
gnuradio-runtime/include/random.h | 38 -
gnuradio-runtime/include/realtime.h | 96 --
.../include/rpccallbackregister_base.h | 105 --
gnuradio-runtime/include/rpcmanager.h | 61 --
gnuradio-runtime/include/rpcmanager_base.h | 46 -
gnuradio-runtime/include/rpcpmtconverters_ice.h | 35 -
gnuradio-runtime/include/rpcregisterhelpers.h | 659 -------------
gnuradio-runtime/include/rpcserver_aggregator.h | 100 --
gnuradio-runtime/include/rpcserver_base.h | 47 -
.../include/rpcserver_booter_aggregator.h | 56 --
gnuradio-runtime/include/rpcserver_booter_base.h | 44 -
gnuradio-runtime/include/rpcserver_booter_ice.h | 49 -
gnuradio-runtime/include/rpcserver_ice.h | 226 -----
gnuradio-runtime/include/rpcserver_selector.h | 32 -
gnuradio-runtime/include/runtime_block_gateway.h | 265 -----
gnuradio-runtime/include/sys_pri.h | 42 -
gnuradio-runtime/include/thread/CMakeLists.txt | 29 -
gnuradio-runtime/include/thread/thread.h | 144 ---
.../include/thread/thread_body_wrapper.h | 72 --
gnuradio-runtime/include/thread/thread_group.h | 48 -
gnuradio-runtime/lib/CMakeLists.txt | 182 ++--
gnuradio-runtime/lib/ICE_LICENSE | 54 --
gnuradio-runtime/lib/basic_block.cc | 233 +++++
gnuradio-runtime/lib/block.cc | 689 +++++++++++++
gnuradio-runtime/lib/block_detail.cc | 474 +++++++++
gnuradio-runtime/lib/block_executor.cc | 489 ++++++++++
gnuradio-runtime/lib/block_executor.h | 78 ++
gnuradio-runtime/lib/block_gateway_impl.cc | 186 ++++
gnuradio-runtime/lib/block_gateway_impl.h | 75 ++
gnuradio-runtime/lib/block_registry.cc | 120 +++
gnuradio-runtime/lib/buffer.cc | 343 +++++++
gnuradio-runtime/lib/circular_file.cc | 208 ++++
gnuradio-runtime/lib/circular_file.h | 65 ++
gnuradio-runtime/lib/complex_vec_test.h | 24 +-
gnuradio-runtime/lib/constants.cc.in | 61 ++
gnuradio-runtime/lib/controlport/CMakeLists.txt | 62 ++
gnuradio-runtime/lib/controlport/ICE_LICENSE | 54 ++
gnuradio-runtime/lib/controlport/frontend.ice | 152 +++
gnuradio-runtime/lib/controlport/gnuradio.ice | 95 ++
.../lib/controlport/ice_application_base.cc | 43 +
gnuradio-runtime/lib/controlport/rpcmanager.cc | 72 ++
.../lib/controlport/rpcpmtconverters_ice.cc | 123 +++
.../lib/controlport/rpcserver_aggregator.cc | 93 ++
.../lib/controlport/rpcserver_booter_aggregator.cc | 62 ++
.../lib/controlport/rpcserver_booter_ice.cc | 54 ++
gnuradio-runtime/lib/controlport/rpcserver_ice.cc | 165 ++++
.../lib/controlport/rpcserver_selector.cc | 40 +
gnuradio-runtime/lib/dispatcher.cc | 195 ++++
gnuradio-runtime/lib/error_handler.cc | 249 +++++
gnuradio-runtime/lib/feval.cc | 136 +++
gnuradio-runtime/lib/flat_flowgraph.cc | 436 +++++++++
gnuradio-runtime/lib/flat_flowgraph.h | 93 ++
gnuradio-runtime/lib/flowgraph.cc | 519 ++++++++++
gnuradio-runtime/lib/frontend.ice | 152 ---
gnuradio-runtime/lib/gen_sine_table.py | 77 --
gnuradio-runtime/lib/gnuradio.ice | 95 --
gnuradio-runtime/lib/gr_basic_block.cc | 226 -----
gnuradio-runtime/lib/gr_block.cc | 687 -------------
gnuradio-runtime/lib/gr_block_detail.cc | 473 ---------
gnuradio-runtime/lib/gr_block_executor.cc | 487 ----------
gnuradio-runtime/lib/gr_block_executor.h | 78 --
gnuradio-runtime/lib/gr_block_registry.cc | 98 --
gnuradio-runtime/lib/gr_buffer.cc | 347 -------
gnuradio-runtime/lib/gr_circular_file.cc | 203 ----
gnuradio-runtime/lib/gr_circular_file.h | 60 --
gnuradio-runtime/lib/gr_constants.cc.in | 57 --
gnuradio-runtime/lib/gr_dispatcher.cc | 193 ----
gnuradio-runtime/lib/gr_error_handler.cc | 244 -----
gnuradio-runtime/lib/gr_fast_atan2f.cc | 199 ----
gnuradio-runtime/lib/gr_feval.cc | 132 ---
gnuradio-runtime/lib/gr_flat_flowgraph.cc | 427 --------
gnuradio-runtime/lib/gr_flat_flowgraph.h | 89 --
gnuradio-runtime/lib/gr_flowgraph.cc | 514 ----------
gnuradio-runtime/lib/gr_fxpt.cc | 35 -
gnuradio-runtime/lib/gr_hier_block2.cc | 153 ---
gnuradio-runtime/lib/gr_hier_block2_detail.cc | 641 ------------
gnuradio-runtime/lib/gr_hier_block2_detail.h | 74 --
gnuradio-runtime/lib/gr_io_signature.cc | 112 ---
gnuradio-runtime/lib/gr_local_sighandler.cc | 187 ----
gnuradio-runtime/lib/gr_local_sighandler.h | 65 --
gnuradio-runtime/lib/gr_logger.cc | 295 ------
gnuradio-runtime/lib/gr_message.cc | 78 --
gnuradio-runtime/lib/gr_misc.cc | 65 --
gnuradio-runtime/lib/gr_misc.h | 39 -
gnuradio-runtime/lib/gr_msg_accepter.cc | 59 --
gnuradio-runtime/lib/gr_msg_handler.cc | 30 -
gnuradio-runtime/lib/gr_msg_queue.cc | 125 ---
gnuradio-runtime/lib/gr_pagesize.cc | 56 --
gnuradio-runtime/lib/gr_pagesize.h | 34 -
gnuradio-runtime/lib/gr_preferences.cc | 108 ---
gnuradio-runtime/lib/gr_prefs.cc | 391 --------
gnuradio-runtime/lib/gr_random.cc | 183 ----
gnuradio-runtime/lib/gr_random.h | 65 --
gnuradio-runtime/lib/gr_realtime.cc | 33 -
gnuradio-runtime/lib/gr_reverse.cc | 60 --
gnuradio-runtime/lib/gr_reverse.h | 34 -
gnuradio-runtime/lib/gr_scheduler.cc | 33 -
gnuradio-runtime/lib/gr_scheduler.h | 65 --
gnuradio-runtime/lib/gr_scheduler_sts.cc | 87 --
gnuradio-runtime/lib/gr_scheduler_sts.h | 63 --
gnuradio-runtime/lib/gr_scheduler_tpb.cc | 103 --
gnuradio-runtime/lib/gr_scheduler_tpb.h | 61 --
gnuradio-runtime/lib/gr_select_handler.cc | 36 -
gnuradio-runtime/lib/gr_sincos.c | 83 --
.../lib/gr_single_threaded_scheduler.cc | 364 -------
gnuradio-runtime/lib/gr_sptr_magic.cc | 72 --
gnuradio-runtime/lib/gr_sync_block.cc | 68 --
gnuradio-runtime/lib/gr_sync_decimator.cc | 69 --
gnuradio-runtime/lib/gr_sync_interpolator.cc | 70 --
gnuradio-runtime/lib/gr_sys_paths.cc | 55 --
gnuradio-runtime/lib/gr_tagged_stream_block.cc | 146 ---
gnuradio-runtime/lib/gr_test.cc | 177 ----
gnuradio-runtime/lib/gr_test.h | 195 ----
gnuradio-runtime/lib/gr_test_types.h | 46 -
gnuradio-runtime/lib/gr_top_block.cc | 162 ----
gnuradio-runtime/lib/gr_top_block_impl.cc | 211 ----
gnuradio-runtime/lib/gr_top_block_impl.h | 88 --
gnuradio-runtime/lib/gr_tpb_detail.cc | 70 --
gnuradio-runtime/lib/gr_tpb_thread_body.cc | 151 ---
gnuradio-runtime/lib/gr_tpb_thread_body.h | 46 -
gnuradio-runtime/lib/gr_vco.h | 94 --
gnuradio-runtime/lib/gr_vmcircbuf.cc | 295 ------
gnuradio-runtime/lib/gr_vmcircbuf.h | 122 ---
.../lib/gr_vmcircbuf_createfilemapping.cc | 204 ----
.../lib/gr_vmcircbuf_createfilemapping.h | 76 --
gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc | 205 ----
gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h | 67 --
gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc | 197 ----
gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h | 67 --
gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc | 194 ----
gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h | 67 --
gnuradio-runtime/lib/gri_debugger_hook.cc | 29 -
gnuradio-runtime/lib/gri_debugger_hook.h | 30 -
gnuradio-runtime/lib/hier_block2.cc | 160 +++
gnuradio-runtime/lib/hier_block2_detail.cc | 657 +++++++++++++
gnuradio-runtime/lib/hier_block2_detail.h | 77 ++
gnuradio-runtime/lib/ice_application_base.cc | 43 -
gnuradio-runtime/lib/io_signature.cc | 117 +++
gnuradio-runtime/lib/local_sighandler.cc | 189 ++++
gnuradio-runtime/lib/local_sighandler.h | 74 ++
gnuradio-runtime/lib/logger.cc | 323 ++++++
gnuradio-runtime/lib/malloc16.h | 2 +-
gnuradio-runtime/lib/math/CMakeLists.txt | 29 +
gnuradio-runtime/lib/math/fast_atan2f.cc | 202 ++++
gnuradio-runtime/lib/math/fxpt.cc | 38 +
gnuradio-runtime/lib/math/gen_sine_table.py | 77 ++
gnuradio-runtime/lib/math/qa_fxpt.cc | 102 ++
gnuradio-runtime/lib/math/qa_fxpt.h | 47 +
gnuradio-runtime/lib/math/qa_fxpt_nco.cc | 120 +++
gnuradio-runtime/lib/math/qa_fxpt_nco.h | 47 +
gnuradio-runtime/lib/math/qa_fxpt_vco.cc | 110 +++
gnuradio-runtime/lib/math/qa_fxpt_vco.h | 47 +
gnuradio-runtime/lib/math/qa_math.cc | 105 ++
gnuradio-runtime/lib/math/qa_math.h | 42 +
gnuradio-runtime/lib/math/qa_sincos.cc | 68 ++
gnuradio-runtime/lib/math/qa_sincos.h | 41 +
gnuradio-runtime/lib/math/random.cc | 188 ++++
gnuradio-runtime/lib/math/sincos.cc | 85 ++
gnuradio-runtime/lib/math/sine_table.h | 1025 ++++++++++++++++++++
gnuradio-runtime/lib/math/vco.h | 99 ++
gnuradio-runtime/lib/message.cc | 82 ++
gnuradio-runtime/lib/messages/msg_accepter.cc | 2 +-
gnuradio-runtime/lib/messages/msg_accepter_msgq.cc | 6 +-
gnuradio-runtime/lib/messages/msg_producer.cc | 2 +-
gnuradio-runtime/lib/messages/msg_queue.cc | 18 +-
gnuradio-runtime/lib/misc.cc | 70 ++
gnuradio-runtime/lib/misc.h | 42 +
gnuradio-runtime/lib/msg_accepter.cc | 62 ++
gnuradio-runtime/lib/msg_handler.cc | 35 +
gnuradio-runtime/lib/msg_queue.cc | 130 +++
gnuradio-runtime/lib/pagesize.cc | 59 ++
gnuradio-runtime/lib/pagesize.h | 37 +
gnuradio-runtime/lib/pmt/pmt.cc | 2 +-
gnuradio-runtime/lib/pmt/qa_pmt.h | 2 +-
gnuradio-runtime/lib/pmt/qa_pmt_prims.cc | 2 +-
gnuradio-runtime/lib/pmt/qa_pmt_prims.h | 6 +-
gnuradio-runtime/lib/pmt/unv_qa_template.cc.t | 2 +-
gnuradio-runtime/lib/posix_memalign.cc | 4 +-
gnuradio-runtime/lib/prefs.cc | 401 ++++++++
gnuradio-runtime/lib/qa_buffer.cc | 304 ++++++
gnuradio-runtime/lib/qa_buffer.h | 49 +
gnuradio-runtime/lib/qa_circular_file.cc | 72 ++
gnuradio-runtime/lib/qa_circular_file.h | 39 +
gnuradio-runtime/lib/qa_gr_buffer.cc | 307 ------
gnuradio-runtime/lib/qa_gr_buffer.h | 53 -
gnuradio-runtime/lib/qa_gr_circular_file.cc | 72 --
gnuradio-runtime/lib/qa_gr_circular_file.h | 40 -
gnuradio-runtime/lib/qa_gr_fxpt.cc | 103 --
gnuradio-runtime/lib/qa_gr_fxpt.h | 48 -
gnuradio-runtime/lib/qa_gr_fxpt_nco.cc | 119 ---
gnuradio-runtime/lib/qa_gr_fxpt_nco.h | 48 -
gnuradio-runtime/lib/qa_gr_fxpt_vco.cc | 110 ---
gnuradio-runtime/lib/qa_gr_fxpt_vco.h | 48 -
gnuradio-runtime/lib/qa_gr_io_signature.cc | 64 --
gnuradio-runtime/lib/qa_gr_io_signature.h | 46 -
gnuradio-runtime/lib/qa_gr_logger.cc | 52 -
gnuradio-runtime/lib/qa_gr_logger.h | 42 -
gnuradio-runtime/lib/qa_gr_math.cc | 105 --
gnuradio-runtime/lib/qa_gr_math.h | 42 -
gnuradio-runtime/lib/qa_gr_vmcircbuf.cc | 40 -
gnuradio-runtime/lib/qa_gr_vmcircbuf.h | 39 -
gnuradio-runtime/lib/qa_io_signature.cc | 65 ++
gnuradio-runtime/lib/qa_io_signature.h | 46 +
gnuradio-runtime/lib/qa_logger.cc | 52 +
gnuradio-runtime/lib/qa_logger.h | 42 +
gnuradio-runtime/lib/qa_runtime.cc | 42 +-
gnuradio-runtime/lib/qa_runtime.h | 2 +-
gnuradio-runtime/lib/qa_sincos.cc | 69 --
gnuradio-runtime/lib/qa_sincos.h | 41 -
gnuradio-runtime/lib/qa_vmcircbuf.cc | 40 +
gnuradio-runtime/lib/qa_vmcircbuf.h | 39 +
gnuradio-runtime/lib/random.h | 38 -
gnuradio-runtime/lib/realtime.cc | 151 +--
gnuradio-runtime/lib/realtime_impl.cc | 178 ++++
gnuradio-runtime/lib/rpcmanager.cc | 72 --
gnuradio-runtime/lib/rpcpmtconverters_ice.cc | 123 ---
gnuradio-runtime/lib/rpcserver_aggregator.cc | 93 --
.../lib/rpcserver_booter_aggregator.cc | 62 --
gnuradio-runtime/lib/rpcserver_booter_ice.cc | 54 --
gnuradio-runtime/lib/rpcserver_ice.cc | 165 ----
gnuradio-runtime/lib/rpcserver_selector.cc | 40 -
gnuradio-runtime/lib/runtime_block_gateway.cc | 185 ----
gnuradio-runtime/lib/scheduler.cc | 39 +
gnuradio-runtime/lib/scheduler.h | 68 ++
gnuradio-runtime/lib/scheduler_sts.cc | 90 ++
gnuradio-runtime/lib/scheduler_sts.h | 66 ++
gnuradio-runtime/lib/scheduler_tpb.cc | 106 ++
gnuradio-runtime/lib/scheduler_tpb.h | 66 ++
gnuradio-runtime/lib/select_handler.cc | 40 +
gnuradio-runtime/lib/sine_table.h | 1025 --------------------
gnuradio-runtime/lib/single_threaded_scheduler.cc | 363 +++++++
gnuradio-runtime/lib/sptr_magic.cc | 72 ++
gnuradio-runtime/lib/sync_block.cc | 72 ++
gnuradio-runtime/lib/sync_decimator.cc | 72 ++
gnuradio-runtime/lib/sync_interpolator.cc | 73 ++
gnuradio-runtime/lib/sys_paths.cc | 65 ++
gnuradio-runtime/lib/tagged_stream_block.cc | 144 +++
gnuradio-runtime/lib/test.cc | 181 ++++
gnuradio-runtime/lib/test.h | 225 +++++
gnuradio-runtime/lib/test_runtime.cc | 2 +-
gnuradio-runtime/lib/test_types.h | 51 +
gnuradio-runtime/lib/thread/thread.cc | 2 +-
gnuradio-runtime/lib/thread/thread_body_wrapper.cc | 2 +-
gnuradio-runtime/lib/thread/thread_group.cc | 2 +-
gnuradio-runtime/lib/top_block.cc | 167 ++++
gnuradio-runtime/lib/top_block_impl.cc | 212 ++++
gnuradio-runtime/lib/top_block_impl.h | 90 ++
gnuradio-runtime/lib/tpb_detail.cc | 71 ++
gnuradio-runtime/lib/tpb_thread_body.cc | 151 +++
gnuradio-runtime/lib/tpb_thread_body.h | 49 +
gnuradio-runtime/lib/vmcircbuf.cc | 299 ++++++
gnuradio-runtime/lib/vmcircbuf.h | 125 +++
.../lib/vmcircbuf_createfilemapping.cc | 204 ++++
gnuradio-runtime/lib/vmcircbuf_createfilemapping.h | 81 ++
gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc | 204 ++++
gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h | 70 ++
gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc | 197 ++++
gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h | 70 ++
gnuradio-runtime/lib/vmcircbuf_prefs.cc | 113 +++
gnuradio-runtime/lib/vmcircbuf_prefs.h | 39 +
gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc | 196 ++++
gnuradio-runtime/lib/vmcircbuf_sysv_shm.h | 70 ++
.../python/gnuradio/ctrlport/CMakeLists.txt | 8 +-
gnuradio-runtime/python/gnuradio/gr/__init__.py | 2 +-
gnuradio-runtime/python/gnuradio/gr/gateway.py | 20 +-
gnuradio-runtime/python/gnuradio/gr/prefs.py | 2 +-
.../python/gnuradio/gr/qa_tag_utils.py | 2 +-
gnuradio-runtime/python/gnuradio/gr/tag_utils.py | 4 +-
gnuradio-runtime/swig/CMakeLists.txt | 42 +-
gnuradio-runtime/swig/basic_block.i | 65 ++
gnuradio-runtime/swig/block.i | 94 ++
gnuradio-runtime/swig/block_detail.i | 56 ++
gnuradio-runtime/swig/block_gateway.i | 49 +
gnuradio-runtime/swig/buffer.i | 67 ++
gnuradio-runtime/swig/constants.i | 13 +
gnuradio-runtime/swig/dispatcher.i | 56 ++
gnuradio-runtime/swig/error_handler.i | 69 ++
gnuradio-runtime/swig/feval.i | 243 +++++
.../swig/gnuradio_swig_bug_workaround.h | 24 +-
gnuradio-runtime/swig/gr_basic_block.i | 63 --
gnuradio-runtime/swig/gr_block.i | 93 --
gnuradio-runtime/swig/gr_block_detail.i | 66 --
gnuradio-runtime/swig/gr_buffer.i | 63 --
gnuradio-runtime/swig/gr_constants.i | 13 -
gnuradio-runtime/swig/gr_ctrlport.i | 12 +-
gnuradio-runtime/swig/gr_dispatcher.i | 55 --
gnuradio-runtime/swig/gr_error_handler.i | 69 --
gnuradio-runtime/swig/gr_feval.i | 233 -----
gnuradio-runtime/swig/gr_hier_block2.i | 88 --
gnuradio-runtime/swig/gr_io_signature.i | 73 --
gnuradio-runtime/swig/gr_logger.i | 58 +-
gnuradio-runtime/swig/gr_message.i | 65 --
gnuradio-runtime/swig/gr_msg_handler.i | 32 -
gnuradio-runtime/swig/gr_msg_queue.i | 107 --
gnuradio-runtime/swig/gr_prefs.i | 63 --
gnuradio-runtime/swig/gr_realtime.i | 44 -
.../swig/gr_single_threaded_scheduler.i | 54 --
gnuradio-runtime/swig/gr_sync_block.i | 29 -
gnuradio-runtime/swig/gr_sync_decimator.i | 31 -
gnuradio-runtime/swig/gr_sync_interpolator.i | 31 -
gnuradio-runtime/swig/gr_tagged_stream_block.i | 30 -
gnuradio-runtime/swig/gr_tags.i | 32 -
gnuradio-runtime/swig/gr_top_block.i | 74 --
gnuradio-runtime/swig/gr_types.i | 2 +-
gnuradio-runtime/swig/hier_block2.i | 92 ++
gnuradio-runtime/swig/io_signature.i | 69 ++
gnuradio-runtime/swig/message.i | 70 ++
gnuradio-runtime/swig/msg_handler.i | 33 +
gnuradio-runtime/swig/msg_queue.i | 108 +++
gnuradio-runtime/swig/prefs.i | 63 ++
gnuradio-runtime/swig/realtime.i | 45 +
gnuradio-runtime/swig/runtime_block_gateway.i | 43 -
gnuradio-runtime/swig/runtime_swig.i | 101 +-
gnuradio-runtime/swig/single_threaded_scheduler.i | 54 ++
gnuradio-runtime/swig/sync_block.i | 30 +
gnuradio-runtime/swig/sync_decimator.i | 31 +
gnuradio-runtime/swig/sync_interpolator.i | 31 +
gnuradio-runtime/swig/tagged_stream_block.i | 31 +
gnuradio-runtime/swig/tags.i | 32 +
gnuradio-runtime/swig/top_block.i | 74 ++
gr-analog/include/analog/agc.h | 2 +-
gr-analog/include/analog/agc2.h | 2 +-
gr-analog/include/analog/agc2_cc.h | 4 +-
gr-analog/include/analog/agc2_ff.h | 4 +-
gr-analog/include/analog/agc_cc.h | 4 +-
gr-analog/include/analog/agc_ff.h | 4 +-
gr-analog/include/analog/api.h | 2 +-
gr-analog/include/analog/cpfsk_bc.h | 4 +-
gr-analog/include/analog/ctcss_squelch_ff.h | 4 +-
gr-analog/include/analog/dpll_bb.h | 4 +-
gr-analog/include/analog/fastnoise_source_X.h.t | 4 +-
gr-analog/include/analog/feedforward_agc_cc.h | 4 +-
gr-analog/include/analog/fmdet_cf.h | 4 +-
gr-analog/include/analog/frequency_modulator_fc.h | 4 +-
gr-analog/include/analog/noise_source_X.h.t | 5 +-
gr-analog/include/analog/phase_modulator_fc.h | 4 +-
gr-analog/include/analog/pll_carriertracking_cc.h | 6 +-
gr-analog/include/analog/pll_freqdet_cf.h | 6 +-
gr-analog/include/analog/pll_refout_cc.h | 6 +-
gr-analog/include/analog/probe_avg_mag_sqrd_c.h | 4 +-
gr-analog/include/analog/probe_avg_mag_sqrd_cf.h | 4 +-
gr-analog/include/analog/probe_avg_mag_sqrd_f.h | 4 +-
gr-analog/include/analog/pwr_squelch_cc.h | 2 +-
gr-analog/include/analog/pwr_squelch_ff.h | 2 +-
gr-analog/include/analog/quadrature_demod_cf.h | 4 +-
gr-analog/include/analog/rail_ff.h | 4 +-
gr-analog/include/analog/sig_source_X.h.t | 4 +-
gr-analog/include/analog/simple_squelch_cc.h | 4 +-
gr-analog/include/analog/squelch_base_cc.h | 4 +-
gr-analog/include/analog/squelch_base_ff.h | 4 +-
gr-analog/lib/CMakeLists.txt | 1 +
gr-analog/lib/agc2_cc_impl.cc | 8 +-
gr-analog/lib/agc2_ff_impl.cc | 8 +-
gr-analog/lib/agc_cc_impl.cc | 8 +-
gr-analog/lib/agc_ff_impl.cc | 8 +-
gr-analog/lib/cpfsk_bc_impl.cc | 10 +-
gr-analog/lib/ctcss_squelch_ff_impl.cc | 6 +-
gr-analog/lib/dpll_bb_impl.cc | 8 +-
gr-analog/lib/fastnoise_source_X_impl.cc.t | 8 +-
gr-analog/lib/fastnoise_source_X_impl.h.t | 4 +-
gr-analog/lib/feedforward_agc_cc_impl.cc | 8 +-
gr-analog/lib/fmdet_cf_impl.cc | 10 +-
gr-analog/lib/fmdet_cf_impl.h | 2 +-
gr-analog/lib/frequency_modulator_fc_impl.cc | 14 +-
gr-analog/lib/noise_source_X_impl.cc.t | 8 +-
gr-analog/lib/noise_source_X_impl.h.t | 4 +-
gr-analog/lib/phase_modulator_fc_impl.cc | 12 +-
gr-analog/lib/pll_carriertracking_cc_impl.cc | 16 +-
gr-analog/lib/pll_freqdet_cf_impl.cc | 12 +-
gr-analog/lib/pll_refout_cc_impl.cc | 16 +-
gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc | 8 +-
gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc | 8 +-
gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc | 8 +-
gr-analog/lib/pwr_squelch_cc_impl.cc | 6 +-
gr-analog/lib/pwr_squelch_ff_impl.cc | 6 +-
gr-analog/lib/qa_analog.h | 2 +-
gr-analog/lib/quadrature_demod_cf_impl.cc | 12 +-
gr-analog/lib/rail_ff_impl.cc | 12 +-
gr-analog/lib/sig_source_X_impl.cc.t | 10 +-
gr-analog/lib/sig_source_X_impl.h.t | 6 +-
gr-analog/lib/simple_squelch_cc_impl.cc | 8 +-
gr-analog/lib/squelch_base_cc_impl.cc | 8 +-
gr-analog/lib/squelch_base_ff_impl.cc | 8 +-
gr-analog/lib/test_gr_analog.cc | 2 +-
gr-analog/swig/analog_swig.i | 4 +-
gr-atsc/include/atsc/GrAtscBitTimingLoop.h | 2 +-
gr-atsc/include/atsc/GrAtscBitTimingLoop2.h | 2 +-
gr-atsc/include/atsc/GrAtscFPLL.h | 2 +-
gr-atsc/include/atsc/GrAtscSymbolMapper.h | 2 +-
gr-atsc/include/atsc/api.h | 2 +-
gr-atsc/include/atsc/bit_timing_loop.h | 4 +-
gr-atsc/include/atsc/deinterleaver.h | 4 +-
gr-atsc/include/atsc/depad.h | 4 +-
gr-atsc/include/atsc/derandomizer.h | 4 +-
gr-atsc/include/atsc/ds_to_softds.h | 4 +-
gr-atsc/include/atsc/equalizer.h | 4 +-
gr-atsc/include/atsc/field_sync_demux.h | 4 +-
gr-atsc/include/atsc/field_sync_mux.h | 4 +-
gr-atsc/include/atsc/fpll.h | 8 +-
gr-atsc/include/atsc/fs_checker.h | 4 +-
gr-atsc/include/atsc/interleaver.h | 4 +-
gr-atsc/include/atsc/pad.h | 4 +-
gr-atsc/include/atsc/randomizer.h | 4 +-
gr-atsc/include/atsc/rs_decoder.h | 4 +-
gr-atsc/include/atsc/rs_encoder.h | 4 +-
gr-atsc/include/atsc/trellis_encoder.h | 4 +-
gr-atsc/include/atsc/viterbi_decoder.h | 4 +-
gr-atsc/lib/atsc_bit_timing_loop.cc | 14 +-
gr-atsc/lib/atsc_deinterleaver.cc | 8 +-
gr-atsc/lib/atsc_depad.cc | 10 +-
gr-atsc/lib/atsc_derandomizer.cc | 8 +-
gr-atsc/lib/atsc_ds_to_softds.cc | 8 +-
gr-atsc/lib/atsc_equalizer.cc | 8 +-
gr-atsc/lib/atsc_field_sync_demux.cc | 16 +-
gr-atsc/lib/atsc_field_sync_mux.cc | 8 +-
gr-atsc/lib/atsc_fpll.cc | 12 +-
gr-atsc/lib/atsc_fs_checker.cc | 8 +-
gr-atsc/lib/atsc_interleaver.cc | 8 +-
gr-atsc/lib/atsc_pad.cc | 10 +-
gr-atsc/lib/atsc_randomizer.cc | 8 +-
gr-atsc/lib/atsc_rs_decoder.cc | 8 +-
gr-atsc/lib/atsc_rs_encoder.cc | 8 +-
gr-atsc/lib/atsc_trellis_encoder.cc | 8 +-
gr-atsc/lib/atsc_viterbi_decoder.cc | 8 +-
gr-atsc/lib/atsci_equalizer_lms2.cc | 2 +-
gr-atsc/lib/atsci_sssr.cc | 2 +-
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc | 2 +-
gr-atsc/lib/qa_atsci_fs_correlator.cc | 2 +-
gr-atsc/lib/qa_atsci_single_viterbi.cc | 2 +-
gr-atsc/lib/test_atsci.cc | 2 +-
gr-atsc/python/qa_atsc.py | 14 +-
gr-audio/examples/c++/CMakeLists.txt | 3 +-
gr-audio/examples/c++/dial_tone.cc | 6 +-
gr-audio/include/audio/api.h | 2 +-
gr-audio/include/audio/sink.h | 4 +-
gr-audio/include/audio/source.h | 4 +-
gr-audio/lib/alsa/alsa_sink.cc | 20 +-
gr-audio/lib/alsa/alsa_source.cc | 20 +-
gr-audio/lib/audio_registry.cc | 4 +-
gr-audio/lib/jack/jack_sink.cc | 14 +-
gr-audio/lib/jack/jack_source.cc | 14 +-
gr-audio/lib/oss/oss_sink.cc | 14 +-
gr-audio/lib/oss/oss_source.cc | 14 +-
gr-audio/lib/osx/circular_buffer.h | 2 +-
gr-audio/lib/osx/osx_sink.cc | 10 +-
gr-audio/lib/osx/osx_source.cc | 10 +-
gr-audio/lib/portaudio/portaudio_sink.cc | 20 +-
gr-audio/lib/portaudio/portaudio_sink.h | 8 +-
gr-audio/lib/portaudio/portaudio_source.cc | 20 +-
gr-audio/lib/portaudio/portaudio_source.h | 8 +-
gr-audio/lib/windows/windows_sink.cc | 8 +-
gr-audio/lib/windows/windows_source.cc | 8 +-
gr-blocks/CMakeLists.txt | 2 +-
gr-blocks/include/blocks/CMakeLists.txt | 218 -----
gr-blocks/include/blocks/add_XX.h.t | 54 --
gr-blocks/include/blocks/add_const_XX.h.t | 65 --
gr-blocks/include/blocks/add_const_vXX.h.t | 66 --
gr-blocks/include/blocks/add_ff.h | 57 --
gr-blocks/include/blocks/and_XX.h.t | 53 -
gr-blocks/include/blocks/and_const_XX.h.t | 68 --
gr-blocks/include/blocks/annotator_1to1.h | 61 --
gr-blocks/include/blocks/annotator_alltoall.h | 62 --
gr-blocks/include/blocks/annotator_raw.h | 58 --
gr-blocks/include/blocks/api.h | 33 -
gr-blocks/include/blocks/argmax_XX.h.t | 61 --
gr-blocks/include/blocks/bin_statistics_f.h | 76 --
gr-blocks/include/blocks/burst_tagger.h | 76 --
gr-blocks/include/blocks/char_to_float.h | 65 --
gr-blocks/include/blocks/char_to_short.h | 49 -
gr-blocks/include/blocks/check_lfsr_32k_s.h | 57 --
gr-blocks/include/blocks/complex_to_arg.h | 53 -
gr-blocks/include/blocks/complex_to_float.h | 53 -
gr-blocks/include/blocks/complex_to_imag.h | 53 -
.../include/blocks/complex_to_interleaved_short.h | 51 -
gr-blocks/include/blocks/complex_to_mag.h | 53 -
gr-blocks/include/blocks/complex_to_mag_squared.h | 53 -
gr-blocks/include/blocks/complex_to_real.h | 53 -
gr-blocks/include/blocks/conjugate_cc.h | 49 -
gr-blocks/include/blocks/control_loop.h | 234 -----
gr-blocks/include/blocks/copy.h | 55 --
gr-blocks/include/blocks/count_bits.h | 46 -
gr-blocks/include/blocks/ctrlport_probe2_c.h | 67 --
gr-blocks/include/blocks/ctrlport_probe_c.h | 65 --
gr-blocks/include/blocks/deinterleave.h | 53 -
gr-blocks/include/blocks/delay.h | 57 --
gr-blocks/include/blocks/divide_XX.h.t | 54 --
gr-blocks/include/blocks/endian_swap.h | 54 --
gr-blocks/include/blocks/file_descriptor_sink.h | 54 --
gr-blocks/include/blocks/file_descriptor_source.h | 61 --
gr-blocks/include/blocks/file_meta_sink.h | 112 ---
gr-blocks/include/blocks/file_meta_source.h | 82 --
gr-blocks/include/blocks/file_sink.h | 55 --
gr-blocks/include/blocks/file_sink_base.h | 80 --
gr-blocks/include/blocks/file_source.h | 85 --
gr-blocks/include/blocks/float_to_char.h | 64 --
gr-blocks/include/blocks/float_to_complex.h | 53 -
gr-blocks/include/blocks/float_to_int.h | 64 --
gr-blocks/include/blocks/float_to_short.h | 64 --
gr-blocks/include/blocks/float_to_uchar.h | 52 -
gr-blocks/include/blocks/head.h | 56 --
gr-blocks/include/blocks/int_to_float.h | 64 --
gr-blocks/include/blocks/integrate_XX.h.t | 51 -
gr-blocks/include/blocks/interleave.h | 53 -
.../include/blocks/interleaved_short_to_complex.h | 51 -
gr-blocks/include/blocks/keep_m_in_n.h | 61 --
gr-blocks/include/blocks/keep_one_in_n.h | 57 --
gr-blocks/include/blocks/lfsr_15_1_0.h | 70 --
gr-blocks/include/blocks/lfsr_32k.h | 91 --
gr-blocks/include/blocks/lfsr_32k_source_s.h | 56 --
gr-blocks/include/blocks/log2_const.h | 53 -
gr-blocks/include/blocks/max_XX.h.t | 59 --
gr-blocks/include/blocks/message_burst_source.h | 52 -
gr-blocks/include/blocks/message_debug.h | 88 --
gr-blocks/include/blocks/message_sink.h | 52 -
gr-blocks/include/blocks/message_source.h | 54 --
gr-blocks/include/blocks/message_strobe.h | 82 --
gr-blocks/include/blocks/moving_average_XX.h.t | 84 --
gr-blocks/include/blocks/multiply_XX.h.t | 54 --
gr-blocks/include/blocks/multiply_cc.h | 57 --
gr-blocks/include/blocks/multiply_conjugate_cc.h | 54 --
gr-blocks/include/blocks/multiply_const_XX.h.t | 66 --
gr-blocks/include/blocks/multiply_const_cc.h | 67 --
gr-blocks/include/blocks/multiply_const_ff.h | 67 --
gr-blocks/include/blocks/multiply_const_vXX.h.t | 66 --
gr-blocks/include/blocks/multiply_ff.h | 57 --
gr-blocks/include/blocks/mute_XX.h.t | 54 --
gr-blocks/include/blocks/nlog10_ff.h | 55 --
gr-blocks/include/blocks/nop.h | 59 --
gr-blocks/include/blocks/not_XX.h.t | 53 -
gr-blocks/include/blocks/null_sink.h | 55 --
gr-blocks/include/blocks/null_source.h | 53 -
gr-blocks/include/blocks/or_XX.h.t | 53 -
gr-blocks/include/blocks/pack_k_bits_bb.h | 53 -
gr-blocks/include/blocks/packed_to_unpacked_XX.h.t | 74 --
gr-blocks/include/blocks/patterned_interleaver.h | 54 --
gr-blocks/include/blocks/pdu.h | 48 -
gr-blocks/include/blocks/pdu_to_tagged_stream.h | 53 -
gr-blocks/include/blocks/peak_detector2_fb.h | 95 --
gr-blocks/include/blocks/peak_detector_XX.h.t | 118 ---
gr-blocks/include/blocks/plateau_detector_fb.h | 70 --
gr-blocks/include/blocks/probe_rate.h | 61 --
gr-blocks/include/blocks/probe_signal_X.h.t | 52 -
gr-blocks/include/blocks/probe_signal_vX.h.t | 54 --
gr-blocks/include/blocks/random_pdu.h | 52 -
gr-blocks/include/blocks/regenerate_bb.h | 81 --
gr-blocks/include/blocks/repack_bits_bb.h | 66 --
gr-blocks/include/blocks/repeat.h | 54 --
gr-blocks/include/blocks/rms_cf.h | 54 --
gr-blocks/include/blocks/rms_ff.h | 54 --
gr-blocks/include/blocks/rotator.h | 63 --
gr-blocks/include/blocks/sample_and_hold_XX.h.t | 54 --
gr-blocks/include/blocks/short_to_char.h | 53 -
gr-blocks/include/blocks/short_to_float.h | 64 --
gr-blocks/include/blocks/skiphead.h | 54 --
gr-blocks/include/blocks/socket_pdu.h | 55 --
gr-blocks/include/blocks/stream_mux.h | 70 --
gr-blocks/include/blocks/stream_to_streams.h | 58 --
gr-blocks/include/blocks/stream_to_vector.h | 54 --
gr-blocks/include/blocks/streams_to_stream.h | 58 --
gr-blocks/include/blocks/streams_to_vector.h | 54 --
gr-blocks/include/blocks/stretch_ff.h | 60 --
gr-blocks/include/blocks/sub_XX.h.t | 54 --
gr-blocks/include/blocks/tag_debug.h | 83 --
gr-blocks/include/blocks/tagged_file_sink.h | 67 --
gr-blocks/include/blocks/tagged_stream_mux.h | 63 --
gr-blocks/include/blocks/tagged_stream_to_pdu.h | 53 -
gr-blocks/include/blocks/threshold_ff.h | 67 --
gr-blocks/include/blocks/throttle.h | 63 --
gr-blocks/include/blocks/transcendental.h | 58 --
gr-blocks/include/blocks/tuntap_pdu.h | 53 -
gr-blocks/include/blocks/uchar_to_float.h | 51 -
gr-blocks/include/blocks/udp_sink.h | 81 --
gr-blocks/include/blocks/udp_source.h | 84 --
gr-blocks/include/blocks/unpack_k_bits_bb.h | 52 -
gr-blocks/include/blocks/unpacked_to_packed_XX.h.t | 73 --
gr-blocks/include/blocks/vco_f.h | 59 --
gr-blocks/include/blocks/vector_insert_X.h.t | 61 --
gr-blocks/include/blocks/vector_map.h | 72 --
gr-blocks/include/blocks/vector_sink_X.h.t | 54 --
gr-blocks/include/blocks/vector_source_X.h.t | 56 --
gr-blocks/include/blocks/vector_to_stream.h | 54 --
gr-blocks/include/blocks/vector_to_streams.h | 55 --
gr-blocks/include/blocks/wavfile.h | 104 --
gr-blocks/include/blocks/wavfile_sink.h | 87 --
gr-blocks/include/blocks/wavfile_source.h | 70 --
gr-blocks/include/blocks/xor_XX.h.t | 53 -
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 218 +++++
gr-blocks/include/gnuradio/blocks/add_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/add_const_XX.h.t | 65 ++
.../include/gnuradio/blocks/add_const_vXX.h.t | 66 ++
gr-blocks/include/gnuradio/blocks/add_ff.h | 57 ++
gr-blocks/include/gnuradio/blocks/and_XX.h.t | 53 +
gr-blocks/include/gnuradio/blocks/and_const_XX.h.t | 68 ++
gr-blocks/include/gnuradio/blocks/annotator_1to1.h | 61 ++
.../include/gnuradio/blocks/annotator_alltoall.h | 62 ++
gr-blocks/include/gnuradio/blocks/annotator_raw.h | 58 ++
gr-blocks/include/gnuradio/blocks/api.h | 33 +
gr-blocks/include/gnuradio/blocks/argmax_XX.h.t | 61 ++
.../include/gnuradio/blocks/bin_statistics_f.h | 76 ++
gr-blocks/include/gnuradio/blocks/burst_tagger.h | 76 ++
gr-blocks/include/gnuradio/blocks/char_to_float.h | 65 ++
gr-blocks/include/gnuradio/blocks/char_to_short.h | 49 +
.../include/gnuradio/blocks/check_lfsr_32k_s.h | 57 ++
gr-blocks/include/gnuradio/blocks/complex_to_arg.h | 53 +
.../include/gnuradio/blocks/complex_to_float.h | 53 +
.../include/gnuradio/blocks/complex_to_imag.h | 53 +
.../gnuradio/blocks/complex_to_interleaved_short.h | 51 +
gr-blocks/include/gnuradio/blocks/complex_to_mag.h | 53 +
.../gnuradio/blocks/complex_to_mag_squared.h | 53 +
.../include/gnuradio/blocks/complex_to_real.h | 53 +
gr-blocks/include/gnuradio/blocks/conjugate_cc.h | 49 +
gr-blocks/include/gnuradio/blocks/control_loop.h | 234 +++++
gr-blocks/include/gnuradio/blocks/copy.h | 55 ++
gr-blocks/include/gnuradio/blocks/count_bits.h | 46 +
.../include/gnuradio/blocks/ctrlport_probe2_c.h | 67 ++
.../include/gnuradio/blocks/ctrlport_probe_c.h | 65 ++
gr-blocks/include/gnuradio/blocks/deinterleave.h | 53 +
gr-blocks/include/gnuradio/blocks/delay.h | 57 ++
gr-blocks/include/gnuradio/blocks/divide_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/endian_swap.h | 54 ++
.../include/gnuradio/blocks/file_descriptor_sink.h | 54 ++
.../gnuradio/blocks/file_descriptor_source.h | 61 ++
gr-blocks/include/gnuradio/blocks/file_meta_sink.h | 112 +++
.../include/gnuradio/blocks/file_meta_source.h | 82 ++
gr-blocks/include/gnuradio/blocks/file_sink.h | 55 ++
gr-blocks/include/gnuradio/blocks/file_sink_base.h | 80 ++
gr-blocks/include/gnuradio/blocks/file_source.h | 85 ++
gr-blocks/include/gnuradio/blocks/float_to_char.h | 64 ++
.../include/gnuradio/blocks/float_to_complex.h | 53 +
gr-blocks/include/gnuradio/blocks/float_to_int.h | 64 ++
gr-blocks/include/gnuradio/blocks/float_to_short.h | 64 ++
gr-blocks/include/gnuradio/blocks/float_to_uchar.h | 52 +
gr-blocks/include/gnuradio/blocks/head.h | 56 ++
gr-blocks/include/gnuradio/blocks/int_to_float.h | 64 ++
gr-blocks/include/gnuradio/blocks/integrate_XX.h.t | 51 +
gr-blocks/include/gnuradio/blocks/interleave.h | 53 +
.../gnuradio/blocks/interleaved_short_to_complex.h | 51 +
gr-blocks/include/gnuradio/blocks/keep_m_in_n.h | 61 ++
gr-blocks/include/gnuradio/blocks/keep_one_in_n.h | 57 ++
gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h | 70 ++
gr-blocks/include/gnuradio/blocks/lfsr_32k.h | 91 ++
.../include/gnuradio/blocks/lfsr_32k_source_s.h | 56 ++
gr-blocks/include/gnuradio/blocks/log2_const.h | 53 +
gr-blocks/include/gnuradio/blocks/max_XX.h.t | 59 ++
.../include/gnuradio/blocks/message_burst_source.h | 52 +
gr-blocks/include/gnuradio/blocks/message_debug.h | 88 ++
gr-blocks/include/gnuradio/blocks/message_sink.h | 52 +
gr-blocks/include/gnuradio/blocks/message_source.h | 54 ++
gr-blocks/include/gnuradio/blocks/message_strobe.h | 82 ++
.../include/gnuradio/blocks/moving_average_XX.h.t | 84 ++
gr-blocks/include/gnuradio/blocks/multiply_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/multiply_cc.h | 57 ++
.../gnuradio/blocks/multiply_conjugate_cc.h | 54 ++
.../include/gnuradio/blocks/multiply_const_XX.h.t | 66 ++
.../include/gnuradio/blocks/multiply_const_cc.h | 67 ++
.../include/gnuradio/blocks/multiply_const_ff.h | 67 ++
.../include/gnuradio/blocks/multiply_const_vXX.h.t | 66 ++
gr-blocks/include/gnuradio/blocks/multiply_ff.h | 57 ++
gr-blocks/include/gnuradio/blocks/mute_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/nlog10_ff.h | 55 ++
gr-blocks/include/gnuradio/blocks/nop.h | 59 ++
gr-blocks/include/gnuradio/blocks/not_XX.h.t | 53 +
gr-blocks/include/gnuradio/blocks/null_sink.h | 55 ++
gr-blocks/include/gnuradio/blocks/null_source.h | 53 +
gr-blocks/include/gnuradio/blocks/or_XX.h.t | 53 +
gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h | 53 +
.../gnuradio/blocks/packed_to_unpacked_XX.h.t | 74 ++
.../gnuradio/blocks/patterned_interleaver.h | 54 ++
gr-blocks/include/gnuradio/blocks/pdu.h | 48 +
.../include/gnuradio/blocks/pdu_to_tagged_stream.h | 53 +
.../include/gnuradio/blocks/peak_detector2_fb.h | 95 ++
.../include/gnuradio/blocks/peak_detector_XX.h.t | 118 +++
.../include/gnuradio/blocks/plateau_detector_fb.h | 70 ++
gr-blocks/include/gnuradio/blocks/probe_rate.h | 61 ++
.../include/gnuradio/blocks/probe_signal_X.h.t | 52 +
.../include/gnuradio/blocks/probe_signal_vX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/random_pdu.h | 52 +
gr-blocks/include/gnuradio/blocks/regenerate_bb.h | 81 ++
gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | 66 ++
gr-blocks/include/gnuradio/blocks/repeat.h | 54 ++
gr-blocks/include/gnuradio/blocks/rms_cf.h | 54 ++
gr-blocks/include/gnuradio/blocks/rms_ff.h | 54 ++
gr-blocks/include/gnuradio/blocks/rotator.h | 63 ++
.../include/gnuradio/blocks/sample_and_hold_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/short_to_char.h | 53 +
gr-blocks/include/gnuradio/blocks/short_to_float.h | 64 ++
gr-blocks/include/gnuradio/blocks/skiphead.h | 54 ++
gr-blocks/include/gnuradio/blocks/socket_pdu.h | 55 ++
gr-blocks/include/gnuradio/blocks/stream_mux.h | 70 ++
.../include/gnuradio/blocks/stream_to_streams.h | 58 ++
.../include/gnuradio/blocks/stream_to_vector.h | 54 ++
.../include/gnuradio/blocks/streams_to_stream.h | 58 ++
.../include/gnuradio/blocks/streams_to_vector.h | 54 ++
gr-blocks/include/gnuradio/blocks/stretch_ff.h | 60 ++
gr-blocks/include/gnuradio/blocks/sub_XX.h.t | 54 ++
gr-blocks/include/gnuradio/blocks/tag_debug.h | 83 ++
.../include/gnuradio/blocks/tagged_file_sink.h | 67 ++
.../include/gnuradio/blocks/tagged_stream_mux.h | 63 ++
.../include/gnuradio/blocks/tagged_stream_to_pdu.h | 53 +
gr-blocks/include/gnuradio/blocks/threshold_ff.h | 67 ++
gr-blocks/include/gnuradio/blocks/throttle.h | 63 ++
gr-blocks/include/gnuradio/blocks/transcendental.h | 58 ++
gr-blocks/include/gnuradio/blocks/tuntap_pdu.h | 53 +
gr-blocks/include/gnuradio/blocks/uchar_to_float.h | 51 +
gr-blocks/include/gnuradio/blocks/udp_sink.h | 81 ++
gr-blocks/include/gnuradio/blocks/udp_source.h | 84 ++
.../include/gnuradio/blocks/unpack_k_bits_bb.h | 52 +
.../gnuradio/blocks/unpacked_to_packed_XX.h.t | 73 ++
gr-blocks/include/gnuradio/blocks/vco_f.h | 59 ++
.../include/gnuradio/blocks/vector_insert_X.h.t | 61 ++
gr-blocks/include/gnuradio/blocks/vector_map.h | 72 ++
.../include/gnuradio/blocks/vector_sink_X.h.t | 54 ++
.../include/gnuradio/blocks/vector_source_X.h.t | 56 ++
.../include/gnuradio/blocks/vector_to_stream.h | 54 ++
.../include/gnuradio/blocks/vector_to_streams.h | 55 ++
gr-blocks/include/gnuradio/blocks/wavfile.h | 104 ++
gr-blocks/include/gnuradio/blocks/wavfile_sink.h | 87 ++
gr-blocks/include/gnuradio/blocks/wavfile_source.h | 70 ++
gr-blocks/include/gnuradio/blocks/xor_XX.h.t | 53 +
gr-blocks/lib/add_XX_impl.cc.t | 8 +-
gr-blocks/lib/add_XX_impl.h.t | 2 +-
gr-blocks/lib/add_const_XX_impl.cc.t | 8 +-
gr-blocks/lib/add_const_XX_impl.h.t | 2 +-
gr-blocks/lib/add_const_vXX_impl.cc.t | 8 +-
gr-blocks/lib/add_const_vXX_impl.h.t | 2 +-
gr-blocks/lib/add_ff_impl.cc | 8 +-
gr-blocks/lib/add_ff_impl.h | 2 +-
gr-blocks/lib/and_XX_impl.cc.t | 8 +-
gr-blocks/lib/and_XX_impl.h.t | 2 +-
gr-blocks/lib/and_const_XX_impl.cc.t | 8 +-
gr-blocks/lib/and_const_XX_impl.h.t | 2 +-
gr-blocks/lib/annotator_1to1_impl.cc | 12 +-
gr-blocks/lib/annotator_1to1_impl.h | 6 +-
gr-blocks/lib/annotator_alltoall_impl.cc | 12 +-
gr-blocks/lib/annotator_alltoall_impl.h | 6 +-
gr-blocks/lib/annotator_raw_impl.cc | 14 +-
gr-blocks/lib/annotator_raw_impl.h | 6 +-
gr-blocks/lib/argmax_XX_impl.cc.t | 8 +-
gr-blocks/lib/argmax_XX_impl.h.t | 2 +-
gr-blocks/lib/bin_statistics_f_impl.cc | 18 +-
gr-blocks/lib/bin_statistics_f_impl.h | 18 +-
gr-blocks/lib/burst_tagger_impl.cc | 8 +-
gr-blocks/lib/burst_tagger_impl.h | 2 +-
gr-blocks/lib/char_to_float_impl.cc | 8 +-
gr-blocks/lib/char_to_float_impl.h | 2 +-
gr-blocks/lib/char_to_short_impl.cc | 8 +-
gr-blocks/lib/char_to_short_impl.h | 2 +-
gr-blocks/lib/check_lfsr_32k_s_impl.cc | 8 +-
gr-blocks/lib/check_lfsr_32k_s_impl.h | 8 +-
gr-blocks/lib/complex_to_arg_impl.cc | 12 +-
gr-blocks/lib/complex_to_arg_impl.h | 2 +-
gr-blocks/lib/complex_to_float_impl.cc | 8 +-
gr-blocks/lib/complex_to_float_impl.h | 2 +-
gr-blocks/lib/complex_to_imag_impl.cc | 8 +-
gr-blocks/lib/complex_to_imag_impl.h | 2 +-
gr-blocks/lib/complex_to_interleaved_short_impl.cc | 8 +-
gr-blocks/lib/complex_to_interleaved_short_impl.h | 2 +-
gr-blocks/lib/complex_to_mag_impl.cc | 8 +-
gr-blocks/lib/complex_to_mag_impl.h | 2 +-
gr-blocks/lib/complex_to_mag_squared_impl.cc | 8 +-
gr-blocks/lib/complex_to_mag_squared_impl.h | 2 +-
gr-blocks/lib/complex_to_real_impl.cc | 8 +-
gr-blocks/lib/complex_to_real_impl.h | 2 +-
gr-blocks/lib/conjugate_cc_impl.cc | 8 +-
gr-blocks/lib/conjugate_cc_impl.h | 2 +-
gr-blocks/lib/control_loop.cc | 4 +-
gr-blocks/lib/copy_impl.cc | 8 +-
gr-blocks/lib/copy_impl.h | 2 +-
gr-blocks/lib/count_bits.cc | 2 +-
gr-blocks/lib/ctrlport_probe2_c_impl.cc | 8 +-
gr-blocks/lib/ctrlport_probe2_c_impl.h | 4 +-
gr-blocks/lib/ctrlport_probe_c_impl.cc | 8 +-
gr-blocks/lib/ctrlport_probe_c_impl.h | 4 +-
gr-blocks/lib/deinterleave_impl.cc | 8 +-
gr-blocks/lib/deinterleave_impl.h | 2 +-
gr-blocks/lib/delay_impl.cc | 8 +-
gr-blocks/lib/delay_impl.h | 4 +-
gr-blocks/lib/divide_XX_impl.cc.t | 8 +-
gr-blocks/lib/divide_XX_impl.h.t | 2 +-
gr-blocks/lib/endian_swap_impl.cc | 8 +-
gr-blocks/lib/endian_swap_impl.h | 2 +-
gr-blocks/lib/file_descriptor_sink_impl.cc | 8 +-
gr-blocks/lib/file_descriptor_sink_impl.h | 2 +-
gr-blocks/lib/file_descriptor_source_impl.cc | 8 +-
gr-blocks/lib/file_descriptor_source_impl.h | 2 +-
gr-blocks/lib/file_meta_sink_impl.cc | 12 +-
gr-blocks/lib/file_meta_sink_impl.h | 4 +-
gr-blocks/lib/file_meta_source_impl.cc | 20 +-
gr-blocks/lib/file_meta_source_impl.h | 14 +-
gr-blocks/lib/file_sink_base.cc | 4 +-
gr-blocks/lib/file_sink_impl.cc | 8 +-
gr-blocks/lib/file_sink_impl.h | 2 +-
gr-blocks/lib/file_source_impl.cc | 10 +-
gr-blocks/lib/file_source_impl.h | 2 +-
gr-blocks/lib/float_array_to_int.h | 2 +-
gr-blocks/lib/float_array_to_uchar.h | 2 +-
gr-blocks/lib/float_to_char_impl.cc | 8 +-
gr-blocks/lib/float_to_char_impl.h | 2 +-
gr-blocks/lib/float_to_complex_impl.cc | 8 +-
gr-blocks/lib/float_to_complex_impl.h | 2 +-
gr-blocks/lib/float_to_int_impl.cc | 8 +-
gr-blocks/lib/float_to_int_impl.h | 2 +-
gr-blocks/lib/float_to_short_impl.cc | 8 +-
gr-blocks/lib/float_to_short_impl.h | 2 +-
gr-blocks/lib/float_to_uchar_impl.cc | 8 +-
gr-blocks/lib/float_to_uchar_impl.h | 2 +-
gr-blocks/lib/head_impl.cc | 8 +-
gr-blocks/lib/head_impl.h | 2 +-
gr-blocks/lib/int_to_float_impl.cc | 8 +-
gr-blocks/lib/int_to_float_impl.h | 2 +-
gr-blocks/lib/integrate_XX_impl.cc.t | 8 +-
gr-blocks/lib/integrate_XX_impl.h.t | 2 +-
gr-blocks/lib/interleave_impl.cc | 8 +-
gr-blocks/lib/interleave_impl.h | 2 +-
gr-blocks/lib/interleaved_short_array_to_complex.h | 4 +-
gr-blocks/lib/interleaved_short_to_complex_impl.cc | 8 +-
gr-blocks/lib/interleaved_short_to_complex_impl.h | 2 +-
gr-blocks/lib/keep_m_in_n_impl.cc | 8 +-
gr-blocks/lib/keep_m_in_n_impl.h | 2 +-
gr-blocks/lib/keep_one_in_n_impl.cc | 14 +-
gr-blocks/lib/keep_one_in_n_impl.h | 2 +-
gr-blocks/lib/lfsr_32k_source_s_impl.cc | 8 +-
gr-blocks/lib/lfsr_32k_source_s_impl.h | 6 +-
gr-blocks/lib/max_XX_impl.cc.t | 8 +-
gr-blocks/lib/max_XX_impl.h.t | 2 +-
gr-blocks/lib/message_burst_source_impl.cc | 22 +-
gr-blocks/lib/message_burst_source_impl.h | 12 +-
gr-blocks/lib/message_debug_impl.cc | 8 +-
gr-blocks/lib/message_debug_impl.h | 6 +-
gr-blocks/lib/message_sink_impl.cc | 40 +-
gr-blocks/lib/message_sink_impl.h | 8 +-
gr-blocks/lib/message_source_impl.cc | 30 +-
gr-blocks/lib/message_source_impl.h | 14 +-
gr-blocks/lib/message_strobe_impl.cc | 8 +-
gr-blocks/lib/message_strobe_impl.h | 2 +-
gr-blocks/lib/moving_average_XX_impl.cc.t | 8 +-
gr-blocks/lib/moving_average_XX_impl.h.t | 2 +-
gr-blocks/lib/multiply_XX_impl.cc.t | 8 +-
gr-blocks/lib/multiply_XX_impl.h.t | 2 +-
gr-blocks/lib/multiply_cc_impl.cc | 8 +-
gr-blocks/lib/multiply_cc_impl.h | 2 +-
gr-blocks/lib/multiply_conjugate_cc_impl.cc | 8 +-
gr-blocks/lib/multiply_conjugate_cc_impl.h | 2 +-
gr-blocks/lib/multiply_const_XX_impl.cc.t | 8 +-
gr-blocks/lib/multiply_const_XX_impl.h.t | 2 +-
gr-blocks/lib/multiply_const_cc_impl.cc | 8 +-
gr-blocks/lib/multiply_const_cc_impl.h | 2 +-
gr-blocks/lib/multiply_const_ff_impl.cc | 8 +-
gr-blocks/lib/multiply_const_ff_impl.h | 2 +-
gr-blocks/lib/multiply_const_vXX_impl.cc.t | 8 +-
gr-blocks/lib/multiply_const_vXX_impl.h.t | 2 +-
gr-blocks/lib/multiply_ff_impl.cc | 8 +-
gr-blocks/lib/multiply_ff_impl.h | 2 +-
gr-blocks/lib/mute_XX_impl.cc.t | 8 +-
gr-blocks/lib/mute_XX_impl.h.t | 2 +-
gr-blocks/lib/nlog10_ff_impl.cc | 8 +-
gr-blocks/lib/nlog10_ff_impl.h | 2 +-
gr-blocks/lib/nop_impl.cc | 8 +-
gr-blocks/lib/nop_impl.h | 2 +-
gr-blocks/lib/not_XX_impl.cc.t | 8 +-
gr-blocks/lib/not_XX_impl.h.t | 2 +-
gr-blocks/lib/null_sink_impl.cc | 8 +-
gr-blocks/lib/null_sink_impl.h | 2 +-
gr-blocks/lib/null_source_impl.cc | 8 +-
gr-blocks/lib/null_source_impl.h | 2 +-
gr-blocks/lib/or_XX_impl.cc.t | 8 +-
gr-blocks/lib/or_XX_impl.h.t | 2 +-
gr-blocks/lib/pack_k_bits_bb_impl.cc | 8 +-
gr-blocks/lib/pack_k_bits_bb_impl.h | 2 +-
gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t | 14 +-
gr-blocks/lib/packed_to_unpacked_XX_impl.h.t | 6 +-
gr-blocks/lib/patterned_interleaver_impl.cc | 8 +-
gr-blocks/lib/patterned_interleaver_impl.h | 2 +-
gr-blocks/lib/pdu.cc | 2 +-
gr-blocks/lib/pdu_to_tagged_stream_impl.cc | 10 +-
gr-blocks/lib/pdu_to_tagged_stream_impl.h | 2 +-
gr-blocks/lib/peak_detector2_fb_impl.cc | 8 +-
gr-blocks/lib/peak_detector2_fb_impl.h | 2 +-
gr-blocks/lib/peak_detector_XX_impl.cc.t | 8 +-
gr-blocks/lib/peak_detector_XX_impl.h.t | 2 +-
gr-blocks/lib/plateau_detector_fb_impl.cc | 8 +-
gr-blocks/lib/plateau_detector_fb_impl.h | 2 +-
gr-blocks/lib/probe_rate_impl.cc | 8 +-
gr-blocks/lib/probe_rate_impl.h | 2 +-
gr-blocks/lib/probe_signal_X_impl.cc.t | 8 +-
gr-blocks/lib/probe_signal_X_impl.h.t | 2 +-
gr-blocks/lib/probe_signal_vX_impl.cc.t | 8 +-
gr-blocks/lib/probe_signal_vX_impl.h.t | 2 +-
gr-blocks/lib/qa_block_tags.cc | 120 ++-
gr-blocks/lib/qa_blocks.cc | 2 +-
gr-blocks/lib/qa_blocks.h | 4 +-
gr-blocks/lib/qa_gr_block.cc | 24 +-
gr-blocks/lib/qa_gr_block.h | 4 +-
gr-blocks/lib/qa_gr_flowgraph.cc | 92 +-
gr-blocks/lib/qa_gr_hier_block2.cc | 12 +-
gr-blocks/lib/qa_gr_hier_block2.h | 4 +-
gr-blocks/lib/qa_gr_hier_block2_derived.cc | 32 +-
gr-blocks/lib/qa_gr_hier_block2_derived.h | 4 +-
gr-blocks/lib/qa_gr_top_block.cc | 153 +--
gr-blocks/lib/qa_gr_top_block.h | 4 +-
gr-blocks/lib/qa_rotator.cc | 6 +-
gr-blocks/lib/qa_set_msg_handler.cc | 18 +-
gr-blocks/lib/random_pdu_impl.cc | 10 +-
gr-blocks/lib/random_pdu_impl.h | 2 +-
gr-blocks/lib/regenerate_bb_impl.cc | 8 +-
gr-blocks/lib/regenerate_bb_impl.h | 2 +-
gr-blocks/lib/repack_bits_bb_impl.cc | 8 +-
gr-blocks/lib/repack_bits_bb_impl.h | 2 +-
gr-blocks/lib/repeat_impl.cc | 8 +-
gr-blocks/lib/repeat_impl.h | 2 +-
gr-blocks/lib/rms_cf_impl.cc | 8 +-
gr-blocks/lib/rms_cf_impl.h | 2 +-
gr-blocks/lib/rms_ff_impl.cc | 8 +-
gr-blocks/lib/rms_ff_impl.h | 2 +-
gr-blocks/lib/sample_and_hold_XX_impl.cc.t | 8 +-
gr-blocks/lib/sample_and_hold_XX_impl.h.t | 2 +-
gr-blocks/lib/short_to_char_impl.cc | 8 +-
gr-blocks/lib/short_to_char_impl.h | 2 +-
gr-blocks/lib/short_to_float_impl.cc | 8 +-
gr-blocks/lib/short_to_float_impl.h | 2 +-
gr-blocks/lib/skiphead_impl.cc | 8 +-
gr-blocks/lib/skiphead_impl.h | 2 +-
gr-blocks/lib/socket_pdu_impl.cc | 10 +-
gr-blocks/lib/socket_pdu_impl.h | 2 +-
gr-blocks/lib/stream_mux_impl.cc | 8 +-
gr-blocks/lib/stream_mux_impl.h | 2 +-
gr-blocks/lib/stream_pdu_base.cc | 6 +-
gr-blocks/lib/stream_pdu_base.h | 8 +-
gr-blocks/lib/stream_to_streams_impl.cc | 20 +-
gr-blocks/lib/stream_to_streams_impl.h | 2 +-
gr-blocks/lib/stream_to_vector_impl.cc | 8 +-
gr-blocks/lib/stream_to_vector_impl.h | 2 +-
gr-blocks/lib/streams_to_stream_impl.cc | 8 +-
gr-blocks/lib/streams_to_stream_impl.h | 2 +-
gr-blocks/lib/streams_to_vector_impl.cc | 8 +-
gr-blocks/lib/streams_to_vector_impl.h | 2 +-
gr-blocks/lib/stretch_ff_impl.cc | 8 +-
gr-blocks/lib/stretch_ff_impl.h | 2 +-
gr-blocks/lib/sub_XX_impl.cc.t | 8 +-
gr-blocks/lib/sub_XX_impl.h.t | 2 +-
gr-blocks/lib/tag_debug_impl.cc | 10 +-
gr-blocks/lib/tag_debug_impl.h | 10 +-
gr-blocks/lib/tagged_file_sink_impl.cc | 22 +-
gr-blocks/lib/tagged_file_sink_impl.h | 2 +-
gr-blocks/lib/tagged_stream_mux_impl.cc | 10 +-
gr-blocks/lib/tagged_stream_mux_impl.h | 2 +-
gr-blocks/lib/tagged_stream_to_pdu_impl.cc | 10 +-
gr-blocks/lib/tagged_stream_to_pdu_impl.h | 6 +-
gr-blocks/lib/tcp_connection.cc | 6 +-
gr-blocks/lib/tcp_connection.h | 9 +-
gr-blocks/lib/test_gr_blocks.cc | 6 +-
gr-blocks/lib/threshold_ff_impl.cc | 8 +-
gr-blocks/lib/threshold_ff_impl.h | 2 +-
gr-blocks/lib/throttle_impl.cc | 8 +-
gr-blocks/lib/throttle_impl.h | 2 +-
gr-blocks/lib/transcendental_impl.cc | 8 +-
gr-blocks/lib/transcendental_impl.h | 2 +-
gr-blocks/lib/tuntap_pdu_impl.cc | 10 +-
gr-blocks/lib/tuntap_pdu_impl.h | 2 +-
gr-blocks/lib/uchar_array_to_float.h | 2 +-
gr-blocks/lib/uchar_to_float_impl.cc | 8 +-
gr-blocks/lib/uchar_to_float_impl.h | 2 +-
gr-blocks/lib/udp_sink_impl.cc | 10 +-
gr-blocks/lib/udp_sink_impl.h | 2 +-
gr-blocks/lib/udp_source_impl.cc | 10 +-
gr-blocks/lib/udp_source_impl.h | 4 +-
gr-blocks/lib/unpack_k_bits_bb_impl.cc | 8 +-
gr-blocks/lib/unpack_k_bits_bb_impl.h | 2 +-
gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t | 12 +-
gr-blocks/lib/unpacked_to_packed_XX_impl.h.t | 6 +-
gr-blocks/lib/vco_f_impl.cc | 8 +-
gr-blocks/lib/vco_f_impl.h | 6 +-
gr-blocks/lib/vector_insert_X_impl.cc.t | 8 +-
gr-blocks/lib/vector_insert_X_impl.h.t | 2 +-
gr-blocks/lib/vector_map_impl.cc | 8 +-
gr-blocks/lib/vector_map_impl.h | 4 +-
gr-blocks/lib/vector_sink_X_impl.cc.t | 12 +-
gr-blocks/lib/vector_sink_X_impl.h.t | 6 +-
gr-blocks/lib/vector_source_X_impl.cc.t | 14 +-
gr-blocks/lib/vector_source_X_impl.h.t | 8 +-
gr-blocks/lib/vector_to_stream_impl.cc | 8 +-
gr-blocks/lib/vector_to_stream_impl.h | 2 +-
gr-blocks/lib/vector_to_streams_impl.cc | 8 +-
gr-blocks/lib/vector_to_streams_impl.h | 2 +-
gr-blocks/lib/wavfile.cc | 2 +-
gr-blocks/lib/wavfile_sink_impl.cc | 12 +-
gr-blocks/lib/wavfile_sink_impl.h | 2 +-
gr-blocks/lib/wavfile_source_impl.cc | 12 +-
gr-blocks/lib/wavfile_source_impl.h | 2 +-
gr-blocks/lib/xor_XX_impl.cc.t | 8 +-
gr-blocks/lib/xor_XX_impl.h.t | 2 +-
gr-blocks/python/qa_keep_one_in_n.py | 1 +
gr-blocks/python/qa_message_tags.py | 4 +-
gr-blocks/python/qa_repack_bits_bb.py | 4 +-
gr-blocks/python/qa_tagged_stream_mux.py | 8 +-
gr-blocks/swig/CMakeLists.txt | 6 +-
gr-blocks/swig/blocks_swig.i | 638 ------------
gr-blocks/swig/blocks_swig.py.in | 3 +
gr-blocks/swig/blocks_swig0.i | 190 +---
gr-blocks/swig/blocks_swig1.i | 331 ++-----
gr-blocks/swig/blocks_swig2.i | 317 +++---
gr-blocks/swig/blocks_swig3.i | 150 +++
gr-blocks/swig/blocks_swig4.i | 123 +++
gr-blocks/swig/blocks_swig5.i | 138 +++
gr-blocks/tests/benchmark_nco.cc | 4 +-
gr-blocks/tests/benchmark_vco.cc | 4 +-
gr-channels/include/channels/api.h | 2 +-
gr-channels/include/channels/channel_model.h | 6 +-
gr-channels/include/channels/fading_model.h | 6 +-
gr-channels/lib/channel_model_impl.cc | 8 +-
gr-channels/lib/channel_model_impl.h | 6 +-
gr-channels/lib/fading_model_impl.cc | 20 +-
gr-channels/lib/fading_model_impl.h | 4 +-
gr-comedi/include/comedi/api.h | 2 +-
gr-comedi/include/comedi/sink_s.h | 4 +-
gr-comedi/include/comedi/source_s.h | 4 +-
gr-comedi/lib/sink_s_impl.cc | 10 +-
gr-comedi/lib/source_s_impl.cc | 10 +-
gr-digital/include/digital/additive_scrambler_bb.h | 4 +-
gr-digital/include/digital/api.h | 2 +-
gr-digital/include/digital/binary_slicer_fb.h | 4 +-
.../include/digital/chunks_to_symbols_XX.h.t | 4 +-
gr-digital/include/digital/clock_recovery_mm_cc.h | 4 +-
gr-digital/include/digital/clock_recovery_mm_ff.h | 4 +-
gr-digital/include/digital/cma_equalizer_cc.h | 4 +-
gr-digital/include/digital/constellation.h | 2 +-
.../include/digital/constellation_decoder_cb.h | 4 +-
.../include/digital/constellation_receiver_cb.h | 4 +-
.../include/digital/correlate_access_code_bb.h | 4 +-
.../include/digital/correlate_access_code_tag_bb.h | 4 +-
gr-digital/include/digital/costas_loop_cc.h | 6 +-
gr-digital/include/digital/cpmmod_bc.h | 4 +-
gr-digital/include/digital/crc32.h | 2 +-
gr-digital/include/digital/crc32_bb.h | 4 +-
gr-digital/include/digital/descrambler_bb.h | 4 +-
gr-digital/include/digital/diff_decoder_bb.h | 4 +-
gr-digital/include/digital/diff_encoder_bb.h | 4 +-
gr-digital/include/digital/diff_phasor_cc.h | 4 +-
gr-digital/include/digital/fll_band_edge_cc.h | 6 +-
gr-digital/include/digital/framer_sink_1.h | 8 +-
gr-digital/include/digital/glfsr_source_b.h | 4 +-
gr-digital/include/digital/glfsr_source_f.h | 4 +-
gr-digital/include/digital/header_payload_demux.h | 4 +-
gr-digital/include/digital/kurtotic_equalizer_cc.h | 4 +-
gr-digital/include/digital/lms_dd_equalizer_cc.h | 4 +-
gr-digital/include/digital/map_bb.h | 4 +-
gr-digital/include/digital/mpsk_receiver_cc.h | 4 +-
gr-digital/include/digital/mpsk_snr_est.h | 2 +-
gr-digital/include/digital/mpsk_snr_est_cc.h | 4 +-
.../include/digital/ofdm_carrier_allocator_cvc.h | 4 +-
gr-digital/include/digital/ofdm_chanest_vcvc.h | 4 +-
gr-digital/include/digital/ofdm_cyclic_prefixer.h | 4 +-
gr-digital/include/digital/ofdm_equalizer_base.h | 6 +-
.../include/digital/ofdm_equalizer_simpledfe.h | 2 +-
gr-digital/include/digital/ofdm_equalizer_static.h | 2 +-
.../include/digital/ofdm_frame_acquisition.h | 4 +-
.../include/digital/ofdm_frame_equalizer_vcvc.h | 4 +-
gr-digital/include/digital/ofdm_frame_sink.h | 8 +-
gr-digital/include/digital/ofdm_insert_preamble.h | 4 +-
gr-digital/include/digital/ofdm_mapper_bcv.h | 8 +-
gr-digital/include/digital/ofdm_sampler.h | 4 +-
gr-digital/include/digital/ofdm_serializer_vcc.h | 4 +-
gr-digital/include/digital/ofdm_sync_sc_cfb.h | 4 +-
gr-digital/include/digital/packet_header_default.h | 6 +-
gr-digital/include/digital/packet_header_ofdm.h | 2 +-
.../include/digital/packet_headergenerator_bb.h | 4 +-
gr-digital/include/digital/packet_headerparser_b.h | 4 +-
gr-digital/include/digital/packet_sink.h | 8 +-
gr-digital/include/digital/pfb_clock_sync_ccf.h | 4 +-
gr-digital/include/digital/pfb_clock_sync_fff.h | 4 +-
gr-digital/include/digital/pn_correlator_cc.h | 4 +-
gr-digital/include/digital/probe_density_b.h | 4 +-
gr-digital/include/digital/probe_mpsk_snr_est_c.h | 4 +-
gr-digital/include/digital/scrambler_bb.h | 4 +-
gr-digital/include/digital/simple_correlator.h | 4 +-
gr-digital/include/digital/simple_framer.h | 4 +-
gr-digital/lib/additive_scrambler_bb_impl.cc | 8 +-
gr-digital/lib/binary_slicer_fb_impl.cc | 12 +-
gr-digital/lib/chunks_to_symbols_XX_impl.cc.t | 8 +-
gr-digital/lib/clock_recovery_mm_cc_impl.cc | 22 +-
gr-digital/lib/clock_recovery_mm_ff_impl.cc | 12 +-
gr-digital/lib/cma_equalizer_cc_impl.cc | 12 +-
gr-digital/lib/cma_equalizer_cc_impl.h | 2 +-
gr-digital/lib/constellation.cc | 6 +-
gr-digital/lib/constellation_decoder_cb_impl.cc | 8 +-
gr-digital/lib/constellation_receiver_cb_impl.cc | 13 +-
gr-digital/lib/constellation_receiver_cb_impl.h | 6 +-
gr-digital/lib/correlate_access_code_bb_impl.cc | 10 +-
.../lib/correlate_access_code_tag_bb_impl.cc | 10 +-
gr-digital/lib/costas_loop_cc_impl.cc | 18 +-
gr-digital/lib/cpmmod_bc_impl.cc | 8 +-
gr-digital/lib/cpmmod_bc_impl.h | 2 +-
gr-digital/lib/crc32_bb_impl.cc | 10 +-
gr-digital/lib/descrambler_bb_impl.cc | 8 +-
gr-digital/lib/diff_decoder_bb_impl.cc | 8 +-
gr-digital/lib/diff_decoder_bb_impl.h | 2 +-
gr-digital/lib/diff_encoder_bb_impl.cc | 8 +-
gr-digital/lib/diff_phasor_cc_impl.cc | 8 +-
gr-digital/lib/diff_phasor_cc_impl.h | 2 +-
gr-digital/lib/fll_band_edge_cc_impl.cc | 10 +-
gr-digital/lib/fll_band_edge_cc_impl.h | 2 +-
gr-digital/lib/framer_sink_1_impl.cc | 20 +-
gr-digital/lib/framer_sink_1_impl.h | 22 +-
gr-digital/lib/glfsr_source_b_impl.cc | 8 +-
gr-digital/lib/glfsr_source_f_impl.cc | 8 +-
gr-digital/lib/header_payload_demux_impl.cc | 12 +-
gr-digital/lib/kurtotic_equalizer_cc_impl.cc | 8 +-
gr-digital/lib/kurtotic_equalizer_cc_impl.h | 6 +-
gr-digital/lib/lms_dd_equalizer_cc_impl.cc | 10 +-
gr-digital/lib/map_bb_impl.cc | 8 +-
gr-digital/lib/map_bb_impl.h | 2 +-
gr-digital/lib/mpsk_receiver_cc_impl.cc | 25 +-
gr-digital/lib/mpsk_receiver_cc_impl.h | 6 +-
gr-digital/lib/mpsk_snr_est_cc_impl.cc | 8 +-
gr-digital/lib/mpsk_snr_est_cc_impl.h | 2 +-
gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc | 10 +-
gr-digital/lib/ofdm_chanest_vcvc_impl.cc | 10 +-
gr-digital/lib/ofdm_cyclic_prefixer_impl.cc | 10 +-
gr-digital/lib/ofdm_equalizer_simpledfe.cc | 2 +-
gr-digital/lib/ofdm_equalizer_static.cc | 2 +-
gr-digital/lib/ofdm_frame_acquisition_impl.cc | 12 +-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc | 10 +-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h | 2 +-
gr-digital/lib/ofdm_frame_sink_impl.cc | 24 +-
gr-digital/lib/ofdm_frame_sink_impl.h | 4 +-
gr-digital/lib/ofdm_insert_preamble_impl.cc | 8 +-
gr-digital/lib/ofdm_mapper_bcv_impl.cc | 10 +-
gr-digital/lib/ofdm_mapper_bcv_impl.h | 12 +-
gr-digital/lib/ofdm_sampler_impl.cc | 10 +-
gr-digital/lib/ofdm_sampler_impl.h | 2 +-
gr-digital/lib/ofdm_serializer_vcc_impl.cc | 10 +-
gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | 28 +-
gr-digital/lib/packet_header_default.cc | 6 +-
gr-digital/lib/packet_header_ofdm.cc | 4 +-
gr-digital/lib/packet_headergenerator_bb_impl.cc | 8 +-
gr-digital/lib/packet_headergenerator_bb_impl.h | 2 +-
gr-digital/lib/packet_headerparser_b_impl.cc | 10 +-
gr-digital/lib/packet_sink_impl.cc | 16 +-
gr-digital/lib/packet_sink_impl.h | 6 +-
gr-digital/lib/pfb_clock_sync_ccf_impl.cc | 12 +-
gr-digital/lib/pfb_clock_sync_fff_impl.cc | 12 +-
gr-digital/lib/pn_correlator_cc_impl.cc | 8 +-
gr-digital/lib/probe_density_b_impl.cc | 8 +-
gr-digital/lib/probe_mpsk_snr_est_c_impl.cc | 8 +-
gr-digital/lib/scrambler_bb_impl.cc | 8 +-
gr-digital/lib/scrambler_bb_impl.h | 2 +-
gr-digital/lib/simple_correlator_impl.cc | 10 +-
gr-digital/lib/simple_framer_impl.cc | 8 +-
gr-digital/python/qa_crc32_bb.py | 20 +-
gr-digital/python/qa_ofdm_carrier_allocator_cvc.py | 18 +-
gr-digital/python/qa_ofdm_chanest_vcvc.py | 4 +-
gr-digital/python/qa_ofdm_cyclic_prefixer.py | 4 +-
gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py | 12 +-
gr-digital/python/qa_ofdm_serializer_vcc.py | 16 +-
gr-digital/python/qa_packet_headergenerator_bb.py | 24 +-
gr-digital/python/utils/tagged_streams.py | 4 +-
gr-digital/swig/digital_swig.i | 4 +-
gr-fcd/examples/c++/fcd_nfm_rx.cc | 4 +-
gr-fcd/include/fcd/fcd_api.h | 2 +-
gr-fcd/include/fcd/fcd_source_c.h | 4 +-
gr-fcd/lib/fcd_source_c_impl.cc | 12 +-
gr-fcd/swig/CMakeLists.txt | 4 +-
gr-fec/include/fec/api.h | 2 +-
gr-fec/include/fec/decode_ccsds_27_fb.h | 4 +-
gr-fec/include/fec/encode_ccsds_27_bb.h | 4 +-
gr-fec/lib/decode_ccsds_27_fb_impl.cc | 8 +-
gr-fec/lib/encode_ccsds_27_bb_impl.cc | 8 +-
gr-fft/include/fft/api.h | 2 +-
gr-fft/include/fft/fft.h | 2 +-
gr-fft/include/fft/fft_vcc.h | 4 +-
gr-fft/include/fft/fft_vfc.h | 4 +-
gr-fft/include/fft/goertzel.h | 2 +-
gr-fft/include/fft/goertzel_fc.h | 4 +-
gr-fft/lib/fft.cc | 6 +-
gr-fft/lib/fft_vcc_fftw.cc | 8 +-
gr-fft/lib/fft_vfc_fftw.cc | 8 +-
gr-fft/lib/goertzel_fc_impl.cc | 8 +-
gr-filter/include/filter/adaptive_fir_ccc.h | 4 +-
gr-filter/include/filter/adaptive_fir_ccf.h | 4 +-
gr-filter/include/filter/api.h | 2 +-
gr-filter/include/filter/dc_blocker_cc.h | 4 +-
gr-filter/include/filter/dc_blocker_ff.h | 4 +-
gr-filter/include/filter/fft_filter.h | 2 +-
gr-filter/include/filter/fft_filter_ccc.h | 4 +-
gr-filter/include/filter/fft_filter_fff.h | 4 +-
gr-filter/include/filter/filter_delay_fc.h | 4 +-
gr-filter/include/filter/fir_filter.h | 2 +-
gr-filter/include/filter/fir_filter_XXX.h.t | 4 +-
gr-filter/include/filter/fir_filter_with_buffer.h | 2 +-
gr-filter/include/filter/firdes.h | 2 +-
.../include/filter/fractional_interpolator_cc.h | 4 +-
.../include/filter/fractional_interpolator_ff.h | 4 +-
gr-filter/include/filter/fractional_resampler_cc.h | 4 +-
gr-filter/include/filter/fractional_resampler_ff.h | 4 +-
.../include/filter/freq_xlating_fir_filter_XXX.h.t | 4 +-
gr-filter/include/filter/hilbert_fc.h | 6 +-
gr-filter/include/filter/iir_filter_ffd.h | 4 +-
gr-filter/include/filter/interp_fir_filter_XXX.h.t | 4 +-
.../include/filter/mmse_fir_interpolator_cc.h | 2 +-
gr-filter/include/filter/pfb_arb_resampler_ccf.h | 4 +-
gr-filter/include/filter/pfb_arb_resampler_fff.h | 4 +-
gr-filter/include/filter/pfb_channelizer_ccf.h | 4 +-
gr-filter/include/filter/pfb_decimator_ccf.h | 4 +-
gr-filter/include/filter/pfb_interpolator_ccf.h | 4 +-
gr-filter/include/filter/pfb_synthesizer_ccf.h | 4 +-
gr-filter/include/filter/pm_remez.h | 2 +-
.../include/filter/rational_resampler_base_XXX.h.t | 4 +-
gr-filter/include/filter/single_pole_iir.h | 2 +-
.../include/filter/single_pole_iir_filter_cc.h | 6 +-
.../include/filter/single_pole_iir_filter_ff.h | 6 +-
gr-filter/lib/adaptive_fir.cc | 2 +-
gr-filter/lib/adaptive_fir_ccc_impl.cc | 8 +-
gr-filter/lib/adaptive_fir_ccc_impl.h | 2 +-
gr-filter/lib/adaptive_fir_ccf_impl.cc | 8 +-
gr-filter/lib/adaptive_fir_ccf_impl.h | 2 +-
gr-filter/lib/dc_blocker_cc_impl.cc | 8 +-
gr-filter/lib/dc_blocker_ff_impl.cc | 8 +-
gr-filter/lib/fft_filter_ccc_impl.cc | 8 +-
gr-filter/lib/fft_filter_fff_impl.cc | 8 +-
gr-filter/lib/filter_delay_fc_impl.cc | 6 +-
gr-filter/lib/filter_delay_fc_impl.h | 2 +-
gr-filter/lib/fir_filter_XXX_impl.cc.t | 8 +-
gr-filter/lib/fractional_interpolator_cc_impl.cc | 8 +-
gr-filter/lib/fractional_interpolator_ff_impl.cc | 8 +-
gr-filter/lib/fractional_resampler_cc_impl.cc | 8 +-
gr-filter/lib/fractional_resampler_ff_impl.cc | 8 +-
.../lib/freq_xlating_fir_filter_XXX_impl.cc.t | 8 +-
gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t | 2 +-
gr-filter/lib/hilbert_fc_impl.cc | 8 +-
gr-filter/lib/hilbert_fc_impl.h | 2 +-
gr-filter/lib/iir_filter_ffd_impl.cc | 8 +-
gr-filter/lib/interp_fir_filter_XXX_impl.cc.t | 8 +-
gr-filter/lib/pfb_arb_resampler_ccf_impl.cc | 8 +-
gr-filter/lib/pfb_arb_resampler_ccf_impl.h | 2 +-
gr-filter/lib/pfb_arb_resampler_fff_impl.cc | 8 +-
gr-filter/lib/pfb_arb_resampler_fff_impl.h | 2 +-
gr-filter/lib/pfb_channelizer_ccf_impl.cc | 8 +-
gr-filter/lib/pfb_channelizer_ccf_impl.h | 2 +-
gr-filter/lib/pfb_decimator_ccf_impl.cc | 8 +-
gr-filter/lib/pfb_decimator_ccf_impl.h | 2 +-
gr-filter/lib/pfb_interpolator_ccf_impl.cc | 8 +-
gr-filter/lib/pfb_interpolator_ccf_impl.h | 2 +-
gr-filter/lib/pfb_synthesizer_ccf_impl.cc | 8 +-
gr-filter/lib/pfb_synthesizer_ccf_impl.h | 2 +-
gr-filter/lib/qa_filter.h | 2 +-
gr-filter/lib/qa_fir_filter_with_buffer.cc | 6 +-
gr-filter/lib/qa_firdes.cc | 2 +-
.../lib/rational_resampler_base_XXX_impl.cc.t | 8 +-
gr-filter/lib/single_pole_iir_filter_cc_impl.cc | 8 +-
gr-filter/lib/single_pole_iir_filter_cc_impl.h | 4 +-
gr-filter/lib/single_pole_iir_filter_ff_impl.cc | 8 +-
gr-filter/lib/single_pole_iir_filter_ff_impl.h | 2 +-
gr-filter/lib/test_gr_filter.cc | 2 +-
gr-noaa/include/noaa/api.h | 2 +-
gr-noaa/include/noaa/hrpt_decoder.h | 4 +-
gr-noaa/include/noaa/hrpt_deframer.h | 4 +-
gr-noaa/include/noaa/hrpt_pll_cf.h | 4 +-
gr-noaa/lib/hrpt_decoder_impl.cc | 8 +-
gr-noaa/lib/hrpt_deframer_impl.cc | 8 +-
gr-noaa/lib/hrpt_pll_cf_impl.cc | 18 +-
gr-pager/include/pager/api.h | 2 +-
gr-pager/include/pager/flex_deinterleave.h | 4 +-
gr-pager/include/pager/flex_parse.h | 8 +-
gr-pager/include/pager/flex_sync.h | 4 +-
gr-pager/include/pager/slicer_fb.h | 4 +-
gr-pager/lib/flex_deinterleave_impl.cc | 8 +-
gr-pager/lib/flex_deinterleave_impl.h | 2 +-
gr-pager/lib/flex_parse_impl.cc | 14 +-
gr-pager/lib/flex_parse_impl.h | 8 +-
gr-pager/lib/flex_sync_impl.cc | 10 +-
gr-pager/lib/slicer_fb_impl.cc | 8 +-
gr-qtgui/include/qtgui/SpectrumGUIClass.h | 2 +-
gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h | 2 +-
gr-qtgui/include/qtgui/WaterfallDisplayPlot.h | 2 +-
gr-qtgui/include/qtgui/api.h | 2 +-
gr-qtgui/include/qtgui/const_sink_c.h | 4 +-
gr-qtgui/include/qtgui/freq_sink_c.h | 4 +-
gr-qtgui/include/qtgui/freq_sink_f.h | 4 +-
gr-qtgui/include/qtgui/qtgui_types.h | 2 +-
gr-qtgui/include/qtgui/sink_c.h | 4 +-
gr-qtgui/include/qtgui/sink_f.h | 4 +-
gr-qtgui/include/qtgui/spectrumUpdateEvents.h | 2 +-
gr-qtgui/include/qtgui/time_raster_sink_b.h | 4 +-
gr-qtgui/include/qtgui/time_raster_sink_f.h | 4 +-
gr-qtgui/include/qtgui/time_sink_c.h | 4 +-
gr-qtgui/include/qtgui/time_sink_f.h | 4 +-
gr-qtgui/include/qtgui/waterfall_sink_c.h | 4 +-
gr-qtgui/include/qtgui/waterfall_sink_f.h | 4 +-
gr-qtgui/lib/const_sink_c_impl.cc | 8 +-
gr-qtgui/lib/const_sink_c_impl.h | 4 +-
gr-qtgui/lib/freq_sink_c_impl.cc | 8 +-
gr-qtgui/lib/freq_sink_c_impl.h | 4 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 8 +-
gr-qtgui/lib/freq_sink_f_impl.h | 4 +-
gr-qtgui/lib/sink_c_impl.cc | 8 +-
gr-qtgui/lib/sink_c_impl.h | 2 +-
gr-qtgui/lib/sink_f_impl.cc | 8 +-
gr-qtgui/lib/sink_f_impl.h | 2 +-
gr-qtgui/lib/time_raster_sink_b_impl.cc | 8 +-
gr-qtgui/lib/time_raster_sink_b_impl.h | 4 +-
gr-qtgui/lib/time_raster_sink_c_impl.cc | 8 +-
gr-qtgui/lib/time_raster_sink_c_impl.h | 4 +-
gr-qtgui/lib/time_raster_sink_f_impl.cc | 8 +-
gr-qtgui/lib/time_raster_sink_f_impl.h | 4 +-
gr-qtgui/lib/time_sink_c_impl.cc | 8 +-
gr-qtgui/lib/time_sink_c_impl.h | 4 +-
gr-qtgui/lib/time_sink_f_impl.cc | 8 +-
gr-qtgui/lib/time_sink_f_impl.h | 4 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 8 +-
gr-qtgui/lib/waterfall_sink_c_impl.h | 4 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 8 +-
gr-qtgui/lib/waterfall_sink_f_impl.h | 4 +-
gr-shd/include/gr_shd_smini_sink.h | 4 +-
gr-shd/include/gr_shd_smini_source.h | 4 +-
gr-shd/lib/gr_shd_smini_sink.cc | 8 +-
gr-shd/lib/gr_shd_smini_source.cc | 8 +-
gr-trellis/include/trellis/api.h | 2 +-
gr-trellis/include/trellis/calc_metric.h | 2 +-
.../include/trellis/constellation_metrics_cf.h | 4 +-
gr-trellis/include/trellis/encoder_XX.h.t | 4 +-
gr-trellis/include/trellis/metrics_X.h.t | 4 +-
gr-trellis/include/trellis/pccc_decoder_X.h.t | 4 +-
.../include/trellis/pccc_decoder_combined_XX.h.t | 4 +-
gr-trellis/include/trellis/pccc_encoder_XX.h.t | 4 +-
gr-trellis/include/trellis/permutation.h | 4 +-
gr-trellis/include/trellis/sccc_decoder_X.h.t | 4 +-
.../include/trellis/sccc_decoder_combined_XX.h.t | 4 +-
gr-trellis/include/trellis/sccc_encoder_XX.h.t | 4 +-
gr-trellis/include/trellis/siso_combined_f.h | 4 +-
gr-trellis/include/trellis/siso_f.h | 4 +-
gr-trellis/include/trellis/viterbi_X.h.t | 4 +-
gr-trellis/include/trellis/viterbi_combined_XX.h.t | 4 +-
gr-trellis/lib/constellation_metrics_cf_impl.cc | 8 +-
gr-trellis/lib/encoder_XX_impl.cc.t | 8 +-
gr-trellis/lib/metrics_X_impl.cc.t | 8 +-
gr-trellis/lib/pccc_decoder_X_impl.cc.t | 8 +-
gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t | 8 +-
gr-trellis/lib/pccc_encoder_XX_impl.cc.t | 8 +-
gr-trellis/lib/permutation_impl.cc | 8 +-
gr-trellis/lib/sccc_decoder_X_impl.cc.t | 8 +-
gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t | 8 +-
gr-trellis/lib/sccc_encoder_XX_impl.cc.t | 8 +-
gr-trellis/lib/siso_combined_f_impl.cc | 8 +-
gr-trellis/lib/siso_f_impl.cc | 8 +-
gr-trellis/lib/viterbi_X_impl.cc.t | 8 +-
gr-trellis/lib/viterbi_combined_XX_impl.cc.t | 8 +-
gr-uhd/examples/c++/tag_sink_demo.h | 17 +-
gr-uhd/examples/c++/tag_source_demo.h | 26 +-
gr-uhd/examples/c++/tags_demo.cc | 4 +-
gr-uhd/include/uhd/amsg_source.h | 6 +-
gr-uhd/include/uhd/usrp_sink.h | 4 +-
gr-uhd/include/uhd/usrp_source.h | 4 +-
gr-uhd/lib/amsg_source_impl.cc | 12 +-
gr-uhd/lib/amsg_source_impl.h | 8 +-
gr-uhd/lib/usrp_sink_impl.cc | 12 +-
gr-uhd/lib/usrp_sink_impl.h | 6 +-
gr-uhd/lib/usrp_source_impl.cc | 6 +-
gr-uhd/lib/usrp_source_impl.h | 4 +-
.../python/modtool/gr-newmod/include/howto/api.h | 2 +-
gr-utils/python/modtool/gr-newmod/lib/qa_howto.h | 2 +-
.../python/modtool/gr-newmod/lib/test_howto.cc | 2 +-
gr-video-sdl/include/video_sdl/api.h | 2 +-
gr-video-sdl/include/video_sdl/sink_s.h | 4 +-
gr-video-sdl/include/video_sdl/sink_uc.h | 4 +-
gr-video-sdl/lib/sink_s_impl.cc | 8 +-
gr-video-sdl/lib/sink_uc_impl.cc | 8 +-
gr-vocoder/include/vocoder/alaw_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/alaw_encode_sb.h | 4 +-
gr-vocoder/include/vocoder/api.h | 2 +-
gr-vocoder/include/vocoder/codec2_decode_ps.h | 4 +-
gr-vocoder/include/vocoder/codec2_encode_sp.h | 4 +-
gr-vocoder/include/vocoder/cvsd_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/cvsd_encode_sb.h | 4 +-
gr-vocoder/include/vocoder/g721_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/g721_encode_sb.h | 4 +-
gr-vocoder/include/vocoder/g723_24_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/g723_24_encode_sb.h | 4 +-
gr-vocoder/include/vocoder/g723_40_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/g723_40_encode_sb.h | 4 +-
gr-vocoder/include/vocoder/gsm_fr_decode_ps.h | 4 +-
gr-vocoder/include/vocoder/gsm_fr_encode_sp.h | 4 +-
gr-vocoder/include/vocoder/ulaw_decode_bs.h | 4 +-
gr-vocoder/include/vocoder/ulaw_encode_sb.h | 4 +-
gr-vocoder/lib/alaw_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/alaw_encode_sb_impl.cc | 8 +-
gr-vocoder/lib/codec2_decode_ps_impl.cc | 8 +-
gr-vocoder/lib/codec2_encode_sp_impl.cc | 8 +-
gr-vocoder/lib/cvsd_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/cvsd_encode_sb_impl.cc | 8 +-
gr-vocoder/lib/g721_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/g721_encode_sb_impl.cc | 8 +-
gr-vocoder/lib/g723_24_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/g723_24_encode_sb_impl.cc | 8 +-
gr-vocoder/lib/g723_40_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/g723_40_encode_sb_impl.cc | 8 +-
gr-vocoder/lib/gsm_fr_decode_ps_impl.cc | 8 +-
gr-vocoder/lib/gsm_fr_encode_sp_impl.cc | 8 +-
gr-vocoder/lib/ulaw_decode_bs_impl.cc | 8 +-
gr-vocoder/lib/ulaw_encode_sb_impl.cc | 8 +-
gr-wavelet/include/wavelet/api.h | 2 +-
gr-wavelet/include/wavelet/squash_ff.h | 4 +-
gr-wavelet/include/wavelet/wavelet_ff.h | 4 +-
gr-wavelet/include/wavelet/wvps_ff.h | 4 +-
gr-wavelet/lib/squash_ff_impl.cc | 8 +-
gr-wavelet/lib/wavelet_ff_impl.cc | 8 +-
gr-wavelet/lib/wvps_ff_impl.cc | 8 +-
gr-wxgui/include/wxgui/api.h | 2 +-
gr-wxgui/include/wxgui/histo_sink_f.h | 8 +-
gr-wxgui/include/wxgui/oscope_guts.h | 6 +-
gr-wxgui/include/wxgui/oscope_sink_f.h | 4 +-
gr-wxgui/include/wxgui/oscope_sink_x.h | 8 +-
gr-wxgui/lib/histo_sink_f_impl.cc | 14 +-
gr-wxgui/lib/histo_sink_f_impl.h | 4 +-
gr-wxgui/lib/oscope_guts.cc | 6 +-
gr-wxgui/lib/oscope_sink_f_impl.cc | 8 +-
gr-wxgui/lib/oscope_sink_f_impl.h | 4 +-
gr-wxgui/lib/oscope_sink_x.cc | 8 +-
1562 files changed, 39240 insertions(+), 39184 deletions(-)
delete mode 100644 gnuradio-runtime/include/IcePy_Communicator.h
delete mode 100644 gnuradio-runtime/include/attributes.h
create mode 100644 gnuradio-runtime/include/gnuradio/CMakeLists.txt
create mode 100644 gnuradio-runtime/include/gnuradio/IcePy_Communicator.h
create mode 100644 gnuradio-runtime/include/gnuradio/api.h
create mode 100644 gnuradio-runtime/include/gnuradio/attributes.h
create mode 100644 gnuradio-runtime/include/gnuradio/basic_block.h
create mode 100644 gnuradio-runtime/include/gnuradio/block.h
create mode 100644 gnuradio-runtime/include/gnuradio/block_detail.h
create mode 100644 gnuradio-runtime/include/gnuradio/block_gateway.h
create mode 100644 gnuradio-runtime/include/gnuradio/block_registry.h
create mode 100644 gnuradio-runtime/include/gnuradio/buffer.h
create mode 100644 gnuradio-runtime/include/gnuradio/constants.h
create mode 100644 gnuradio-runtime/include/gnuradio/dispatcher.h
create mode 100644 gnuradio-runtime/include/gnuradio/endianness.h
create mode 100644 gnuradio-runtime/include/gnuradio/error_handler.h
create mode 100644 gnuradio-runtime/include/gnuradio/expj.h
create mode 100644 gnuradio-runtime/include/gnuradio/feval.h
create mode 100644 gnuradio-runtime/include/gnuradio/flowgraph.h
create mode 100644 gnuradio-runtime/include/gnuradio/fxpt.h
create mode 100644 gnuradio-runtime/include/gnuradio/fxpt_nco.h
create mode 100644 gnuradio-runtime/include/gnuradio/fxpt_vco.h
create mode 100644 gnuradio-runtime/include/gnuradio/gr_complex.h
create mode 100644 gnuradio-runtime/include/gnuradio/hier_block2.h
create mode 100644 gnuradio-runtime/include/gnuradio/high_res_timer.h
create mode 100644 gnuradio-runtime/include/gnuradio/ice_application_base.h
create mode 100644 gnuradio-runtime/include/gnuradio/ice_server_template.h
create mode 100644 gnuradio-runtime/include/gnuradio/io_signature.h
create mode 100644 gnuradio-runtime/include/gnuradio/logger.h.in
create mode 100644 gnuradio-runtime/include/gnuradio/math.h
create mode 100644 gnuradio-runtime/include/gnuradio/message.h
create mode 100644 gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt
create mode 100644 gnuradio-runtime/include/gnuradio/messages/msg_accepter.h
create mode 100644 gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h
create mode 100644 gnuradio-runtime/include/gnuradio/messages/msg_passing.h
create mode 100644 gnuradio-runtime/include/gnuradio/messages/msg_producer.h
create mode 100644 gnuradio-runtime/include/gnuradio/messages/msg_queue.h
create mode 100644 gnuradio-runtime/include/gnuradio/misc.h
create mode 100644 gnuradio-runtime/include/gnuradio/msg_accepter.h
create mode 100644 gnuradio-runtime/include/gnuradio/msg_handler.h
create mode 100644 gnuradio-runtime/include/gnuradio/msg_queue.h
create mode 100644 gnuradio-runtime/include/gnuradio/nco.h
create mode 100644 gnuradio-runtime/include/gnuradio/prefs.h
create mode 100644 gnuradio-runtime/include/gnuradio/py_feval.h
create mode 100644 gnuradio-runtime/include/gnuradio/pycallback_object.h
create mode 100644 gnuradio-runtime/include/gnuradio/random.h
create mode 100644 gnuradio-runtime/include/gnuradio/realtime.h
create mode 100644 gnuradio-runtime/include/gnuradio/realtime_impl.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpccallbackregister_base.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcmanager.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcmanager_base.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_base.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_ice.h
create mode 100644 gnuradio-runtime/include/gnuradio/rpcserver_selector.h
create mode 100644 gnuradio-runtime/include/gnuradio/runtime_types.h
create mode 100644 gnuradio-runtime/include/gnuradio/select_handler.h
create mode 100644 gnuradio-runtime/include/gnuradio/sincos.h
create mode 100644 gnuradio-runtime/include/gnuradio/single_threaded_scheduler.h
create mode 100644 gnuradio-runtime/include/gnuradio/sptr_magic.h
create mode 100644 gnuradio-runtime/include/gnuradio/sync_block.h
create mode 100644 gnuradio-runtime/include/gnuradio/sync_decimator.h
create mode 100644 gnuradio-runtime/include/gnuradio/sync_interpolator.h
create mode 100644 gnuradio-runtime/include/gnuradio/sys_paths.h
create mode 100644 gnuradio-runtime/include/gnuradio/sys_pri.h
create mode 100644 gnuradio-runtime/include/gnuradio/tagged_stream_block.h
create mode 100644 gnuradio-runtime/include/gnuradio/tags.h
create mode 100644 gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt
create mode 100644 gnuradio-runtime/include/gnuradio/thread/thread.h
create mode 100644 gnuradio-runtime/include/gnuradio/thread/thread_body_wrapper.h
create mode 100644 gnuradio-runtime/include/gnuradio/thread/thread_group.h
create mode 100644 gnuradio-runtime/include/gnuradio/timer.h
create mode 100644 gnuradio-runtime/include/gnuradio/top_block.h
create mode 100644 gnuradio-runtime/include/gnuradio/tpb_detail.h
create mode 100644 gnuradio-runtime/include/gnuradio/types.h
create mode 100644 gnuradio-runtime/include/gnuradio/unittests.h
delete mode 100644 gnuradio-runtime/include/gr_basic_block.h
delete mode 100644 gnuradio-runtime/include/gr_block.h
delete mode 100644 gnuradio-runtime/include/gr_block_detail.h
delete mode 100644 gnuradio-runtime/include/gr_block_registry.h
delete mode 100644 gnuradio-runtime/include/gr_buffer.h
delete mode 100644 gnuradio-runtime/include/gr_complex.h
delete mode 100644 gnuradio-runtime/include/gr_constants.h
delete mode 100644 gnuradio-runtime/include/gr_dispatcher.h
delete mode 100644 gnuradio-runtime/include/gr_endianness.h
delete mode 100644 gnuradio-runtime/include/gr_error_handler.h
delete mode 100644 gnuradio-runtime/include/gr_expj.h
delete mode 100644 gnuradio-runtime/include/gr_feval.h
delete mode 100644 gnuradio-runtime/include/gr_flowgraph.h
delete mode 100644 gnuradio-runtime/include/gr_fxpt.h
delete mode 100644 gnuradio-runtime/include/gr_fxpt_nco.h
delete mode 100644 gnuradio-runtime/include/gr_fxpt_vco.h
delete mode 100644 gnuradio-runtime/include/gr_hier_block2.h
delete mode 100644 gnuradio-runtime/include/gr_io_signature.h
delete mode 100644 gnuradio-runtime/include/gr_logger.h
delete mode 100644 gnuradio-runtime/include/gr_math.h
delete mode 100644 gnuradio-runtime/include/gr_message.h
delete mode 100644 gnuradio-runtime/include/gr_misc.h
delete mode 100644 gnuradio-runtime/include/gr_msg_accepter.h
delete mode 100644 gnuradio-runtime/include/gr_msg_handler.h
delete mode 100644 gnuradio-runtime/include/gr_msg_queue.h
delete mode 100644 gnuradio-runtime/include/gr_nco.h
delete mode 100644 gnuradio-runtime/include/gr_preferences.h
delete mode 100644 gnuradio-runtime/include/gr_prefs.h
delete mode 100644 gnuradio-runtime/include/gr_py_feval.h
delete mode 100644 gnuradio-runtime/include/gr_random.h
delete mode 100644 gnuradio-runtime/include/gr_realtime.h
delete mode 100644 gnuradio-runtime/include/gr_runtime_api.h
delete mode 100644 gnuradio-runtime/include/gr_runtime_types.h
delete mode 100644 gnuradio-runtime/include/gr_select_handler.h
delete mode 100644 gnuradio-runtime/include/gr_sincos.h
delete mode 100644 gnuradio-runtime/include/gr_single_threaded_scheduler.h
delete mode 100644 gnuradio-runtime/include/gr_sptr_magic.h
delete mode 100644 gnuradio-runtime/include/gr_sync_block.h
delete mode 100644 gnuradio-runtime/include/gr_sync_decimator.h
delete mode 100644 gnuradio-runtime/include/gr_sync_interpolator.h
delete mode 100644 gnuradio-runtime/include/gr_sys_paths.h
delete mode 100644 gnuradio-runtime/include/gr_tagged_stream_block.h
delete mode 100644 gnuradio-runtime/include/gr_tags.h
delete mode 100644 gnuradio-runtime/include/gr_timer.h
delete mode 100644 gnuradio-runtime/include/gr_top_block.h
delete mode 100644 gnuradio-runtime/include/gr_tpb_detail.h
delete mode 100644 gnuradio-runtime/include/gr_types.h
delete mode 100644 gnuradio-runtime/include/gr_unittests.h
delete mode 100644 gnuradio-runtime/include/high_res_timer.h
delete mode 100644 gnuradio-runtime/include/ice_application_base.h
delete mode 100644 gnuradio-runtime/include/ice_server_template.h
delete mode 100644 gnuradio-runtime/include/messages/CMakeLists.txt
delete mode 100644 gnuradio-runtime/include/messages/msg_accepter.h
delete mode 100644 gnuradio-runtime/include/messages/msg_accepter_msgq.h
delete mode 100644 gnuradio-runtime/include/messages/msg_passing.h
delete mode 100644 gnuradio-runtime/include/messages/msg_producer.h
delete mode 100644 gnuradio-runtime/include/messages/msg_queue.h
delete mode 100644 gnuradio-runtime/include/pycallback_object.h
delete mode 100644 gnuradio-runtime/include/random.h
delete mode 100644 gnuradio-runtime/include/realtime.h
delete mode 100644 gnuradio-runtime/include/rpccallbackregister_base.h
delete mode 100644 gnuradio-runtime/include/rpcmanager.h
delete mode 100644 gnuradio-runtime/include/rpcmanager_base.h
delete mode 100644 gnuradio-runtime/include/rpcpmtconverters_ice.h
delete mode 100644 gnuradio-runtime/include/rpcregisterhelpers.h
delete mode 100644 gnuradio-runtime/include/rpcserver_aggregator.h
delete mode 100644 gnuradio-runtime/include/rpcserver_base.h
delete mode 100644 gnuradio-runtime/include/rpcserver_booter_aggregator.h
delete mode 100644 gnuradio-runtime/include/rpcserver_booter_base.h
delete mode 100644 gnuradio-runtime/include/rpcserver_booter_ice.h
delete mode 100644 gnuradio-runtime/include/rpcserver_ice.h
delete mode 100644 gnuradio-runtime/include/rpcserver_selector.h
delete mode 100644 gnuradio-runtime/include/runtime_block_gateway.h
delete mode 100644 gnuradio-runtime/include/sys_pri.h
delete mode 100644 gnuradio-runtime/include/thread/CMakeLists.txt
delete mode 100644 gnuradio-runtime/include/thread/thread.h
delete mode 100644 gnuradio-runtime/include/thread/thread_body_wrapper.h
delete mode 100644 gnuradio-runtime/include/thread/thread_group.h
delete mode 100644 gnuradio-runtime/lib/ICE_LICENSE
create mode 100644 gnuradio-runtime/lib/basic_block.cc
create mode 100644 gnuradio-runtime/lib/block.cc
create mode 100644 gnuradio-runtime/lib/block_detail.cc
create mode 100644 gnuradio-runtime/lib/block_executor.cc
create mode 100644 gnuradio-runtime/lib/block_executor.h
create mode 100644 gnuradio-runtime/lib/block_gateway_impl.cc
create mode 100644 gnuradio-runtime/lib/block_gateway_impl.h
create mode 100644 gnuradio-runtime/lib/block_registry.cc
create mode 100644 gnuradio-runtime/lib/buffer.cc
create mode 100644 gnuradio-runtime/lib/circular_file.cc
create mode 100644 gnuradio-runtime/lib/circular_file.h
create mode 100644 gnuradio-runtime/lib/constants.cc.in
create mode 100644 gnuradio-runtime/lib/controlport/CMakeLists.txt
create mode 100644 gnuradio-runtime/lib/controlport/ICE_LICENSE
create mode 100644 gnuradio-runtime/lib/controlport/frontend.ice
create mode 100644 gnuradio-runtime/lib/controlport/gnuradio.ice
create mode 100644 gnuradio-runtime/lib/controlport/ice_application_base.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcmanager.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcserver_ice.cc
create mode 100644 gnuradio-runtime/lib/controlport/rpcserver_selector.cc
create mode 100644 gnuradio-runtime/lib/dispatcher.cc
create mode 100644 gnuradio-runtime/lib/error_handler.cc
create mode 100644 gnuradio-runtime/lib/feval.cc
create mode 100644 gnuradio-runtime/lib/flat_flowgraph.cc
create mode 100644 gnuradio-runtime/lib/flat_flowgraph.h
create mode 100644 gnuradio-runtime/lib/flowgraph.cc
delete mode 100644 gnuradio-runtime/lib/frontend.ice
delete mode 100755 gnuradio-runtime/lib/gen_sine_table.py
delete mode 100644 gnuradio-runtime/lib/gnuradio.ice
delete mode 100644 gnuradio-runtime/lib/gr_basic_block.cc
delete mode 100644 gnuradio-runtime/lib/gr_block.cc
delete mode 100644 gnuradio-runtime/lib/gr_block_detail.cc
delete mode 100644 gnuradio-runtime/lib/gr_block_executor.cc
delete mode 100644 gnuradio-runtime/lib/gr_block_executor.h
delete mode 100644 gnuradio-runtime/lib/gr_block_registry.cc
delete mode 100644 gnuradio-runtime/lib/gr_buffer.cc
delete mode 100644 gnuradio-runtime/lib/gr_circular_file.cc
delete mode 100644 gnuradio-runtime/lib/gr_circular_file.h
delete mode 100644 gnuradio-runtime/lib/gr_constants.cc.in
delete mode 100644 gnuradio-runtime/lib/gr_dispatcher.cc
delete mode 100644 gnuradio-runtime/lib/gr_error_handler.cc
delete mode 100644 gnuradio-runtime/lib/gr_fast_atan2f.cc
delete mode 100644 gnuradio-runtime/lib/gr_feval.cc
delete mode 100644 gnuradio-runtime/lib/gr_flat_flowgraph.cc
delete mode 100644 gnuradio-runtime/lib/gr_flat_flowgraph.h
delete mode 100644 gnuradio-runtime/lib/gr_flowgraph.cc
delete mode 100644 gnuradio-runtime/lib/gr_fxpt.cc
delete mode 100644 gnuradio-runtime/lib/gr_hier_block2.cc
delete mode 100644 gnuradio-runtime/lib/gr_hier_block2_detail.cc
delete mode 100644 gnuradio-runtime/lib/gr_hier_block2_detail.h
delete mode 100644 gnuradio-runtime/lib/gr_io_signature.cc
delete mode 100644 gnuradio-runtime/lib/gr_local_sighandler.cc
delete mode 100644 gnuradio-runtime/lib/gr_local_sighandler.h
delete mode 100644 gnuradio-runtime/lib/gr_logger.cc
delete mode 100644 gnuradio-runtime/lib/gr_message.cc
delete mode 100644 gnuradio-runtime/lib/gr_misc.cc
delete mode 100644 gnuradio-runtime/lib/gr_misc.h
delete mode 100644 gnuradio-runtime/lib/gr_msg_accepter.cc
delete mode 100644 gnuradio-runtime/lib/gr_msg_handler.cc
delete mode 100644 gnuradio-runtime/lib/gr_msg_queue.cc
delete mode 100644 gnuradio-runtime/lib/gr_pagesize.cc
delete mode 100644 gnuradio-runtime/lib/gr_pagesize.h
delete mode 100644 gnuradio-runtime/lib/gr_preferences.cc
delete mode 100644 gnuradio-runtime/lib/gr_prefs.cc
delete mode 100644 gnuradio-runtime/lib/gr_random.cc
delete mode 100644 gnuradio-runtime/lib/gr_random.h
delete mode 100644 gnuradio-runtime/lib/gr_realtime.cc
delete mode 100644 gnuradio-runtime/lib/gr_reverse.cc
delete mode 100644 gnuradio-runtime/lib/gr_reverse.h
delete mode 100644 gnuradio-runtime/lib/gr_scheduler.cc
delete mode 100644 gnuradio-runtime/lib/gr_scheduler.h
delete mode 100644 gnuradio-runtime/lib/gr_scheduler_sts.cc
delete mode 100644 gnuradio-runtime/lib/gr_scheduler_sts.h
delete mode 100644 gnuradio-runtime/lib/gr_scheduler_tpb.cc
delete mode 100644 gnuradio-runtime/lib/gr_scheduler_tpb.h
delete mode 100644 gnuradio-runtime/lib/gr_select_handler.cc
delete mode 100644 gnuradio-runtime/lib/gr_sincos.c
delete mode 100644 gnuradio-runtime/lib/gr_single_threaded_scheduler.cc
delete mode 100644 gnuradio-runtime/lib/gr_sptr_magic.cc
delete mode 100644 gnuradio-runtime/lib/gr_sync_block.cc
delete mode 100644 gnuradio-runtime/lib/gr_sync_decimator.cc
delete mode 100644 gnuradio-runtime/lib/gr_sync_interpolator.cc
delete mode 100644 gnuradio-runtime/lib/gr_sys_paths.cc
delete mode 100644 gnuradio-runtime/lib/gr_tagged_stream_block.cc
delete mode 100644 gnuradio-runtime/lib/gr_test.cc
delete mode 100644 gnuradio-runtime/lib/gr_test.h
delete mode 100644 gnuradio-runtime/lib/gr_test_types.h
delete mode 100644 gnuradio-runtime/lib/gr_top_block.cc
delete mode 100644 gnuradio-runtime/lib/gr_top_block_impl.cc
delete mode 100644 gnuradio-runtime/lib/gr_top_block_impl.h
delete mode 100644 gnuradio-runtime/lib/gr_tpb_detail.cc
delete mode 100644 gnuradio-runtime/lib/gr_tpb_thread_body.cc
delete mode 100644 gnuradio-runtime/lib/gr_tpb_thread_body.h
delete mode 100644 gnuradio-runtime/lib/gr_vco.h
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf.cc
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf.h
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc
delete mode 100644 gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h
delete mode 100644 gnuradio-runtime/lib/gri_debugger_hook.cc
delete mode 100644 gnuradio-runtime/lib/gri_debugger_hook.h
create mode 100644 gnuradio-runtime/lib/hier_block2.cc
create mode 100644 gnuradio-runtime/lib/hier_block2_detail.cc
create mode 100644 gnuradio-runtime/lib/hier_block2_detail.h
delete mode 100644 gnuradio-runtime/lib/ice_application_base.cc
create mode 100644 gnuradio-runtime/lib/io_signature.cc
create mode 100644 gnuradio-runtime/lib/local_sighandler.cc
create mode 100644 gnuradio-runtime/lib/local_sighandler.h
create mode 100644 gnuradio-runtime/lib/logger.cc
create mode 100644 gnuradio-runtime/lib/math/CMakeLists.txt
create mode 100644 gnuradio-runtime/lib/math/fast_atan2f.cc
create mode 100644 gnuradio-runtime/lib/math/fxpt.cc
create mode 100755 gnuradio-runtime/lib/math/gen_sine_table.py
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt.cc
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt.h
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt_nco.cc
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt_nco.h
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt_vco.cc
create mode 100644 gnuradio-runtime/lib/math/qa_fxpt_vco.h
create mode 100644 gnuradio-runtime/lib/math/qa_math.cc
create mode 100644 gnuradio-runtime/lib/math/qa_math.h
create mode 100644 gnuradio-runtime/lib/math/qa_sincos.cc
create mode 100644 gnuradio-runtime/lib/math/qa_sincos.h
create mode 100644 gnuradio-runtime/lib/math/random.cc
create mode 100644 gnuradio-runtime/lib/math/sincos.cc
create mode 100644 gnuradio-runtime/lib/math/sine_table.h
create mode 100644 gnuradio-runtime/lib/math/vco.h
create mode 100644 gnuradio-runtime/lib/message.cc
create mode 100644 gnuradio-runtime/lib/misc.cc
create mode 100644 gnuradio-runtime/lib/misc.h
create mode 100644 gnuradio-runtime/lib/msg_accepter.cc
create mode 100644 gnuradio-runtime/lib/msg_handler.cc
create mode 100644 gnuradio-runtime/lib/msg_queue.cc
create mode 100644 gnuradio-runtime/lib/pagesize.cc
create mode 100644 gnuradio-runtime/lib/pagesize.h
create mode 100644 gnuradio-runtime/lib/prefs.cc
create mode 100644 gnuradio-runtime/lib/qa_buffer.cc
create mode 100644 gnuradio-runtime/lib/qa_buffer.h
create mode 100644 gnuradio-runtime/lib/qa_circular_file.cc
create mode 100644 gnuradio-runtime/lib/qa_circular_file.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_buffer.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_buffer.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_circular_file.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_circular_file.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt_nco.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt_nco.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt_vco.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_fxpt_vco.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_io_signature.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_io_signature.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_logger.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_logger.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_math.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_math.h
delete mode 100644 gnuradio-runtime/lib/qa_gr_vmcircbuf.cc
delete mode 100644 gnuradio-runtime/lib/qa_gr_vmcircbuf.h
create mode 100644 gnuradio-runtime/lib/qa_io_signature.cc
create mode 100644 gnuradio-runtime/lib/qa_io_signature.h
create mode 100644 gnuradio-runtime/lib/qa_logger.cc
create mode 100644 gnuradio-runtime/lib/qa_logger.h
delete mode 100644 gnuradio-runtime/lib/qa_sincos.cc
delete mode 100644 gnuradio-runtime/lib/qa_sincos.h
create mode 100644 gnuradio-runtime/lib/qa_vmcircbuf.cc
create mode 100644 gnuradio-runtime/lib/qa_vmcircbuf.h
delete mode 100644 gnuradio-runtime/lib/random.h
create mode 100644 gnuradio-runtime/lib/realtime_impl.cc
delete mode 100644 gnuradio-runtime/lib/rpcmanager.cc
delete mode 100644 gnuradio-runtime/lib/rpcpmtconverters_ice.cc
delete mode 100644 gnuradio-runtime/lib/rpcserver_aggregator.cc
delete mode 100644 gnuradio-runtime/lib/rpcserver_booter_aggregator.cc
delete mode 100644 gnuradio-runtime/lib/rpcserver_booter_ice.cc
delete mode 100644 gnuradio-runtime/lib/rpcserver_ice.cc
delete mode 100644 gnuradio-runtime/lib/rpcserver_selector.cc
delete mode 100644 gnuradio-runtime/lib/runtime_block_gateway.cc
create mode 100644 gnuradio-runtime/lib/scheduler.cc
create mode 100644 gnuradio-runtime/lib/scheduler.h
create mode 100644 gnuradio-runtime/lib/scheduler_sts.cc
create mode 100644 gnuradio-runtime/lib/scheduler_sts.h
create mode 100644 gnuradio-runtime/lib/scheduler_tpb.cc
create mode 100644 gnuradio-runtime/lib/scheduler_tpb.h
create mode 100644 gnuradio-runtime/lib/select_handler.cc
delete mode 100644 gnuradio-runtime/lib/sine_table.h
create mode 100644 gnuradio-runtime/lib/single_threaded_scheduler.cc
create mode 100644 gnuradio-runtime/lib/sptr_magic.cc
create mode 100644 gnuradio-runtime/lib/sync_block.cc
create mode 100644 gnuradio-runtime/lib/sync_decimator.cc
create mode 100644 gnuradio-runtime/lib/sync_interpolator.cc
create mode 100644 gnuradio-runtime/lib/sys_paths.cc
create mode 100644 gnuradio-runtime/lib/tagged_stream_block.cc
create mode 100644 gnuradio-runtime/lib/test.cc
create mode 100644 gnuradio-runtime/lib/test.h
create mode 100644 gnuradio-runtime/lib/test_types.h
create mode 100644 gnuradio-runtime/lib/top_block.cc
create mode 100644 gnuradio-runtime/lib/top_block_impl.cc
create mode 100644 gnuradio-runtime/lib/top_block_impl.h
create mode 100644 gnuradio-runtime/lib/tpb_detail.cc
create mode 100644 gnuradio-runtime/lib/tpb_thread_body.cc
create mode 100644 gnuradio-runtime/lib/tpb_thread_body.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf_prefs.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf_prefs.h
create mode 100644 gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
create mode 100644 gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
create mode 100644 gnuradio-runtime/swig/basic_block.i
create mode 100644 gnuradio-runtime/swig/block.i
create mode 100644 gnuradio-runtime/swig/block_detail.i
create mode 100644 gnuradio-runtime/swig/block_gateway.i
create mode 100644 gnuradio-runtime/swig/buffer.i
create mode 100644 gnuradio-runtime/swig/constants.i
create mode 100644 gnuradio-runtime/swig/dispatcher.i
create mode 100644 gnuradio-runtime/swig/error_handler.i
create mode 100644 gnuradio-runtime/swig/feval.i
delete mode 100644 gnuradio-runtime/swig/gr_basic_block.i
delete mode 100644 gnuradio-runtime/swig/gr_block.i
delete mode 100644 gnuradio-runtime/swig/gr_block_detail.i
delete mode 100644 gnuradio-runtime/swig/gr_buffer.i
delete mode 100644 gnuradio-runtime/swig/gr_constants.i
delete mode 100644 gnuradio-runtime/swig/gr_dispatcher.i
delete mode 100644 gnuradio-runtime/swig/gr_error_handler.i
delete mode 100644 gnuradio-runtime/swig/gr_feval.i
delete mode 100644 gnuradio-runtime/swig/gr_hier_block2.i
delete mode 100644 gnuradio-runtime/swig/gr_io_signature.i
delete mode 100644 gnuradio-runtime/swig/gr_message.i
delete mode 100644 gnuradio-runtime/swig/gr_msg_handler.i
delete mode 100644 gnuradio-runtime/swig/gr_msg_queue.i
delete mode 100644 gnuradio-runtime/swig/gr_prefs.i
delete mode 100644 gnuradio-runtime/swig/gr_realtime.i
delete mode 100644 gnuradio-runtime/swig/gr_single_threaded_scheduler.i
delete mode 100644 gnuradio-runtime/swig/gr_sync_block.i
delete mode 100644 gnuradio-runtime/swig/gr_sync_decimator.i
delete mode 100644 gnuradio-runtime/swig/gr_sync_interpolator.i
delete mode 100644 gnuradio-runtime/swig/gr_tagged_stream_block.i
delete mode 100644 gnuradio-runtime/swig/gr_tags.i
delete mode 100644 gnuradio-runtime/swig/gr_top_block.i
create mode 100644 gnuradio-runtime/swig/hier_block2.i
create mode 100644 gnuradio-runtime/swig/io_signature.i
create mode 100644 gnuradio-runtime/swig/message.i
create mode 100644 gnuradio-runtime/swig/msg_handler.i
create mode 100644 gnuradio-runtime/swig/msg_queue.i
create mode 100644 gnuradio-runtime/swig/prefs.i
create mode 100644 gnuradio-runtime/swig/realtime.i
delete mode 100644 gnuradio-runtime/swig/runtime_block_gateway.i
create mode 100644 gnuradio-runtime/swig/single_threaded_scheduler.i
create mode 100644 gnuradio-runtime/swig/sync_block.i
create mode 100644 gnuradio-runtime/swig/sync_decimator.i
create mode 100644 gnuradio-runtime/swig/sync_interpolator.i
create mode 100644 gnuradio-runtime/swig/tagged_stream_block.i
create mode 100644 gnuradio-runtime/swig/tags.i
create mode 100644 gnuradio-runtime/swig/top_block.i
delete mode 100644 gr-blocks/include/blocks/CMakeLists.txt
delete mode 100644 gr-blocks/include/blocks/add_XX.h.t
delete mode 100644 gr-blocks/include/blocks/add_const_XX.h.t
delete mode 100644 gr-blocks/include/blocks/add_const_vXX.h.t
delete mode 100644 gr-blocks/include/blocks/add_ff.h
delete mode 100644 gr-blocks/include/blocks/and_XX.h.t
delete mode 100644 gr-blocks/include/blocks/and_const_XX.h.t
delete mode 100644 gr-blocks/include/blocks/annotator_1to1.h
delete mode 100644 gr-blocks/include/blocks/annotator_alltoall.h
delete mode 100644 gr-blocks/include/blocks/annotator_raw.h
delete mode 100644 gr-blocks/include/blocks/api.h
delete mode 100644 gr-blocks/include/blocks/argmax_XX.h.t
delete mode 100644 gr-blocks/include/blocks/bin_statistics_f.h
delete mode 100644 gr-blocks/include/blocks/burst_tagger.h
delete mode 100644 gr-blocks/include/blocks/char_to_float.h
delete mode 100644 gr-blocks/include/blocks/char_to_short.h
delete mode 100644 gr-blocks/include/blocks/check_lfsr_32k_s.h
delete mode 100644 gr-blocks/include/blocks/complex_to_arg.h
delete mode 100644 gr-blocks/include/blocks/complex_to_float.h
delete mode 100644 gr-blocks/include/blocks/complex_to_imag.h
delete mode 100644 gr-blocks/include/blocks/complex_to_interleaved_short.h
delete mode 100644 gr-blocks/include/blocks/complex_to_mag.h
delete mode 100644 gr-blocks/include/blocks/complex_to_mag_squared.h
delete mode 100644 gr-blocks/include/blocks/complex_to_real.h
delete mode 100644 gr-blocks/include/blocks/conjugate_cc.h
delete mode 100644 gr-blocks/include/blocks/control_loop.h
delete mode 100644 gr-blocks/include/blocks/copy.h
delete mode 100644 gr-blocks/include/blocks/count_bits.h
delete mode 100644 gr-blocks/include/blocks/ctrlport_probe2_c.h
delete mode 100644 gr-blocks/include/blocks/ctrlport_probe_c.h
delete mode 100644 gr-blocks/include/blocks/deinterleave.h
delete mode 100644 gr-blocks/include/blocks/delay.h
delete mode 100644 gr-blocks/include/blocks/divide_XX.h.t
delete mode 100644 gr-blocks/include/blocks/endian_swap.h
delete mode 100644 gr-blocks/include/blocks/file_descriptor_sink.h
delete mode 100644 gr-blocks/include/blocks/file_descriptor_source.h
delete mode 100644 gr-blocks/include/blocks/file_meta_sink.h
delete mode 100644 gr-blocks/include/blocks/file_meta_source.h
delete mode 100644 gr-blocks/include/blocks/file_sink.h
delete mode 100644 gr-blocks/include/blocks/file_sink_base.h
delete mode 100644 gr-blocks/include/blocks/file_source.h
delete mode 100644 gr-blocks/include/blocks/float_to_char.h
delete mode 100644 gr-blocks/include/blocks/float_to_complex.h
delete mode 100644 gr-blocks/include/blocks/float_to_int.h
delete mode 100644 gr-blocks/include/blocks/float_to_short.h
delete mode 100644 gr-blocks/include/blocks/float_to_uchar.h
delete mode 100644 gr-blocks/include/blocks/head.h
delete mode 100644 gr-blocks/include/blocks/int_to_float.h
delete mode 100644 gr-blocks/include/blocks/integrate_XX.h.t
delete mode 100644 gr-blocks/include/blocks/interleave.h
delete mode 100644 gr-blocks/include/blocks/interleaved_short_to_complex.h
delete mode 100644 gr-blocks/include/blocks/keep_m_in_n.h
delete mode 100644 gr-blocks/include/blocks/keep_one_in_n.h
delete mode 100644 gr-blocks/include/blocks/lfsr_15_1_0.h
delete mode 100644 gr-blocks/include/blocks/lfsr_32k.h
delete mode 100644 gr-blocks/include/blocks/lfsr_32k_source_s.h
delete mode 100644 gr-blocks/include/blocks/log2_const.h
delete mode 100644 gr-blocks/include/blocks/max_XX.h.t
delete mode 100644 gr-blocks/include/blocks/message_burst_source.h
delete mode 100644 gr-blocks/include/blocks/message_debug.h
delete mode 100644 gr-blocks/include/blocks/message_sink.h
delete mode 100644 gr-blocks/include/blocks/message_source.h
delete mode 100644 gr-blocks/include/blocks/message_strobe.h
delete mode 100644 gr-blocks/include/blocks/moving_average_XX.h.t
delete mode 100644 gr-blocks/include/blocks/multiply_XX.h.t
delete mode 100644 gr-blocks/include/blocks/multiply_cc.h
delete mode 100644 gr-blocks/include/blocks/multiply_conjugate_cc.h
delete mode 100644 gr-blocks/include/blocks/multiply_const_XX.h.t
delete mode 100644 gr-blocks/include/blocks/multiply_const_cc.h
delete mode 100644 gr-blocks/include/blocks/multiply_const_ff.h
delete mode 100644 gr-blocks/include/blocks/multiply_const_vXX.h.t
delete mode 100644 gr-blocks/include/blocks/multiply_ff.h
delete mode 100644 gr-blocks/include/blocks/mute_XX.h.t
delete mode 100644 gr-blocks/include/blocks/nlog10_ff.h
delete mode 100644 gr-blocks/include/blocks/nop.h
delete mode 100644 gr-blocks/include/blocks/not_XX.h.t
delete mode 100644 gr-blocks/include/blocks/null_sink.h
delete mode 100644 gr-blocks/include/blocks/null_source.h
delete mode 100644 gr-blocks/include/blocks/or_XX.h.t
delete mode 100644 gr-blocks/include/blocks/pack_k_bits_bb.h
delete mode 100644 gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
delete mode 100644 gr-blocks/include/blocks/patterned_interleaver.h
delete mode 100644 gr-blocks/include/blocks/pdu.h
delete mode 100644 gr-blocks/include/blocks/pdu_to_tagged_stream.h
delete mode 100644 gr-blocks/include/blocks/peak_detector2_fb.h
delete mode 100644 gr-blocks/include/blocks/peak_detector_XX.h.t
delete mode 100644 gr-blocks/include/blocks/plateau_detector_fb.h
delete mode 100644 gr-blocks/include/blocks/probe_rate.h
delete mode 100644 gr-blocks/include/blocks/probe_signal_X.h.t
delete mode 100644 gr-blocks/include/blocks/probe_signal_vX.h.t
delete mode 100644 gr-blocks/include/blocks/random_pdu.h
delete mode 100644 gr-blocks/include/blocks/regenerate_bb.h
delete mode 100644 gr-blocks/include/blocks/repack_bits_bb.h
delete mode 100644 gr-blocks/include/blocks/repeat.h
delete mode 100644 gr-blocks/include/blocks/rms_cf.h
delete mode 100644 gr-blocks/include/blocks/rms_ff.h
delete mode 100644 gr-blocks/include/blocks/rotator.h
delete mode 100644 gr-blocks/include/blocks/sample_and_hold_XX.h.t
delete mode 100644 gr-blocks/include/blocks/short_to_char.h
delete mode 100644 gr-blocks/include/blocks/short_to_float.h
delete mode 100644 gr-blocks/include/blocks/skiphead.h
delete mode 100644 gr-blocks/include/blocks/socket_pdu.h
delete mode 100644 gr-blocks/include/blocks/stream_mux.h
delete mode 100644 gr-blocks/include/blocks/stream_to_streams.h
delete mode 100644 gr-blocks/include/blocks/stream_to_vector.h
delete mode 100644 gr-blocks/include/blocks/streams_to_stream.h
delete mode 100644 gr-blocks/include/blocks/streams_to_vector.h
delete mode 100644 gr-blocks/include/blocks/stretch_ff.h
delete mode 100644 gr-blocks/include/blocks/sub_XX.h.t
delete mode 100644 gr-blocks/include/blocks/tag_debug.h
delete mode 100644 gr-blocks/include/blocks/tagged_file_sink.h
delete mode 100644 gr-blocks/include/blocks/tagged_stream_mux.h
delete mode 100644 gr-blocks/include/blocks/tagged_stream_to_pdu.h
delete mode 100644 gr-blocks/include/blocks/threshold_ff.h
delete mode 100644 gr-blocks/include/blocks/throttle.h
delete mode 100644 gr-blocks/include/blocks/transcendental.h
delete mode 100644 gr-blocks/include/blocks/tuntap_pdu.h
delete mode 100644 gr-blocks/include/blocks/uchar_to_float.h
delete mode 100644 gr-blocks/include/blocks/udp_sink.h
delete mode 100644 gr-blocks/include/blocks/udp_source.h
delete mode 100644 gr-blocks/include/blocks/unpack_k_bits_bb.h
delete mode 100644 gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
delete mode 100644 gr-blocks/include/blocks/vco_f.h
delete mode 100644 gr-blocks/include/blocks/vector_insert_X.h.t
delete mode 100644 gr-blocks/include/blocks/vector_map.h
delete mode 100644 gr-blocks/include/blocks/vector_sink_X.h.t
delete mode 100644 gr-blocks/include/blocks/vector_source_X.h.t
delete mode 100644 gr-blocks/include/blocks/vector_to_stream.h
delete mode 100644 gr-blocks/include/blocks/vector_to_streams.h
delete mode 100644 gr-blocks/include/blocks/wavfile.h
delete mode 100644 gr-blocks/include/blocks/wavfile_sink.h
delete mode 100644 gr-blocks/include/blocks/wavfile_source.h
delete mode 100644 gr-blocks/include/blocks/xor_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/CMakeLists.txt
create mode 100644 gr-blocks/include/gnuradio/blocks/add_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/add_const_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/add_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/and_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/and_const_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/annotator_1to1.h
create mode 100644 gr-blocks/include/gnuradio/blocks/annotator_alltoall.h
create mode 100644 gr-blocks/include/gnuradio/blocks/annotator_raw.h
create mode 100644 gr-blocks/include/gnuradio/blocks/api.h
create mode 100644 gr-blocks/include/gnuradio/blocks/argmax_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
create mode 100644 gr-blocks/include/gnuradio/blocks/burst_tagger.h
create mode 100644 gr-blocks/include/gnuradio/blocks/char_to_float.h
create mode 100644 gr-blocks/include/gnuradio/blocks/char_to_short.h
create mode 100644 gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_arg.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_float.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_imag.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_mag.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h
create mode 100644 gr-blocks/include/gnuradio/blocks/complex_to_real.h
create mode 100644 gr-blocks/include/gnuradio/blocks/conjugate_cc.h
create mode 100644 gr-blocks/include/gnuradio/blocks/control_loop.h
create mode 100644 gr-blocks/include/gnuradio/blocks/copy.h
create mode 100644 gr-blocks/include/gnuradio/blocks/count_bits.h
create mode 100644 gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h
create mode 100644 gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
create mode 100644 gr-blocks/include/gnuradio/blocks/deinterleave.h
create mode 100644 gr-blocks/include/gnuradio/blocks/delay.h
create mode 100644 gr-blocks/include/gnuradio/blocks/divide_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/endian_swap.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_descriptor_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_meta_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_meta_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_sink_base.h
create mode 100644 gr-blocks/include/gnuradio/blocks/file_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/float_to_char.h
create mode 100644 gr-blocks/include/gnuradio/blocks/float_to_complex.h
create mode 100644 gr-blocks/include/gnuradio/blocks/float_to_int.h
create mode 100644 gr-blocks/include/gnuradio/blocks/float_to_short.h
create mode 100644 gr-blocks/include/gnuradio/blocks/float_to_uchar.h
create mode 100644 gr-blocks/include/gnuradio/blocks/head.h
create mode 100644 gr-blocks/include/gnuradio/blocks/int_to_float.h
create mode 100644 gr-blocks/include/gnuradio/blocks/integrate_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/interleave.h
create mode 100644 gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
create mode 100644 gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
create mode 100644 gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
create mode 100644 gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h
create mode 100644 gr-blocks/include/gnuradio/blocks/lfsr_32k.h
create mode 100644 gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h
create mode 100644 gr-blocks/include/gnuradio/blocks/log2_const.h
create mode 100644 gr-blocks/include/gnuradio/blocks/max_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/message_burst_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/message_debug.h
create mode 100644 gr-blocks/include/gnuradio/blocks/message_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/message_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/message_strobe.h
create mode 100644 gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_cc.h
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_const_cc.h
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_const_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/multiply_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/mute_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/nlog10_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/nop.h
create mode 100644 gr-blocks/include/gnuradio/blocks/not_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/null_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/null_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/or_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
create mode 100644 gr-blocks/include/gnuradio/blocks/pdu.h
create mode 100644 gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h
create mode 100644 gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/probe_rate.h
create mode 100644 gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/random_pdu.h
create mode 100644 gr-blocks/include/gnuradio/blocks/regenerate_bb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/repeat.h
create mode 100644 gr-blocks/include/gnuradio/blocks/rms_cf.h
create mode 100644 gr-blocks/include/gnuradio/blocks/rms_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/rotator.h
create mode 100644 gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/short_to_char.h
create mode 100644 gr-blocks/include/gnuradio/blocks/short_to_float.h
create mode 100644 gr-blocks/include/gnuradio/blocks/skiphead.h
create mode 100644 gr-blocks/include/gnuradio/blocks/socket_pdu.h
create mode 100644 gr-blocks/include/gnuradio/blocks/stream_mux.h
create mode 100644 gr-blocks/include/gnuradio/blocks/stream_to_streams.h
create mode 100644 gr-blocks/include/gnuradio/blocks/stream_to_vector.h
create mode 100644 gr-blocks/include/gnuradio/blocks/streams_to_stream.h
create mode 100644 gr-blocks/include/gnuradio/blocks/streams_to_vector.h
create mode 100644 gr-blocks/include/gnuradio/blocks/stretch_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/sub_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/tag_debug.h
create mode 100644 gr-blocks/include/gnuradio/blocks/tagged_file_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h
create mode 100644 gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h
create mode 100644 gr-blocks/include/gnuradio/blocks/threshold_ff.h
create mode 100644 gr-blocks/include/gnuradio/blocks/throttle.h
create mode 100644 gr-blocks/include/gnuradio/blocks/transcendental.h
create mode 100644 gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
create mode 100644 gr-blocks/include/gnuradio/blocks/uchar_to_float.h
create mode 100644 gr-blocks/include/gnuradio/blocks/udp_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/udp_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
create mode 100644 gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/vco_f.h
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_map.h
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_source_X.h.t
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_to_stream.h
create mode 100644 gr-blocks/include/gnuradio/blocks/vector_to_streams.h
create mode 100644 gr-blocks/include/gnuradio/blocks/wavfile.h
create mode 100644 gr-blocks/include/gnuradio/blocks/wavfile_sink.h
create mode 100644 gr-blocks/include/gnuradio/blocks/wavfile_source.h
create mode 100644 gr-blocks/include/gnuradio/blocks/xor_XX.h.t
delete mode 100644 gr-blocks/swig/blocks_swig.i
create mode 100644 gr-blocks/swig/blocks_swig3.i
create mode 100644 gr-blocks/swig/blocks_swig4.i
create mode 100644 gr-blocks/swig/blocks_swig5.i
(limited to 'gr-blocks/lib/file_meta_source_impl.cc')
diff --git a/docs/doxygen/other/logger.dox b/docs/doxygen/other/logger.dox
index f5228cfc55..2b8919dc78 100644
--- a/docs/doxygen/other/logger.dox
+++ b/docs/doxygen/other/logger.dox
@@ -83,7 +83,7 @@ data members of d_logger and d_debug_logger of gr_block and pass them
to our pre-defined macros:
\code
- GR_LOG_<level>(<logger>, "<Message to print>");
+ gr::LOG_<level>(<logger>, "<Message to print>");
\endcode
Where \<level\> is one of the levels as mentioned above, \<logger\> is
@@ -93,8 +93,8 @@ message to the standard logger and a WARN level message to the debug
logger, it would look like this:
\code
- GR_LOG_INFO(d_logger, "Some info about the block");
- GR_LOG_WARN(d_debug_logger, "Some warning about the block");
+ gr::LOG_INFO(d_logger, "Some info about the block");
+ gr::LOG_WARN(d_debug_logger, "Some warning about the block");
\endcode
When this is printed to wherever you are directing the output of the
@@ -115,15 +115,15 @@ The various logging macros are defined in gr_logger.h. Here are some
simple examples of using them:
\code
- GR_LOG_DEBUG(LOG, "DEBUG message");
- GR_LOG_INFO(LOG, "INFO message");
- GR_LOG_NOTICE(LOG, "NOTICE message");
- GR_LOG_WARN(LOG, "WARNING message");
- GR_LOG_ERROR(LOG, "ERROR message");
- GR_LOG_CRIT(LOG, "CRIT message");
- GR_LOG_ALERT(LOG, "ALERT message");
- GR_LOG_FATAL(LOG, "FATAL message");
- GR_LOG_EMERG(LOG, "EMERG message");
+ gr::LOG_DEBUG(LOG, "DEBUG message");
+ gr::LOG_INFO(LOG, "INFO message");
+ gr::LOG_NOTICE(LOG, "NOTICE message");
+ gr::LOG_WARN(LOG, "WARNING message");
+ gr::LOG_ERROR(LOG, "ERROR message");
+ gr::LOG_CRIT(LOG, "CRIT message");
+ gr::LOG_ALERT(LOG, "ALERT message");
+ gr::LOG_FATAL(LOG, "FATAL message");
+ gr::LOG_EMERG(LOG, "EMERG message");
\endcode
If the logger is not enabled, then these macros become nops and do
@@ -188,20 +188,20 @@ a singleton in the system, but we need to get a pointer to the right
logger and then set it up for our local use. The following code
snippet shows how to do this to get access to the standard logger,
which has a root of "gr_log." (access to the debug logger is similar
-except we would use "gr_log_debug." in the GR_LOG_GETLOGGER call):
+except we would use "gr_log_debug." in the gr::LOG_GETLOGGER call):
\code
- gr_prefs *p = gr_prefs::singleton();
+ prefs *p = prefs::singleton();
std::string log_file = p->get_string("LOG", "log_config", "");
std::string log_level = p->get_string("LOG", "log_level", "off");
- GR_CONFIG_LOGGER(log_file);
- GR_LOG_GETLOGGER(LOG, "gr_log." + "my_logger_name");
- GR_LOG_SET_LEVEL(LOG, log_level);
+ gr::CONFIG_LOGGER(log_file);
+ gr::LOG_GETLOGGER(LOG, "gr_log." + "my_logger_name");
+ gr::LOG_SET_LEVEL(LOG, log_level);
\endcode
This creates a pointer called LOG (which is instantiated as a
log4cpp:LoggerPtr in the macro) that we can now use locally as the
-input to our logging macros like 'GR_LOG_INFO(LOG, "message")'.
+input to our logging macros like 'gr::LOG_INFO(LOG, "message")'.
\section logPy Logging from Python
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox
index 3ad9e68021..2f638dec84 100644
--- a/docs/doxygen/other/main_page.dox
+++ b/docs/doxygen/other/main_page.dox
@@ -376,10 +376,10 @@ Similarly, in C++, we get a reference to the object by explicitly
calling for the singleton of the object:
\code
- gr_prefs *p = gr_prefs::singleton();
+ prefs *p = prefs::singleton();
\endcode
-The methods associated with this preferences object are (from class gr_prefs):
+The methods associated with this preferences object are (from class gr::prefs):
\code
bool has_section(string section)
diff --git a/gnuradio-runtime/apps/gnuradio-config-info.cc b/gnuradio-runtime/apps/gnuradio-config-info.cc
index d3e6454fd8..19291f4dae 100644
--- a/gnuradio-runtime/apps/gnuradio-config-info.cc
+++ b/gnuradio-runtime/apps/gnuradio-config-info.cc
@@ -24,7 +24,7 @@
#include <config.h>
#endif
-#include <gr_constants.h>
+#include <gnuradio/constants.h>
#include <boost/program_options.hpp>
#include <iostream>
@@ -48,25 +48,25 @@ main(int argc, char **argv)
po::store(po::parse_command_line(argc, argv, desc), vm);
po::notify(vm);
- if (vm.size() == 0 || vm.count("help")) {
+ if(vm.size() == 0 || vm.count("help")) {
std::cout << desc << std::endl;
return 1;
}
- if (vm.count("prefix"))
- std::cout << gr_prefix() << std::endl;
+ if(vm.count("prefix"))
+ std::cout << gr::prefix() << std::endl;
- if (vm.count("sysconfdir"))
- std::cout << gr_sysconfdir() << std::endl;
+ if(vm.count("sysconfdir"))
+ std::cout << gr::sysconfdir() << std::endl;
- if (vm.count("prefsdir"))
- std::cout << gr_prefsdir() << std::endl;
+ if(vm.count("prefsdir"))
+ std::cout << gr::prefsdir() << std::endl;
- if (vm.count("builddate"))
- std::cout << gr_build_date() << std::endl;
+ if(vm.count("builddate"))
+ std::cout << gr::build_date() << std::endl;
- if (vm.count("version"))
- std::cout << gr_version() << std::endl;
+ if(vm.count("version"))
+ std::cout << gr::version() << std::endl;
return 0;
}
diff --git a/gnuradio-runtime/include/CMakeLists.txt b/gnuradio-runtime/include/CMakeLists.txt
index 832522f92c..929a673016 100644
--- a/gnuradio-runtime/include/CMakeLists.txt
+++ b/gnuradio-runtime/include/CMakeLists.txt
@@ -17,84 +17,5 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-add_subdirectory(messages)
add_subdirectory(pmt)
-add_subdirectory(thread)
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- gr_basic_block.h
- gr_block_detail.h
- gr_block.h
- gr_block_registry.h
- gr_buffer.h
- gr_complex.h
- gr_constants.h
- gr_dispatcher.h
- gr_endianness.h
- gr_error_handler.h
- gr_expj.h
- gr_feval.h
- gr_flowgraph.h
- gr_fxpt.h
- gr_fxpt_nco.h
- gr_fxpt_vco.h
- gr_hier_block2.h
- gr_io_signature.h
- gr_logger.h
- gr_math.h
- gr_message.h
- gr_misc.h
- gr_msg_accepter.h
- gr_msg_handler.h
- gr_msg_queue.h
- gr_nco.h
- gr_preferences.h
- gr_prefs.h
- gr_py_feval.h
- gr_random.h
- gr_realtime.h
- gr_runtime_api.h
- gr_runtime_types.h
- gr_select_handler.h
- gr_sincos.h
- gr_single_threaded_scheduler.h
- gr_sptr_magic.h
- gr_sync_block.h
- gr_sync_decimator.h
- gr_sync_interpolator.h
- gr_sys_paths.h
- gr_tagged_stream_block.h
- gr_tags.h
- gr_timer.h
- gr_top_block.h
- gr_tpb_detail.h
- gr_types.h
- gr_unittests.h
- ice_application_base.h
- IcePy_Communicator.h
- ice_server_template.h
- pycallback_object.h
- random.h
- rpccallbackregister_base.h
- rpcmanager_base.h
- rpcmanager.h
- rpcpmtconverters_ice.h
- rpcregisterhelpers.h
- rpcserver_aggregator.h
- rpcserver_base.h
- rpcserver_booter_aggregator.h
- rpcserver_booter_base.h
- rpcserver_booter_ice.h
- rpcserver_ice.h
- rpcserver_selector.h
- runtime_block_gateway.h
- attributes.h
- high_res_timer.h
- realtime.h
- sys_pri.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio
- COMPONENT "runtime_devel"
-)
+add_subdirectory(gnuradio)
diff --git a/gnuradio-runtime/include/IcePy_Communicator.h b/gnuradio-runtime/include/IcePy_Communicator.h
deleted file mode 100644
index aae4378229..0000000000
--- a/gnuradio-runtime/include/IcePy_Communicator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICEPY_COMMUNICATOR_H
-#define ICEPY_COMMUNICATOR_H
-
-#include <Ice/CommunicatorF.h>
-#include <gr_runtime_api.h>
-
-namespace IcePy
-{
-
-extern PyTypeObject CommunicatorType;
-
-GR_RUNTIME_API bool initCommunicator(PyObject*);
-
-GR_RUNTIME_API Ice::CommunicatorPtr getCommunicator(PyObject*);
-
-GR_RUNTIME_API PyObject* createCommunicator(const Ice::CommunicatorPtr&);
-GR_RUNTIME_API PyObject* getCommunicatorWrapper(const Ice::CommunicatorPtr&);
-
-}
-
-extern "C" PyObject* IcePy_initialize(PyObject*, PyObject*);
-extern "C" PyObject* IcePy_initializeWithProperties(PyObject*, PyObject*);
-extern "C" PyObject* IcePy_initializeWithLogger(PyObject*, PyObject*);
-extern "C" PyObject* IcePy_initializeWithPropertiesAndLogger(PyObject*, PyObject*);
-
-#endif
diff --git a/gnuradio-runtime/include/attributes.h b/gnuradio-runtime/include/attributes.h
deleted file mode 100644
index 5baa52e7d3..0000000000
--- a/gnuradio-runtime/include/attributes.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GNURADIO_ATTRIBUTES_H
-#define INCLUDED_GNURADIO_ATTRIBUTES_H
-
-////////////////////////////////////////////////////////////////////////
-// Cross-platform attribute macros
-////////////////////////////////////////////////////////////////////////
-#if defined __GNUC__
-# define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
-# define __GR_ATTR_UNUSED __attribute__((unused))
-# define __GR_ATTR_INLINE __attribute__((always_inline))
-# define __GR_ATTR_DEPRECATED __attribute__((deprecated))
-# if __GNUC__ >= 4
-# define __GR_ATTR_EXPORT __attribute__((visibility("default")))
-# define __GR_ATTR_IMPORT __attribute__((visibility("default")))
-# else
-# define __GR_ATTR_EXPORT
-# define __GR_ATTR_IMPORT
-# endif
-#elif _MSC_VER
-# define __GR_ATTR_ALIGNED(x) __declspec(align(x))
-# define __GR_ATTR_UNUSED
-# define __GR_ATTR_INLINE __forceinline
-# define __GR_ATTR_DEPRECATED __declspec(deprecated)
-# define __GR_ATTR_EXPORT __declspec(dllexport)
-# define __GR_ATTR_IMPORT __declspec(dllimport)
-#else
-# define __GR_ATTR_ALIGNED(x)
-# define __GR_ATTR_UNUSED
-# define __GR_ATTR_INLINE
-# define __GR_ATTR_DEPRECATED
-# define __GR_ATTR_EXPORT
-# define __GR_ATTR_IMPORT
-#endif
-
-////////////////////////////////////////////////////////////////////////
-// define inline when building C
-////////////////////////////////////////////////////////////////////////
-#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
-# define inline __inline
-#endif
-
-////////////////////////////////////////////////////////////////////////
-// suppress warnings
-////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-# pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
-# pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
-# pragma warning(disable: 4244) // conversion from 'double' to 'float', possible loss of data
-# pragma warning(disable: 4305) // 'initializing' : truncation from 'double' to 'float'
-# pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
-#endif /* INCLUDED_GNURADIO_ATTRIBUTES_H */
diff --git a/gnuradio-runtime/include/gnuradio/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/CMakeLists.txt
new file mode 100644
index 0000000000..aece490e45
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt
@@ -0,0 +1,105 @@
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+add_subdirectory(messages)
+add_subdirectory(thread)
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+ api.h
+ attributes.h
+ basic_block.h
+ block.h
+ block_detail.h
+ block_gateway.h
+ block_registry.h
+ buffer.h
+ constants.h
+ dispatcher.h
+ endianness.h
+ error_handler.h
+ expj.h
+ feval.h
+ flowgraph.h
+ fxpt.h
+ fxpt_nco.h
+ fxpt_vco.h
+ gr_complex.h
+ hier_block2.h
+ high_res_timer.h
+ io_signature.h
+ math.h
+ message.h
+ misc.h
+ msg_accepter.h
+ msg_handler.h
+ msg_queue.h
+ nco.h
+ prefs.h
+ py_feval.h
+ pycallback_object.h
+ random.h
+ realtime.h
+ realtime_impl.h
+ runtime_types.h
+ single_threaded_scheduler.h
+ tags.h
+ tagged_stream_block.h
+ top_block.h
+ tpb_detail.h
+ select_handler.h
+ sincos.h
+ sptr_magic.h
+ sync_block.h
+ sync_decimator.h
+ sync_interpolator.h
+ sys_paths.h
+ timer.h
+ types.h
+ sys_pri.h
+ unittests.h
+ ice_application_base.h
+ IcePy_Communicator.h
+ ice_server_template.h
+ rpccallbackregister_base.h
+ rpcmanager_base.h
+ rpcmanager.h
+ rpcpmtconverters_ice.h
+ rpcregisterhelpers.h
+ rpcserver_aggregator.h
+ rpcserver_base.h
+ rpcserver_booter_aggregator.h
+ rpcserver_booter_base.h
+ rpcserver_booter_ice.h
+ rpcserver_ice.h
+ rpcserver_selector.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/logger.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+ COMPONENT "runtime_devel"
+)
+
+##########################################################################
+# Configure logger
+##########################################################################
+CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/logger.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/logger.h
+)
\ No newline at end of file
diff --git a/gnuradio-runtime/include/gnuradio/IcePy_Communicator.h b/gnuradio-runtime/include/gnuradio/IcePy_Communicator.h
new file mode 100644
index 0000000000..2dd0cc7bba
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/IcePy_Communicator.h
@@ -0,0 +1,35 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEPY_COMMUNICATOR_H
+#define ICEPY_COMMUNICATOR_H
+
+#include <Ice/CommunicatorF.h>
+#include <gnuradio/api.h>
+
+namespace IcePy
+{
+
+extern PyTypeObject CommunicatorType;
+
+GR_RUNTIME_API bool initCommunicator(PyObject*);
+
+GR_RUNTIME_API Ice::CommunicatorPtr getCommunicator(PyObject*);
+
+GR_RUNTIME_API PyObject* createCommunicator(const Ice::CommunicatorPtr&);
+GR_RUNTIME_API PyObject* getCommunicatorWrapper(const Ice::CommunicatorPtr&);
+
+}
+
+extern "C" PyObject* IcePy_initialize(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_initializeWithProperties(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_initializeWithLogger(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_initializeWithPropertiesAndLogger(PyObject*, PyObject*);
+
+#endif
diff --git a/gnuradio-runtime/include/gnuradio/api.h b/gnuradio-runtime/include/gnuradio/api.h
new file mode 100644
index 0000000000..1c68b8c8b8
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_RUNTIME_API_H
+#define INCLUDED_GR_RUNTIME_RUNTIME_API_H
+
+#include <gnuradio/attributes.h>
+
+#ifdef gnuradio_runtime_EXPORTS
+# define GR_RUNTIME_API __GR_ATTR_EXPORT
+#else
+# define GR_RUNTIME_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_GR_RUNTIME_RUNTIME_API_H */
diff --git a/gnuradio-runtime/include/gnuradio/attributes.h b/gnuradio-runtime/include/gnuradio/attributes.h
new file mode 100644
index 0000000000..5baa52e7d3
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/attributes.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GNURADIO_ATTRIBUTES_H
+#define INCLUDED_GNURADIO_ATTRIBUTES_H
+
+////////////////////////////////////////////////////////////////////////
+// Cross-platform attribute macros
+////////////////////////////////////////////////////////////////////////
+#if defined __GNUC__
+# define __GR_ATTR_ALIGNED(x) __attribute__((aligned(x)))
+# define __GR_ATTR_UNUSED __attribute__((unused))
+# define __GR_ATTR_INLINE __attribute__((always_inline))
+# define __GR_ATTR_DEPRECATED __attribute__((deprecated))
+# if __GNUC__ >= 4
+# define __GR_ATTR_EXPORT __attribute__((visibility("default")))
+# define __GR_ATTR_IMPORT __attribute__((visibility("default")))
+# else
+# define __GR_ATTR_EXPORT
+# define __GR_ATTR_IMPORT
+# endif
+#elif _MSC_VER
+# define __GR_ATTR_ALIGNED(x) __declspec(align(x))
+# define __GR_ATTR_UNUSED
+# define __GR_ATTR_INLINE __forceinline
+# define __GR_ATTR_DEPRECATED __declspec(deprecated)
+# define __GR_ATTR_EXPORT __declspec(dllexport)
+# define __GR_ATTR_IMPORT __declspec(dllimport)
+#else
+# define __GR_ATTR_ALIGNED(x)
+# define __GR_ATTR_UNUSED
+# define __GR_ATTR_INLINE
+# define __GR_ATTR_DEPRECATED
+# define __GR_ATTR_EXPORT
+# define __GR_ATTR_IMPORT
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// define inline when building C
+////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
+# define inline __inline
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// suppress warnings
+////////////////////////////////////////////////////////////////////////
+#ifdef _MSC_VER
+# pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
+# pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
+# pragma warning(disable: 4244) // conversion from 'double' to 'float', possible loss of data
+# pragma warning(disable: 4305) // 'initializing' : truncation from 'double' to 'float'
+# pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
+#endif /* INCLUDED_GNURADIO_ATTRIBUTES_H */
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
new file mode 100644
index 0000000000..be385465d1
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/basic_block.h
@@ -0,0 +1,354 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2008,2009,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_BASIC_BLOCK_H
+#define INCLUDED_GR_BASIC_BLOCK_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/sptr_magic.h>
+#include <gnuradio/msg_accepter.h>
+#include <gnuradio/runtime_types.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/thread/thread.h>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/function.hpp>
+#include <boost/foreach.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <iostream>
+#include <string>
+#include <deque>
+#include <map>
+
+#ifdef GR_CTRLPORT
+#include <gnuradio/rpcregisterhelpers.h>
+#endif
+
+namespace gr {
+
+ /*!
+ * \brief The abstract base class for all signal processing blocks.
+ * \ingroup internal
+ *
+ * Basic blocks are the bare abstraction of an entity that has a
+ * name, a set of inputs and outputs, and a message queue. These
+ * are never instantiated directly; rather, this is the abstract
+ * parent class of both gr_hier_block, which is a recursive
+ * container, and block, which implements actual signal
+ * processing functions.
+ */
+ class GR_RUNTIME_API basic_block : public msg_accepter,
+ public boost::enable_shared_from_this<basic_block>
+ {
+ typedef boost::function<void(pmt::pmt_t)> msg_handler_t;
+
+ private:
+ //msg_handler_t d_msg_handler;
+ typedef std::map<pmt::pmt_t , msg_handler_t, pmt::comperator> d_msg_handlers_t;
+ d_msg_handlers_t d_msg_handlers;
+
+ typedef std::deque<pmt::pmt_t> msg_queue_t;
+ typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comperator> msg_queue_map_t;
+ typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comperator>::iterator msg_queue_map_itr;
+ std::map<pmt::pmt_t, boost::shared_ptr<boost::condition_variable>, pmt::comperator> msg_queue_ready;
+
+ gr::thread::mutex mutex; //< protects all vars
+
+ protected:
+ friend class flowgraph;
+ friend class flat_flowgraph; // TODO: will be redundant
+ friend class tpb_thread_body;
+
+ enum vcolor { WHITE, GREY, BLACK };
+
+ std::string d_name;
+ gr::io_signature::sptr d_input_signature;
+ gr::io_signature::sptr d_output_signature;
+ long d_unique_id;
+ long d_symbolic_id;
+ std::string d_symbol_name;
+ std::string d_symbol_alias;
+ vcolor d_color;
+ bool d_rpc_set;
+
+ msg_queue_map_t msg_queue;
+ std::vector<boost::any> d_rpc_vars; // container for all RPC variables
+
+ basic_block(void) {} // allows pure virtual interface sub-classes
+
+ //! Protected constructor prevents instantiation by non-derived classes
+ basic_block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ //! may only be called during constructor
+ void set_input_signature(gr::io_signature::sptr iosig) {
+ d_input_signature = iosig;
+ }
+
+ //! may only be called during constructor
+ void set_output_signature(gr::io_signature::sptr iosig) {
+ d_output_signature = iosig;
+ }
+
+ /*!
+ * \brief Allow the flowgraph to set for sorting and partitioning
+ */
+ void set_color(vcolor color) { d_color = color; }
+ vcolor color() const { return d_color; }
+
+ /*!
+ * \brief Tests if there is a handler attached to port \p which_port
+ */
+ bool has_msg_handler(pmt::pmt_t which_port) {
+ return (d_msg_handlers.find(which_port) != d_msg_handlers.end());
+ }
+
+ /*
+ * This function is called by the runtime system to dispatch messages.
+ *
+ * The thread-safety guarantees mentioned in set_msg_handler are
+ * implemented by the callers of this method.
+ */
+ virtual void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ // AA Update this
+ if(has_msg_handler(which_port)) { // Is there a handler?
+ d_msg_handlers[which_port](msg); // Yes, invoke it.
+ }
+ }
+
+ // Message passing interface
+ pmt::pmt_t message_subscribers;
+
+ public:
+ virtual ~basic_block();
+ long unique_id() const { return d_unique_id; }
+ long symbolic_id() const { return d_symbolic_id; }
+ std::string name() const { return d_name; }
+ std::string symbol_name() const { return d_symbol_name; }
+ gr::io_signature::sptr input_signature() const { return d_input_signature; }
+ gr::io_signature::sptr output_signature() const { return d_output_signature; }
+ basic_block_sptr to_basic_block(); // Needed for Python type coercion
+ bool alias_set() { return !d_symbol_alias.empty(); }
+ std::string alias(){ return alias_set()?d_symbol_alias:symbol_name(); }
+ pmt::pmt_t alias_pmt(){ return pmt::intern(alias()); }
+ void set_block_alias(std::string name);
+
+ // ** Message passing interface **
+ void message_port_register_in(pmt::pmt_t port_id);
+ void message_port_register_out(pmt::pmt_t port_id);
+ void message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg);
+ void message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target);
+ void message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target);
+
+ virtual bool message_port_is_hier(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier\n"; return false; }
+ virtual bool message_port_is_hier_in(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_in\n"; return false; }
+ virtual bool message_port_is_hier_out(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_out\n"; return false; }
+
+ /*!
+ * \brief Get input message port names.
+ *
+ * Returns the available input message ports for a block. The
+ * return object is a PMT vector that is filled with PMT symbols.
+ */
+ pmt::pmt_t message_ports_in();
+
+ /*!
+ * \brief Get output message port names.
+ *
+ * Returns the available output message ports for a block. The
+ * return object is a PMT vector that is filled with PMT symbols.
+ */
+ pmt::pmt_t message_ports_out();
+
+ /*!
+ * Accept msg, place in queue, arrange for thread to be awakened if it's not already.
+ */
+ void _post(pmt::pmt_t which_port, pmt::pmt_t msg);
+
+ //! is the queue empty?
+ //bool empty_p(const pmt::pmt_t &which_port) const { return msg_queue[which_port].empty(); }
+ bool empty_p(pmt::pmt_t which_port) {
+ if(msg_queue.find(which_port) == msg_queue.end())
+ throw std::runtime_error("port does not exist!");
+ return msg_queue[which_port].empty();
+ }
+ bool empty_p() {
+ bool rv = true;
+ BOOST_FOREACH(msg_queue_map_t::value_type &i, msg_queue) {
+ rv &= msg_queue[i.first].empty();
+ }
+ return rv;
+ }
+
+ //! How many messages in the queue?
+ size_t nmsgs(pmt::pmt_t which_port) {
+ if(msg_queue.find(which_port) == msg_queue.end())
+ throw std::runtime_error("port does not exist!");
+ return msg_queue[which_port].size();
+ }
+
+ //| Acquires and release the mutex
+ void insert_tail( pmt::pmt_t which_port, pmt::pmt_t msg);
+ /*!
+ * \returns returns pmt at head of queue or pmt::pmt_t() if empty.
+ */
+ pmt::pmt_t delete_head_nowait( pmt::pmt_t which_port);
+
+ /*!
+ * \returns returns pmt at head of queue or pmt::pmt_t() if empty.
+ */
+ pmt::pmt_t delete_head_blocking( pmt::pmt_t which_port);
+
+ msg_queue_t::iterator get_iterator(pmt::pmt_t which_port) {
+ return msg_queue[which_port].begin();
+ }
+
+ void erase_msg(pmt::pmt_t which_port, msg_queue_t::iterator it) {
+ msg_queue[which_port].erase(it);
+ }
+
+ virtual bool has_msg_port(pmt::pmt_t which_port) {
+ if(msg_queue.find(which_port) != msg_queue.end()) {
+ return true;
+ }
+ if(pmt::dict_has_key(message_subscribers, which_port)) {
+ return true;
+ }
+ return false;
+ }
+
+#ifdef GR_CTRLPORT
+ /*!
+ * \brief Add an RPC variable (get or set).
+ *
+ * Using controlport, we create new getters/setters and need to
+ * store them. Each block has a vector to do this, and these never
+ * need to be accessed again once they are registered with the RPC
+ * backend. This function takes a
+ * boost::shared_sptr<rpcbasic_base> so that when the block is
+ * deleted, all RPC registered variables are cleaned up.
+ *
+ * \param s an rpcbasic_sptr of the new RPC variable register to store.
+ */
+ void add_rpc_variable(rpcbasic_sptr s)
+ {
+ d_rpc_vars.push_back(s);
+ }
+#endif /* GR_CTRLPORT */
+
+ /*!
+ * \brief Set up the RPC registered variables.
+ *
+ * This must be overloaded by a block that wants to use
+ * controlport. This is where rpcbasic_register_{get,set} pointers
+ * are created, which then get wrapped as shared pointers
+ * (rpcbasic_sptr(...)) and stored using add_rpc_variable.
+ */
+ virtual void setup_rpc() {};
+
+ /*!
+ * \brief Ask if this block has been registered to the RPC.
+ *
+ * We can only register a block once, so we use this to protect us
+ * from calling it multiple times.
+ */
+ bool is_rpc_set() { return d_rpc_set; }
+
+ /*!
+ * \brief When the block is registered with the RPC, set this.
+ */
+ void rpc_set() { d_rpc_set = true; }
+
+ /*!
+ * \brief Confirm that ninputs and noutputs is an acceptable combination.
+ *
+ * \param ninputs number of input streams connected
+ * \param noutputs number of output streams connected
+ *
+ * \returns true if this is a valid configuration for this block.
+ *
+ * This function is called by the runtime system whenever the
+ * topology changes. Most classes do not need to override this.
+ * This check is in addition to the constraints specified by the
+ * input and output gr::io_signatures.
+ */
+ virtual bool check_topology(int ninputs, int noutputs) {
+ (void)ninputs;
+ (void)noutputs;
+ return true;
+ }
+
+ /*!
+ * \brief Set the callback that is fired when messages are available.
+ *
+ * \p msg_handler can be any kind of function pointer or function object
+ * that has the signature:
+ * <pre>
+ * void msg_handler(pmt::pmt msg);
+ * </pre>
+ *
+ * (You may want to use boost::bind to massage your callable into
+ * the correct form. See gr::blocks::nop for an example that sets
+ * up a class method as the callback.)
+ *
+ * Blocks that desire to handle messages must call this method in
+ * their constructors to register the handler that will be invoked
+ * when messages are available.
+ *
+ * If the block inherits from block, the runtime system will
+ * ensure that msg_handler is called in a thread-safe manner, such
+ * that work and msg_handler will never be called concurrently.
+ * This allows msg_handler to update state variables without
+ * having to worry about thread-safety issues with work,
+ * general_work or another invocation of msg_handler.
+ *
+ * If the block inherits from hier_block2, the runtime system
+ * will ensure that no reentrant calls are made to msg_handler.
+ */
+ template <typename T> void set_msg_handler(pmt::pmt_t which_port, T msg_handler) {
+ if(msg_queue.find(which_port) == msg_queue.end()) {
+ throw std::runtime_error("attempt to set_msg_handler() on bad input message port!");
+ }
+ d_msg_handlers[which_port] = msg_handler_t(msg_handler);
+ }
+ };
+
+ inline bool operator<(basic_block_sptr lhs, basic_block_sptr rhs)
+ {
+ return lhs->unique_id() < rhs->unique_id();
+ }
+
+ typedef std::vector<basic_block_sptr> basic_block_vector_t;
+ typedef std::vector<basic_block_sptr>::iterator basic_block_viter_t;
+
+ GR_RUNTIME_API long basic_block_ncurrently_allocated();
+
+ inline std::ostream &operator << (std::ostream &os, basic_block_sptr basic_block)
+ {
+ os << basic_block->name() << "(" << basic_block->unique_id() << ")";
+ return os;
+ }
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_BASIC_BLOCK_H */
diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h
new file mode 100644
index 0000000000..fd6c48c29b
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/block.h
@@ -0,0 +1,714 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2009,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_BLOCK_H
+#define INCLUDED_GR_RUNTIME_BLOCK_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/basic_block.h>
+#include <gnuradio/tags.h>
+#include <gnuradio/logger.h>
+
+namespace gr {
+
+ /*!
+ * \brief The abstract base class for all 'terminal' processing blocks.
+ * \ingroup base_blk
+ *
+ * A signal processing flow is constructed by creating a tree of
+ * hierarchical blocks, which at any level may also contain terminal
+ * nodes that actually implement signal processing functions. This
+ * is the base class for all such leaf nodes.
+ *
+ * Blocks have a set of input streams and output streams. The
+ * input_signature and output_signature define the number of input
+ * streams and output streams respectively, and the type of the data
+ * items in each stream.
+ *
+ * Although blocks may consume data on each input stream at a
+ * different rate, all outputs streams must produce data at the same
+ * rate. That rate may be different from any of the input rates.
+ *
+ * User derived blocks override two methods, forecast and
+ * general_work, to implement their signal processing
+ * behavior. forecast is called by the system scheduler to determine
+ * how many items are required on each input stream in order to
+ * produce a given number of output items.
+ *
+ * general_work is called to perform the signal processing in the
+ * block. It reads the input items and writes the output items.
+ */
+ class GR_RUNTIME_API block : public basic_block
+ {
+ public:
+
+ //! Magic return values from general_work
+ enum {
+ WORK_CALLED_PRODUCE = -2,
+ WORK_DONE = -1
+ };
+
+ enum tag_propagation_policy_t {
+ TPP_DONT = 0,
+ TPP_ALL_TO_ALL = 1,
+ TPP_ONE_TO_ONE = 2
+ };
+
+ virtual ~block();
+
+ /*!
+ * Assume block computes y_i = f(x_i, x_i-1, x_i-2, x_i-3...)
+ * History is the number of x_i's that are examined to produce one y_i.
+ * This comes in handy for FIR filters, where we use history to
+ * ensure that our input contains the appropriate "history" for the
+ * filter. History should be equal to the number of filter taps.
+ */
+ unsigned history() const { return d_history; }
+ void set_history(unsigned history) { d_history = history; }
+
+ /*!
+ * \brief Return true if this block has a fixed input to output rate.
+ *
+ * If true, then fixed_rate_in_to_out and fixed_rate_out_to_in may be called.
+ */
+ bool fixed_rate() const { return d_fixed_rate; }
+
+ // ----------------------------------------------------------------
+ // override these to define your behavior
+ // ----------------------------------------------------------------
+
+ /*!
+ * \brief Estimate input requirements given output request
+ *
+ * \param noutput_items number of output items to produce
+ * \param ninput_items_required number of input items required on each input stream
+ *
+ * Given a request to product \p noutput_items, estimate the
+ * number of data items required on each input stream. The
+ * estimate doesn't have to be exact, but should be close.
+ */
+ virtual void forecast(int noutput_items,
+ gr_vector_int &ninput_items_required);
+
+ /*!
+ * \brief compute output items from input items
+ *
+ * \param noutput_items number of output items to write on each output stream
+ * \param ninput_items number of input items available on each input stream
+ * \param input_items vector of pointers to the input items, one entry per input stream
+ * \param output_items vector of pointers to the output items, one entry per output stream
+ *
+ * \returns number of items actually written to each output stream, or -1 on EOF.
+ * It is OK to return a value less than noutput_items. -1 <= return value <= noutput_items
+ *
+ * general_work must call consume or consume_each to indicate how
+ * many items were consumed on each input stream.
+ */
+ virtual int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ /*!
+ * \brief Called to enable drivers, etc for i/o devices.
+ *
+ * This allows a block to enable an associated driver to begin
+ * transfering data just before we start to execute the scheduler.
+ * The end result is that this reduces latency in the pipeline
+ * when dealing with audio devices, usrps, etc.
+ */
+ virtual bool start();
+
+ /*!
+ * \brief Called to disable drivers, etc for i/o devices.
+ */
+ virtual bool stop();
+
+ // ----------------------------------------------------------------
+
+ /*!
+ * \brief Constrain the noutput_items argument passed to forecast and general_work
+ *
+ * set_output_multiple causes the scheduler to ensure that the
+ * noutput_items argument passed to forecast and general_work will
+ * be an integer multiple of \param multiple The default value of
+ * output multiple is 1.
+ */
+ void set_output_multiple(int multiple);
+ int output_multiple() const { return d_output_multiple; }
+ bool output_multiple_set() const { return d_output_multiple_set; }
+
+ /*!
+ * \brief Constrains buffers to work on a set item alignment (for SIMD)
+ *
+ * set_alignment_multiple causes the scheduler to ensure that the
+ * noutput_items argument passed to forecast and general_work will
+ * be an integer multiple of \param multiple The default value is
+ * 1.
+ *
+ * This control is similar to the output_multiple setting, except
+ * that if the number of items passed to the block is less than
+ * the output_multiple, this value is ignored and the block can
+ * produce like normal. The d_unaligned value is set to the number
+ * of items the block is off by. In the next call to general_work,
+ * the noutput_items is set to d_unaligned or less until
+ * d_unaligned==0. The buffers are now aligned again and the
+ * aligned calls can be performed again.
+ */
+ void set_alignment(int multiple);
+ int alignment() const { return d_output_multiple; }
+
+ void set_unaligned(int na);
+ int unaligned() const { return d_unaligned; }
+ void set_is_unaligned(bool u);
+ bool is_unaligned() const { return d_is_unaligned; }
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items of input stream \p
+ * which_input were consumed.
+ */
+ void consume(int which_input, int how_many_items);
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items were consumed on
+ * each input stream.
+ */
+ void consume_each(int how_many_items);
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items were produced on
+ * output stream \p which_output.
+ *
+ * If the block's general_work method calls produce, \p
+ * general_work must return WORK_CALLED_PRODUCE.
+ */
+ void produce(int which_output, int how_many_items);
+
+ /*!
+ * \brief Set the approximate output rate / input rate
+ *
+ * Provide a hint to the buffer allocator and scheduler.
+ * The default relative_rate is 1.0
+ *
+ * decimators have relative_rates < 1.0
+ * interpolators have relative_rates > 1.0
+ */
+ void set_relative_rate(double relative_rate);
+
+ /*!
+ * \brief return the approximate output rate / input rate
+ */
+ double relative_rate() const { return d_relative_rate; }
+
+ /*
+ * The following two methods provide special case info to the
+ * scheduler in the event that a block has a fixed input to output
+ * ratio. sync_block, sync_decimator and
+ * sync_interpolator override these. If you're fixed rate,
+ * subclass one of those.
+ */
+ /*!
+ * \brief Given ninput samples, return number of output samples that will be produced.
+ * N.B. this is only defined if fixed_rate returns true.
+ * Generally speaking, you don't need to override this.
+ */
+ virtual int fixed_rate_ninput_to_noutput(int ninput);
+
+ /*!
+ * \brief Given noutput samples, return number of input samples required to produce noutput.
+ * N.B. this is only defined if fixed_rate returns true.
+ * Generally speaking, you don't need to override this.
+ */
+ virtual int fixed_rate_noutput_to_ninput(int noutput);
+
+ /*!
+ * \brief Return the number of items read on input stream which_input
+ */
+ uint64_t nitems_read(unsigned int which_input);
+
+ /*!
+ * \brief Return the number of items written on output stream which_output
+ */
+ uint64_t nitems_written(unsigned int which_output);
+
+ /*!
+ * \brief Asks for the policy used by the scheduler to moved tags downstream.
+ */
+ tag_propagation_policy_t tag_propagation_policy();
+
+ /*!
+ * \brief Set the policy by the scheduler to determine how tags are moved downstream.
+ */
+ void set_tag_propagation_policy(tag_propagation_policy_t p);
+
+ /*!
+ * \brief Return the minimum number of output items this block can
+ * produce during a call to work.
+ *
+ * Should be 0 for most blocks. Useful if we're dealing with
+ * packets and the block produces one packet per call to work.
+ */
+ int min_noutput_items() const { return d_min_noutput_items; }
+
+ /*!
+ * \brief Set the minimum number of output items this block can
+ * produce during a call to work.
+ *
+ * \param m the minimum noutput_items this block can produce.
+ */
+ void set_min_noutput_items(int m) { d_min_noutput_items = m; }
+
+ /*!
+ * \brief Return the maximum number of output items this block will
+ * handle during a call to work.
+ */
+ int max_noutput_items();
+
+ /*!
+ * \brief Set the maximum number of output items this block will
+ * handle during a call to work.
+ *
+ * \param m the maximum noutput_items this block will handle.
+ */
+ void set_max_noutput_items(int m);
+
+ /*!
+ * \brief Clear the switch for using the max_noutput_items value of this block.
+ *
+ * When is_set_max_noutput_items() returns 'true', the scheduler
+ * will use the value returned by max_noutput_items() to limit the
+ * size of the number of items possible for this block's work
+ * function. If is_set_max_notput_items() returns 'false', then
+ * the scheduler ignores the internal value and uses the value set
+ * globally in the top_block.
+ *
+ * Use this value to clear the 'is_set' flag so the scheduler will
+ * ignore this. Use the set_max_noutput_items(m) call to both set
+ * a new value for max_noutput_items and to reenable its use in
+ * the scheduler.
+ */
+ void unset_max_noutput_items();
+
+ /*!
+ * \brief Ask the block if the flag is or is not set to use the
+ * internal value of max_noutput_items during a call to work.
+ */
+ bool is_set_max_noutput_items();
+
+ /*
+ * Used to expand the vectors that hold the min/max buffer sizes.
+ *
+ * Specifically, when -1 is used, the vectors are just initialized
+ * with 1 value; this is used by the flat_flowgraph to expand when
+ * required to add a new value for new ports on these blocks.
+ */
+ void expand_minmax_buffer(int port)
+ {
+ if((size_t)port >= d_max_output_buffer.size())
+ set_max_output_buffer(port, -1);
+ if((size_t)port >= d_min_output_buffer.size())
+ set_min_output_buffer(port, -1);
+ }
+
+ /*!
+ * \brief Returns max buffer size on output port \p i.
+ */
+ long max_output_buffer(size_t i)
+ {
+ if(i >= d_max_output_buffer.size())
+ throw std::invalid_argument("basic_block::max_output_buffer: port out of range.");
+ return d_max_output_buffer[i];
+ }
+
+ /*!
+ * \brief Sets max buffer size on all output ports.
+ */
+ void set_max_output_buffer(long max_output_buffer)
+ {
+ for(int i = 0; i < output_signature()->max_streams(); i++) {
+ set_max_output_buffer(i, max_output_buffer);
+ }
+ }
+
+ /*!
+ * \brief Sets max buffer size on output port \p port.
+ */
+ void set_max_output_buffer(int port, long max_output_buffer)
+ {
+ if((size_t)port >= d_max_output_buffer.size())
+ d_max_output_buffer.push_back(max_output_buffer);
+ else
+ d_max_output_buffer[port] = max_output_buffer;
+ }
+
+ /*!
+ * \brief Returns min buffer size on output port \p i.
+ */
+ long min_output_buffer(size_t i)
+ {
+ if(i >= d_min_output_buffer.size())
+ throw std::invalid_argument("basic_block::min_output_buffer: port out of range.");
+ return d_min_output_buffer[i];
+ }
+
+ /*!
+ * \brief Sets min buffer size on all output ports.
+ */
+ void set_min_output_buffer(long min_output_buffer)
+ {
+ for(int i=0; i<output_signature()->max_streams(); i++) {
+ set_min_output_buffer(i, min_output_buffer);
+ }
+ }
+
+ /*!
+ * \brief Sets min buffer size on output port \p port.
+ */
+ void set_min_output_buffer(int port, long min_output_buffer)
+ {
+ if((size_t)port >= d_min_output_buffer.size())
+ d_min_output_buffer.push_back(min_output_buffer);
+ else
+ d_min_output_buffer[port] = min_output_buffer;
+ }
+
+ // --------------- Performance counter functions -------------
+
+ /*!
+ * \brief Gets instantaneous noutput_items performance counter.
+ */
+ float pc_noutput_items();
+
+ /*!
+ * \brief Gets average noutput_items performance counter.
+ */
+ float pc_noutput_items_avg();
+
+ /*!
+ * \brief Gets variance of noutput_items performance counter.
+ */
+ float pc_noutput_items_var();
+
+ /*!
+ * \brief Gets instantaneous num items produced performance counter.
+ */
+ float pc_nproduced();
+
+ /*!
+ * \brief Gets average num items produced performance counter.
+ */
+ float pc_nproduced_avg();
+
+ /*!
+ * \brief Gets variance of num items produced performance counter.
+ */
+ float pc_nproduced_var();
+
+ /*!
+ * \brief Gets instantaneous fullness of \p which input buffer.
+ */
+ float pc_input_buffers_full(int which);
+
+ /*!
+ * \brief Gets average fullness of \p which input buffer.
+ */
+ float pc_input_buffers_full_avg(int which);
+
+ /*!
+ * \brief Gets variance of fullness of \p which input buffer.
+ */
+ float pc_input_buffers_full_var(int which);
+
+ /*!
+ * \brief Gets instantaneous fullness of all input buffers.
+ */
+ std::vector<float> pc_input_buffers_full();
+
+ /*!
+ * \brief Gets average fullness of all input buffers.
+ */
+ std::vector<float> pc_input_buffers_full_avg();
+
+ /*!
+ * \brief Gets variance of fullness of all input buffers.
+ */
+ std::vector<float> pc_input_buffers_full_var();
+
+ /*!
+ * \brief Gets instantaneous fullness of \p which input buffer.
+ */
+ float pc_output_buffers_full(int which);
+
+ /*!
+ * \brief Gets average fullness of \p which input buffer.
+ */
+ float pc_output_buffers_full_avg(int which);
+
+ /*!
+ * \brief Gets variance of fullness of \p which input buffer.
+ */
+ float pc_output_buffers_full_var(int which);
+
+ /*!
+ * \brief Gets instantaneous fullness of all output buffers.
+ */
+ std::vector<float> pc_output_buffers_full();
+
+ /*!
+ * \brief Gets average fullness of all output buffers.
+ */
+ std::vector<float> pc_output_buffers_full_avg();
+
+ /*!
+ * \brief Gets variance of fullness of all output buffers.
+ */
+ std::vector<float> pc_output_buffers_full_var();
+
+ /*!
+ * \brief Gets instantaneous clock cycles spent in work.
+ */
+ float pc_work_time();
+
+ /*!
+ * \brief Gets average clock cycles spent in work.
+ */
+ float pc_work_time_avg();
+
+ /*!
+ * \brief Gets average clock cycles spent in work.
+ */
+ float pc_work_time_var();
+
+ /*!
+ * \brief Resets the performance counters
+ */
+ void reset_perf_counters();
+
+ /*!
+ * \brief Sets up export of perf. counters to ControlPort. Only
+ * called by the scheduler.
+ */
+ void setup_pc_rpc();
+
+ /*!
+ * \brief Checks if this block is already exporting perf. counters
+ * to ControlPort.
+ */
+ bool is_pc_rpc_set() { return d_pc_rpc_set; }
+
+ /*!
+ * \brief If the block calls this in its constructor, it's
+ * perf. counters will not be exported.
+ */
+ void no_pc_rpc() { d_pc_rpc_set = true; }
+
+
+ // ----------------------------------------------------------------------------
+ // Functions to handle thread affinity
+
+ /*!
+ * \brief Set the thread's affinity to processor core \p n.
+ *
+ * \param mask a vector of ints of the core numbers available to this block.
+ */
+ void set_processor_affinity(const std::vector<int> &mask);
+
+ /*!
+ * \brief Remove processor affinity to a specific core.
+ */
+ void unset_processor_affinity();
+
+ /*!
+ * \brief Get the current processor affinity.
+ */
+ std::vector<int> processor_affinity() { return d_affinity; }
+
+ // ----------------------------------------------------------------------------
+
+ private:
+ int d_output_multiple;
+ bool d_output_multiple_set;
+ int d_unaligned;
+ bool d_is_unaligned;
+ double d_relative_rate; // approx output_rate / input_rate
+ block_detail_sptr d_detail; // implementation details
+ unsigned d_history;
+ bool d_fixed_rate;
+ bool d_max_noutput_items_set; // if d_max_noutput_items is valid
+ int d_max_noutput_items; // value of max_noutput_items for this block
+ int d_min_noutput_items;
+ tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream
+ std::vector<int> d_affinity; // thread affinity proc. mask
+ bool d_pc_rpc_set;
+
+ protected:
+ block(void) {} // allows pure virtual interface sub-classes
+ block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ void set_fixed_rate(bool fixed_rate) { d_fixed_rate = fixed_rate; }
+
+ /*!
+ * \brief Adds a new tag onto the given output buffer.
+ *
+ * \param which_output an integer of which output stream to attach the tag
+ * \param abs_offset a uint64 number of the absolute item number
+ * assicated with the tag. Can get from nitems_written.
+ * \param key the tag key as a PMT symbol
+ * \param value any PMT holding any value for the given key
+ * \param srcid optional source ID specifier; defaults to PMT_F
+ */
+ inline void add_item_tag(unsigned int which_output,
+ uint64_t abs_offset,
+ const pmt::pmt_t &key,
+ const pmt::pmt_t &value,
+ const pmt::pmt_t &srcid=pmt::PMT_F)
+ {
+ tag_t tag;
+ tag.offset = abs_offset;
+ tag.key = key;
+ tag.value = value;
+ tag.srcid = srcid;
+ this->add_item_tag(which_output, tag);
+ }
+
+ /*!
+ * \brief Adds a new tag onto the given output buffer.
+ *
+ * \param which_output an integer of which output stream to attach the tag
+ * \param tag the tag object to add
+ */
+ void add_item_tag(unsigned int which_output, const tag_t &tag);
+
+ /*!
+ * \brief Removes a tag from the given input buffer.
+ *
+ * \param which_input an integer of which input stream to remove the tag from
+ * \param abs_offset a uint64 number of the absolute item number
+ * assicated with the tag. Can get from nitems_written.
+ * \param key the tag key as a PMT symbol
+ * \param value any PMT holding any value for the given key
+ * \param srcid optional source ID specifier; defaults to PMT_F
+ *
+ * If no such tag is found, does nothing.
+ */
+ inline void remove_item_tag(unsigned int which_input,
+ uint64_t abs_offset,
+ const pmt::pmt_t &key,
+ const pmt::pmt_t &value,
+ const pmt::pmt_t &srcid=pmt::PMT_F)
+ {
+ tag_t tag;
+ tag.offset = abs_offset;
+ tag.key = key;
+ tag.value = value;
+ tag.srcid = srcid;
+ this->remove_item_tag(which_input, tag);
+ }
+
+ /*!
+ * \brief Removes a tag from the given input buffer.
+ *
+ * If no such tag is found, does nothing.
+ *
+ * \param which_input an integer of which input stream to remove the tag from
+ * \param tag the tag object to remove
+ */
+ void remove_item_tag(unsigned int which_input, const tag_t &tag);
+
+ /*!
+ * \brief Given a [start,end), returns a vector of all tags in the range.
+ *
+ * Range of counts is from start to end-1.
+ *
+ * Tags are tuples of:
+ * (item count, source id, key, value)
+ *
+ * \param v a vector reference to return tags into
+ * \param which_input an integer of which input stream to pull from
+ * \param abs_start a uint64 count of the start of the range of interest
+ * \param abs_end a uint64 count of the end of the range of interest
+ */
+ void get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end);
+
+ /*!
+ * \brief Given a [start,end), returns a vector of all tags in the
+ * range with a given key.
+ *
+ * Range of counts is from start to end-1.
+ *
+ * Tags are tuples of:
+ * (item count, source id, key, value)
+ *
+ * \param v a vector reference to return tags into
+ * \param which_input an integer of which input stream to pull from
+ * \param abs_start a uint64 count of the start of the range of interest
+ * \param abs_end a uint64 count of the end of the range of interest
+ * \param key a PMT symbol key to filter only tags of this key
+ */
+ void get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end,
+ const pmt::pmt_t &key);
+
+ std::vector<long> d_max_output_buffer;
+ std::vector<long> d_min_output_buffer;
+
+ /*! Used by block's setters and work functions to make
+ * setting/resetting of parameters thread-safe.
+ *
+ * Used by calling gr::thread::scoped_lock l(d_setlock);
+ */
+ gr::thread::mutex d_setlock;
+
+ /*! Used by blocks to access the logger system.
+ */
+ gr::logger_ptr d_logger;
+ gr::logger_ptr d_debug_logger;
+
+ // These are really only for internal use, but leaving them public avoids
+ // having to work up an ever-varying list of friend GR_RUNTIME_APIs
+
+ public:
+ block_detail_sptr detail() const { return d_detail; }
+ void set_detail(block_detail_sptr detail) { d_detail = detail; }
+ };
+
+ typedef std::vector<block_sptr> block_vector_t;
+ typedef std::vector<block_sptr>::iterator block_viter_t;
+
+ inline block_sptr cast_to_block_sptr(basic_block_sptr p)
+ {
+ return boost::dynamic_pointer_cast<block, basic_block>(p);
+ }
+
+ std::ostream&
+ operator << (std::ostream& os, const block *m);
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_BLOCK_H */
diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h
new file mode 100644
index 0000000000..0a8615a2b6
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/block_detail.h
@@ -0,0 +1,261 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more detail.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_BLOCK_DETAIL_H
+#define INCLUDED_GR_RUNTIME_BLOCK_DETAIL_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/runtime_types.h>
+#include <gnuradio/tpb_detail.h>
+#include <gnuradio/tags.h>
+#include <gnuradio/high_res_timer.h>
+#include <stdexcept>
+
+namespace gr {
+
+ /*!
+ * \brief Implementation details to support the signal processing abstraction
+ * \ingroup internal
+ *
+ * This class contains implementation detail that should be "out of
+ * sight" of almost all users of GNU Radio. This decoupling also
+ * means that we can make changes to the guts without having to
+ * recompile everything.
+ */
+ class GR_RUNTIME_API block_detail
+ {
+ public:
+ ~block_detail();
+
+ int ninputs() const { return d_ninputs; }
+ int noutputs() const { return d_noutputs; }
+ bool sink_p() const { return d_noutputs == 0; }
+ bool source_p() const { return d_ninputs == 0; }
+
+ void set_done(bool done);
+ bool done() const { return d_done; }
+
+ void set_input(unsigned int which, buffer_reader_sptr reader);
+ buffer_reader_sptr input(unsigned int which)
+ {
+ if(which >= d_ninputs)
+ throw std::invalid_argument("block_detail::input");
+ return d_input[which];
+ }
+
+ void set_output(unsigned int which, buffer_sptr buffer);
+ buffer_sptr output(unsigned int which)
+ {
+ if(which >= d_noutputs)
+ throw std::invalid_argument("block_detail::output");
+ return d_output[which];
+ }
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items of input stream \p
+ * which_input were consumed.
+ */
+ void consume(int which_input, int how_many_items);
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items were consumed on
+ * each input stream.
+ */
+ void consume_each(int how_many_items);
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items were produced on
+ * output stream \p which_output.
+ */
+ void produce(int which_output, int how_many_items);
+
+ /*!
+ * \brief Tell the scheduler \p how_many_items were produced on
+ * each output stream.
+ */
+ void produce_each(int how_many_items);
+
+ // Return the number of items read on input stream which_input
+ uint64_t nitems_read(unsigned int which_input);
+
+ // Return the number of items written on output stream which_output
+ uint64_t nitems_written(unsigned int which_output);
+
+ /*!
+ * \brief Adds a new tag to the given output stream.
+ *
+ * Calls gr::buffer::add_item_tag(),
+ * which appends the tag onto its deque.
+ *
+ * \param which_output an integer of which output stream to attach the tag
+ * \param tag the tag object to add
+ */
+ void add_item_tag(unsigned int which_output, const tag_t &tag);
+
+ /*!
+ * \brief Removes a tag from the given input stream.
+ *
+ * Calls gr::buffer::remove_item_tag(), which removes the tag from
+ * its deque.
+ *
+ * \param which_input an integer of which input stream to remove the tag from
+ * \param tag the tag object to add
+ */
+ void remove_item_tag(unsigned int which_input, const tag_t &tag);
+
+ /*!
+ * \brief Given a [start,end), returns a vector of all tags in the range.
+ *
+ * Pass-through function to gr::buffer_reader to get a vector of
+ * tags in given range. Range of counts is from start to end-1.
+ *
+ * Tags are tuples of:
+ * (item count, source id, key, value)
+ *
+ * \param v a vector reference to return tags into
+ * \param which_input an integer of which input stream to pull from
+ * \param abs_start a uint64 count of the start of the range of interest
+ * \param abs_end a uint64 count of the end of the range of interest
+ */
+ void get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end);
+
+ /*!
+ * \brief Given a [start,end), returns a vector of all tags in the
+ * range with a given key.
+ *
+ * Calls get_tags_in_range(which_input, abs_start, abs_end) to get
+ * a vector of tags from the buffers. This function then provides
+ * a secondary filter to the tags to extract only tags with the
+ * given 'key'.
+ *
+ * Tags are tuples of:
+ * (item count, source id, key, value)
+ *
+ * \param v a vector reference to return tags into
+ * \param which_input an integer of which input stream to pull from
+ * \param abs_start a uint64 count of the start of the range of interest
+ * \param abs_end a uint64 count of the end of the range of interest
+ * \param key a PMT symbol to select only tags of this key
+ */
+ void get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end,
+ const pmt::pmt_t &key);
+
+ /*!
+ * \brief Set core affinity of block to the cores in the vector
+ * mask.
+ *
+ * \param mask a vector of ints of the core numbers available to
+ * this block.
+ */
+ void set_processor_affinity(const std::vector<int> &mask);
+
+ /*!
+ * \brief Unset core affinity.
+ */
+ void unset_processor_affinity();
+
+ bool threaded; // set if thread is currently running.
+ gr::thread::gr_thread_t thread; // portable thread handle
+
+ void start_perf_counters();
+ void stop_perf_counters(int noutput_items, int nproduced);
+ void reset_perf_counters();
+
+ // Calls to get performance counter items
+ float pc_noutput_items();
+ float pc_nproduced();
+ float pc_input_buffers_full(size_t which);
+ std::vector<float> pc_input_buffers_full();
+ float pc_output_buffers_full(size_t which);
+ std::vector<float> pc_output_buffers_full();
+ float pc_work_time();
+
+ float pc_noutput_items_avg();
+ float pc_nproduced_avg();
+ float pc_input_buffers_full_avg(size_t which);
+ std::vector<float> pc_input_buffers_full_avg();
+ float pc_output_buffers_full_avg(size_t which);
+ std::vector<float> pc_output_buffers_full_avg();
+ float pc_work_time_avg();
+
+ float pc_noutput_items_var();
+ float pc_nproduced_var();
+ float pc_input_buffers_full_var(size_t which);
+ std::vector<float> pc_input_buffers_full_var();
+ float pc_output_buffers_full_var(size_t which);
+ std::vector<float> pc_output_buffers_full_var();
+ float pc_work_time_var();
+
+ tpb_detail d_tpb; // used by thread-per-block scheduler
+ int d_produce_or;
+
+ // ----------------------------------------------------------------------------
+
+ private:
+ unsigned int d_ninputs;
+ unsigned int d_noutputs;
+ std::vector<buffer_reader_sptr> d_input;
+ std::vector<buffer_sptr> d_output;
+ bool d_done;
+
+ // Performance counters
+ float d_ins_noutput_items;
+ float d_avg_noutput_items;
+ float d_var_noutput_items;
+ float d_ins_nproduced;
+ float d_avg_nproduced;
+ float d_var_nproduced;
+ std::vector<float> d_ins_input_buffers_full;
+ std::vector<float> d_avg_input_buffers_full;
+ std::vector<float> d_var_input_buffers_full;
+ std::vector<float> d_ins_output_buffers_full;
+ std::vector<float> d_avg_output_buffers_full;
+ std::vector<float> d_var_output_buffers_full;
+ gr::high_res_timer_type d_start_of_work, d_end_of_work;
+ float d_ins_work_time;
+ float d_avg_work_time;
+ float d_var_work_time;
+ float d_pc_counter;
+
+ block_detail(unsigned int ninputs, unsigned int noutputs);
+
+ friend struct tpb_detail;
+
+ friend GR_RUNTIME_API block_detail_sptr
+ make_block_detail(unsigned int ninputs, unsigned int noutputs);
+ };
+
+ GR_RUNTIME_API block_detail_sptr
+ make_block_detail(unsigned int ninputs, unsigned int noutputs);
+
+ GR_RUNTIME_API long
+ block_detail_ncurrently_allocated();
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_BLOCK_DETAIL_H */
diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h
new file mode 100644
index 0000000000..0f328de2e5
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/block_gateway.h
@@ -0,0 +1,271 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_RUNTIME_BLOCK_GATEWAY_H
+#define INCLUDED_RUNTIME_BLOCK_GATEWAY_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/feval.h>
+
+namespace gr {
+
+ /*!
+ * The work type enum tells the gateway what kind of block to
+ * implement. The choices are familiar gnuradio block overloads
+ * (sync, decim, interp).
+ */
+ enum block_gw_work_type {
+ GR_BLOCK_GW_WORK_GENERAL,
+ GR_BLOCK_GW_WORK_SYNC,
+ GR_BLOCK_GW_WORK_DECIM,
+ GR_BLOCK_GW_WORK_INTERP,
+ };
+
+ /*!
+ * Shared message structure between python and gateway.
+ * Each action type represents a scheduler-called function.
+ */
+ struct block_gw_message_type {
+ enum action_type {
+ ACTION_GENERAL_WORK, //dispatch work
+ ACTION_WORK, //dispatch work
+ ACTION_FORECAST, //dispatch forecast
+ ACTION_START, //dispatch start
+ ACTION_STOP, //dispatch stop
+ };
+
+ action_type action;
+
+ int general_work_args_noutput_items;
+ std::vector<int> general_work_args_ninput_items;
+ std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig cant int cast it right
+ std::vector<void *> general_work_args_output_items;
+ int general_work_args_return_value;
+
+ int work_args_ninput_items;
+ int work_args_noutput_items;
+ std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig cant int cast it right
+ std::vector<void *> work_args_output_items;
+ int work_args_return_value;
+
+ int forecast_args_noutput_items;
+ std::vector<int> forecast_args_ninput_items_required;
+
+ bool start_args_return_value;
+
+ bool stop_args_return_value;
+ };
+
+ /*!
+ * The gateway block which performs all the magic.
+ *
+ * The gateway provides access to all the gr::block routines.
+ * The methods prefixed with gr::block__ are renamed
+ * to class methods without the prefix in python.
+ */
+ class GR_RUNTIME_API block_gateway : virtual public gr::block
+ {
+ public:
+ // gr::block_gateway::sptr
+ typedef boost::shared_ptr<block_gateway> sptr;
+
+ /*!
+ * Make a new gateway block.
+ * \param handler the swig director object with callback
+ * \param name the name of the block (Ex: "Shirley")
+ * \param in_sig the input signature for this block
+ * \param out_sig the output signature for this block
+ * \param work_type the type of block overload to implement
+ * \param factor the decimation or interpolation factor
+ * \return a new gateway block
+ */
+ static sptr make(gr::feval_ll *handler,
+ const std::string &name,
+ gr::io_signature::sptr in_sig,
+ gr::io_signature::sptr out_sig,
+ const block_gw_work_type work_type,
+ const unsigned factor);
+
+ //! Provide access to the shared message object
+ virtual block_gw_message_type &block_message(void) = 0;
+
+ long block__unique_id(void) const {
+ return gr::block::unique_id();
+ }
+
+ std::string block__name(void) const {
+ return gr::block::name();
+ }
+
+ unsigned block__history(void) const {
+ return gr::block::history();
+ }
+
+ void block__set_history(unsigned history) {
+ return gr::block::set_history(history);
+ }
+
+ void block__set_fixed_rate(bool fixed_rate) {
+ return gr::block::set_fixed_rate(fixed_rate);
+ }
+
+ bool block__fixed_rate(void) const {
+ return gr::block::fixed_rate();
+ }
+
+ void block__set_output_multiple(int multiple) {
+ return gr::block::set_output_multiple(multiple);
+ }
+
+ int block__output_multiple(void) const {
+ return gr::block::output_multiple();
+ }
+
+ void block__consume(int which_input, int how_many_items) {
+ return gr::block::consume(which_input, how_many_items);
+ }
+
+ void block__consume_each(int how_many_items) {
+ return gr::block::consume_each(how_many_items);
+ }
+
+ void block__produce(int which_output, int how_many_items) {
+ return gr::block::produce(which_output, how_many_items);
+ }
+
+ void block__set_relative_rate(double relative_rate) {
+ return gr::block::set_relative_rate(relative_rate);
+ }
+
+ double block__relative_rate(void) const {
+ return gr::block::relative_rate();
+ }
+
+ uint64_t block__nitems_read(unsigned int which_input) {
+ return gr::block::nitems_read(which_input);
+ }
+
+ uint64_t block__nitems_written(unsigned int which_output) {
+ return gr::block::nitems_written(which_output);
+ }
+
+ block::tag_propagation_policy_t block__tag_propagation_policy(void) {
+ return gr::block::tag_propagation_policy();
+ }
+
+ void block__set_tag_propagation_policy(block::tag_propagation_policy_t p) {
+ return gr::block::set_tag_propagation_policy(p);
+ }
+
+ void block__add_item_tag(unsigned int which_output,
+ const tag_t &tag)
+ {
+ return gr::block::add_item_tag(which_output, tag);
+ }
+
+ void block__add_item_tag(unsigned int which_output,
+ uint64_t abs_offset,
+ const pmt::pmt_t &key,
+ const pmt::pmt_t &value,
+ const pmt::pmt_t &srcid=pmt::PMT_F)
+ {
+ return gr::block::add_item_tag(which_output, abs_offset,
+ key, value, srcid);
+ }
+
+ std::vector<tag_t> block__get_tags_in_range(unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end)
+ {
+ std::vector<gr::tag_t> tags;
+ gr::block::get_tags_in_range(tags, which_input, abs_start, abs_end);
+ return tags;
+ }
+
+ std::vector<tag_t> block__get_tags_in_range(unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end,
+ const pmt::pmt_t &key)
+ {
+ std::vector<gr::tag_t> tags;
+ gr::block::get_tags_in_range(tags, which_input, abs_start, abs_end, key);
+ return tags;
+ }
+
+ /* Message passing interface */
+ void block__message_port_register_in(pmt::pmt_t port_id) {
+ gr::basic_block::message_port_register_in(port_id);
+ }
+
+ void block__message_port_register_out(pmt::pmt_t port_id) {
+ gr::basic_block::message_port_register_out(port_id);
+ }
+
+ void block__message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg) {
+ gr::basic_block::message_port_pub(port_id, msg);
+ }
+
+ void block__message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target) {
+ gr::basic_block::message_port_sub(port_id, target);
+ }
+
+ void block__message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target) {
+ gr::basic_block::message_port_unsub(port_id, target);
+ }
+
+ pmt::pmt_t block__message_ports_in() {
+ return gr::basic_block::message_ports_in();
+ }
+
+ pmt::pmt_t block__message_ports_out() {
+ return gr::basic_block::message_ports_out();
+ }
+
+ void set_msg_handler_feval(pmt::pmt_t which_port, gr::feval_p *msg_handler)
+ {
+ if(msg_queue.find(which_port) == msg_queue.end()) {
+ throw std::runtime_error("attempt to set_msg_handler_feval() on bad input message port!");
+ }
+ d_msg_handlers_feval[which_port] = msg_handler;
+ }
+
+ protected:
+ typedef std::map<pmt::pmt_t, feval_p *, pmt::comperator> msg_handlers_feval_t;
+ msg_handlers_feval_t d_msg_handlers_feval;
+
+ void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ // Is there a handler?
+ if(d_msg_handlers_feval.find(which_port) != d_msg_handlers_feval.end()) {
+ d_msg_handlers_feval[which_port]->calleval(msg); // Yes, invoke it.
+ }
+ else {
+ // Pass to generic dispatcher if not found
+ gr::basic_block::dispatch_msg(which_port, msg);
+ }
+ }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_RUNTIME_BLOCK_GATEWAY_H */
diff --git a/gnuradio-runtime/include/gnuradio/block_registry.h b/gnuradio-runtime/include/gnuradio/block_registry.h
new file mode 100644
index 0000000000..f94be2dafb
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/block_registry.h
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_RUNTIME_BLOCK_REGISTRY_H
+#define GR_RUNTIME_BLOCK_REGISTRY_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/basic_block.h>
+#include <map>
+
+namespace gr {
+
+#ifndef GR_BASIC_BLOCK_H
+ class basic_block;
+ class block;
+#endif
+
+ class GR_RUNTIME_API block_registry
+ {
+ public:
+ block_registry();
+
+ long block_register(basic_block* block);
+ void block_unregister(basic_block* block);
+
+ std::string register_symbolic_name(basic_block* block);
+ void register_symbolic_name(basic_block* block, std::string name);
+
+ basic_block_sptr block_lookup(pmt::pmt_t symbol);
+
+ void register_primitive(std::string blk, gr::block* ref);
+ void unregister_primitive(std::string blk);
+ void notify_blk(std::string blk);
+
+ private:
+ //typedef std::map< long, basic_block_sptr > blocksubmap_t;
+ typedef std::map< long, basic_block* > blocksubmap_t;
+ typedef std::map< std::string, blocksubmap_t > blockmap_t;
+
+ blockmap_t d_map;
+ pmt::pmt_t d_ref_map;
+ std::map< std::string, block*> primitive_map;
+ };
+
+} /* namespace gr */
+
+GR_RUNTIME_API extern gr::block_registry global_block_registry;
+
+#endif /* GR_RUNTIME_BLOCK_REGISTRY_H */
diff --git a/gnuradio-runtime/include/gnuradio/buffer.h b/gnuradio-runtime/include/gnuradio/buffer.h
new file mode 100644
index 0000000000..490c8e0e9f
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/buffer.h
@@ -0,0 +1,302 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009-2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_BUFFER_H
+#define INCLUDED_GR_RUNTIME_BUFFER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/runtime_types.h>
+#include <gnuradio/tags.h>
+#include <boost/weak_ptr.hpp>
+#include <gnuradio/thread/thread.h>
+#include <deque>
+
+namespace gr {
+
+ class vmcircbuf;
+
+ /*!
+ * \brief Allocate a buffer that holds at least \p nitems of size \p sizeof_item.
+ *
+ * The total size of the buffer will be rounded up to a system
+ * dependent boundary. This is typically the system page size, but
+ * under MS windows is 64KB.
+ *
+ * \param nitems is the minimum number of items the buffer will hold.
+ * \param sizeof_item is the size of an item in bytes.
+ * \param link is the block that writes to this buffer.
+ */
+ GR_RUNTIME_API buffer_sptr make_buffer(int nitems, size_t sizeof_item,
+ block_sptr link=block_sptr());
+
+ /*!
+ * \brief Single writer, multiple reader fifo.
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API buffer
+ {
+ public:
+ virtual ~buffer();
+
+ /*!
+ * \brief return number of items worth of space available for writing
+ */
+ int space_available();
+
+ /*!
+ * \brief return size of this buffer in items
+ */
+ int bufsize() const { return d_bufsize; }
+
+ /*!
+ * \brief return pointer to write buffer.
+ *
+ * The return value points at space that can hold at least
+ * space_available() items.
+ */
+ void *write_pointer();
+
+ /*!
+ * \brief tell buffer that we wrote \p nitems into it
+ */
+ void update_write_pointer(int nitems);
+
+ void set_done(bool done);
+ bool done() const { return d_done; }
+
+ /*!
+ * \brief Return the block that writes to this buffer.
+ */
+ block_sptr link() { return block_sptr(d_link); }
+
+ size_t nreaders() const { return d_readers.size(); }
+ buffer_reader* reader(size_t index) { return d_readers[index]; }
+
+ gr::thread::mutex *mutex() { return &d_mutex; }
+
+ uint64_t nitems_written() { return d_abs_write_offset; }
+
+ size_t get_sizeof_item() { return d_sizeof_item; }
+
+ /*!
+ * \brief Adds a new tag to the buffer.
+ *
+ * \param tag the new tag
+ */
+ void add_item_tag(const tag_t &tag);
+
+ /*!
+ * \brief Removes an existing tag from the buffer.
+ *
+ * If no such tag is found, does nothing.
+ *
+ * \param tag the tag that needs to be removed
+ */
+ void remove_item_tag(const tag_t &tag);
+
+ /*!
+ * \brief Removes all tags before \p max_time from buffer
+ *
+ * \param max_time the time (item number) to trim up until.
+ */
+ void prune_tags(uint64_t max_time);
+
+ std::deque<tag_t>::iterator get_tags_begin() { return d_item_tags.begin(); }
+ std::deque<tag_t>::iterator get_tags_end() { return d_item_tags.end(); }
+
+ // -------------------------------------------------------------------------
+
+ private:
+ friend class buffer_reader;
+ friend GR_RUNTIME_API buffer_sptr make_buffer(int nitems, size_t sizeof_item, block_sptr link);
+ friend GR_RUNTIME_API buffer_reader_sptr buffer_add_reader(buffer_sptr buf, int nzero_preload, block_sptr link);
+
+ protected:
+ char *d_base; // base address of buffer
+ unsigned int d_bufsize; // in items
+ private:
+ gr::vmcircbuf *d_vmcircbuf;
+ size_t d_sizeof_item; // in bytes
+ std::vector<buffer_reader *> d_readers;
+ boost::weak_ptr<block> d_link; // block that writes to this buffer
+
+ //
+ // The mutex protects d_write_index, d_abs_write_offset, d_done, d_item_tags
+ // and the d_read_index's and d_abs_read_offset's in the buffer readers.
+ //
+ gr::thread::mutex d_mutex;
+ unsigned int d_write_index; // in items [0,d_bufsize)
+ uint64_t d_abs_write_offset; // num items written since the start
+ bool d_done;
+ std::deque<tag_t> d_item_tags;
+ uint64_t d_last_min_items_read;
+
+ unsigned index_add(unsigned a, unsigned b)
+ {
+ unsigned s = a + b;
+
+ if(s >= d_bufsize)
+ s -= d_bufsize;
+
+ assert(s < d_bufsize);
+ return s;
+ }
+
+ unsigned index_sub(unsigned a, unsigned b)
+ {
+ int s = a - b;
+
+ if(s < 0)
+ s += d_bufsize;
+
+ assert((unsigned) s < d_bufsize);
+ return s;
+ }
+
+ virtual bool allocate_buffer(int nitems, size_t sizeof_item);
+
+ /*!
+ * \brief constructor is private. Use gr_make_buffer to create instances.
+ *
+ * Allocate a buffer that holds at least \p nitems of size \p sizeof_item.
+ *
+ * \param nitems is the minimum number of items the buffer will hold.
+ * \param sizeof_item is the size of an item in bytes.
+ * \param link is the block that writes to this buffer.
+ *
+ * The total size of the buffer will be rounded up to a system
+ * dependent boundary. This is typically the system page size, but
+ * under MS windows is 64KB.
+ */
+ buffer(int nitems, size_t sizeof_item, block_sptr link);
+
+ /*!
+ * \brief disassociate \p reader from this buffer
+ */
+ void drop_reader(buffer_reader *reader);
+ };
+
+ /*!
+ * \brief Create a new gr::buffer_reader and attach it to buffer \p buf
+ * \param buf is the buffer the \p gr::buffer_reader reads from.
+ * \param nzero_preload -- number of zero items to "preload" into buffer.
+ * \param link is the block that reads from the buffer using this gr::buffer_reader.
+ */
+ GR_RUNTIME_API buffer_reader_sptr
+ buffer_add_reader(buffer_sptr buf, int nzero_preload, block_sptr link=block_sptr());
+
+ //! returns # of buffers currently allocated
+ GR_RUNTIME_API long buffer_ncurrently_allocated();
+
+
+ // ---------------------------------------------------------------------------
+
+ /*!
+ * \brief How we keep track of the readers of a gr::buffer.
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API buffer_reader
+ {
+ public:
+ ~buffer_reader();
+
+ /*!
+ * \brief Return number of items available for reading.
+ */
+ int items_available() const;
+
+ /*!
+ * \brief Return buffer this reader reads from.
+ */
+ buffer_sptr buffer() const { return d_buffer; }
+
+ /*!
+ * \brief Return maximum number of items that could ever be available for reading.
+ * This is used as a sanity check in the scheduler to avoid looping forever.
+ */
+ int max_possible_items_available() const { return d_buffer->d_bufsize - 1; }
+
+ /*!
+ * \brief return pointer to read buffer.
+ *
+ * The return value points to items_available() number of items
+ */
+ const void *read_pointer();
+
+ /*
+ * \brief tell buffer we read \p items from it
+ */
+ void update_read_pointer(int nitems);
+
+ void set_done(bool done) { d_buffer->set_done(done); }
+ bool done() const { return d_buffer->done(); }
+
+ gr::thread::mutex *mutex() { return d_buffer->mutex(); }
+
+ uint64_t nitems_read() { return d_abs_read_offset; }
+
+ size_t get_sizeof_item() { return d_buffer->get_sizeof_item(); }
+
+ /*!
+ * \brief Return the block that reads via this reader.
+ *
+ */
+ block_sptr link() { return block_sptr(d_link); }
+
+ /*!
+ * \brief Given a [start,end), returns a vector all tags in the range.
+ *
+ * Get a vector of tags in given range. Range of counts is from start to end-1.
+ *
+ * Tags are tuples of:
+ * (item count, source id, key, value)
+ *
+ * \param v a vector reference to return tags into
+ * \param abs_start a uint64 count of the start of the range of interest
+ * \param abs_end a uint64 count of the end of the range of interest
+ */
+ void get_tags_in_range(std::vector<tag_t> &v,
+ uint64_t abs_start,
+ uint64_t abs_end);
+
+ // -------------------------------------------------------------------------
+
+ private:
+ friend class buffer;
+ friend GR_RUNTIME_API buffer_reader_sptr
+ buffer_add_reader(buffer_sptr buf, int nzero_preload, block_sptr link);
+
+ buffer_sptr d_buffer;
+ unsigned int d_read_index; // in items [0,d->buffer.d_bufsize)
+ uint64_t d_abs_read_offset; // num items seen since the start
+ boost::weak_ptr<block> d_link; // block that reads via this buffer reader
+
+ //! constructor is private. Use gr::buffer::add_reader to create instances
+ buffer_reader(buffer_sptr buffer, unsigned int read_index, block_sptr link);
+ };
+
+ //! returns # of buffer_readers currently allocated
+ GR_RUNTIME_API long buffer_reader_ncurrently_allocated ();
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_BUFFER_H */
diff --git a/gnuradio-runtime/include/gnuradio/constants.h b/gnuradio-runtime/include/gnuradio/constants.h
new file mode 100644
index 0000000000..5ae924ca0d
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/constants.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_CONSTANTS_H
+#define INCLUDED_GR_CONSTANTS_H
+
+#include <gnuradio/api.h>
+#include <string>
+
+namespace gr {
+
+ /*!
+ * \brief return ./configure --prefix argument. Typically /usr/local
+ */
+ GR_RUNTIME_API const std::string prefix();
+
+ /*!
+ * \brief return ./configure --sysconfdir argument. Typically $prefix/etc or /etc
+ */
+ GR_RUNTIME_API const std::string sysconfdir();
+
+ /*!
+ * \brief return preferences file directory. Typically $sysconfdir/etc/conf.d
+ */
+ GR_RUNTIME_API const std::string prefsdir();
+
+ /*!
+ * \brief return date/time of build, as set when 'bootstrap' is run
+ */
+ GR_RUNTIME_API const std::string build_date();
+
+ /*!
+ * \brief return version string defined in configure.ac
+ */
+ GR_RUNTIME_API const std::string version();
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_CONSTANTS_H */
diff --git a/gnuradio-runtime/include/gnuradio/dispatcher.h b/gnuradio-runtime/include/gnuradio/dispatcher.h
new file mode 100644
index 0000000000..ab1d6190c6
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/dispatcher.h
@@ -0,0 +1,73 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_DISPATCHER_H
+#define INCLUDED_GR_DISPATCHER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/select_handler.h>
+#include <vector>
+
+namespace gr {
+
+ class dispatcher;
+ typedef boost::shared_ptr<dispatcher> dispatcher_sptr;
+
+ GR_RUNTIME_API dispatcher_sptr dispatcher_singleton();
+ GR_RUNTIME_API dispatcher_sptr make_dispatcher();
+
+ /*!
+ * \brief invoke callbacks based on select.
+ * \ingroup internal
+ *
+ * \sa gr_select_handler
+ */
+ class GR_RUNTIME_API dispatcher
+ {
+ dispatcher();
+ friend GR_RUNTIME_API dispatcher_sptr make_dispatcher();
+
+ std::vector<select_handler_sptr> d_handler;
+ int d_max_index;
+
+ public:
+ ~dispatcher();
+
+ bool add_handler(select_handler_sptr handler);
+ bool del_handler(select_handler_sptr handler);
+ bool del_handler(select_handler *handler);
+
+ /*!
+ * \brief Event dispatching loop.
+ *
+ * Enter a polling loop that only terminates after all
+ * gr::select_handlers have been removed. \p timeout sets the
+ * timeout parameter to the select() call, measured in seconds.
+ *
+ * \param timeout maximum number of seconds to block in select.
+ */
+ void loop(double timeout=10);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_DISPATCHER_H */
diff --git a/gnuradio-runtime/include/gnuradio/endianness.h b/gnuradio-runtime/include/gnuradio/endianness.h
new file mode 100644
index 0000000000..43c21a1c15
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/endianness.h
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ENDIANNESS_H
+#define INCLUDED_GR_ENDIANNESS_H
+
+namespace gr {
+
+ typedef enum {GR_MSB_FIRST, GR_LSB_FIRST} endianness_t;
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ENDIANNESS_H */
diff --git a/gnuradio-runtime/include/gnuradio/error_handler.h b/gnuradio-runtime/include/gnuradio/error_handler.h
new file mode 100644
index 0000000000..2d6a8c3883
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/error_handler.h
@@ -0,0 +1,125 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * This code is based on error.hh from the "Click Modular Router".
+ * Original copyright follows:
+ */
+/*
+ * error.{cc,hh} -- flexible classes for error reporting
+ * Eddie Kohler
+ *
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#ifndef INCLUDED_GR_ERROR_HANDLER_H
+#define INCLUDED_GR_ERROR_HANDLER_H
+
+#include <gnuradio/api.h>
+#include <stdarg.h>
+#include <string>
+#include <cstdio> // for FILE
+
+namespace gr {
+
+ /*!
+ * \brief abstract error handler
+ * \ingroup base
+ */
+ class GR_RUNTIME_API error_handler
+ {
+ public:
+ enum seriousness {
+ ERR_DEBUG = 0x00000000,
+ ERR_MESSAGE = 0x00010000,
+ ERR_WARNING = 0x00020000,
+ ERR_ERROR = 0x00030000,
+ ERR_FATAL = 0x00040000
+ };
+
+ error_handler() {}
+ virtual ~error_handler();
+
+ static error_handler *default_handler();
+ static error_handler *silent_handler();
+
+ static bool has_default_handler();
+ static void set_default_handler(error_handler *errh);
+
+ void debug(const char *format, ...);
+ void message(const char *format, ...);
+ void warning(const char *format, ...);
+ void error(const char *format, ...);
+ void fatal(const char *format, ...);
+
+ virtual int nwarnings() const = 0;
+ virtual int nerrors() const = 0;
+ virtual void reset_counts() = 0;
+
+ void verror(seriousness s, const char *format, va_list);
+ void verror_text(seriousness s, const std::string &text);
+
+ protected:
+ virtual void count_error(seriousness s) = 0;
+ virtual void handle_text(seriousness s, const std::string &str) = 0;
+ std::string make_text(seriousness s, const char *format, va_list);
+ };
+
+
+ class GR_RUNTIME_API base_error_handler : public error_handler
+ {
+ int d_nwarnings;
+ int d_nerrors;
+
+ public:
+ base_error_handler() : d_nwarnings(0), d_nerrors(0) {}
+ int nwarnings() const { return d_nwarnings; }
+ int nerrors() const { return d_nerrors; }
+ void reset_counts() { d_nwarnings = d_nerrors = 0; }
+ void count_error(seriousness s);
+ };
+
+ class GR_RUNTIME_API file_error_handler : public base_error_handler
+ {
+ FILE *d_file;
+ int d_fd;
+
+ public:
+ file_error_handler(FILE *file);
+ file_error_handler(int file_descriptor);
+ ~file_error_handler();
+
+ void handle_text(seriousness s, const std::string &str);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ERROR_HANDLER_H */
diff --git a/gnuradio-runtime/include/gnuradio/expj.h b/gnuradio-runtime/include/gnuradio/expj.h
new file mode 100644
index 0000000000..7556e17011
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/expj.h
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef INCLUDED_GR_EXPJ_H
+#define INCLUDED_GR_EXPJ_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/sincos.h>
+#include <gnuradio/types.h>
+
+static inline gr_complex
+gr_expj(float phase)
+{
+ float t_imag, t_real;
+ gr::sincosf(phase, &t_imag, &t_real);
+ return gr_complex(t_real, t_imag);
+}
+
+
+#endif /* INCLUDED_GR_EXPJ_H */
diff --git a/gnuradio-runtime/include/gnuradio/feval.h b/gnuradio-runtime/include/gnuradio/feval.h
new file mode 100644
index 0000000000..40e3ad9a55
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/feval.h
@@ -0,0 +1,187 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FEVAL_H
+#define INCLUDED_GR_FEVAL_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/gr_complex.h>
+#include <pmt/pmt.h>
+
+namespace gr {
+
+ /*!
+ * \brief base class for evaluating a function: double -> double
+ * \ingroup misc
+ *
+ * This class is designed to be subclassed in Python or C++ and is
+ * callable from both places. It uses SWIG's "director" feature to
+ * implement the magic.
+ *
+ * It's slow. Don't use it in a performance critical path.
+ *
+ * Override eval to define the behavior.
+ * Use calleval to invoke eval (this kludge is required to allow a
+ * python specific "shim" to be inserted.
+ */
+ class GR_RUNTIME_API feval_dd
+ {
+ protected:
+ /*!
+ * \brief override this to define the function
+ */
+ virtual double eval(double x);
+
+ public:
+ feval_dd() {}
+ virtual ~feval_dd();
+
+ virtual double calleval(double x); // invoke "eval"
+ };
+
+ /*!
+ * \brief base class for evaluating a function: complex -> complex
+ * \ingroup misc
+ *
+ * This class is designed to be subclassed in Python or C++ and is
+ * callable from both places. It uses SWIG's "director" feature to
+ * implement the magic.
+ *
+ * It's slow. Don't use it in a performance critical path.
+ *
+ * Override eval to define the behavior.
+ * Use calleval to invoke eval (this kludge is required to allow a
+ * python specific "shim" to be inserted.
+ */
+ class GR_RUNTIME_API feval_cc
+ {
+ protected:
+ /*!
+ * \brief override this to define the function
+ */
+ virtual gr_complex eval(gr_complex x);
+
+ public:
+ feval_cc() {}
+ virtual ~feval_cc();
+
+ virtual gr_complex calleval(gr_complex x); // invoke "eval"
+ };
+
+ /*!
+ * \brief base class for evaluating a function: long -> long
+ * \ingroup misc
+ *
+ * This class is designed to be subclassed in Python or C++ and is
+ * callable from both places. It uses SWIG's "director" feature to
+ * implement the magic.
+ *
+ * It's slow. Don't use it in a performance critical path.
+ *
+ * Override eval to define the behavior.
+ * Use calleval to invoke eval (this kludge is required to allow a
+ * python specific "shim" to be inserted.
+ */
+ class GR_RUNTIME_API feval_ll
+ {
+ protected:
+ /*!
+ * \brief override this to define the function
+ */
+ virtual long eval(long x);
+
+ public:
+ feval_ll() {}
+ virtual ~feval_ll();
+
+ virtual long calleval(long x); // invoke "eval"
+ };
+
+ /*!
+ * \brief base class for evaluating a function: void -> void
+ * \ingroup misc
+ *
+ * This class is designed to be subclassed in Python or C++ and is
+ * callable from both places. It uses SWIG's "director" feature to
+ * implement the magic.
+ *
+ * It's slow. Don't use it in a performance critical path.
+ *
+ * Override eval to define the behavior.
+ * Use calleval to invoke eval (this kludge is required to allow a
+ * python specific "shim" to be inserted.
+ */
+ class GR_RUNTIME_API feval
+ {
+ protected:
+ /*!
+ * \brief override this to define the function
+ */
+ virtual void eval();
+
+ public:
+ feval() {}
+ virtual ~feval();
+
+ virtual void calleval(); // invoke "eval"
+ };
+
+ /*!
+ * \brief base class for evaluating a function: pmt -> void
+ * \ingroup misc
+ *
+ * This class is designed to be subclassed in Python or C++ and is
+ * callable from both places. It uses SWIG's "director" feature to
+ * implement the magic.
+ *
+ * It's slow. Don't use it in a performance critical path.
+ *
+ * Override eval to define the behavior.
+ * Use calleval to invoke eval (this kludge is required to allow a
+ * python specific "shim" to be inserted.
+ */
+ class GR_RUNTIME_API feval_p
+ {
+ protected:
+ /*!
+ * \brief override this to define the function
+ */
+ virtual void eval(pmt::pmt_t x);
+
+ public:
+ feval_p() {}
+ virtual ~feval_p();
+
+ virtual void calleval(pmt::pmt_t x); // invoke "eval"
+ };
+
+ /*!
+ * \brief trivial examples / test cases showing C++ calling Python code
+ */
+ GR_RUNTIME_API double feval_dd_example(feval_dd *f, double x);
+ GR_RUNTIME_API gr_complex feval_cc_example(feval_cc *f, gr_complex x);
+ GR_RUNTIME_API long feval_ll_example(feval_ll *f, long x);
+ GR_RUNTIME_API void feval_example(feval *f);
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FEVAL_H */
diff --git a/gnuradio-runtime/include/gnuradio/flowgraph.h b/gnuradio-runtime/include/gnuradio/flowgraph.h
new file mode 100644
index 0000000000..cfa451f11b
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/flowgraph.h
@@ -0,0 +1,256 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_FLOWGRAPH_H
+#define INCLUDED_GR_RUNTIME_FLOWGRAPH_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/basic_block.h>
+#include <gnuradio/io_signature.h>
+#include <iostream>
+
+namespace gr {
+
+ /*!
+ * \brief Class representing a specific input or output graph endpoint
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API endpoint
+ {
+ private:
+ basic_block_sptr d_basic_block;
+ int d_port;
+
+ public:
+ endpoint() : d_basic_block(), d_port(0) { }
+ endpoint(basic_block_sptr block, int port) { d_basic_block = block; d_port = port; }
+ basic_block_sptr block() const { return d_basic_block; }
+ int port() const { return d_port; }
+
+ bool operator==(const endpoint &other) const;
+ };
+
+ inline bool endpoint::operator==(const endpoint &other) const
+ {
+ return (d_basic_block == other.d_basic_block &&
+ d_port == other.d_port);
+ }
+
+ class GR_RUNTIME_API msg_endpoint
+ {
+ private:
+ basic_block_sptr d_basic_block;
+ pmt::pmt_t d_port;
+ bool d_is_hier;
+
+ public:
+ msg_endpoint() : d_basic_block(), d_port(pmt::PMT_NIL) { }
+ msg_endpoint(basic_block_sptr block, pmt::pmt_t port, bool is_hier=false) {
+ d_basic_block = block; d_port = port; d_is_hier = is_hier;
+ }
+ basic_block_sptr block() const { return d_basic_block; }
+ pmt::pmt_t port() const { return d_port; }
+ bool is_hier() const { return d_is_hier; }
+ void set_hier(bool h) { d_is_hier = h; }
+
+ bool operator==(const msg_endpoint &other) const;
+ };
+
+ inline bool
+ msg_endpoint::operator==(const msg_endpoint &other) const
+ {
+ return (d_basic_block == other.d_basic_block &&
+ pmt::equal(d_port, other.d_port));
+ }
+
+ // Hold vectors of gr::endpoint objects
+ typedef std::vector<endpoint> endpoint_vector_t;
+ typedef std::vector<endpoint>::iterator endpoint_viter_t;
+
+ /*!
+ *\brief Class representing a connection between to graph endpoints
+ */
+ class GR_RUNTIME_API edge
+ {
+ public:
+ edge() : d_src(), d_dst() { };
+ edge(const endpoint &src, const endpoint &dst)
+ : d_src(src), d_dst(dst) { }
+ ~edge();
+
+ const endpoint &src() const { return d_src; }
+ const endpoint &dst() const { return d_dst; }
+
+ private:
+ endpoint d_src;
+ endpoint d_dst;
+ };
+
+ // Hold vectors of gr::edge objects
+ typedef std::vector<edge> edge_vector_t;
+ typedef std::vector<edge>::iterator edge_viter_t;
+
+
+ /*!
+ *\brief Class representing a msg connection between to graph msg endpoints
+ */
+ class GR_RUNTIME_API msg_edge
+ {
+ public:
+ msg_edge() : d_src(), d_dst() { };
+ msg_edge(const msg_endpoint &src, const msg_endpoint &dst)
+ : d_src(src), d_dst(dst) { }
+ ~msg_edge() {}
+
+ const msg_endpoint &src() const { return d_src; }
+ const msg_endpoint &dst() const { return d_dst; }
+
+ private:
+ msg_endpoint d_src;
+ msg_endpoint d_dst;
+ };
+
+ // Hold vectors of gr::msg_edge objects
+ typedef std::vector<msg_edge> msg_edge_vector_t;
+ typedef std::vector<msg_edge>::iterator msg_edge_viter_t;
+
+ // Create a shared pointer to a heap allocated flowgraph
+ // (types defined in runtime_types.h)
+ GR_RUNTIME_API flowgraph_sptr make_flowgraph();
+
+ /*!
+ * \brief Class representing a directed, acyclic graph of basic blocks
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API flowgraph
+ {
+ public:
+ friend GR_RUNTIME_API flowgraph_sptr make_flowgraph();
+
+ // Destruct an arbitrary flowgraph
+ ~flowgraph();
+
+ // Connect two endpoints
+ void connect(const endpoint &src, const endpoint &dst);
+
+ // Disconnect two endpoints
+ void disconnect(const endpoint &src, const endpoint &dst);
+
+ // Connect an output port to an input port (convenience)
+ void connect(basic_block_sptr src_block, int src_port,
+ basic_block_sptr dst_block, int dst_port);
+
+ // Disconnect an input port from an output port (convenience)
+ void disconnect(basic_block_sptr src_block, int src_port,
+ basic_block_sptr dst_block, int dst_port);
+
+ // Connect two msg endpoints
+ void connect(const msg_endpoint &src, const msg_endpoint &dst);
+
+ // Disconnect two msg endpoints
+ void disconnect(const msg_endpoint &src, const msg_endpoint &dst);
+
+ // Validate connectivity, raise exception if invalid
+ void validate();
+
+ // Clear existing flowgraph
+ void clear();
+
+ // Return vector of edges
+ const edge_vector_t &edges() const { return d_edges; }
+
+ // Return vector of msg edges
+ const msg_edge_vector_t &msg_edges() const { return d_msg_edges; }
+
+ // Return vector of connected blocks
+ basic_block_vector_t calc_used_blocks();
+
+ // Return toplogically sorted vector of blocks. All the sources come first.
+ basic_block_vector_t topological_sort(basic_block_vector_t &blocks);
+
+ // Return vector of vectors of disjointly connected blocks,
+ // topologically sorted.
+ std::vector<basic_block_vector_t> partition();
+
+ protected:
+ basic_block_vector_t d_blocks;
+ edge_vector_t d_edges;
+ msg_edge_vector_t d_msg_edges;
+
+ flowgraph();
+ std::vector<int> calc_used_ports(basic_block_sptr block, bool check_inputs);
+ basic_block_vector_t calc_downstream_blocks(basic_block_sptr block, int port);
+ edge_vector_t calc_upstream_edges(basic_block_sptr block);
+ bool has_block_p(basic_block_sptr block);
+ edge calc_upstream_edge(basic_block_sptr block, int port);
+
+ private:
+ void check_valid_port(gr::io_signature::sptr sig, int port);
+ void check_valid_port(const msg_endpoint &e);
+ void check_dst_not_used(const endpoint &dst);
+ void check_type_match(const endpoint &src, const endpoint &dst);
+ edge_vector_t calc_connections(basic_block_sptr block, bool check_inputs); // false=use outputs
+ void check_contiguity(basic_block_sptr block, const std::vector<int> &used_ports, bool check_inputs);
+
+ basic_block_vector_t calc_downstream_blocks(basic_block_sptr block);
+ basic_block_vector_t calc_reachable_blocks(basic_block_sptr block, basic_block_vector_t &blocks);
+ void reachable_dfs_visit(basic_block_sptr block, basic_block_vector_t &blocks);
+ basic_block_vector_t calc_adjacent_blocks(basic_block_sptr block, basic_block_vector_t &blocks);
+ basic_block_vector_t sort_sources_first(basic_block_vector_t &blocks);
+ bool source_p(basic_block_sptr block);
+ void topological_dfs_visit(basic_block_sptr block, basic_block_vector_t &output);
+ };
+
+ // Convenience functions
+ inline
+ void flowgraph::connect(basic_block_sptr src_block, int src_port,
+ basic_block_sptr dst_block, int dst_port)
+ {
+ connect(endpoint(src_block, src_port),
+ endpoint(dst_block, dst_port));
+ }
+
+ inline
+ void flowgraph::disconnect(basic_block_sptr src_block, int src_port,
+ basic_block_sptr dst_block, int dst_port)
+ {
+ disconnect(endpoint(src_block, src_port),
+ endpoint(dst_block, dst_port));
+ }
+
+ inline std::ostream&
+ operator <<(std::ostream &os, const endpoint endp)
+ {
+ os << endp.block()->alias() << ":" << endp.port();
+ return os;
+ }
+
+ inline std::ostream&
+ operator <<(std::ostream &os, const edge edge)
+ {
+ os << edge.src() << "->" << edge.dst();
+ return os;
+ }
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_FLOWGRAPH_H */
diff --git a/gnuradio-runtime/include/gnuradio/fxpt.h b/gnuradio-runtime/include/gnuradio/fxpt.h
new file mode 100644
index 0000000000..6143acafeb
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/fxpt.h
@@ -0,0 +1,108 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FXPT_H
+#define INCLUDED_GR_FXPT_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+
+namespace gr {
+
+ /*!
+ * \brief fixed point sine and cosine and friends.
+ * \ingroup misc
+ *
+ * fixed pt radians
+ * --------- --------
+ * -2**31 -pi
+ * 0 0
+ * 2**31-1 pi - epsilon
+ */
+ class GR_RUNTIME_API fxpt
+ {
+ static const int WORDBITS = 32;
+ static const int NBITS = 10;
+ static const float s_sine_table[1 << NBITS][2];
+ static const float PI;
+ static const float TWO_TO_THE_31;
+
+ public:
+ static gr_int32
+ float_to_fixed(float x)
+ {
+ // Fold x into -PI to PI.
+ int d = (int)floor(x/2/PI+0.5);
+ x -= d*2*PI;
+ // And convert to an integer.
+ return (gr_int32) ((float) x * TWO_TO_THE_31 / PI);
+ }
+
+ static float
+ fixed_to_float (gr_int32 x)
+ {
+ return x * (PI / TWO_TO_THE_31);
+ }
+
+ /*!
+ * \brief Given a fixed point angle x, return float sine (x)
+ */
+ static float
+ sin(gr_int32 x)
+ {
+ gr_uint32 ux = x;
+ int index = ux >> (WORDBITS - NBITS);
+ return s_sine_table[index][0] * (ux >> 1) + s_sine_table[index][1];
+ }
+
+ /*
+ * \brief Given a fixed point angle x, return float cosine (x)
+ */
+ static float
+ cos (gr_int32 x)
+ {
+ gr_uint32 ux = x + 0x40000000;
+ int index = ux >> (WORDBITS - NBITS);
+ return s_sine_table[index][0] * (ux >> 1) + s_sine_table[index][1];
+ }
+
+ /*
+ * \brief Given a fixedpoint angle x, return float cos(x) and sin (x)
+ */
+ static void sincos(gr_int32 x, float *s, float *c)
+ {
+ gr_uint32 ux = x;
+ int sin_index = ux >> (WORDBITS - NBITS);
+ *s = s_sine_table[sin_index][0] * (ux >> 1) + s_sine_table[sin_index][1];
+
+ ux = x + 0x40000000;
+ int cos_index = ux >> (WORDBITS - NBITS);
+ *c = s_sine_table[cos_index][0] * (ux >> 1) + s_sine_table[cos_index][1];
+
+ return;
+ }
+
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FXPT_H */
diff --git a/gnuradio-runtime/include/gnuradio/fxpt_nco.h b/gnuradio-runtime/include/gnuradio/fxpt_nco.h
new file mode 100644
index 0000000000..33a176d9b4
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/fxpt_nco.h
@@ -0,0 +1,160 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FXPT_NCO_H
+#define INCLUDED_GR_FXPT_NCO_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/fxpt.h>
+#include <gnuradio/gr_complex.h>
+#include <stdint.h>
+
+namespace gr {
+
+ /*!
+ * \brief Numerically Controlled Oscillator (NCO)
+ * \ingroup misc
+ */
+ class /*GR_RUNTIME_API*/ fxpt_nco
+ {
+ uint32_t d_phase;
+ int32_t d_phase_inc;
+
+ public:
+ fxpt_nco() : d_phase(0), d_phase_inc(0) {}
+
+ ~fxpt_nco() {}
+
+ // radians
+ void set_phase(float angle) {
+ d_phase = gr::fxpt::float_to_fixed(angle);
+ }
+
+ void adjust_phase(float delta_phase) {
+ d_phase += gr::fxpt::float_to_fixed(delta_phase);
+ }
+
+ // angle_rate is in radians / step
+ void set_freq(float angle_rate){
+ d_phase_inc = gr::fxpt::float_to_fixed(angle_rate);
+ }
+
+ // angle_rate is a delta in radians / step
+ void adjust_freq(float delta_angle_rate)
+ {
+ d_phase_inc += gr::fxpt::float_to_fixed(delta_angle_rate);
+ }
+
+ // increment current phase angle
+
+ void step()
+ {
+ d_phase += d_phase_inc;
+ }
+
+ void step(int n)
+ {
+ d_phase += d_phase_inc * n;
+ }
+
+ // units are radians / step
+ float get_phase() const { return gr::fxpt::fixed_to_float(d_phase); }
+ float get_freq() const { return gr::fxpt::fixed_to_float(d_phase_inc); }
+
+ // compute sin and cos for current phase angle
+ void sincos(float *sinx, float *cosx) const
+ {
+ *sinx = gr::fxpt::sin(d_phase);
+ *cosx = gr::fxpt::cos(d_phase);
+ }
+
+ // compute cos and sin for a block of phase angles
+ void sincos(gr_complex *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = gr_complex(gr::fxpt::cos(d_phase) * ampl, gr::fxpt::sin(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute sin for a block of phase angles
+ void sin(float *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (float)(gr::fxpt::sin(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute cos for a block of phase angles
+ void cos(float *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (float)(gr::fxpt::cos(d_phase) * ampl);
+ step ();
+ }
+ }
+
+ // compute sin for a block of phase angles
+ void sin(short *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (short)(gr::fxpt::sin(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute cos for a block of phase angles
+ void cos(short *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (short)(gr::fxpt::cos(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute sin for a block of phase angles
+ void sin(int *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (int)(gr::fxpt::sin(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute cos for a block of phase angles
+ void cos(int *output, int noutput_items, double ampl=1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (int)(gr::fxpt::cos(d_phase) * ampl);
+ step();
+ }
+ }
+
+ // compute cos or sin for current phase angle
+ float cos() const { return gr::fxpt::cos(d_phase); }
+ float sin() const { return gr::fxpt::sin(d_phase); }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FXPT_NCO_H */
diff --git a/gnuradio-runtime/include/gnuradio/fxpt_vco.h b/gnuradio-runtime/include/gnuradio/fxpt_vco.h
new file mode 100644
index 0000000000..77d58677ce
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/fxpt_vco.h
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2004,2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FXPT_VCO_H
+#define INCLUDED_GR_FXPT_VCO_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/fxpt.h>
+#include <gnuradio/gr_complex.h>
+
+namespace gr {
+
+ /*!
+ * \brief Voltage Controlled Oscillator (VCO)
+ * \ingroup misc
+ */
+ class /*GR_RUNTIME_API*/ fxpt_vco {
+ gr_int32 d_phase;
+
+ public:
+ fxpt_vco () : d_phase(0) {}
+
+ ~fxpt_vco() {}
+
+ // radians
+ void set_phase(float angle) {
+ d_phase = fxpt::float_to_fixed(angle);
+ }
+
+ void adjust_phase(float delta_phase) {
+ d_phase += fxpt::float_to_fixed(delta_phase);
+ }
+
+ float get_phase() const {
+ return fxpt::fixed_to_float(d_phase);
+ }
+
+ // compute sin and cos for current phase angle
+ void sincos(float *sinx, float *cosx) const
+ {
+ *sinx = fxpt::sin(d_phase);
+ *cosx = fxpt::cos(d_phase);
+ }
+
+ // compute a block at a time
+ void cos(float *output, const float *input, int noutput_items, float k, float ampl = 1.0)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (float)(fxpt::cos(d_phase) * ampl);
+ adjust_phase(input[i] * k);
+ }
+ }
+
+ // compute cos or sin for current phase angle
+ float cos() const { return fxpt::cos(d_phase); }
+ float sin() const { return fxpt::sin(d_phase); }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FXPT_VCO_H */
diff --git a/gnuradio-runtime/include/gnuradio/gr_complex.h b/gnuradio-runtime/include/gnuradio/gr_complex.h
new file mode 100644
index 0000000000..bd94c0f0f8
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/gr_complex.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_COMPLEX_H
+#define INCLUDED_GR_COMPLEX_H
+
+#include <complex>
+typedef std::complex<float> gr_complex;
+typedef std::complex<double> gr_complexd;
+
+inline bool is_complex (gr_complex x) { (void) x; return true;}
+inline bool is_complex (gr_complexd x) { (void) x; return true;}
+inline bool is_complex (float x) { (void) x; return false;}
+inline bool is_complex (double x) { (void) x; return false;}
+inline bool is_complex (int x) { (void) x; return false;}
+inline bool is_complex (char x) { (void) x; return false;}
+inline bool is_complex (short x) { (void) x; return false;}
+
+// this doesn't really belong here, but there are worse places for it...
+
+#define CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected,actual,delta) \
+ CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.real(), actual.real(), delta); \
+ CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.imag(), actual.imag(), delta);
+
+#endif /* INCLUDED_GR_COMPLEX_H */
+
diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h
new file mode 100644
index 0000000000..ff09f9139d
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/hier_block2.h
@@ -0,0 +1,221 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006-2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_HIER_BLOCK2_H
+#define INCLUDED_GR_RUNTIME_HIER_BLOCK2_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/basic_block.h>
+
+namespace gr {
+
+ /*!
+ * \brief public constructor for hier_block2
+ */
+ GR_RUNTIME_API hier_block2_sptr
+ make_hier_block2(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ class hier_block2_detail;
+
+ /*!
+ * \brief Hierarchical container class for gr::block's and gr::hier_block2's
+ * \ingroup container_blk
+ * \ingroup base_blk
+ */
+ class GR_RUNTIME_API hier_block2 : public basic_block
+ {
+ private:
+ friend class hier_block2_detail;
+ friend GR_RUNTIME_API hier_block2_sptr
+ make_hier_block2(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ /*!
+ * \brief Private implementation details of gr::hier_block2
+ */
+ hier_block2_detail *d_detail;
+
+ protected:
+ hier_block2(void) {} // allows pure virtual interface sub-classes
+ hier_block2(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ public:
+ virtual ~hier_block2();
+
+ /*!
+ * \brief typedef for object returned from self().
+ *
+ * This type is only guaranteed to be passable to connect and
+ * disconnect. No other assumptions should be made about it.
+ */
+ typedef basic_block_sptr opaque_self;
+
+ /*!
+ * \brief Return an object, representing the current block, which
+ * can be passed to connect.
+ *
+ * The returned object may only be used as an argument to connect
+ * or disconnect. Any other use of self() results in unspecified
+ * (erroneous) behavior.
+ */
+ opaque_self self();
+
+ /*!
+ * \brief Add a stand-alone (possibly hierarchical) block to
+ * internal graph
+ *
+ * This adds a gr-block or hierarchical block to the internal
+ * graph without wiring it to anything else.
+ */
+ void connect(basic_block_sptr block);
+
+ /*!
+ * \brief Add gr-blocks or hierarchical blocks to internal graph
+ * and wire together
+ *
+ * This adds (if not done earlier by another connect) a pair of
+ * gr-blocks or hierarchical blocks to the internal flowgraph, and
+ * wires the specified output port to the specified input port.
+ */
+ void connect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port);
+
+ /*!
+ * \brief Add gr-blocks or hierarchical blocks to internal graph
+ * and wire together
+ *
+ * This adds (if not done earlier by another connect) a pair of
+ * gr-blocks or hierarchical blocks to the internal message port
+ * subscription
+ */
+ void msg_connect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport);
+ void msg_connect(basic_block_sptr src, std::string srcport,
+ basic_block_sptr dst, std::string dstport);
+ void msg_disconnect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport);
+ void msg_disconnect(basic_block_sptr src, std::string srcport,
+ basic_block_sptr dst, std::string dstport);
+
+ /*!
+ * \brief Remove a gr-block or hierarchical block from the
+ * internal flowgraph.
+ *
+ * This removes a gr-block or hierarchical block from the internal
+ * flowgraph, disconnecting it from other blocks as needed.
+ */
+ void disconnect(basic_block_sptr block);
+
+ /*!
+ * \brief Disconnect a pair of gr-blocks or hierarchical blocks in
+ * internal flowgraph.
+ *
+ * This disconnects the specified input port from the specified
+ * output port of a pair of gr-blocks or hierarchical blocks.
+ */
+ void disconnect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port);
+
+ /*!
+ * \brief Disconnect all connections in the internal flowgraph.
+ *
+ * This call removes all output port to input port connections in
+ * the internal flowgraph.
+ */
+ void disconnect_all();
+
+ /*!
+ * Lock a flowgraph in preparation for reconfiguration. When an
+ * equal number of calls to lock() and unlock() have occurred, the
+ * flowgraph will be reconfigured.
+ *
+ * N.B. lock() and unlock() may not be called from a flowgraph
+ * thread (E.g., gr::block::work method) or deadlock will occur
+ * when reconfiguration happens.
+ */
+ virtual void lock();
+
+ /*!
+ * Unlock a flowgraph in preparation for reconfiguration. When an
+ * equal number of calls to lock() and unlock() have occurred, the
+ * flowgraph will be reconfigured.
+ *
+ * N.B. lock() and unlock() may not be called from a flowgraph
+ * thread (E.g., gr::block::work method) or deadlock will occur
+ * when reconfiguration happens.
+ */
+ virtual void unlock();
+
+ // This is a public method for ease of code organization, but should be
+ // ignored by the user.
+ flat_flowgraph_sptr flatten() const;
+
+ hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
+
+ bool has_msg_port(pmt::pmt_t which_port) {
+ return message_port_is_hier(which_port) || basic_block::has_msg_port(which_port);
+ }
+
+ bool message_port_is_hier(pmt::pmt_t port_id) {
+ return message_port_is_hier_in(port_id) || message_port_is_hier_out(port_id);
+ }
+
+ bool message_port_is_hier_in(pmt::pmt_t port_id) {
+ return pmt::list_has(hier_message_ports_in, port_id);
+ }
+
+ bool message_port_is_hier_out(pmt::pmt_t port_id) {
+ return pmt::list_has(hier_message_ports_out, port_id);
+ }
+
+ pmt::pmt_t hier_message_ports_in;
+ pmt::pmt_t hier_message_ports_out;
+
+ void message_port_register_hier_in(pmt::pmt_t port_id) {
+ if(pmt::list_has(hier_message_ports_in, port_id))
+ throw std::invalid_argument("hier msg in port by this name already registered");
+ if(msg_queue.find(port_id) != msg_queue.end())
+ throw std::invalid_argument("block already has a primitive input port by this name");
+ hier_message_ports_in = pmt::list_add(hier_message_ports_in, port_id);
+ }
+
+ void message_port_register_hier_out(pmt::pmt_t port_id) {
+ if(pmt::list_has(hier_message_ports_out, port_id))
+ throw std::invalid_argument("hier msg out port by this name already registered");
+ if(pmt::dict_has_key(message_subscribers, port_id))
+ throw std::invalid_argument("block already has a primitive output port by this name");
+ hier_message_ports_out = pmt::list_add(hier_message_ports_out, port_id);
+ }
+ };
+
+ inline hier_block2_sptr cast_to_hier_block2_sptr(basic_block_sptr block) {
+ return boost::dynamic_pointer_cast<hier_block2, basic_block>(block);
+ }
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_HIER_BLOCK2_H */
diff --git a/gnuradio-runtime/include/gnuradio/high_res_timer.h b/gnuradio-runtime/include/gnuradio/high_res_timer.h
new file mode 100644
index 0000000000..fc7b007c61
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/high_res_timer.h
@@ -0,0 +1,126 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GNURADIO_HIGH_RES_TIMER_H
+#define INCLUDED_GNURADIO_HIGH_RES_TIMER_H
+
+namespace gr {
+
+ //! Typedef for the timer tick count
+ typedef signed long long high_res_timer_type;
+
+ //! Get the current time in ticks
+ high_res_timer_type high_res_timer_now(void);
+
+ //! Get the number of ticks per second
+ high_res_timer_type high_res_timer_tps(void);
+
+ //! Get the tick count at the epoch
+ high_res_timer_type high_res_timer_epoch(void);
+
+} /* namespace gr */
+
+////////////////////////////////////////////////////////////////////////
+// Use architecture defines to determine the implementation
+////////////////////////////////////////////////////////////////////////
+#if defined(linux) || defined(__linux) || defined(__linux__)
+ #define GNURADIO_HRT_USE_CLOCK_GETTIME
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+ #define GNURADIO_HRT_USE_QUERY_PERFORMANCE_COUNTER
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+ #define GNURADIO_HRT_USE_MACH_ABSOLUTE_TIME
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define GNURADIO_HRT_USE_CLOCK_GETTIME
+#else
+ #define GNURADIO_HRT_USE_MICROSEC_CLOCK
+#endif
+
+////////////////////////////////////////////////////////////////////////
+#ifdef GNURADIO_HRT_USE_CLOCK_GETTIME
+ #include <ctime>
+
+ inline gr::high_res_timer_type gr::high_res_timer_now(void){
+ timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return ts.tv_sec*high_res_timer_tps() + ts.tv_nsec;
+ }
+
+ inline gr::high_res_timer_type gr::high_res_timer_tps(void){
+ return 1000000000UL;
+ }
+#endif /* GNURADIO_HRT_USE_CLOCK_GETTIME */
+
+////////////////////////////////////////////////////////////////////////
+#ifdef GNURADIO_HRT_USE_MACH_ABSOLUTE_TIME
+ #include <mach/mach_time.h>
+
+ inline gr::high_res_timer_type gr::high_res_timer_now(void){
+ return mach_absolute_time();
+ }
+
+ inline gr::high_res_timer_type gr::high_res_timer_tps(void){
+ mach_timebase_info_data_t info;
+ mach_timebase_info(&info);
+ return gr::high_res_timer_type(info.numer*1000000000UL)/info.denom;
+ }
+#endif
+
+////////////////////////////////////////////////////////////////////////
+#ifdef GNURADIO_HRT_USE_QUERY_PERFORMANCE_COUNTER
+ #include <Windows.h>
+
+ inline gr::high_res_timer_type gr::high_res_timer_now(void){
+ LARGE_INTEGER counts;
+ QueryPerformanceCounter(&counts);
+ return counts.QuadPart;
+ }
+
+ inline gr::high_res_timer_type gr::high_res_timer_tps(void){
+ LARGE_INTEGER freq;
+ QueryPerformanceFrequency(&freq);
+ return freq.QuadPart;
+ }
+#endif
+
+////////////////////////////////////////////////////////////////////////
+#ifdef GNURADIO_HRT_USE_MICROSEC_CLOCK
+ #include <boost/date_time/posix_time/posix_time.hpp>
+
+ inline gr::high_res_timer_type gr::high_res_timer_now(void){
+ static const boost::posix_time::ptime epoch(boost::posix_time::from_time_t(0));
+ return (boost::posix_time::microsec_clock::universal_time() - epoch).ticks();
+ }
+
+ inline gr::high_res_timer_type gr::high_res_timer_tps(void){
+ return boost::posix_time::time_duration::ticks_per_second();
+ }
+#endif
+
+////////////////////////////////////////////////////////////////////////
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+inline gr::high_res_timer_type gr::high_res_timer_epoch(void){
+ static const double hrt_ticks_per_utc_ticks = gr::high_res_timer_tps()/double(boost::posix_time::time_duration::ticks_per_second());
+ boost::posix_time::time_duration utc = boost::posix_time::microsec_clock::universal_time() - boost::posix_time::from_time_t(0);
+ return gr::high_res_timer_now() - utc.ticks()*hrt_ticks_per_utc_ticks;
+}
+
+#endif /* INCLUDED_GNURADIO_HIGH_RES_TIMER_H */
diff --git a/gnuradio-runtime/include/gnuradio/ice_application_base.h b/gnuradio-runtime/include/gnuradio/ice_application_base.h
new file mode 100644
index 0000000000..1cb60fbf96
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/ice_application_base.h
@@ -0,0 +1,231 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ICE_APPLICATION_BASE_H
+#define ICE_APPLICATION_BASE_H
+
+#ifdef HAVE_WINDOWS_H
+#include <winsock2.h>
+#include <sys/time.h>
+#endif
+
+#include <gnuradio/api.h>
+#include <gnuradio/prefs.h>
+#include <Ice/Ice.h>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <stdio.h>
+#include <iostream>
+#include <set>
+#include <string>
+#include <stdio.h>
+
+namespace {
+ static const unsigned int ICEAPPLICATION_ACTIVATION_TIMEOUT_MS(600);
+};
+
+class GR_RUNTIME_API ice_application_common : public Ice::Application
+{
+ public:
+ template<typename TserverBase, typename TserverClass> friend class ice_application_base;
+ static boost::shared_ptr<ice_application_common> Instance();
+ ~ice_application_common() {;}
+ static int d_reacquire_attributes;
+
+ protected:
+ static bool d_main_called;
+ static bool d_have_ice_config;
+ static std::string d_endpointStr;
+ static boost::shared_ptr<boost::thread> d_thread;
+ ice_application_common() {;}
+ int run(int, char*[]);
+};
+
+template<typename TserverBase, typename TserverClass>
+class ice_application_base
+{
+public:
+ boost::shared_ptr<ice_application_common> d_application;
+ ice_application_base(TserverClass* _this);
+ ~ice_application_base() {;}
+
+ static TserverBase* i();
+ static const std::vector<std::string> endpoints();
+
+protected:
+ bool have_ice_config() { return d_application->d_have_ice_config; }
+ void set_endpoint(const std::string& endpoint) { d_application->d_endpointStr = endpoint;}
+
+ //this one is the key... overwrite in templated/inherited variants
+ virtual TserverBase* i_impl() = 0;
+
+ //tools for the i_impl...
+ //tell it when it has to resync with the communicator
+ virtual bool reacquire_sync();
+ virtual void sync_reacquire();
+
+ static TserverClass* d_this;
+
+ int d_reacquire;
+ //static int d_reacquire_attributes;
+
+private:
+ void starticeexample();
+
+ bool application_started();
+
+ int run(int, char*[]);
+
+ static void kickoff();
+};
+
+template<typename TserverBase, typename TserverClass>
+TserverClass* ice_application_base<TserverBase, TserverClass>::d_this(0);
+
+//template<typename TserverBase, typename TserverClass>
+//int ice_application_base<TserverBase, TserverClass>::d_reacquire_attributes(0);
+
+template<typename TserverBase, typename TserverClass>
+ice_application_base<TserverBase, TserverClass>::ice_application_base(TserverClass* _this)
+ : d_reacquire(0)
+{
+ //d_reacquire_attributes = 0;
+ d_this = _this;
+ d_application = ice_application_common::Instance();
+}
+
+template<typename TserverBase, typename TserverClass>
+void ice_application_base<TserverBase, TserverClass>::starticeexample()
+{
+ char* argv[2];
+ argv[0] = (char*)"";
+
+ std::string conffile = gr::prefs::singleton()->get_string("ControlPort", "config", "");
+
+ if(conffile.size() > 0) {
+ std::stringstream iceconf;
+ ice_application_common::d_have_ice_config = true;
+ ice_application_common::d_main_called = true;
+ iceconf << conffile;
+ d_application->main(0, argv, iceconf.str().c_str());
+ }
+ else {
+ ice_application_common::d_have_ice_config = false;
+ ice_application_common::d_main_called = true;
+ d_application->main(0, argv);
+ }
+}
+
+template<typename TserverBase, typename TserverClass>
+void ice_application_base<TserverBase, TserverClass>::kickoff()
+{
+ static bool run_once = false;
+
+ //if(!d_this->application_started()) {
+ if(!run_once) {
+ ++d_this->d_application->d_reacquire_attributes;
+
+ ice_application_common::d_thread = boost::shared_ptr<boost::thread>
+ (new boost::thread(boost::bind(&ice_application_base::starticeexample, d_this)));
+
+ ::timespec timer_ts, rem_ts;
+ timer_ts.tv_sec = 0; timer_ts.tv_nsec = ICEAPPLICATION_ACTIVATION_TIMEOUT_MS*1000;
+
+ int iter = 0;
+ while(!d_this->application_started()) {
+ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+ ::Sleep(timer_ts.tv_nsec / 1000000);
+ #else
+ ::nanosleep(&timer_ts, &rem_ts);
+ #endif
+ if(!d_this->application_started())
+ std::cout << "@";
+ if(iter++ > 100) {
+ std::cout << "ice_application_base::kickoff(), timeout waiting to get communicator() d_application->main() might have failed?!" << std::endl;;
+ break;
+ }
+ }
+
+ run_once = true;
+ }
+
+ return;
+}
+
+
+template<typename TserverBase, typename TserverClass>
+bool ice_application_base<TserverBase, TserverClass>::reacquire_sync()
+{
+ return (d_this->d_reacquire != d_application->d_reacquire_attributes);
+}
+
+template<typename TserverBase, typename TserverClass>
+void ice_application_base<TserverBase, TserverClass>::sync_reacquire()
+{
+ d_this->d_reacquire = d_application->d_reacquire_attributes;
+}
+
+
+template<typename TserverBase, typename TserverClass>
+const std::vector<std::string> ice_application_base<TserverBase, TserverClass>::endpoints()
+{
+ std::vector<std::string> ep; ep.push_back(d_this->d_application->d_endpointStr); return ep;
+}
+
+template<typename TserverBase, typename TserverClass>
+TserverBase* ice_application_base<TserverBase, TserverClass>::i()
+{
+ //printf("indacall\n");
+
+ assert(d_this != 0);
+ if(!d_this->application_started()) {
+ //printf("anotherkickoff\n");
+ kickoff();
+ }
+ //printf("donekickedoff\n");
+
+ /*else if(!d_proxy) {
+ d_proxy = d_this->i_impl();
+ assert(d_proxy != 0);
+ }*/
+
+ return d_this->i_impl();
+}
+
+/*template<typename TserverBase, typename TserverClass>
+ int ice_application_base<TserverBase, TserverClass>::run(int argc, char* argv[]) {
+ int implreturn(run_impl(argc, argv));
+ ice_application_base<TserverBase, TserverClass>::communicator()->waitForShutdown();
+ return implreturn;
+ }*/
+
+template<typename TserverBase, typename TImplClass>
+bool ice_application_base<TserverBase, TImplClass>::application_started()
+{
+ return ice_application_base<TserverBase, TImplClass>::d_this->d_application->communicator();
+}
+
+/*template<typename TserverBase, typename TImplClass>
+int ice_application_base<TserverBase, TImplClass>::run_impl(int argc, char* argv[]) { return EXIT_SUCCESS; }
+*/
+
+#endif
diff --git a/gnuradio-runtime/include/gnuradio/ice_server_template.h b/gnuradio-runtime/include/gnuradio/ice_server_template.h
new file mode 100644
index 0000000000..45c1756a48
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/ice_server_template.h
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ICE_SERVER_TEMPLATE_H
+#define ICE_SERVER_TEMPLATE_H
+
+#include <gnuradio/rpcserver_ice.h>
+#include <gnuradio/ice_application_base.h>
+#include <iostream>
+
+template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
+class ice_server_template : public ice_application_base<TserverBase, TImplClass>
+{
+public:
+ ice_server_template(TImplClass* _this,
+ const std::string& contolPortName,
+ const std::string& endpointName);
+ ~ice_server_template();
+
+protected:
+ //virtual bool application_started();
+ TserverBase* i_impl();
+ friend class ice_application_base<TserverBase, TImplClass>;
+
+private:
+ //virtual int run_impl(int, char*[]);
+ Ice::ObjectAdapterPtr d_adapter;
+ TserverBase* d_iceserver;
+ const std::string d_contolPortName, d_endpointName;
+};
+
+template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
+ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::ice_server_template
+ (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName)
+ : ice_application_base<TserverBase, TImplClass>(_this),
+ d_iceserver(0),
+ d_contolPortName(controlPortName),
+ d_endpointName(endpointName)
+{;}
+
+template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
+ice_server_template<TserverBase, TserverClass,TImplClass, TIceClass>::~ice_server_template()
+{
+ if(d_adapter) {
+ d_adapter->deactivate();
+ delete(d_iceserver);
+ d_adapter = 0;
+ }
+}
+
+template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
+TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::i_impl()
+{
+ if(ice_application_base<TserverBase, TImplClass>::d_this->reacquire_sync()) {
+ d_adapter = (ice_application_base<TserverBase, TImplClass>::d_this->have_ice_config()) ?
+ ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapter(d_contolPortName) :
+ ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapterWithEndpoints(d_contolPortName,"tcp -h *");
+
+ TserverClass* server_ice(new TserverClass());
+ TIceClass obj(server_ice);
+
+ Ice::Identity id(ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->stringToIdentity(d_endpointName));
+ d_adapter->add(obj, id);
+ d_adapter->activate();
+ ice_application_base<TserverBase, TImplClass>::d_this->set_endpoint(ice_application_common::communicator()->proxyToString(d_adapter->createDirectProxy(id)));
+
+ std::cout << std::endl << "Ice Radio Endpoint: "
+ << ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::endpoints()[0]
+ << std::endl;
+
+ d_iceserver = (TserverBase*) server_ice;
+ ice_application_base<TserverBase, TImplClass>::d_this->sync_reacquire();
+ }
+
+ return d_iceserver;
+}
+
+#endif /* ICE_SERVER_TEMPLATE_H */
diff --git a/gnuradio-runtime/include/gnuradio/io_signature.h b/gnuradio-runtime/include/gnuradio/io_signature.h
new file mode 100644
index 0000000000..973f93cd98
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/io_signature.h
@@ -0,0 +1,111 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_IO_SIGNATURE_H
+#define INCLUDED_IO_SIGNATURE_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/runtime_types.h>
+
+namespace gr {
+
+ /*!
+ * \brief i/o signature for input and output ports.
+ * \brief misc
+ */
+ class GR_RUNTIME_API io_signature
+ {
+ int d_min_streams;
+ int d_max_streams;
+ std::vector<int> d_sizeof_stream_item;
+
+ io_signature(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items);
+
+ public:
+ typedef boost::shared_ptr<io_signature> sptr;
+
+ static const int IO_INFINITE = -1;
+
+ ~io_signature();
+
+ /*!
+ * \brief Create an i/o signature
+ *
+ * \ingroup internal
+ * \param min_streams specify minimum number of streams (>= 0)
+ * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
+ * \param sizeof_stream_item specify the size of the items in each stream
+ */
+ static sptr make(int min_streams, int max_streams,
+ int sizeof_stream_item);
+
+ /*!
+ * \brief Create an i/o signature
+ *
+ * \param min_streams specify minimum number of streams (>= 0)
+ * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
+ * \param sizeof_stream_item1 specify the size of the items in the first stream
+ * \param sizeof_stream_item2 specify the size of the items in the second and subsequent streams
+ */
+ static sptr make2(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2);
+
+ /*!
+ * \brief Create an i/o signature
+ *
+ * \param min_streams specify minimum number of streams (>= 0)
+ * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
+ * \param sizeof_stream_item1 specify the size of the items in the first stream
+ * \param sizeof_stream_item2 specify the size of the items in the second stream
+ * \param sizeof_stream_item3 specify the size of the items in the third and subsequent streams
+ */
+ static sptr make3(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2,
+ int sizeof_stream_item3);
+
+ /*!
+ * \brief Create an i/o signature
+ *
+ * \param min_streams specify minimum number of streams (>= 0)
+ * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
+ * \param sizeof_stream_items specify the size of the items in the streams
+ *
+ * If there are more streams than there are entries in
+ * sizeof_stream_items, the value of the last entry in
+ * sizeof_stream_items is used for the missing values.
+ * sizeof_stream_items must contain at least 1 entry.
+ */
+ static sptr makev(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items);
+
+ int min_streams() const { return d_min_streams; }
+ int max_streams() const { return d_max_streams; }
+ int sizeof_stream_item(int index) const;
+ std::vector<int> sizeof_stream_items() const;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_IO_SIGNATURE_H */
diff --git a/gnuradio-runtime/include/gnuradio/logger.h.in b/gnuradio-runtime/include/gnuradio/logger.h.in
new file mode 100644
index 0000000000..87f3611d9c
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/logger.h.in
@@ -0,0 +1,747 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*******************************************************************************
+* Author: Mark Plett
+* Description:
+* The gr::logger module wraps the log4cpp library for logging in gnuradio
+*******************************************************************************/
+
+#ifndef INCLUDED_GR_LOGGER_H
+#define INCLUDED_GR_LOGGER_H
+
+/*!
+* \ingroup logging
+* \brief GNU Radio logging wrapper for log4cpp library (C++ port of log4j)
+*
+*/
+
+#ifndef ENABLE_GR_LOG
+#cmakedefine ENABLE_GR_LOG
+#endif
+#ifndef HAVE_LOG4CPP
+#cmakedefine HAVE_LOG4CPP
+#endif
+
+#include <gnuradio/api.h>
+#include <assert.h>
+#include <iostream>
+#include <time.h>
+#include <boost/filesystem.hpp>
+#include <boost/thread.hpp>
+#include <pmt/pmt.h>
+
+#ifdef ENABLE_GR_LOG
+
+// We have three configurations... first logging to stdout/stderr
+#ifndef HAVE_LOG4CPP
+
+namespace gr {
+ //#warning GR logging Enabled and using std::cout
+ typedef std::string logger_ptr;
+} /* namespace gr */
+
+#define GR_LOG_DECLARE_LOGPTR(logger)
+#define GR_LOG_ASSIGN_LOGPTR(logger,name)
+#define GR_CONFIG_LOGGER(config)
+#define GR_CONFIG_AND_WATCH_LOGGER(config,period)
+#define GR_LOG_GETLOGGER(logger, name)
+#define GR_SET_LEVEL(name, level)
+#define GR_LOG_SET_LEVEL(logger, level)
+#define GR_GET_LEVEL(name, level)
+#define GR_LOG_GET_LEVEL(logger, level)
+#define GR_ADD_APPENDER(name,appender)
+#define GR_LOG_ADD_APPENDER(logger,appender)
+#define GR_ADD_CONSOLE_APPENDER(logger,target,pattern)
+#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern)
+#define GR_ADD_FILE_APPENDER(name,filename,append,pattern)
+#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern)
+#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern)
+#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern)
+#define GR_GET_LOGGER_NAMES(names)
+#define GR_RESET_CONFIGURATION()
+#define GR_DEBUG(name, msg) std::cout<<"DEBUG: "<<msg<<std::endl
+#define GR_INFO(name, msg) std::cout<<"INFO: "<<msg<<std::endl
+#define GR_NOTICE(name, msg) std::cout<<"NOTICE: "<<msg<<std::endl
+#define GR_WARN(name, msg) std::cerr<<"WARN: "<<msg<<std::endl
+#define GR_ERROR(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
+#define GR_ALERT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
+#define GR_CRIT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
+#define GR_FATAL(name, msg) std::cerr<<"FATAL: "<<msg<<std::endl
+#define GR_EMERG(name, msg) std::cerr<<"EMERG: "<<msg<<std::endl
+#define GR_ERRORIF(name, cond, msg) {if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl;}
+#define GR_ASSERT(name, cond, msg) {if(!(cond)) std::cerr<<"FATAL: "<<msg<<std::endl; assert(cond);}
+#define GR_LOG_DEBUG(logger, msg) std::cout<<"DEBUG: "<<msg<<std::endl
+#define GR_LOG_INFO(logger, msg) std::cout<<"INFO: "<<msg<<std::endl
+#define GR_LOG_NOTICE(logger, msg) std::cout<<"NOTICE: "<<msg<<std::endl
+#define GR_LOG_WARN(logger, msg) std::cerr<<"WARN: "<<msg<<std::endl
+#define GR_LOG_ERROR(logger, msg) std::cerr<<"ERROR: "<<msg<<std::endl
+#define GR_LOG_ALERT(logger, msg) std::cerr<<"ALERT: "<<msg<<std::endl
+#define GR_LOG_CRIT(logger, msg) std::cerr<<"CRIT: "<<msg<<std::endl
+#define GR_LOG_FATAL(logger, msg) std::cerr<<"FATAL: "<<msg<<std::endl
+#define GR_LOG_EMERG(logger, msg) std::cerr<<"EMERG: "<<msg<<std::endl
+#define GR_LOG_ERRORIF(logger, cond, msg) { \
+ if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl;}
+#define GR_LOG_ASSERT(logger, cond, msg) { \
+ if(!(cond)) {std::cerr<<"FATAL: "<<msg<<std::endl; assert(cond);};}
+
+
+#else /* HAVE_LOG4CPP */
+
+// Second configuration...logging to log4cpp
+#include <log4cpp/Category.hh>
+#include <log4cpp/PropertyConfigurator.hh>
+#include <log4cpp/FileAppender.hh>
+#include <log4cpp/RollingFileAppender.hh>
+#include <log4cpp/OstreamAppender.hh>
+#include <log4cpp/PatternLayout.hh>
+
+namespace gr {
+
+ /*!
+ * \brief GR_LOG macros
+ * \ingroup logging
+ *
+ * These macros wrap the standard LOG4CPP_LEVEL macros. The availablie macros
+ * are:
+ * LOG_DEBUG
+ * LOG_INFO
+ * LOG_WARN
+ * LOG_TRACE
+ * LOG_ERROR
+ * LOG_ALERT
+ * LOG_CRIT
+ * LOG_FATAL
+ * LOG_EMERG
+ */
+ typedef log4cpp::Category* logger_ptr;
+
+} /* namespace gr */
+
+
+ /* Macros for Programmatic Configuration */
+#define GR_LOG_DECLARE_LOGPTR(logger) \
+ gr::logger_ptr logger;
+
+#define GR_LOG_ASSIGN_LOGPTR(logger,name) \
+ logger = gr::logger_get_logger(name);
+
+#define GR_CONFIG_LOGGER(config) \
+ gr::logger_config::load_config(config)
+
+#define GR_CONFIG_AND_WATCH_LOGGER(config,period) \
+ gr::logger_config::load_config(config,period)
+
+#define GR_LOG_GETLOGGER(logger, name) \
+ gr::logger_ptr logger = gr::logger_get_logger(name);
+
+#define GR_SET_LEVEL(name, level) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_set_level(logger,level);}
+
+#define GR_LOG_SET_LEVEL(logger, level) \
+ gr::logger_set_level(logger, level);
+
+#define GR_GET_LEVEL(name, level) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_get_level(logger,level);}
+
+#define GR_LOG_GET_LEVEL(logger, level) \
+ gr::logger_get_level(logger,level);
+
+#define GR_ADD_APPENDER(name, appender) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_add_appender(logger,appender);}
+
+#define GR_LOG_ADD_APPENDER(logger, appender) { \
+ gr::logger_add_appender(logger, appender);}
+
+#define GR_ADD_CONSOLE_APPENDER(name, target, pattern) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_add_console_appender(logger,target,pattern);}
+
+#define GR_LOG_ADD_CONSOLE_APPENDER(logger, target, pattern) { \
+ gr::logger_add_console_appender(logger,target,pattern);}
+
+#define GR_ADD_FILE_APPENDER(name, filename, append, pattern) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_add_file_appender(logger,filename,append,pattern);}
+
+#define GR_LOG_ADD_FILE_APPENDER(logger, filename, append, pattern) { \
+ gr::logger_add_file_appender(logger,filename,append,pattern);}
+
+#define GR_ADD_ROLLINGFILE_APPENDER(name, filename, filesize, bkup_index, append, mode, pattern) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ gr::logger_add_rollingfile_appender(logger,filename,filesize,bkup_index,append,mode,pattern);}
+
+#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger, filename, filesize, bkup_index, append, mode, pattern) { \
+ gr::logger_add_rollingfile_appender(logger,filename,filesize,bkup_index,append,mode,pattern);}
+
+#define GR_GET_LOGGER_NAMES(names) { \
+ names = gr::logger_get_logger_names();}
+
+#define GR_RESET_CONFIGURATION() \
+ gr::logger_config::reset_config();
+
+ /* Logger name referenced macros */
+#define GR_DEBUG(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::DEBUG << msg << log4cpp::eol;}
+
+#define GR_INFO(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::INFO << msg << log4cpp::eol;}
+
+#define GR_NOTICE(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger << log4cpp::Priority::NOTICE << msg;}
+
+#define GR_WARN(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::WARN << msg << log4cpp::eol;}
+
+#define GR_ERROR(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;}
+
+#define GR_CRIT(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::CRIT << msg << log4cpp::eol;}
+
+#define GR_ALERT(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::ALERT << msg << log4cpp::eol;}
+
+#define GR_FATAL(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::FATAL << msg << log4cpp::eol;}
+
+#define GR_EMERG(name, msg) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol;}
+
+#define GR_ERRORIF(name, cond, msg) { \
+ if((cond)) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;} \
+ }
+
+#define GR_ASSERT(name, cond, msg) { \
+ if(!(cond)) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
+ *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol;} \
+ assert(0); \
+ }
+
+ /* LoggerPtr Referenced Macros */
+#define GR_LOG_DEBUG(logger, msg) { \
+ *logger << log4cpp::Priority::DEBUG << msg << log4cpp::eol;}
+
+#define GR_LOG_INFO(logger, msg) { \
+ *logger << log4cpp::Priority::INFO << msg << log4cpp::eol;}
+
+#define GR_LOG_NOTICE(logger, msg) { \
+ *logger << log4cpp::Priority::NOTICE << msg << log4cpp::eol;}
+
+#define GR_LOG_WARN(logger, msg) { \
+ *logger << log4cpp::Priority::WARN << msg << log4cpp::eol;}
+
+#define GR_LOG_ERROR(logger, msg) { \
+ *logger << log4cpp::Priority::ERROR << msg << log4cpp::eol;}
+
+#define GR_LOG_CRIT(logger, msg) { \
+ *logger << log4cpp::Priority::CRIT << msg << log4cpp::eol;}
+
+#define GR_LOG_ALERT(logger, msg) { \
+ *logger << log4cpp::Priority::ALERT << msg << log4cpp::eol;}
+
+#define GR_LOG_FATAL(logger, msg) { \
+ *logger << log4cpp::Priority::FATAL << msg << log4cpp::eol;}
+
+#define GR_LOG_EMERG(logger, msg) { \
+ *logger << log4cpp::Priority::EMERG << msg << log4cpp::eol;}
+
+#define GR_LOG_ERRORIF(logger,cond, msg) { \
+ if((cond)) { \
+ *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;} \
+ }
+
+#define GR_LOG_ASSERT(logger, cond, msg) { \
+ if(!(cond)) { \
+ *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol; \
+ assert(0);} \
+ }
+
+namespace gr {
+
+ /*!
+ * \brief Class to control configuration of logger.
+ * This is a singleton that cna launch a thread to wathc a config file for changes
+ * \ingroup logging
+ */
+ class logger_config
+ {
+ private:
+ /*! \brief filename of logger config file */
+ std::string filename;
+ /*! \brief Period (seconds) over which watcher thread checks config file for changes */
+ unsigned int watch_period;
+ /*! \brief Pointer to watch thread for config file changes */
+ boost::thread *watch_thread;
+
+ /*! \brief Watcher thread method
+ * /param filename Name of configuration file
+ * /param watch_period Seconds between checks for changes in config file
+ */
+ static void watch_file(std::string filename,unsigned int watch_period);
+
+ static bool logger_configured;
+
+ logger_config()/*:
+ rpc_get_filename("logger_config", "filename", &logger_config::get_filename4rpc,
+ pmt::mp(""), pmt::mp(""), pmt::mp(""),
+ "", "filename", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP),
+ rpc_get_watchperiod("logger_config", "watch_period", &logger_config::get_watchperiod4rpc,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "watch_period", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP),
+ rpc_get_config("logger_config", "config", &logger_config::get_config4rpc,
+ pmt::mp(""), pmt::mp(""), pmt::mp(""),
+ "", "filename", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP),
+ rpc_set_config("logger_config","config", &logger_config::set_config4rpc,
+ pmt::mp(""), pmt::mp(""), pmt::mp(""),
+ "", "filename", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)
+ */
+ {
+ } //!< Constructor
+
+ /*
+ rpcbasic_register_get<logger_config,std::string> rpc_get_filename;
+ rpcbasic_register_get<logger_config,int> rpc_get_watchperiod;
+ rpcbasic_register_get<logger_config,std::string> rpc_get_config;
+ rpcbasic_register_set<logger_config,std::string> rpc_set_config;
+ */
+
+ logger_config(logger_config const&); //!<Copy constructor
+ void operator=(logger_config const&); //!<Assignment Operator
+
+ std::string get_filename4rpc() {
+ return filename;
+ }
+ int get_watchperiod4rpc(){return watch_period;};
+
+ std::string get_config4rpc() {
+ return filename;
+ }
+
+ void set_config4rpc(std::string set) {
+ printf("Set string was:%s\n", set.c_str());
+ }
+
+ /*! \brief destrcutor stops watch thread before exits */
+ ~logger_config() {
+ stop_watch();
+ }
+
+ /*! \brief Instance getter for singleton. Only used by class. */
+ static logger_config& get_instance(void);
+
+ public:
+ /*! \brief Getter for config filename */
+ static std::string get_filename();
+ /*! \brief Getter for watch period */
+ static unsigned int get_watch_period();
+ /*! \brief Method to load configuration
+ * /param filename Name of configuration file
+ * /param watch_period Seconds between checks for changes in config file
+ */
+ static void load_config(std::string filename,unsigned int watch_period=0);
+ /*! \brief Method to stop watcher thread */
+ static void stop_watch();
+ /*! \brief method to reset logger configuration */
+ static void reset_config(void);
+ };
+
+ /*!
+ * \brief Retrieve a pointer to a logger by name
+ *
+ * Retrives a logger pointer
+ * \p name.
+ *
+ * \param name Name of the logger for which a pointer is requested
+ */
+ GR_RUNTIME_API logger_ptr logger_get_logger(std::string name);
+
+ /*!
+ * \brief Load logger's configuration file.
+ *
+ * Initialize the GNU Radio logger by loading the configuration file
+ * \p config_filename.
+ *
+ * \param config_filename The configuration file. Set to "" for the
+ * basic logger that outputs to the console.
+ */
+ GR_RUNTIME_API bool logger_load_config(const std::string &config_filename="");
+
+ /*!
+ * \brief Reset logger's configuration file.
+ *
+ * Remove all appenders from loggers
+ */
+ GR_RUNTIME_API void logger_reset_config(void);
+
+ /*!
+ * \brief Set the logger's output level.
+ *
+ * Sets the level of the logger. This takes a string that is
+ * translated to the standard levels and can be (case insensitive):
+ *
+ * \li off , notset
+ * \li debug
+ * \li info
+ * \li notice
+ * \li warn
+ * \li error
+ * \li crit
+ * \li alert
+ * \li fatal
+ * \li emerg
+ *
+ * \param logger the logger to set the level of.
+ * \param level string to set the level to.
+ */
+ GR_RUNTIME_API void logger_set_level(logger_ptr logger,
+ const std::string &level);
+
+ /*!
+ * \brief Set the logger's output level.
+ *
+ * Sets the level of the logger. This takes the actual Log4cpp::Priority
+ * data type, which can be:
+ *
+ * \li log4cpp::Priority::NOTSET
+ * \li log4cpp::Priority::DEBUG
+ * \li log4cpp::Priority::INFO
+ * \li log4cpp::Priority::NOTICE
+ * \li log4cpp::Priority::WARN
+ * \li log4cpp::Priority::ERROR
+ * \li log4cpp::Priority::CRIT
+ * \li log4cpp::Priority::ALERT
+ * \li log4cpp::Priority::FATAL
+ * \li log4cpp::Priority::EMERG
+ *
+ * \param logger the logger to set the level of.
+ * \param level new logger level of type Log4cpp::Priority
+ */
+ GR_RUNTIME_API void logger_set_level(logger_ptr logger,
+ log4cpp::Priority::Value level);
+
+ /*!
+ * \brief Get the logger's output level.
+ *
+ * Gets the level of the logger. This returns a string that
+ * corresponds to the standard levels and can be (case insensitive):
+ *
+ * \li notset
+ * \li debug
+ * \li info
+ * \li notice
+ * \li warn
+ * \li error
+ * \li crit
+ * \li alert
+ * \li fatal
+ * \li emerg
+ *
+ * \param logger the logger to get the level of.
+ * \param level string to get the level into.
+ */
+ GR_RUNTIME_API void logger_get_level(logger_ptr logger, std::string &level);
+
+ /*!
+ * \brief Get the logger's output level.
+ *
+ * Gets the level of the logger. This returns the actual Log4cpp::Level
+ * data type, which can be:
+ *
+ * \li log4cpp::Priority::NOTSET
+ * \li log4cpp::Priority::DEBUG
+ * \li log4cpp::Priority::INFO
+ * \li log4cpp::Priority::NOTICE
+ * \li log4cpp::Priority::WARN
+ * \li log4cpp::Priority::ERROR
+ * \li log4cpp::Priority::CRIT
+ * \li log4cpp::Priority::ALERT
+ * \li log4cpp::Priority::FATAL
+ * \li log4cpp::Priority::EMERG
+ *
+ * \param logger the logger to get the level of.
+ * \param level of the logger.
+ */
+ GR_RUNTIME_API void logger_get_level(logger_ptr logger,
+ log4cpp::Priority::Value &level);
+
+ /*!
+ * \brief Add console appender to a given logger
+ *
+ * Add console appender to a given logger
+ *
+ * \param logger Logger to which appender will be added
+ * \param target Std target to write 'cout' or 'cerr' (default is cout)
+ * \param pattern Formating pattern for log messages
+ */
+ GR_RUNTIME_API void logger_add_appender(logger_ptr logger,
+ std::string appender);
+
+ /*!
+ * \brief Add console appender to a given logger
+ *
+ * Add console appender to a given logger
+ *
+ * \param logger Logger to which appender will be added
+ * \param target Std target to write 'cout' or 'cerr' (default is cout)
+ * \param pattern Formating pattern for log messages
+ */
+ GR_RUNTIME_API void logger_add_console_appender(logger_ptr logger,
+ std::string target,
+ std::string pattern);
+
+ /*!
+ * \brief Add file appender to a given logger
+ *
+ * Add file appender to a given logger
+ *
+ * \param logger Logger to which appender will be added
+ * \param filename File to which log will be written
+ * \param append Overwrite or append to log file
+ * \param pattern Formating pattern for log messages
+ */
+ GR_RUNTIME_API void logger_add_file_appender(logger_ptr logger,
+ std::string filename,
+ bool append, std::string pattern);
+
+ /*!
+ * \brief Add rolling file appender to a given logger
+ *
+ * Add rolling file appender to a given logger
+ *
+ * \param logger Logger to which appender will be added
+ * \param filename File to which log will be written
+ * \param filesize Sizez of files to write
+ * \param bkup_index Number of files to write
+ * \param append Overwrite or append to log file
+ * \param mode Permissions to set on log file
+ * \param pattern Formating pattern for log messages
+ */
+ GR_RUNTIME_API void logger_add_rollingfile_appender(logger_ptr logger, std::string filename,
+ size_t filesize, int bkup_index, bool append,
+ mode_t mode,std::string pattern);
+
+ /*!
+ * \brief Add rolling file appender to a given logger
+ *
+ * Add rolling file appender to a given logger
+ *
+ * \return vector of string names of loggers
+ */
+ GR_RUNTIME_API std::vector<std::string> logger_get_logger_names(void);
+
+} /* namespace gr */
+
+#endif /* HAVE_LOG4CPP */
+
+ // If Logger disable do nothing
+#else /* ENABLE_GR_LOG */
+
+namespace gr {
+ typedef void* logger_ptr;
+} /* namespace gr */
+
+#define GR_LOG_DECLARE_LOGPTR(logger)
+#define GR_LOG_ASSIGN_LOGPTR(logger,name)
+#define GR_CONFIG_LOGGER(config)
+#define GR_CONFIG_AND_WATCH_LOGGER(config,period)
+#define GR_LOG_GETLOGGER(logger, name)
+#define GR_SET_LEVEL(name, level)
+#define GR_LOG_SET_LEVEL(logger, level)
+#define GR_GET_LEVEL(name, level)
+#define GR_LOG_GET_LEVEL(logger, level)
+#define GR_ADD_APPENDER(name,appender)
+#define GR_LOG_ADD_APPENDER(logger,appender)
+#define GR_ADD_CONSOLE_APPENDER(logger,target,pattern)
+#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern)
+#define GR_ADD_FILE_APPENDER(name,filename,append,pattern)
+#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern)
+#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern)
+#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern)
+#define GR_GET_LOGGER_NAMES(names)
+#define GR_RESET_CONFIGURATION()
+#define GR_DEBUG(name, msg)
+#define GR_INFO(name, msg)
+#define GR_NOTICE(name, msg)
+#define GR_WARN(name, msg)
+#define GR_ERROR(name, msg)
+#define GR_ALERT(name, msg)
+#define GR_CRIT(name, msg)
+#define GR_FATAL(name, msg)
+#define GR_EMERG(name, msg)
+#define GR_ERRORIF(name, cond, msg)
+#define GR_ASSERT(name, cond, msg)
+#define GR_LOG_DEBUG(logger, msg)
+#define GR_LOG_INFO(logger, msg)
+#define GR_LOG_NOTICE(logger, msg)
+#define GR_LOG_WARN(logger, msg)
+#define GR_LOG_ERROR(logger, msg)
+#define GR_LOG_ALERT(logger, msg)
+#define GR_LOG_CRIT(logger, msg)
+#define GR_LOG_FATAL(logger, msg)
+#define GR_LOG_EMERG(logger, msg)
+#define GR_LOG_ERRORIF(logger, cond, msg)
+#define GR_LOG_ASSERT(logger, cond, msg)
+
+#endif /* ENABLE_GR_LOG */
+
+namespace gr {
+
+ // Even if logger is disabled we'll need for methods below to exist in python.
+ // The macros these call will be disabled if ENABLE_GR_LOG is undefined
+
+ /********************* Start Classes and Methods for Python ******************/
+ /*!
+ * \brief Logger class for referencing loggers in python. Not
+ * needed in C++ (use macros) Wraps and manipulates loggers for
+ * python as python has no macros
+ * \ingroup logging
+ *
+ */
+ class logger
+ {
+ private:
+ /*! \brief logger pointer to logger associated wiith this wrapper class */
+ logger_ptr d_logger;
+ public:
+ /*!
+ * \brief contructor Provide name of logger to associate with this class
+ * \param logger_name Name of logger associated with class
+ */
+ logger(std::string logger_name) {
+ GR_LOG_ASSIGN_LOGPTR(d_logger,logger_name);
+ };
+
+ /*! \brief Destructor */
+ ~logger(){;}
+
+ // Wrappers for logging macros
+ /*! \brief inline function, wrapper to set the logger level */
+ void set_level(std::string level){GR_LOG_SET_LEVEL(d_logger,level);}
+
+ /*! \brief inline function, wrapper to get the logger level */
+ void get_level(std::string &level){GR_LOG_GET_LEVEL(d_logger,level);}
+
+ /*! \brief inline function, wrapper for LOG4CPP_DEBUG for DEBUG message */
+ void debug(std::string msg){GR_LOG_DEBUG(d_logger,msg);};
+
+ /*! \brief inline function, wrapper for LOG4CPP_INFO for INFO message */
+ void info(std::string msg){GR_LOG_INFO(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for NOTICE message */
+ void notice(std::string msg){GR_LOG_NOTICE(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for LOG4CPP_WARN for WARN message */
+ void warn(std::string msg){GR_LOG_WARN(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for LOG4CPP_ERROR for ERROR message */
+ void error(std::string msg){GR_LOG_ERROR(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for NOTICE message */
+ void crit(std::string msg){GR_LOG_CRIT(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for ALERT message */
+ void alert(std::string msg){GR_LOG_ALERT(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for FATAL message */
+ void fatal(std::string msg){GR_LOG_FATAL(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for EMERG message */
+ void emerg(std::string msg){GR_LOG_EMERG(d_logger,msg);}
+
+ /*! \brief inline function, wrapper for LOG4CPP_ASSERT for conditional ERROR message */
+ void errorIF(bool cond,std::string msg){GR_LOG_ERRORIF(d_logger,cond,msg);}
+
+ /*! \brief inline function, wrapper for LOG4CPP_ASSERT for conditional ERROR message */
+ void log_assert(bool cond,std::string msg){GR_LOG_ASSERT(d_logger,cond,msg);}
+
+ /*! \brief inline function, Method to add appender to logger by
+ name (define appender in conf file) */
+ void add_appender(std::string appender) {
+ GR_LOG_ADD_APPENDER(d_logger, appender);
+ }
+
+ /*! \brief inline function, Method to add console appender to logger */
+ void add_console_appender(std::string target,std::string pattern) {
+ GR_LOG_ADD_CONSOLE_APPENDER(d_logger, target, pattern);
+ }
+
+ /*! \brief inline function, Method to add file appender to logger */
+ void add_file_appender(std::string filename, bool append, std::string pattern) {
+ GR_LOG_ADD_FILE_APPENDER(d_logger, filename, append, pattern);
+ }
+
+ /*! \brief inline function, Method to add rolling file appender to logger */
+ void add_rollingfile_appender(std::string filename, size_t filesize,
+ int bkup_index, bool append, mode_t mode,
+ std::string pattern) {
+ GR_LOG_ADD_ROLLINGFILE_APPENDER(d_logger,filename,filesize,
+ bkup_index,append,mode,pattern);
+ }
+ };
+
+} /* namespace gr */
+
+/**************** Start Configuration Class and Methods for Python ************/
+/*!
+ * \brief Function to call configuration macro from python.
+ * Note: Configuration is only updated if filename or watch_period has changed.
+ * \param config_filename Name of configuration file
+ * \param watch_period Seconds to wait between checking for changes in conf file.
+ * Watch_period defaults to 0 in which case the file is not watched for changes
+ */
+GR_RUNTIME_API void gr_logger_config(const std::string config_filename,
+ unsigned int watch_period = 0);
+
+/*!
+ * \brief Function to return logger names to python
+ * \return Vector of name strings
+ *
+ */
+GR_RUNTIME_API std::vector<std::string> gr_logger_get_logger_names(void);
+
+/*!
+ * \brief Function to reset logger configuration from python
+ *
+ */
+GR_RUNTIME_API void gr_logger_reset_config(void);
+
+#endif /* INCLUDED_GR_LOGGER_H */
diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h
new file mode 100644
index 0000000000..ec4cfb014f
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/math.h
@@ -0,0 +1,226 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2005,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * mathematical odds and ends.
+ */
+
+#ifndef _GR_MATH_H_
+#define _GR_MATH_H_
+
+#include <gnuradio/api.h>
+#include <gnuradio/gr_complex.h>
+
+namespace gr {
+
+ static inline bool
+ is_power_of_2(long x)
+ {
+ return x != 0 && (x & (x-1)) == 0;
+ }
+
+ /*!
+ * \brief Fast arc tangent using table lookup and linear interpolation
+ * \ingroup misc
+ *
+ * \param y component of input vector
+ * \param x component of input vector
+ * \returns float angle angle of vector (x, y) in radians
+ *
+ * This function calculates the angle of the vector (x,y) based on a
+ * table lookup and linear interpolation. The table uses a 256 point
+ * table covering -45 to +45 degrees and uses symetry to determine
+ * the final angle value in the range of -180 to 180 degrees. Note
+ * that this function uses the small angle approximation for values
+ * close to zero. This routine calculates the arc tangent with an
+ * average error of +/- 0.045 degrees.
+ */
+ GR_RUNTIME_API float fast_atan2f(float y, float x);
+
+ static inline float
+ fast_atan2f(gr_complex z)
+ {
+ return fast_atan2f(z.imag(), z.real());
+ }
+
+ /* This bounds x by +/- clip without a branch */
+ static inline float
+ branchless_clip(float x, float clip)
+ {
+ float x1 = fabsf(x+clip);
+ float x2 = fabsf(x-clip);
+ x1 -= x2;
+ return 0.5*x1;
+ }
+
+ static inline float
+ clip(float x, float clip)
+ {
+ float y = x;
+ if(x > clip)
+ y = clip;
+ else if(x < -clip)
+ y = -clip;
+ return y;
+ }
+
+ // Slicer Functions
+ static inline unsigned int
+ binary_slicer(float x)
+ {
+ if(x >= 0)
+ return 1;
+ else
+ return 0;
+ }
+
+ static inline unsigned int
+ quad_45deg_slicer(float r, float i)
+ {
+ unsigned int ret = 0;
+ if((r >= 0) && (i >= 0))
+ ret = 0;
+ else if((r < 0) && (i >= 0))
+ ret = 1;
+ else if((r < 0) && (i < 0))
+ ret = 2;
+ else
+ ret = 3;
+ return ret;
+ }
+
+ static inline unsigned int
+ quad_0deg_slicer(float r, float i)
+ {
+ unsigned int ret = 0;
+ if(fabsf(r) > fabsf(i)) {
+ if(r > 0)
+ ret = 0;
+ else
+ ret = 2;
+ }
+ else {
+ if(i > 0)
+ ret = 1;
+ else
+ ret = 3;
+ }
+
+ return ret;
+ }
+
+ static inline unsigned int
+ quad_45deg_slicer(gr_complex x)
+ {
+ return quad_45deg_slicer(x.real(), x.imag());
+ }
+
+ static inline unsigned int
+ quad_0deg_slicer(gr_complex x)
+ {
+ return quad_0deg_slicer(x.real(), x.imag());
+ }
+
+ // Branchless Slicer Functions
+ static inline unsigned int
+ branchless_binary_slicer(float x)
+ {
+ return (x >= 0);
+ }
+
+ static inline unsigned int
+ branchless_quad_0deg_slicer(float r, float i)
+ {
+ unsigned int ret = 0;
+ ret = (fabsf(r) > fabsf(i)) * (((r < 0) << 0x1)); // either 0 (00) or 2 (10)
+ ret |= (fabsf(i) > fabsf(r)) * (((i < 0) << 0x1) | 0x1); // either 1 (01) or 3 (11)
+
+ return ret;
+ }
+
+ static inline unsigned int
+ branchless_quad_0deg_slicer(gr_complex x)
+ {
+ return branchless_quad_0deg_slicer(x.real(), x.imag());
+ }
+
+ static inline unsigned int
+ branchless_quad_45deg_slicer(float r, float i)
+ {
+ char ret = (r <= 0);
+ ret |= ((i <= 0) << 1);
+ return (ret ^ ((ret & 0x2) >> 0x1));
+ }
+
+ static inline unsigned int
+ branchless_quad_45deg_slicer(gr_complex x)
+ {
+ return branchless_quad_45deg_slicer(x.real(), x.imag());
+ }
+
+ /*!
+ * \param x any value
+ * \param pow2 must be a power of 2
+ * \returns \p x rounded down to a multiple of \p pow2.
+ */
+ static inline size_t
+ p2_round_down(size_t x, size_t pow2)
+ {
+ return x & -pow2;
+ }
+
+ /*!
+ * \param x any value
+ * \param pow2 must be a power of 2
+ * \returns \p x rounded up to a multiple of \p pow2.
+ */
+ static inline size_t
+ p2_round_up(size_t x, size_t pow2)
+ {
+ return p2_round_down(x + pow2 - 1, pow2);
+ }
+
+ /*!
+ * \param x any value
+ * \param pow2 must be a power of 2
+ * \returns \p x modulo \p pow2.
+ */
+ static inline size_t
+ p2_modulo(size_t x, size_t pow2)
+ {
+ return x & (pow2 - 1);
+ }
+
+ /*!
+ * \param x any value
+ * \param pow2 must be a power of 2
+ * \returns \p pow2 - (\p x modulo \p pow2).
+ */
+ static inline size_t
+ p2_modulo_neg(size_t x, size_t pow2)
+ {
+ return pow2 - p2_modulo(x, pow2);
+ }
+
+} /* namespace gr */
+
+#endif /* _GR_MATH_H_ */
diff --git a/gnuradio-runtime/include/gnuradio/message.h b/gnuradio-runtime/include/gnuradio/message.h
new file mode 100644
index 0000000000..0fda2d9c8c
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/message.h
@@ -0,0 +1,91 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_H
+#define INCLUDED_GR_MESSAGE_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+#include <string>
+
+namespace gr {
+
+ /*!
+ * \brief Message class.
+ *
+ * \ingroup misc
+ * The ideas and method names for adjustable message length were
+ * lifted from the click modular router "Packet" class.
+ */
+ class GR_RUNTIME_API message
+ {
+ public:
+ typedef boost::shared_ptr<message> sptr;
+
+ private:
+ sptr d_next; // link field for msg queue
+ long d_type; // type of the message
+ double d_arg1; // optional arg1
+ double d_arg2; // optional arg2
+
+ unsigned char *d_buf_start; // start of allocated buffer
+ unsigned char *d_msg_start; // where the msg starts
+ unsigned char *d_msg_end; // one beyond end of msg
+ unsigned char *d_buf_end; // one beyond end of allocated buffer
+
+ message(long type, double arg1, double arg2, size_t length);
+
+ friend class msg_queue;
+
+ unsigned char *buf_data() const { return d_buf_start; }
+ size_t buf_len() const { return d_buf_end - d_buf_start; }
+
+ public:
+ /*!
+ * \brief public constructor for message
+ */
+ static sptr make(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
+
+ static sptr make_from_string(const std::string s, long type = 0,
+ double arg1 = 0, double arg2 = 0);
+
+
+ ~message();
+
+ long type() const { return d_type; }
+ double arg1() const { return d_arg1; }
+ double arg2() const { return d_arg2; }
+
+ void set_type(long type) { d_type = type; }
+ void set_arg1(double arg1) { d_arg1 = arg1; }
+ void set_arg2(double arg2) { d_arg2 = arg2; }
+
+ unsigned char *msg() const { return d_msg_start; }
+ size_t length() const { return d_msg_end - d_msg_start; }
+ std::string to_string() const;
+ };
+
+ GR_RUNTIME_API long message_ncurrently_allocated();
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_H */
diff --git a/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt
new file mode 100644
index 0000000000..f79f2bd24f
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+ msg_accepter.h
+ msg_accepter_msgq.h
+ msg_passing.h
+ msg_producer.h
+ msg_queue.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/messages
+ COMPONENT "runtime_devel"
+)
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h b/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h
new file mode 100644
index 0000000000..cd87b21dec
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_MSG_ACCEPTER_H
+#define INCLUDED_MSG_ACCEPTER_H
+
+#include <gnuradio/api.h>
+#include <pmt/pmt.h>
+#include <boost/shared_ptr.hpp>
+
+namespace gr {
+ namespace messages {
+
+ /*!
+ * \brief Virtual base class that accepts messages
+ */
+ class GR_RUNTIME_API msg_accepter
+ {
+ public:
+ msg_accepter() {};
+ virtual ~msg_accepter();
+
+ /*!
+ * \brief send \p msg to \p msg_accepter on port \p which_port
+ *
+ * Sending a message is an asynchronous operation. The \p post
+ * call will not wait for the message either to arrive at the
+ * destination or to be received.
+ */
+ virtual void post(pmt::pmt_t which_port, pmt::pmt_t msg) = 0;
+ };
+
+ typedef boost::shared_ptr<msg_accepter> msg_accepter_sptr;
+
+ } /* namespace messages */
+} /* namespace gr */
+
+#endif /* INCLUDED_MSG_ACCEPTER_H */
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h b/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h
new file mode 100644
index 0000000000..ba699b8ee6
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_MSG_ACCEPTER_MSGQ_H
+#define INCLUDED_MSG_ACCEPTER_MSGQ_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/messages/msg_accepter.h>
+#include <gnuradio/messages/msg_queue.h>
+
+namespace gr {
+ namespace messages {
+
+ /*!
+ * \brief Concrete class that accepts messages and inserts them
+ * into a message queue.
+ */
+ class GR_RUNTIME_API msg_accepter_msgq : public msg_accepter
+ {
+ protected:
+ msg_queue_sptr d_msg_queue;
+
+ public:
+ msg_accepter_msgq(msg_queue_sptr msgq);
+ ~msg_accepter_msgq();
+
+ virtual void post(pmt::pmt_t msg);
+
+ msg_queue_sptr msg_queue() const { return d_msg_queue; }
+ };
+
+ } /* namespace messages */
+} /* namespace gr */
+
+#endif /* INCLUDED_MSG_ACCEPTER_MSGQ_H */
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
new file mode 100644
index 0000000000..6ad6c40b08
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
@@ -0,0 +1,123 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_MSG_PASSING_H
+#define INCLUDED_MSG_PASSING_H
+
+/*!
+ * \brief Include this header to use the message passing features
+ */
+
+#include <gnuradio/api.h>
+#include <pmt/pmt.h>
+#include <gnuradio/messages/msg_accepter.h>
+
+namespace gr {
+ namespace messages {
+
+ /*!
+ * \brief send message to msg_accepter
+ *
+ * \param accepter is the target of the send.
+ * \param which_port A pmt symbol describing the port by name.
+ * \param msg is the message to send. It's usually a pmt tuple.
+ *
+ * Sending a message is an asynchronous operation. The \p send
+ * call will not wait for the message either to arrive at the
+ * destination or to be received.
+ *
+ * \returns msg
+ */
+ static inline pmt::pmt_t
+ send(msg_accepter_sptr accepter, const pmt::pmt_t &which_port,
+ const pmt::pmt_t &msg)
+ {
+ accepter->post(which_port, msg);
+ return msg;
+ }
+
+ /*!
+ * \brief send message to msg_accepter
+ *
+ * \param accepter is the target of the send.
+ * \param which_port A pmt symbol describing the port by name.
+ * \param msg is the message to send. It's usually a pmt tuple.
+ *
+ * Sending a message is an asynchronous operation. The \p send
+ * call will not wait for the message either to arrive at the
+ * destination or to be received.
+ *
+ * \returns msg
+ */
+ static inline pmt::pmt_t
+ send(msg_accepter *accepter, const pmt::pmt_t &which_port,
+ const pmt::pmt_t &msg)
+ {
+ accepter->post(which_port, msg);
+ return msg;
+ }
+
+ /*!
+ * \brief send message to msg_accepter
+ *
+ * \param accepter is the target of the send.
+ * \param which_port A pmt symbol describing the port by name.
+ * \param msg is the message to send. It's usually a pmt tuple.
+ *
+ * Sending a message is an asynchronous operation. The \p send
+ * call will not wait for the message either to arrive at the
+ * destination or to be received.
+ *
+ * \returns msg
+ */
+ static inline pmt::pmt_t
+ send(msg_accepter &accepter, const pmt::pmt_t &which_port,
+ const pmt::pmt_t &msg)
+ {
+ accepter.post(which_port, msg);
+ return msg;
+ }
+
+ /*!
+ * \brief send message to msg_accepter
+ *
+ * \param accepter is the target of the send.
+ * aprecond: pmt::is_msg_accepter(accepter)
+ * \param which_port A pmt symbol describing the port by name.
+ * \param msg is the message to send. It's usually a pmt tuple.
+ *
+ * Sending a message is an asynchronous operation. The \p send
+ * call will not wait for the message either to arrive at the
+ * destination or to be received.
+ *
+ * \returns msg
+ */
+ static inline pmt::pmt_t
+ send(pmt::pmt_t accepter, const pmt::pmt_t &which_port,
+ const pmt::pmt_t &msg)
+ {
+ return send(pmt::msg_accepter_ref(accepter), which_port, msg);
+ }
+
+ } /* namespace messages */
+} /* namespace gr */
+
+#endif /* INCLUDED_MSG_PASSING_H */
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h
new file mode 100644
index 0000000000..758320fc6a
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_MSG_PRODUCER_H
+#define INCLUDED_MSG_PRODUCER_H
+
+#include <gnuradio/api.h>
+#include <pmt/pmt.h>
+#include <boost/shared_ptr.hpp>
+
+namespace gr {
+ namespace messages {
+
+ /*!
+ * \brief Virtual base class that produces messages
+ */
+ class GR_RUNTIME_API msg_producer
+ {
+ public:
+ msg_producer() {}
+ virtual ~msg_producer();
+
+ /*!
+ * \brief send \p msg to \p msg_producer
+ */
+ virtual pmt::pmt_t retrieve() = 0;
+ };
+
+ typedef boost::shared_ptr<msg_producer> msg_producer_sptr;
+
+ } /* namespace messages */
+} /* namespace gr */
+
+#endif /* INCLUDED_MSG_PRODUCER_H */
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_queue.h b/gnuradio-runtime/include/gnuradio/messages/msg_queue.h
new file mode 100644
index 0000000000..dfe1ca97be
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_queue.h
@@ -0,0 +1,95 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_MSG_QUEUE_H
+#define INCLUDED_MSG_QUEUE_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread.h>
+#include <pmt/pmt.h>
+#include <deque>
+
+namespace gr {
+ namespace messages {
+
+ class msg_queue;
+ typedef boost::shared_ptr<msg_queue> msg_queue_sptr;
+
+ msg_queue_sptr make_msg_queue(unsigned int limit=0);
+
+ /*!
+ * \brief thread-safe message queue
+ */
+ class GR_RUNTIME_API msg_queue
+ {
+ private:
+ gr::thread::mutex d_mutex;
+ gr::thread::condition_variable d_not_empty;
+ gr::thread::condition_variable d_not_full;
+ unsigned int d_limit; // max # of messages in queue. 0 -> unbounded
+
+ std::deque<pmt::pmt_t> d_msgs;
+
+ public:
+ msg_queue(unsigned int limit);
+ ~msg_queue();
+
+ /*!
+ * \brief Insert message at tail of queue.
+ * \param msg message
+ *
+ * Block if queue if full.
+ */
+ void insert_tail(pmt::pmt_t msg);
+
+ /*!
+ * \brief Delete message from head of queue and return it.
+ * Block if no message is available.
+ */
+ pmt::pmt_t delete_head();
+
+ /*!
+ * \brief If there's a message in the q, delete it and return it.
+ * If no message is available, return pmt::pmt_t().
+ */
+ pmt::pmt_t delete_head_nowait();
+
+ //! Delete all messages from the queue
+ void flush();
+
+ //! is the queue empty?
+ bool empty_p() const { return d_msgs.empty(); }
+
+ //! is the queue full?
+ bool full_p() const { return d_limit != 0 && count() >= d_limit; }
+
+ //! return number of messages in queue
+ unsigned int count() const { return d_msgs.size(); }
+
+ //! return limit on number of message in queue. 0 -> unbounded
+ unsigned int limit() const { return d_limit; }
+ };
+
+ } /* namespace messages */
+} /* namespace gr */
+
+#endif /* INCLUDED_MSG_QUEUE_H */
diff --git a/gnuradio-runtime/include/gnuradio/misc.h b/gnuradio-runtime/include/gnuradio/misc.h
new file mode 100644
index 0000000000..290e39b490
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/misc.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MISC_H
+#define INCLUDED_GR_MISC_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+
+GR_RUNTIME_API unsigned int
+gr_rounduppow2(unsigned int n);
+
+// FIXME should be template
+GR_RUNTIME_API void gr_zero_vector(std::vector<float> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<double> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<int> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<gr_complex> &v);
+
+
+#endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-runtime/include/gnuradio/msg_accepter.h b/gnuradio-runtime/include/gnuradio/msg_accepter.h
new file mode 100644
index 0000000000..1f60a9e555
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/msg_accepter.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_MSG_ACCEPTER_H
+#define INCLUDED_GR_RUNTIME_MSG_ACCEPTER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/messages/msg_accepter.h>
+#include <pmt/pmt.h>
+
+namespace gr {
+
+ /*!
+ * \brief Accepts messages and inserts them into a message queue,
+ * then notifies subclass gr::basic_block there is a message pending.
+ */
+ class GR_RUNTIME_API msg_accepter : public gr::messages::msg_accepter
+ {
+ public:
+ msg_accepter();
+ ~msg_accepter();
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_MSG_ACCEPTER_H */
diff --git a/gnuradio-runtime/include/gnuradio/msg_handler.h b/gnuradio-runtime/include/gnuradio/msg_handler.h
new file mode 100644
index 0000000000..b37f215616
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/msg_handler.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MSG_HANDLER_H
+#define INCLUDED_GR_MSG_HANDLER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/message.h>
+
+namespace gr {
+
+ class msg_handler;
+ typedef boost::shared_ptr<msg_handler> msg_handler_sptr;
+
+ /*!
+ * \brief abstract class of message handlers
+ * \ingroup base
+ */
+ class GR_RUNTIME_API msg_handler
+ {
+ public:
+ virtual ~msg_handler();
+
+ //! handle \p msg
+ virtual void handle(message::sptr msg) = 0;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MSG_HANDLER_H */
diff --git a/gnuradio-runtime/include/gnuradio/msg_queue.h b/gnuradio-runtime/include/gnuradio/msg_queue.h
new file mode 100644
index 0000000000..3326cf9a7f
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/msg_queue.h
@@ -0,0 +1,95 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2009 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MSG_QUEUE_H
+#define INCLUDED_GR_MSG_QUEUE_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/msg_handler.h>
+#include <gnuradio/thread/thread.h>
+
+namespace gr {
+
+ /*!
+ * \brief thread-safe message queue
+ * \ingroup misc
+ */
+ class GR_RUNTIME_API msg_queue : public msg_handler
+ {
+ gr::thread::mutex d_mutex;
+ gr::thread::condition_variable d_not_empty;
+ gr::thread::condition_variable d_not_full;
+ message::sptr d_head;
+ message::sptr d_tail;
+ unsigned int d_count; // # of messages in queue.
+ unsigned int d_limit; // max # of messages in queue. 0 -> unbounded
+
+ public:
+ typedef boost::shared_ptr<msg_queue> sptr;
+
+ static sptr make(unsigned int limit=0);
+
+ msg_queue(unsigned int limit);
+ ~msg_queue();
+
+ //! Generic msg_handler method: insert the message.
+ void handle(message::sptr msg) { insert_tail (msg); }
+
+ /*!
+ * \brief Insert message at tail of queue.
+ * \param msg message
+ *
+ * Block if queue if full.
+ */
+ void insert_tail(message::sptr msg);
+
+ /*!
+ * \brief Delete message from head of queue and return it.
+ * Block if no message is available.
+ */
+ message::sptr delete_head();
+
+ /*!
+ * \brief If there's a message in the q, delete it and return it.
+ * If no message is available, return 0.
+ */
+ message::sptr delete_head_nowait();
+
+ //! Delete all messages from the queue
+ void flush();
+
+ //! is the queue empty?
+ bool empty_p() const { return d_count == 0; }
+
+ //! is the queue full?
+ bool full_p() const { return d_limit != 0 && d_count >= d_limit; }
+
+ //! return number of messages in queue
+ unsigned int count() const { return d_count; }
+
+ //! return limit on number of message in queue. 0 -> unbounded
+ unsigned int limit() const { return d_limit; }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MSG_QUEUE_H */
diff --git a/gnuradio-runtime/include/gnuradio/nco.h b/gnuradio-runtime/include/gnuradio/nco.h
new file mode 100644
index 0000000000..aff72068b9
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/nco.h
@@ -0,0 +1,199 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GR_NCO_H_
+#define _GR_NCO_H_
+
+#include <gnuradio/sincos.h>
+#include <gnuradio/gr_complex.h>
+#include <vector>
+#include <cmath>
+
+namespace gr {
+
+ /*!
+ * \brief base class template for Numerically Controlled Oscillator (NCO)
+ * \ingroup misc
+ */
+ template<class o_type, class i_type>
+ class nco
+ {
+ public:
+ nco() : phase(0), phase_inc(0) {}
+
+ virtual ~nco() {}
+
+ // radians
+ void set_phase(double angle)
+ {
+ phase = angle;
+ }
+
+ void adjust_phase(double delta_phase)
+ {
+ phase += delta_phase;
+ }
+
+ // angle_rate is in radians / step
+ void set_freq(double angle_rate)
+ {
+ phase_inc = angle_rate;
+ }
+
+ // angle_rate is a delta in radians / step
+ void adjust_freq(double delta_angle_rate)
+ {
+ phase_inc += delta_angle_rate;
+ }
+
+ // increment current phase angle
+ void step()
+ {
+ phase += phase_inc;
+ if(fabs(phase) > M_PI) {
+ while(phase > M_PI)
+ phase -= 2*M_PI;
+
+ while(phase < -M_PI)
+ phase += 2*M_PI;
+ }
+ }
+
+ void step(int n)
+ {
+ phase += phase_inc * n;
+ if(fabs(phase) > M_PI){
+ while(phase > M_PI)
+ phase -= 2*M_PI;
+
+ while(phase < -M_PI)
+ phase += 2*M_PI;
+ }
+ }
+
+ // units are radians / step
+ double get_phase() const { return phase; }
+ double get_freq() const { return phase_inc; }
+
+ // compute sin and cos for current phase angle
+ void sincos(float *sinx, float *cosx) const;
+
+ // compute cos or sin for current phase angle
+ float cos() const { return std::cos(phase); }
+ float sin() const { return std::sin(phase); }
+
+ // compute a block at a time
+ void sin(float *output, int noutput_items, double ampl = 1.0);
+ void cos(float *output, int noutput_items, double ampl = 1.0);
+ void sincos(gr_complex *output, int noutput_items, double ampl = 1.0);
+ void sin(short *output, int noutput_items, double ampl = 1.0);
+ void cos(short *output, int noutput_items, double ampl = 1.0);
+ void sin(int *output, int noutput_items, double ampl = 1.0);
+ void cos(int *output, int noutput_items, double ampl = 1.0);
+
+ protected:
+ double phase;
+ double phase_inc;
+ };
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::sincos(float *sinx, float *cosx) const
+ {
+ gr::sincosf(phase, sinx, cosx);
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::sin(float *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (float)(sin () * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::cos(float *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (float)(cos() * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::sin(short *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (short)(sin() * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::cos(short *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (short)(cos() * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::sin(int *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (int)(sin() * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::cos(int *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = (int)(cos() * ampl);
+ step();
+ }
+ }
+
+ template<class o_type, class i_type>
+ void
+ nco<o_type,i_type>::sincos(gr_complex *output, int noutput_items, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ float cosx, sinx;
+ nco::sincos(&sinx, &cosx);
+ output[i] = gr_complex(cosx * ampl, sinx * ampl);
+ step();
+ }
+ }
+
+} /* namespace gr */
+
+#endif /* _NCO_H_ */
diff --git a/gnuradio-runtime/include/gnuradio/prefs.h b/gnuradio-runtime/include/gnuradio/prefs.h
new file mode 100644
index 0000000000..b675c83491
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/prefs.h
@@ -0,0 +1,152 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_PREFS_H
+#define INCLUDED_GR_PREFS_H
+
+#include <gnuradio/api.h>
+#include <string>
+#include <map>
+#include <gnuradio/thread/thread.h>
+
+namespace gr {
+
+ typedef std::map< std::string, std::map<std::string, std::string> > config_map_t;
+ typedef std::map< std::string, std::map<std::string, std::string> >::iterator config_map_itr;
+ typedef std::map<std::string, std::string> config_map_elem_t;
+ typedef std::map<std::string, std::string>::iterator config_map_elem_itr;
+
+ /*!
+ * \brief Base class for representing user preferences a la windows INI files.
+ * \ingroup misc
+ *
+ * The real implementation is in Python, and is accessable from C++
+ * via the magic of SWIG directors.
+ */
+ class GR_RUNTIME_API prefs
+ {
+ public:
+ static prefs *singleton();
+ static void set_singleton(prefs *p);
+
+ prefs();
+ virtual ~prefs();
+
+ /*!
+ * \brief Returns the configuration options as a string.
+ */
+ std::string to_string();
+
+ /*!
+ * \brief Saves the configuration settings to
+ * ${HOME}/.gnuradio/config.conf.
+ *
+ * WARNING: this will overwrite your current config.conf file.
+ */
+ void save();
+
+ /*!
+ * \brief Does \p section exist?
+ */
+ virtual bool has_section(const std::string §ion);
+
+ /*!
+ * \brief Does \p option exist?
+ */
+ virtual bool has_option(const std::string §ion,
+ const std::string &option);
+
+ /*!
+ * \brief If option exists return associated value; else
+ * default_val.
+ */
+ virtual const std::string get_string(const std::string §ion,
+ const std::string &option,
+ const std::string &default_val);
+
+ /*!
+ * \brief Set or add a string \p option to \p section with value
+ * \p val.
+ */
+ virtual void set_string(const std::string §ion,
+ const std::string &option,
+ const std::string &val);
+
+ /*!
+ * \brief If option exists and value can be converted to bool,
+ * return it; else default_val.
+ */
+ virtual bool get_bool(const std::string §ion,
+ const std::string &option,
+ bool default_val);
+
+ /*!
+ * \brief Set or add a bool \p option to \p section with value \p val.
+ */
+ virtual void set_bool(const std::string §ion,
+ const std::string &option,
+ bool val);
+
+ /*!
+ * \brief If option exists and value can be converted to long,
+ * return it; else default_val.
+ */
+ virtual long get_long(const std::string §ion,
+ const std::string &option,
+ long default_val);
+
+ /*!
+ * \brief Set or add a long \p option to \p section with value \p val.
+ */
+ virtual void set_long(const std::string §ion,
+ const std::string &option,
+ long val);
+
+ /*!
+ * \brief If option exists and value can be converted to double,
+ * return it; else default_val.
+ */
+ virtual double get_double(const std::string §ion,
+ const std::string &option,
+ double default_val);
+
+ /*!
+ * \brief Set or add a double \p option to \p section with value \p val.
+ */
+ virtual void set_double(const std::string §ion,
+ const std::string &option,
+ double val);
+
+ protected:
+ virtual std::vector<std::string> _sys_prefs_filenames();
+ virtual void _read_files();
+ virtual void _convert_to_map(const std::string &conf);
+ virtual char * option_to_env(std::string section, std::string option);
+
+ private:
+ gr::thread::mutex d_mutex;
+ config_map_t d_config_map;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PREFS_H */
diff --git a/gnuradio-runtime/include/gnuradio/py_feval.h b/gnuradio-runtime/include/gnuradio/py_feval.h
new file mode 100644
index 0000000000..94def79ca1
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/py_feval.h
@@ -0,0 +1,77 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <pmt/pmt.h>
+
+namespace gr {
+
+ class py_feval_dd : public feval_dd
+ {
+ public:
+ double calleval(double x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval_cc : public feval_cc
+ {
+ public:
+ gr_complex calleval(gr_complex x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval_ll : public feval_ll
+ {
+ public:
+ long calleval(long x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval : public feval
+ {
+ public:
+ void calleval()
+ {
+ ensure_py_gil_state _lock;
+ eval();
+ }
+ };
+
+ class py_feval_p : public feval_p
+ {
+ public:
+ void calleval(pmt::pmt_t x)
+ {
+ ensure_py_gil_state _lock;
+ eval(x);
+ }
+ };
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h
new file mode 100644
index 0000000000..de35181c0b
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h
@@ -0,0 +1,206 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <iostream>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <gnuradio/ice_application_base.h>
+#include <gnuradio/IcePy_Communicator.h>
+#include <pythread.h>
+#include <boost/format.hpp>
+
+enum pyport_t {
+ PYPORT_STRING,
+ PYPORT_FLOAT
+};
+
+class Instance
+{
+public:
+ static boost::shared_ptr<ice_application_common> get_application()
+ {
+ return ice_application_common::Instance();
+ }
+ static Ice::CommunicatorPtr get_swig_communicator()
+ {
+ return get_application()->communicator();
+ }
+};
+
+int pycallback_object_count = 500;
+
+// a simple to-PMT converter template class-function
+template <class myType> class pmt_assist
+{
+public:
+ static pmt::pmt_t make(myType _val)
+ {
+ return pmt::mp(_val);
+ }
+};
+
+/* template specializations for vectors that cant use pmt::mp() */
+template<>
+pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val)
+{
+ return pmt::init_f32vector(_val.size(), &_val[0]);
+}
+
+template<>
+pmt::pmt_t pmt_assist<std::vector<gr_complex> >::make(std::vector<gr_complex> _val)
+{
+ return pmt::init_c32vector(_val.size(), &_val[0]);
+}
+
+template <class myType> class pycallback_object
+{
+public:
+ pycallback_object(std::string name, std::string functionbase,
+ std::string units, std::string desc,
+ myType min, myType max, myType deflt,
+ DisplayType dtype) :
+ d_callback(NULL),
+ d_functionbase(functionbase), d_units(units), d_desc(desc),
+ d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype),
+ d_name(name), d_id(pycallback_object_count++)
+ {
+ d_callback = NULL;
+ setup_rpc();
+ }
+
+ void add_rpc_variable(rpcbasic_sptr s)
+ {
+ d_rpc_vars.push_back(s);
+ }
+
+ myType get() {
+ myType rVal;
+ if(d_callback == NULL) {
+ printf("WARNING: pycallback_object get() called without py callback set!\n");
+ return rVal;
+ }
+ else {
+ // obtain PyGIL
+ PyGILState_STATE state = PyGILState_Ensure();
+
+ PyObject *func;
+ //PyObject *arglist;
+ PyObject *result;
+
+ func = (PyObject *) d_callback; // Get Python function
+ //arglist = Py_BuildValue(""); // Build argument list
+ result = PyEval_CallObject(func,NULL); // Call Python
+ //result = PyEval_CallObject(func,arglist); // Call Python
+ //Py_DECREF(arglist); // Trash arglist
+ if(result) { // If no errors, return double
+ rVal = pyCast(result);
+ }
+ Py_XDECREF(result);
+
+ // release PyGIL
+ PyGILState_Release(state);
+ return rVal;
+ }
+ }
+
+ void set_callback(PyObject *cb)
+ {
+ d_callback = cb;
+ }
+
+ void setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ add_rpc_variable(
+ rpcbasic_sptr(new rpcbasic_register_get<pycallback_object, myType>(
+ (boost::format("%s%d") % d_name % d_id).str() , d_functionbase.c_str(),
+ this, &pycallback_object::get, pmt_assist<myType>::make(d_min),
+ pmt_assist<myType>::make(d_max), pmt_assist<myType>::make(d_deflt),
+ d_units.c_str(), d_desc.c_str(), RPC_PRIVLVL_MIN, d_dtype)));
+#endif /* GR_CTRLPORT */
+ }
+
+private:
+ PyObject* d_callback;
+ std::string d_functionbase, d_units, d_desc;
+ myType d_min, d_max, d_deflt;
+ DisplayType d_dtype;
+
+ myType pyCast(PyObject* obj) {
+ printf("TYPE NOT IMPLEMENTED!\n");
+ assert(0);
+ };
+ std::vector<boost::any> d_rpc_vars; // container for all RPC variables
+ std::string d_name;
+ int d_id;
+
+};
+
+
+// template specialization conversion functions
+// get data out of the PyObject and into the real world
+template<>
+std::string pycallback_object<std::string>::pyCast(PyObject* obj)
+{
+ return std::string(PyString_AsString(obj));
+}
+
+template<>
+double pycallback_object<double>::pyCast(PyObject* obj)
+{
+ return PyFloat_AsDouble(obj);
+}
+
+template<>
+float pycallback_object<float>::pyCast(PyObject* obj)
+{
+ return (float)PyFloat_AsDouble(obj);
+}
+
+template<>
+int pycallback_object<int>::pyCast(PyObject* obj)
+{
+ return PyInt_AsLong(obj);
+}
+
+template<>
+std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj)
+{
+ int size = PyObject_Size(obj);
+ std::vector<float> rval(size);
+ for(int i=0; i<size; i++) {
+ rval[i] = (float)PyFloat_AsDouble(PyList_GetItem(obj, i));
+ }
+ return rval;
+}
+
+template<>
+std::vector<gr_complex> pycallback_object<std::vector<gr_complex> >::pyCast(PyObject* obj)
+{
+ int size = PyObject_Size(obj);
+ std::vector<gr_complex> rval(size);
+ for(int i=0; i<size; i++){ rval[i] = \
+ gr_complex((float)PyComplex_RealAsDouble(PyList_GetItem(obj, i)),
+ (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i)));
+ }
+ return rval;
+}
+// TODO: add more template specializations as needed!
diff --git a/gnuradio-runtime/include/gnuradio/random.h b/gnuradio-runtime/include/gnuradio/random.h
new file mode 100644
index 0000000000..e01fcb7be7
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/random.h
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RANDOM_H
+#define INCLUDED_GR_RANDOM_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/gr_complex.h>
+
+// While rand(3) specifies RAND_MAX, random(3) says that the output
+// ranges from 0 to 2^31-1 but does not specify a macro to denote
+// this. We define RANDOM_MAX for cleanliness. We must omit the
+// definition for systems that have made the same choice. (Note that
+// random(3) is from 4.2BSD, and not specified by POSIX.)
+
+#ifndef RANDOM_MAX
+static const int RANDOM_MAX = 2147483647; // 2^31-1
+#endif /* RANDOM_MAX */
+
+#include <stdlib.h>
+
+namespace gr {
+
+ /*!
+ * \brief pseudo random number generator
+ * \ingroup math_blk
+ */
+ class GR_RUNTIME_API random
+ {
+ protected:
+ static const int NTAB = 32;
+ long d_seed;
+ long d_iy;
+ long d_iv[NTAB];
+ int d_iset;
+ float d_gset;
+
+ public:
+ random(long seed=3021);
+
+ void reseed(long seed);
+
+ /*!
+ * \brief uniform random deviate in the range [0.0, 1.0)
+ */
+ float ran1();
+
+ /*!
+ * \brief normally distributed deviate with zero mean and variance 1
+ */
+ float gasdev();
+
+ float laplacian();
+ float impulse(float factor);
+ float rayleigh();
+ gr_complex rayleigh_complex();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RANDOM_H */
+
diff --git a/gnuradio-runtime/include/gnuradio/realtime.h b/gnuradio-runtime/include/gnuradio/realtime.h
new file mode 100644
index 0000000000..f3910f8c7d
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/realtime.h
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_REALTIME_H
+#define INCLUDED_GR_REALTIME_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/realtime_impl.h>
+
+namespace gr {
+
+ typedef impl::rt_status_t rt_status_t;
+
+ /*!
+ * \brief If possible, enable high-priority "real time" scheduling.
+ * \ingroup misc
+ */
+ GR_RUNTIME_API rt_status_t enable_realtime_scheduling();
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_REALTIME_H */
diff --git a/gnuradio-runtime/include/gnuradio/realtime_impl.h b/gnuradio-runtime/include/gnuradio/realtime_impl.h
new file mode 100644
index 0000000000..82845918ee
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/realtime_impl.h
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GNURADIO_REALTIME_H
+#define INCLUDED_GNURADIO_REALTIME_H
+
+#include <gnuradio/api.h>
+#include <stdexcept>
+
+/*!
+ * \brief System independent way to ask for realtime scheduling
+ *
+ * \sa sys_pri.h
+ */
+namespace gr {
+ namespace impl {
+
+ typedef enum {
+ RT_OK = 0,
+ RT_NOT_IMPLEMENTED,
+ RT_NO_PRIVS,
+ RT_OTHER_ERROR
+ } rt_status_t;
+
+ enum rt_sched_policy {
+ RT_SCHED_RR = 0, // round robin
+ RT_SCHED_FIFO = 1, // first in first out
+ };
+
+ /*
+ * Define the range for our virtual priorities (don't change
+ * these)
+ *
+ * Processes (or threads) with numerically higher priority values
+ * are scheduled before processes with numerically lower priority
+ * values. Thus, the value returned by rt_priority_max() will be
+ * greater than the value returned by rt_priority_min().
+ */
+ static inline int rt_priority_min() { return 0; }
+ static inline int rt_priority_max() { return 15; }
+ static inline int rt_priority_default() { return 1; }
+
+ struct GR_RUNTIME_API rt_sched_param {
+ int priority;
+ rt_sched_policy policy;
+
+ rt_sched_param()
+ : priority(rt_priority_default()), policy(RT_SCHED_RR){}
+
+ rt_sched_param(int priority_, rt_sched_policy policy_ = RT_SCHED_RR)
+ {
+ if(priority_ < rt_priority_min() || priority_ > rt_priority_max())
+ throw std::invalid_argument("rt_sched_param: priority out of range");
+
+ priority = priority_;
+ policy = policy_;
+ }
+ };
+
+ /*!
+ * \brief If possible, enable "realtime" scheduling.
+ * \ingroup misc
+ *
+ * In general, this means that the code will be scheduled before
+ * any non-realtime (normal) processes. Note that if your code
+ * contains an non-blocking infinite loop and you enable realtime
+ * scheduling, it's possible to hang the system.
+ */
+
+ // NOTE: If you change this, you need to change the code in
+ // gnuradio-core/src/lib/runtime/gr_realtime.i, see note there.
+ rt_status_t
+ GR_RUNTIME_API enable_realtime_scheduling(rt_sched_param = rt_sched_param());
+
+ } /* namespace impl */
+} /* namespace gr */
+
+#endif /* INCLUDED_GNURADIO_REALTIME_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpccallbackregister_base.h b/gnuradio-runtime/include/gnuradio/rpccallbackregister_base.h
new file mode 100644
index 0000000000..3b5b392ec3
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpccallbackregister_base.h
@@ -0,0 +1,105 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCCALLBACKREGISTER_BASE_H
+#define RPCCALLBACKREGISTER_BASE_H
+
+#include <gnuradio/messages/msg_accepter.h>
+#include <gnuradio/messages/msg_producer.h>
+
+typedef uint32_t DisplayType;
+
+// DisplayType Plotting types
+const uint32_t DISPNULL = 0x0000;
+const uint32_t DISPTIME = 0x0001;
+const uint32_t DISPXY = 0x0002;
+const uint32_t DISPPSD = 0x0004;
+const uint32_t DISPSPEC = 0x0008;
+const uint32_t DISPRAST = 0x0010;
+
+// DisplayType Options
+const uint32_t DISPOPTCPLX = 0x0100;
+const uint32_t DISPOPTLOG = 0x0200;
+const uint32_t DISPOPTSTEM = 0x0400;
+const uint32_t DISPOPTSTRIP = 0x0800;
+const uint32_t DISPOPTSCATTER = 0x1000;
+
+enum priv_lvl_t {
+ RPC_PRIVLVL_ALL = 0,
+ RPC_PRIVLVL_MIN = 9,
+ RPC_PRIVLVL_NONE = 10
+};
+
+enum KnobType {
+ KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
+ KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
+ KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
+ KNOBVECSTRING, KNOBVECLONG
+};
+
+struct callbackregister_base
+{
+ struct callback_base_t
+ {
+ public:
+ callback_base_t(const priv_lvl_t priv_, const std::string& units_,
+ const DisplayType display_, const std::string& desc_,
+ const pmt::pmt_t min_, const pmt::pmt_t max_, const pmt::pmt_t def)
+ : priv(priv_), units(units_), description(desc_),
+ min(min_), max(max_), defaultvalue(def), display(display_)
+ {
+ }
+
+ priv_lvl_t priv;
+ std::string units, description;
+ pmt::pmt_t min, max, defaultvalue;
+ DisplayType display;
+ };
+
+ template<typename T, typename Tsptr>
+ class callback_t : public callback_base_t
+ {
+ public:
+ callback_t(T* callback_, priv_lvl_t priv_,
+ const std::string& units_, const DisplayType display_, const:: std::string& desc_,
+ const pmt::pmt_t& min_, const pmt::pmt_t& max_, const pmt::pmt_t& def_) :
+ callback_base_t(priv_, units_, display_, desc_, min_, max_, def_),
+ callback(callback_)
+ {
+ }
+
+ Tsptr callback;
+ };
+
+ typedef callback_t<gr::messages::msg_accepter, gr::messages::msg_accepter_sptr> configureCallback_t;
+ typedef callback_t<gr::messages::msg_producer, gr::messages::msg_producer_sptr> queryCallback_t;
+
+ callbackregister_base() {;}
+ virtual ~callbackregister_base() {;}
+
+ virtual void registerConfigureCallback(const std::string &id, const configureCallback_t callback) = 0;
+ virtual void unregisterConfigureCallback(const std::string &id) = 0;
+ virtual void registerQueryCallback(const std::string &id, const queryCallback_t callback) = 0;
+ virtual void unregisterQueryCallback(const std::string &id) = 0;
+};
+
+#endif /* RPCCALLBACKREGISTER_BASE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h
new file mode 100644
index 0000000000..12cf279406
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcmanager.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCMANAGER_H
+#define RPCMANAGER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/rpcmanager_base.h>
+#include <gnuradio/rpcserver_booter_aggregator.h>
+#include <memory>
+#include <iostream>
+
+class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
+{
+ public:
+ rpcmanager();
+ ~rpcmanager();
+
+ static rpcserver_booter_base* get();
+
+ static void register_booter(rpcserver_booter_base* booter);
+
+ template<typename T> class rpcserver_booter_register_helper
+ {
+ public:
+ rpcserver_booter_register_helper() {
+ rpcmanager::register_booter(new T());
+ }
+
+ //TODO: unregister
+ };
+
+ private:
+ static bool make_aggregator;
+ static bool booter_registered;
+ static bool aggregator_registered;
+ static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {;}
+ static rpcserver_booter_base* boot;
+ static std::auto_ptr<rpcserver_booter_aggregator> aggregator;
+};
+
+#endif /* RPCMANAGER_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h
new file mode 100644
index 0000000000..60425c4a15
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCMANAGER_BASE_H
+#define RPCMANAGER_BASE_H
+
+#include <boost/shared_ptr.hpp>
+
+class rpcserver_booter_base;
+//class rpcserver_booter_aggregator;
+
+class rpcmanager_base
+{
+ public:
+ typedef boost::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr;
+
+ rpcmanager_base() {;}
+ ~rpcmanager_base() {;}
+
+ //static rpcserver_booter_base* get();
+
+ //static void register_booter(rpcserver_booter_base_sptr booter);
+
+private:
+};
+
+#endif /* RPCMANAGER_BASE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
new file mode 100644
index 0000000000..e592f4cdfb
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCPMTCONVERTERS_ICE_H
+#define RPCPMTCONVERTERS_ICE_H
+
+#include <pmt/pmt.h>
+#include <gnuradio.h>
+
+namespace rpcpmtconverter
+{
+ pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c);
+ GNURadio::KnobPtr from_pmt(const pmt::pmt_t& knob, const Ice::Current& c);
+}
+
+#endif /* RPCPMTCONVERTERS_ICE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
new file mode 100644
index 0000000000..e405f4e1ea
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
@@ -0,0 +1,659 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCREGISTERHELPERS_H
+#define RPCREGISTERHELPERS_H
+
+#include <stdio.h>
+#include <sstream>
+#include <iostream>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/rpcmanager.h>
+#include <gnuradio/rpcserver_selector.h>
+#include <gnuradio/rpcserver_base.h>
+#include <gnuradio/block_registry.h>
+
+// Base classes
+template<typename T, typename Tto> class rpcextractor_base
+ : public virtual gr::messages::msg_accepter
+{
+public:
+ rpcextractor_base(T* source, void (T::*func)(Tto)) :
+ _source(source), _func(func) {;}
+ ~rpcextractor_base() {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
+ throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
+ }
+
+protected:
+ T* _source;
+ void (T::*_func)(Tto);
+};
+
+template<typename T, typename Tto>
+class rpcbasic_extractor : public virtual rpcextractor_base<T,Tto>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(Tto)) :
+ rpcextractor_base<T,Tto>(source, func)
+ {;}
+};
+
+template<typename T, typename Tfrom>
+class rpcinserter_base : public virtual gr::messages::msg_producer
+{
+public:
+ rpcinserter_base(T* source, Tfrom (T::*func)()) : _source(source), _func(func) {;}
+ rpcinserter_base() {;}
+
+ pmt::pmt_t retrieve() { assert(0); return pmt::pmt_t(); }
+
+protected:
+ T* _source;
+ Tfrom (T::*_func)();
+};
+
+template<typename T, typename Tfrom>
+class rpcbasic_inserter :
+ public virtual rpcinserter_base<T,Tfrom>
+{
+public:
+ rpcbasic_inserter(T* source, Tfrom (T::*func)()const)
+ : rpcinserter_base<T,Tfrom>(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, Tfrom (T::*func)())
+ : rpcinserter_base<T,Tfrom>(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ return pmt::mp((rpcinserter_base<T,Tfrom>::
+ _source->*rpcinserter_base<T,Tfrom>::_func)());
+ }
+};
+
+// Specialized Extractor Templates
+template<typename T>
+class rpcbasic_extractor<T,double> : public virtual rpcextractor_base<T,double>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(double))
+ : rpcextractor_base<T,double>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,double>::_source->*rpcextractor_base<T,double>::_func)
+ (pmt::to_double(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,float> : public virtual rpcextractor_base<T,float>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(float))
+ : rpcextractor_base<T,float>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,float>::_source->*rpcextractor_base<T,float>::_func)
+ (pmt::to_double(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,long> : public virtual rpcextractor_base<T,long>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(long))
+ : rpcextractor_base<T,long>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,long>::_source->*rpcextractor_base<T,long>::_func)
+ (pmt::to_long(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,int> : public virtual rpcextractor_base<T,int>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(int))
+ : rpcextractor_base<T,int>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,int>::_source->*rpcextractor_base<T,int>::_func)
+ (pmt::to_long(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,bool> : public virtual rpcextractor_base<T,bool>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(bool))
+ : rpcextractor_base<T,bool>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,bool>::_source->*rpcextractor_base<T,bool>::_func)
+ (pmt::to_bool(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,std::complex<double> >
+ : public virtual rpcextractor_base<T,std::complex<double> >
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(std::complex<double>))
+ : rpcextractor_base<T,std::complex<double> >(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,std::complex<double> >::
+ _source->*rpcextractor_base<T,std::complex<double> >::_func)(pmt::to_complex(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_extractor<T,std::string>
+ : public virtual rpcextractor_base<T,std::string>
+{
+public:
+ rpcbasic_extractor(T* source, void (T::*func)(std::string))
+ : rpcextractor_base<T,std::string>(source, func)
+ {;}
+
+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ (rpcextractor_base<T,std::string>::
+ _source->*rpcextractor_base<T,std::string>::_func)(pmt::symbol_to_string(msg));
+ }
+};
+
+template<typename T>
+class rpcbasic_inserter<T,uint64_t> : public virtual rpcinserter_base<T,uint64_t>
+{
+public:
+ rpcbasic_inserter(T* source, uint64_t (T::*func)() const)
+ : rpcinserter_base<T,uint64_t>(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, uint64_t (T::*func)())
+ : rpcinserter_base<T,uint64_t>(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ return pmt::from_uint64((rpcinserter_base<T,uint64_t>::
+ _source->*rpcinserter_base<T,uint64_t>::_func)());
+ }
+};
+
+template<typename T>
+class rpcbasic_inserter<T,std::vector< int > >
+ : public virtual rpcinserter_base<T,std::vector< int > >
+{
+public:
+ rpcbasic_inserter(T* source, std::vector<int > (T::*func)() const)
+ : rpcinserter_base<T,std::vector<int > >(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, std::vector<int > (T::*func)())
+ : rpcinserter_base<T,std::vector<int > >(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ std::vector< int >
+ vec((rpcinserter_base<T,std::vector<int > >::
+ _source->*rpcinserter_base<T,std::vector< int > >::_func)());
+ return pmt::init_s32vector(vec.size(), &vec[0]);
+ }
+};
+
+template<typename T>
+class rpcbasic_inserter<T,std::vector< std::complex<float> > >
+ : public virtual rpcinserter_base<T,std::vector< std::complex<float> > >
+{
+public:
+ rpcbasic_inserter(T* source, std::vector<std::complex<float> > (T::*func)() const)
+ : rpcinserter_base<T,std::vector<std::complex<float> > >(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, std::vector<std::complex<float> > (T::*func)())
+ : rpcinserter_base<T,std::vector<std::complex<float> > >(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ std::vector< std::complex<float> >
+ vec((rpcinserter_base<T,std::vector<std::complex<float> > >::
+ _source->*rpcinserter_base<T,std::vector< std::complex<float> > >::_func)());
+ return pmt::init_c32vector(vec.size(), &vec[0]);
+ }
+};
+
+template<typename T>
+class rpcbasic_inserter<T,std::vector< float> >
+ : public virtual rpcinserter_base<T,std::vector< float > >
+{
+public:
+ rpcbasic_inserter(T* source, std::vector<float> (T::*func)() const)
+ : rpcinserter_base<T,std::vector<float > >(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, std::vector<float> (T::*func)())
+ : rpcinserter_base<T,std::vector<float> >(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ std::vector< float > vec((rpcinserter_base<T,std::vector<float> >::
+ _source->*rpcinserter_base<T,std::vector< float> >::_func)());
+ return pmt::init_f32vector(vec.size(), &vec[0]);
+ }
+};
+
+template<typename T>
+class rpcbasic_inserter<T,std::vector< uint8_t> >
+ : public virtual rpcinserter_base<T,std::vector< uint8_t > > {
+public:
+ rpcbasic_inserter(T* source, std::vector<uint8_t> (T::*func)() const)
+ : rpcinserter_base<T,std::vector<uint8_t > >(source, func)
+ {;}
+
+ rpcbasic_inserter(T* source, std::vector<uint8_t> (T::*func)())
+ : rpcinserter_base<T,std::vector<uint8_t> >(source, func)
+ {;}
+
+ pmt::pmt_t retrieve()
+ {
+ std::vector< uint8_t > vec((rpcinserter_base<T,std::vector<uint8_t> >::
+ _source->*rpcinserter_base<T,std::vector< uint8_t> >::_func)());
+ return pmt::init_u8vector(vec.size(), &vec[0]);
+ }
+};
+
+template <typename T>
+struct rpc_register_base
+{
+ rpc_register_base() {count++;}
+protected: static int count;
+};
+
+// Base class to inherit from and create universal shared pointers.
+class rpcbasic_base
+{
+public:
+ rpcbasic_base() {}
+ virtual ~rpcbasic_base() {};
+};
+
+typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr;
+
+template<typename T, typename Tto>
+struct rpcbasic_register_set : public rpcbasic_base
+{
+ // Function used to add a 'set' RPC call using a basic_block's alias.
+ rpcbasic_register_set(const std::string& block_alias,
+ const char* functionbase,
+ void (T::*function)(Tto),
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::configureCallback_t
+ extractor(new rpcbasic_extractor<T,Tto>(d_object, function),
+ minpriv_, std::string(units_),
+ display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << block_alias << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING SET: " << d_id << " " << desc_ << std::endl;
+ rpcmanager::get()->i()->registerConfigureCallback(d_id, extractor);
+#endif
+ }
+
+ // Function used to add a 'set' RPC call using a name and the object
+ rpcbasic_register_set(const std::string& name,
+ const char* functionbase,
+ T* obj,
+ void (T::*function)(Tto),
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = obj;
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::configureCallback_t
+ extractor(new rpcbasic_extractor<T,Tto>(d_object, function),
+ minpriv_, std::string(units_),
+ display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << name << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING SET: " << d_id << " " << desc_ << std::endl;
+ rpcmanager::get()->i()->registerConfigureCallback(d_id, extractor);
+#endif
+ }
+
+ ~rpcbasic_register_set()
+ {
+#ifdef RPCSERVER_ENABLED
+ rpcmanager::get()->i()->unregisterConfigureCallback(d_id);
+#endif
+ }
+
+
+ pmt::pmt_t min() const { return d_min; }
+ pmt::pmt_t max() const { return d_max; }
+ pmt::pmt_t def() const { return d_def; }
+ std::string units() const { return d_units; }
+ std::string description() const { return d_desc; }
+ priv_lvl_t privilege_level() const { return d_minpriv; }
+ DisplayType default_display() const { return d_display; }
+
+ void set_min(pmt::pmt_t p) { d_min = p; }
+ void set_max(pmt::pmt_t p) { d_max = p; }
+ void set_def(pmt::pmt_t p) { d_def = p; }
+ void units(std::string u) { d_units = u; }
+ void description(std::string d) { d_desc = d; }
+ void privilege_level(priv_lvl_t p) { d_minpriv = p; }
+ void default_display(DisplayType d) { d_display = d; }
+
+private:
+ std::string d_id;
+ pmt::pmt_t d_min, d_max, d_def;
+ std::string d_units, d_desc;
+ priv_lvl_t d_minpriv;
+ DisplayType d_display;
+ T *d_object;
+};
+
+
+template<typename T, typename Tfrom>
+class rpcbasic_register_get : public rpcbasic_base
+{
+public:
+ // Function used to add a 'set' RPC call using a basic_block's alias.
+ // primary constructor to allow for T get() functions
+ rpcbasic_register_get(const std::string& block_alias,
+ const char* functionbase,
+ Tfrom (T::*function)(),
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::queryCallback_t
+ inserter(new rpcbasic_inserter<T,Tfrom>(d_object, function),
+ minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << block_alias << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING GET: " << d_id << " " << desc_ << std::endl;
+ rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
+#endif
+ }
+
+
+ // alternate constructor to allow for T get() const functions
+ rpcbasic_register_get(const std::string& block_alias,
+ const char* functionbase,
+ Tfrom (T::*function)() const,
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::queryCallback_t
+ inserter(new rpcbasic_inserter<T,Tfrom>(d_object, (Tfrom (T::*)())function),
+ minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << block_alias << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING GET CONST: " << d_id << " " << desc_ << " " << display_ << std::endl;
+ rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
+#endif
+ }
+
+ // Function used to add a 'set' RPC call using a name and the object
+ // primary constructor to allow for T get() functions
+ rpcbasic_register_get(const std::string& name,
+ const char* functionbase,
+ T* obj,
+ Tfrom (T::*function)(),
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = obj;
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::queryCallback_t
+ inserter(new rpcbasic_inserter<T,Tfrom>(d_object, function),
+ minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << name << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING GET: " << d_id << " " << desc_ << std::endl;
+ rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
+#endif
+ }
+
+
+ // alternate constructor to allow for T get() const functions
+ rpcbasic_register_get(const std::string& name,
+ const char* functionbase,
+ T* obj,
+ Tfrom (T::*function)() const,
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_ = DISPNULL)
+ {
+ d_min = min;
+ d_max = max;
+ d_def = def;
+ d_units = units_;
+ d_desc = desc_;
+ d_minpriv = minpriv_;
+ d_display = display_;
+ d_object = obj;
+#ifdef RPCSERVER_ENABLED
+ callbackregister_base::queryCallback_t
+ inserter(new rpcbasic_inserter<T,Tfrom>(d_object, (Tfrom (T::*)())function),
+ minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
+ std::ostringstream oss(std::ostringstream::out);
+ oss << name << "::" << functionbase;
+ d_id = oss.str();
+ //std::cerr << "REGISTERING GET CONST: " << d_id << " " << desc_ << " " << display_ << std::endl;
+ rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
+#endif
+ }
+
+ ~rpcbasic_register_get()
+ {
+#ifdef RPCSERVER_ENABLED
+ rpcmanager::get()->i()->unregisterQueryCallback(d_id);
+#endif
+ }
+
+ pmt::pmt_t min() const { return d_min; }
+ pmt::pmt_t max() const { return d_max; }
+ pmt::pmt_t def() const { return d_def; }
+ std::string units() const { return d_units; }
+ std::string description() const { return d_desc; }
+ priv_lvl_t privilege_level() const { return d_minpriv; }
+ DisplayType default_display() const { return d_display; }
+
+ void set_min(pmt::pmt_t p) { d_min = p; }
+ void set_max(pmt::pmt_t p) { d_max = p; }
+ void set_def(pmt::pmt_t p) { d_def = p; }
+ void units(std::string u) { d_units = u; }
+ void description(std::string d) { d_desc = d; }
+ void privilege_level(priv_lvl_t p) { d_minpriv = p; }
+ void default_display(DisplayType d) { d_display = d; }
+
+private:
+ std::string d_id;
+ pmt::pmt_t d_min, d_max, d_def;
+ std::string d_units, d_desc;
+ priv_lvl_t d_minpriv;
+ DisplayType d_display;
+ T *d_object;
+};
+
+/*
+ * This class can wrap a pre-existing variable type for you
+ * it will define the getter and rpcregister call for you.
+ *
+ * It should be used for read-only getters.
+ *
+ */
+template<typename Tfrom>
+class rpcbasic_register_variable : public rpcbasic_base
+{
+protected:
+ rpcbasic_register_get< rpcbasic_register_variable<Tfrom>, Tfrom > d_rpc_reg;
+ Tfrom *d_variable;
+ Tfrom get() { return *d_variable; }
+public:
+ // empty constructor which should never be called but needs to exist for ues in varous STL data structures
+ void setptr(Tfrom* _variable){ rpcbasic_register_variable<Tfrom>::d_variable = _variable; }
+ rpcbasic_register_variable() :
+ d_rpc_reg("FAIL", "FAIL", this, &rpcbasic_register_variable::get,
+ pmt::PMT_NIL, pmt::PMT_NIL, pmt::PMT_NIL, DISPNULL,
+ "FAIL", "FAIL", RPC_PRIVLVL_MIN),
+ d_variable(NULL)
+ {
+ throw std::runtime_error("ERROR: rpcbasic_register_variable called with no args. If this happens, someone has tried to use rpcbasic_register_variable incorrectly.");
+ };
+
+ rpcbasic_register_variable(const std::string& namebase,
+ const char* functionbase,
+ Tfrom *variable,
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
+ DisplayType display_=DISPNULL) :
+ d_rpc_reg(namebase, functionbase, this, &rpcbasic_register_variable::get,
+ min, max, def, units_, desc_, minpriv_, display_),
+ d_variable(variable)
+ {
+ //std::cerr << "REGISTERING VAR: " << " " << desc_ << std::endl;
+ }
+};
+
+template<typename Tfrom> class rpcbasic_register_variable_rw : public rpcbasic_register_variable<Tfrom> {
+ private:
+ rpcbasic_register_set< rpcbasic_register_variable_rw<Tfrom>, Tfrom > d_rpc_regset;
+ public:
+ // empty constructor which should never be called but needs to exist for ues in varous STL data structures
+ rpcbasic_register_variable_rw() :
+ d_rpc_regset("FAIL","FAIL",this,&rpcbasic_register_variable<Tfrom>::get,pmt::PMT_NIL,pmt::PMT_NIL,pmt::PMT_NIL,DISPNULL,"FAIL","FAIL",RPC_PRIVLVL_MIN)
+ {
+ throw std::runtime_error("ERROR: rpcbasic_register_variable_rw called with no args. if this happens someone used rpcbasic_register_variable_rw incorrectly.\n");
+ };
+ void set(Tfrom _variable){ *(rpcbasic_register_variable<Tfrom>::d_variable) = _variable; }
+ rpcbasic_register_variable_rw(
+ const std::string& namebase,
+ const char* functionbase,
+ Tfrom *variable,
+ const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
+ const char* units_ = "",
+ const char* desc_ = "",
+ priv_lvl_t minpriv = RPC_PRIVLVL_MIN,
+ DisplayType display_=DISPNULL) :
+ rpcbasic_register_variable<Tfrom>(namebase,functionbase,variable,min,max,def,units_,desc_),
+ d_rpc_regset(namebase,functionbase,this,&rpcbasic_register_variable_rw::set,min,max,def,units_,desc_,minpriv,display_)
+ {
+ // no action
+ }
+};
+
+
+
+
+#endif
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
new file mode 100644
index 0000000000..cc19d7ff48
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
@@ -0,0 +1,100 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_AGGREGATOR_H
+#define RPCSERVER_AGGREGATOR_H
+
+#include <vector>
+#include <string>
+#include <gnuradio/rpcserver_base.h>
+#include <gnuradio/rpcmanager_base.h>
+
+class rpcserver_aggregator : public virtual rpcserver_base
+{
+public:
+ rpcserver_aggregator();
+ virtual ~rpcserver_aggregator();
+
+ void registerConfigureCallback(const std::string &id, const configureCallback_t callback);
+ void unregisterConfigureCallback(const std::string &id);
+
+ void registerQueryCallback(const std::string &id, const queryCallback_t callback);
+ void unregisterQueryCallback(const std::string &id);
+
+ void registerServer(rpcmanager_base::rpcserver_booter_base_sptr server);
+
+ const std::string& type();
+
+ const std::vector<std::string>& registeredServers();
+
+private:
+ template<class T, typename Tcallback>
+ struct registerConfigureCallback_f: public std::unary_function<T,void>
+ {
+ registerConfigureCallback_f(const std::string &_id, const Tcallback _callback)
+ : id(_id), callback(_callback)
+ {;}
+
+ void operator()(T& x) { x->i()->registerConfigureCallback(id, callback); }
+ const std::string& id; const Tcallback& callback;
+ };
+
+ template<class T, typename Tcallback>
+ struct unregisterConfigureCallback_f: public std::unary_function<T,void>
+ {
+ unregisterConfigureCallback_f(const std::string &_id)
+ : id(_id)
+ {;}
+
+ void operator()(T& x) { x->i()->unregisterConfigureCallback(id); }
+ const std::string& id;
+ };
+
+ template<class T, typename Tcallback>
+ struct registerQueryCallback_f: public std::unary_function<T,void>
+ {
+ registerQueryCallback_f(const std::string &_id, const Tcallback _callback)
+ : id(_id), callback(_callback)
+ {;}
+
+ void operator()(T& x) { x->i()->registerQueryCallback(id, callback); }
+ const std::string& id; const Tcallback& callback;
+ };
+
+ template<class T, typename Tcallback>
+ struct unregisterQueryCallback_f: public std::unary_function<T,void>
+ {
+ unregisterQueryCallback_f(const std::string &_id)
+ : id(_id)
+ {;}
+
+ void operator()(T& x) { x->i()->unregisterQueryCallback(id); }
+ const std::string& id;
+ };
+
+ const std::string d_type;
+ typedef std::vector<rpcmanager_base::rpcserver_booter_base_sptr> rpcServerMap_t;
+ std::vector<std::string> d_registeredServers;
+ rpcServerMap_t d_serverlist;
+};
+
+#endif /* RPCSERVER_AGGREGATOR_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_base.h
new file mode 100644
index 0000000000..e2a1f6ef24
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_base.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_BASE_H
+#define RPCSERVER_BASE_H
+
+#include <gnuradio/rpccallbackregister_base.h>
+
+class rpcserver_base : public virtual callbackregister_base
+{
+public:
+ rpcserver_base() : cur_priv(RPC_PRIVLVL_ALL) {;}
+ virtual ~rpcserver_base() {;}
+
+ virtual void registerConfigureCallback(const std::string &id, const configureCallback_t callback) = 0;
+ virtual void unregisterConfigureCallback(const std::string &id) = 0;
+ virtual void registerQueryCallback(const std::string &id, const queryCallback_t callback) = 0;
+ virtual void unregisterQueryCallback(const std::string &id) = 0;
+ virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; }
+
+ typedef boost::shared_ptr<rpcserver_base> rpcserver_base_sptr;
+protected:
+ priv_lvl_t cur_priv;
+
+private:
+};
+
+#endif /* RPCSERVER_BASE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
new file mode 100644
index 0000000000..aac9ef8de6
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_BOOTER_AGGREGATOR
+#define RPCSERVER_BOOTER_AGGREGATOR
+
+#include <gnuradio/api.h>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/rpcserver_aggregator.h>
+#include <boost/shared_ptr.hpp>
+#include <string>
+
+class rpcserver_server;
+
+class GR_RUNTIME_API rpcserver_booter_aggregator :
+ public virtual rpcserver_booter_base
+{
+ public:
+ rpcserver_booter_aggregator();
+ ~rpcserver_booter_aggregator();
+
+ rpcserver_base* i();
+ const std::string& type();
+ const std::vector<std::string> endpoints();
+
+ const std::vector<std::string>& registeredServers();
+
+ protected:
+ friend class rpcmanager;
+ rpcserver_aggregator* agg();
+
+private:
+ std::string d_type;
+ boost::shared_ptr<rpcserver_aggregator> server;
+};
+
+#endif /* RPCSERVER_BOOTER_AGGREGATOR */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
new file mode 100644
index 0000000000..682944dada
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_BOOTER_BASE
+#define RPCSERVER_BOOTER_BASE
+
+#include <string>
+#include <vector>
+
+class rpcserver_base;
+
+class rpcserver_booter_base
+{
+public:
+ rpcserver_booter_base() {;}
+ virtual ~rpcserver_booter_base() {;}
+
+ virtual rpcserver_base* i()=0;
+ virtual const std::vector<std::string> endpoints()=0;
+ virtual const std::string& type()=0;
+
+private:
+};
+
+#endif /* RPCSERVER_BOOTER_BASE */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
new file mode 100644
index 0000000000..11095ac433
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_BOOTER_ICE_H
+#define RPCSERVER_BOOTER_ICE_H
+
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/ice_server_template.h>
+#include <gnuradio.h>
+
+class rpcserver_base;
+class rpcserver_ice;
+
+class rpcserver_booter_ice : public virtual rpcserver_booter_base,
+ public virtual ice_server_template<rpcserver_base, rpcserver_ice,
+ rpcserver_booter_ice, GNURadio::ControlPortPtr>
+{
+public:
+ rpcserver_booter_ice();
+ ~rpcserver_booter_ice();
+
+ rpcserver_base* i();
+ const std::string & type() {return d_type;}
+ const std::vector<std::string> endpoints();
+
+private:
+ std::string d_type;
+};
+
+#endif /* RPCSERVER_BOOTER_ICE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h
new file mode 100644
index 0000000000..c6c9d45717
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h
@@ -0,0 +1,226 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_ICE_H
+#define RPCSERVER_ICE_H
+
+#include <gnuradio/rpcserver_base.h>
+#include <gnuradio/rpcpmtconverters_ice.h>
+#include <string>
+#include <sstream>
+#include <map>
+#include <gnuradio.h>
+#include <Ice/Exception.h>
+#include <boost/format.hpp>
+
+class rpcserver_ice : public virtual rpcserver_base, public GNURadio::ControlPort
+{
+public:
+ rpcserver_ice();
+ virtual ~rpcserver_ice();
+
+ void registerConfigureCallback(const std::string &id, const configureCallback_t callback);
+ void unregisterConfigureCallback(const std::string &id);
+
+ void registerQueryCallback(const std::string &id, const queryCallback_t callback);
+ void unregisterQueryCallback(const std::string &id);
+
+ virtual void set(const GNURadio::KnobMap&, const Ice::Current&);
+
+ GNURadio::KnobMap get(const GNURadio::KnobIDList&, const Ice::Current&);
+
+ GNURadio::KnobPropMap properties(const GNURadio::KnobIDList&, const Ice::Current&);
+
+ virtual void shutdown(const Ice::Current&);
+
+private:
+ typedef std::map<std::string, configureCallback_t> ConfigureCallbackMap_t;
+ ConfigureCallbackMap_t d_setcallbackmap;
+
+ typedef std::map<std::string, queryCallback_t> QueryCallbackMap_t;
+ QueryCallbackMap_t d_getcallbackmap;
+
+ template<typename T, typename TMap> struct set_f
+ : public std::unary_function<T,void>
+ {
+ set_f(const Ice::Current& _c, TMap& _setcallbackmap, const priv_lvl_t& _cur_priv) :
+ c(_c), d_setcallbackmap(_setcallbackmap), cur_priv(_cur_priv)
+ {;}
+
+ void operator()(const T& p)
+ {
+ ConfigureCallbackMap_t::const_iterator iter(d_setcallbackmap.find(p.first));
+ if(iter != d_setcallbackmap.end()) {
+ if(cur_priv <= iter->second.priv) {
+ (*iter->second.callback).post(pmt::PMT_NIL, rpcpmtconverter::to_pmt(p.second,c));
+ }
+ else {
+ std::cout << "Key " << p.first << " requires PRIVLVL <= "
+ << iter->second.priv << " to set, currently at: "
+ << cur_priv << std::endl;
+ }
+ }
+ else {
+ throw IceUtil::NullHandleException(__FILE__, __LINE__);
+ }
+ }
+
+ const Ice::Current& c;
+ TMap& d_setcallbackmap;
+ const priv_lvl_t& cur_priv;
+ };
+
+ template<typename T, typename TMap>
+ struct get_f : public std::unary_function<T,void>
+ {
+ get_f(const Ice::Current& _c, TMap& _getcallbackmap,
+ const priv_lvl_t& _cur_priv, GNURadio::KnobMap& _outknobs) :
+ c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
+ {}
+
+ void operator()(const T& p)
+ {
+ QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(p));
+ if(iter != d_getcallbackmap.end()) {
+ if(cur_priv <= iter->second.priv) {
+ outknobs[p] = rpcpmtconverter::from_pmt((*iter->second.callback).retrieve(), c);
+ }
+ else {
+ std::cout << "Key " << iter->first << " requires PRIVLVL: <= "
+ << iter->second.priv << " to get, currently at: "
+ << cur_priv << std::endl;
+ }
+ }
+ else {
+ std::stringstream ss;
+ ss << "Ctrlport Key called with unregistered key (" << p << ")\n";
+ std::cout << ss.str();
+ throw IceUtil::IllegalArgumentException(__FILE__,__LINE__,ss.str().c_str());
+ }
+ }
+
+ const Ice::Current& c;
+ TMap& d_getcallbackmap;
+ const priv_lvl_t& cur_priv;
+ GNURadio::KnobMap& outknobs;
+ };
+
+ template<typename T, typename TMap, typename TKnobMap>
+ struct get_all_f : public std::unary_function<T,void>
+ {
+ get_all_f(const Ice::Current& _c, TMap& _getcallbackmap,
+ const priv_lvl_t& _cur_priv, TKnobMap& _outknobs) :
+ c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
+ {;}
+
+ void operator()(const T& p)
+ {
+ if(cur_priv <= p.second.priv) {
+ outknobs[p.first] = rpcpmtconverter::from_pmt(p.second.callback->retrieve(), c);
+ }
+ else {
+ std::cout << "Key " << p.first << " requires PRIVLVL <= "
+ << p.second.priv << " to get, currently at: "
+ << cur_priv << std::endl;
+ }
+ }
+
+ const Ice::Current& c;
+ TMap& d_getcallbackmap;
+ const priv_lvl_t& cur_priv;
+ TKnobMap& outknobs;
+ };
+
+ template<typename T, typename TMap, typename TKnobMap>
+ struct properties_all_f : public std::unary_function<T,void>
+ {
+ properties_all_f(const Ice::Current& _c, QueryCallbackMap_t& _getcallbackmap,
+ const priv_lvl_t& _cur_priv, GNURadio::KnobPropMap& _outknobs) :
+ c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
+ {;}
+
+ void operator()(const T& p)
+ {
+ if(cur_priv <= p.second.priv) {
+ GNURadio::KnobProp prop;//(new GNURadio::KnobProp());
+ prop.type = GNURadio::KNOBDOUBLE;
+ prop.units = p.second.units;
+ prop.description = p.second.description;
+ prop.min = rpcpmtconverter::from_pmt(p.second.min, c);
+ prop.max = rpcpmtconverter::from_pmt(p.second.max, c);
+ prop.display = static_cast<uint32_t>(p.second.display);
+ outknobs[p.first] = prop;
+ }
+ else {
+ std::cout << "Key " << p.first << " requires PRIVLVL <= "
+ << p.second.priv << " to get, currently at: "
+ << cur_priv << std::endl;
+ }
+ }
+
+ const Ice::Current& c;
+ TMap& d_getcallbackmap;
+ const priv_lvl_t& cur_priv;
+ TKnobMap& outknobs;
+ };
+
+ template<class T, typename TMap, typename TKnobMap>
+ struct properties_f : public std::unary_function<T,void>
+ {
+ properties_f(const Ice::Current& _c, TMap& _getcallbackmap,
+ const priv_lvl_t& _cur_priv, TKnobMap& _outknobs) :
+ c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
+ {;}
+
+ void operator()(const T& p)
+ {
+ typename TMap::const_iterator iter(d_getcallbackmap.find(p));
+ if(iter != d_getcallbackmap.end()) {
+ if(cur_priv <= iter->second.priv) {
+ GNURadio::KnobProp prop;
+ prop.type = GNURadio::KNOBDOUBLE;
+ prop.units = iter->second.units;
+ prop.description = iter->second.description;
+ prop.min = rpcpmtconverter::from_pmt(iter->second.min, c);
+ prop.max = rpcpmtconverter::from_pmt(iter->second.max, c);
+ prop.display = static_cast<uint32_t>(iter->second.display);
+ //outknobs[iter->first] = prop;
+ outknobs[p] = prop;
+ }
+ else {
+ std::cout << "Key " << iter->first << " requires PRIVLVL: <= " <<
+ iter->second.priv << " to get, currently at: " << cur_priv << std::endl;
+ }
+ }
+ else {
+ throw IceUtil::NullHandleException(__FILE__, __LINE__);
+ }
+ }
+
+ const Ice::Current& c;
+ TMap& d_getcallbackmap;
+ const priv_lvl_t& cur_priv;
+ TKnobMap& outknobs;
+ };
+};
+
+#endif /* RPCSERVER_ICE_H */
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_selector.h b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h
new file mode 100644
index 0000000000..fa63c9a2dc
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h
@@ -0,0 +1,32 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RPCSERVER_SELECTOR
+#define RPCSERVER_SELECTOR
+
+#define RPCSERVER_ENABLED
+
+#define RPCSERVER_ICE
+//#define RPCSERVER_ERLANG
+//#define RPCSERVER_XMLRPC
+
+#endif
diff --git a/gnuradio-runtime/include/gnuradio/runtime_types.h b/gnuradio-runtime/include/gnuradio/runtime_types.h
new file mode 100644
index 0000000000..f4674c0f0c
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/runtime_types.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_TYPES_H
+#define INCLUDED_GR_RUNTIME_TYPES_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+
+namespace gr {
+
+ /*
+ * typedefs for smart pointers we use throughout the runtime system
+ */
+ class basic_block;
+ class block;
+ class block_detail;
+ class buffer;
+ class buffer_reader;
+ class hier_block2;
+ class flat_flowgraph;
+ class flowgraph;
+ class top_block;
+
+ typedef boost::shared_ptr<basic_block> basic_block_sptr;
+ typedef boost::shared_ptr<block> block_sptr;
+ typedef boost::shared_ptr<block_detail> block_detail_sptr;
+ typedef boost::shared_ptr<buffer> buffer_sptr;
+ typedef boost::shared_ptr<buffer_reader> buffer_reader_sptr;
+ typedef boost::shared_ptr<hier_block2> hier_block2_sptr;
+ typedef boost::shared_ptr<flat_flowgraph> flat_flowgraph_sptr;
+ typedef boost::shared_ptr<flowgraph> flowgraph_sptr;
+ typedef boost::shared_ptr<top_block> top_block_sptr;
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_TYPES_H */
diff --git a/gnuradio-runtime/include/gnuradio/select_handler.h b/gnuradio-runtime/include/gnuradio/select_handler.h
new file mode 100644
index 0000000000..df7c753ced
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/select_handler.h
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_SELECT_HANDLER_H
+#define INCLUDED_GR_SELECT_HANDLER_H
+
+#include <gnuradio/api.h>
+#include <boost/shared_ptr.hpp>
+
+namespace gr {
+
+ class select_handler;
+ typedef boost::shared_ptr<select_handler> select_handler_sptr;
+
+ /*!
+ * \brief Abstract handler for select based notification.
+ * \ingroup base
+ *
+ * \sa gr::dispatcher
+ */
+ class GR_RUNTIME_API select_handler
+ {
+ int d_fd;
+
+ protected:
+ select_handler(int file_descriptor);
+
+ public:
+ virtual ~select_handler();
+
+ int fd() const { return d_fd; }
+ int file_descriptor() const { return d_fd; }
+
+ /*!
+ * \brief Called when file_descriptor is readable.
+ *
+ * Called when the dispatcher detects that file_descriptor can be
+ * read without blocking.
+ */
+ virtual void handle_read() = 0;
+
+ /*!
+ * \brief Called when file_descriptor is writable.
+ *
+ * Called when dispatcher detects that file descriptor can be
+ * written without blocking.
+ */
+ virtual void handle_write() = 0;
+
+ /*!
+ * Called each time around the dispatcher loop to determine
+ * whether this handler's file descriptor should be added to the
+ * list on which read events can occur. The default method
+ * returns true, indicating that by default, all handlers are
+ * interested in read events.
+ */
+ virtual bool readable() { return true; }
+
+ /*!
+ * Called each time around the dispatcher loop to determine
+ * whether this handler's file descriptor should be added to the
+ * list on which write events can occur. The default method
+ * returns true, indicating that by default, all handlers are
+ * interested in write events.
+ */
+ virtual bool writable() { return true; }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SELECT_HANDLER_H */
diff --git a/gnuradio-runtime/include/gnuradio/sincos.h b/gnuradio-runtime/include/gnuradio/sincos.h
new file mode 100644
index 0000000000..f162f6e31b
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sincos.h
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_SINCOS_H
+#define INCLUDED_GR_SINCOS_H
+
+#include <gnuradio/api.h>
+
+namespace gr {
+
+ // compute sine and cosine at the same time
+ GR_RUNTIME_API void sincos (double x, double *sin, double *cos);
+ GR_RUNTIME_API void sincosf (float x, float *sin, float *cos);
+}
+
+#endif /* INCLUDED_GR_SINCOS_H */
diff --git a/gnuradio-runtime/include/gnuradio/single_threaded_scheduler.h b/gnuradio-runtime/include/gnuradio/single_threaded_scheduler.h
new file mode 100644
index 0000000000..eccbf03b36
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/single_threaded_scheduler.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
+#define INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/runtime_types.h>
+#include <fstream>
+
+namespace gr {
+
+ class single_threaded_scheduler;
+ typedef boost::shared_ptr<single_threaded_scheduler> single_threaded_scheduler_sptr;
+
+ /*!
+ * \brief Simple scheduler for stream computations.
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API single_threaded_scheduler
+ {
+ public:
+ ~single_threaded_scheduler();
+
+ void run();
+ void stop();
+
+ private:
+ const std::vector<block_sptr> d_blocks;
+ volatile bool d_enabled;
+ std::ofstream *d_log;
+
+ single_threaded_scheduler(const std::vector<block_sptr> &blocks);
+
+ void main_loop();
+
+ friend GR_RUNTIME_API single_threaded_scheduler_sptr
+ make_single_threaded_scheduler(const std::vector<block_sptr> &blocks);
+ };
+
+ GR_RUNTIME_API single_threaded_scheduler_sptr
+ make_single_threaded_scheduler(const std::vector<block_sptr> &blocks);
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H */
diff --git a/gnuradio-runtime/include/gnuradio/sptr_magic.h b/gnuradio-runtime/include/gnuradio/sptr_magic.h
new file mode 100644
index 0000000000..898edc87fd
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sptr_magic.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_SPTR_MAGIC_H
+#define INCLUDED_GR_RUNTIME_SPTR_MAGIC_H
+
+#include <gnuradio/api.h>
+#include <boost/shared_ptr.hpp>
+
+namespace gr {
+ class basic_block;
+ class hier_block2;
+}
+
+namespace gnuradio {
+ namespace detail {
+
+ class GR_RUNTIME_API sptr_magic
+ {
+ public:
+ static boost::shared_ptr<gr::basic_block> fetch_initial_sptr(gr::basic_block *p);
+ static void create_and_stash_initial_sptr(gr::hier_block2 *p);
+ };
+ };
+
+ /*
+ * \brief New! Improved! Standard method to get/create the
+ * boost::shared_ptr for a block.
+ */
+ template<class T>
+ boost::shared_ptr<T>
+ get_initial_sptr(T *p)
+ {
+ return boost::dynamic_pointer_cast<T, gr::basic_block>
+ (detail::sptr_magic::fetch_initial_sptr(p));
+ }
+}
+
+#endif /* INCLUDED_GR_RUNTIME_SPTR_MAGIC_H */
diff --git a/gnuradio-runtime/include/gnuradio/sync_block.h b/gnuradio-runtime/include/gnuradio/sync_block.h
new file mode 100644
index 0000000000..4b0022ab7e
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sync_block.h
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_SYNC_BLOCK_H
+#define INCLUDED_GR_RUNTIME_SYNC_BLOCK_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+
+ /*!
+ * \brief synchronous 1:1 input to output with history
+ * \ingroup base_blk
+ *
+ * Override work to provide the signal processing implementation.
+ */
+ class GR_RUNTIME_API sync_block : public block
+ {
+ protected:
+ sync_block(void) {} // allows pure virtual interface sub-classes
+ sync_block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ public:
+ /*!
+ * \brief just like gr::block::general_work, only this arranges to
+ * call consume_each for you
+ *
+ * The user must override work to define the signal processing code
+ */
+ virtual int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items) = 0;
+
+ // gr::sync_block overrides these to assist work
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int fixed_rate_ninput_to_noutput(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_SYNC_BLOCK_H */
diff --git a/gnuradio-runtime/include/gnuradio/sync_decimator.h b/gnuradio-runtime/include/gnuradio/sync_decimator.h
new file mode 100644
index 0000000000..129abdca79
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sync_decimator.h
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004, 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_SYNC_DECIMATOR_H
+#define INCLUDED_GR_RUNTIME_SYNC_DECIMATOR_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+
+ /*!
+ * \brief synchronous N:1 input to output with history
+ * \ingroup base_blk
+ *
+ * Override work to provide the signal processing implementation.
+ */
+ class GR_RUNTIME_API sync_decimator : public sync_block
+ {
+ private:
+ unsigned d_decimation;
+
+ protected:
+ sync_decimator(void) {} // allows pure virtual interface sub-classes
+ sync_decimator(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ unsigned decimation);
+
+ public:
+ unsigned decimation() const { return d_decimation; }
+ void set_decimation(unsigned decimation)
+ {
+ d_decimation = decimation;
+ set_relative_rate(1.0 / decimation);
+ }
+
+ // gr::sync_decimator overrides these to assist work
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ // derived classes should override work
+
+ int fixed_rate_ninput_to_noutput(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_SYNC_DECIMATOR_H */
diff --git a/gnuradio-runtime/include/gnuradio/sync_interpolator.h b/gnuradio-runtime/include/gnuradio/sync_interpolator.h
new file mode 100644
index 0000000000..bfe79f902e
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sync_interpolator.h
@@ -0,0 +1,74 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_SYNC_INTERPOLATOR_H
+#define INCLUDED_GR_RUNTIME_SYNC_INTERPOLATOR_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+
+ /*!
+ * \brief synchronous 1:N input to output with history
+ * \ingroup base_blk
+ *
+ * Override work to provide the signal processing implementation.
+ */
+ class GR_RUNTIME_API sync_interpolator : public sync_block
+ {
+ private:
+ unsigned d_interpolation;
+
+ protected:
+ sync_interpolator(void) {} // allows pure virtual interface sub-classes
+ sync_interpolator(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ unsigned interpolation);
+
+ public:
+ unsigned interpolation() const { return d_interpolation; }
+ void set_interpolation(unsigned interpolation)
+ {
+ d_interpolation = interpolation;
+ set_relative_rate(1.0 * interpolation);
+ set_output_multiple(interpolation);
+ }
+
+ // gr::sync_interpolator overrides these to assist work
+ void forecast(int noutput_items,
+ gr_vector_int &ninput_items_required);
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ // derived classes should override work
+
+ int fixed_rate_ninput_to_noutput(int ninput);
+ int fixed_rate_noutput_to_ninput(int noutput);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_SYNC_INTERPOLATOR_H */
diff --git a/gnuradio-runtime/include/gnuradio/sys_paths.h b/gnuradio-runtime/include/gnuradio/sys_paths.h
new file mode 100644
index 0000000000..1bd2e0deb7
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sys_paths.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_SYS_PATHS_H
+#define GR_SYS_PATHS_H
+
+#include <gnuradio/api.h>
+
+namespace gr {
+
+ //! directory to create temporary files
+ GR_RUNTIME_API const char *tmp_path();
+
+ //! directory to store application data
+ GR_RUNTIME_API const char *appdata_path();
+
+} /* namespace gr */
+
+#endif /* GR_SYS_PATHS_H */
diff --git a/gnuradio-runtime/include/gnuradio/sys_pri.h b/gnuradio-runtime/include/gnuradio/sys_pri.h
new file mode 100644
index 0000000000..adceb91b9d
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/sys_pri.h
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GNURADIO_SYS_PRI_H
+#define INCLUDED_GNURADIO_SYS_PRI_H
+
+#include <gnuradio/api.h>
+#include <realtime.h>
+
+/*
+ * A single place to define real-time priorities used by the system itself
+ */
+namespace gr {
+
+ struct GR_RUNTIME_API sys_pri {
+ static rt_sched_param python(); // python code
+ static rt_sched_param normal(); // normal blocks
+ static rt_sched_param gcell_event_handler();
+ static rt_sched_param usrp2_backend(); // thread that services the ethernet
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GNURADIO_SYS_PRI_H */
diff --git a/gnuradio-runtime/include/gnuradio/tagged_stream_block.h b/gnuradio-runtime/include/gnuradio/tagged_stream_block.h
new file mode 100644
index 0000000000..1fe92ee25a
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/tagged_stream_block.h
@@ -0,0 +1,144 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_TAGGED_STREAM_BLOCK_H
+#define INCLUDED_GR_RUNTIME_TAGGED_STREAM_BLOCK_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+
+ /*!
+ * \brief Block that operates on PDUs in form of tagged streams
+ * \ingroup base_blk
+ *
+ * Override work to provide the signal processing implementation.
+ */
+ class GR_RUNTIME_API tagged_stream_block : public block
+ {
+ private:
+ pmt::pmt_t d_length_tag_key; //!< This is the key for the tag that stores the PDU length
+ gr_vector_int d_n_input_items_reqd; //!< How many input items do I need to process the next PDU?
+
+ protected:
+ std::string d_length_tag_key_str;
+ tagged_stream_block(void) {} // allows pure virtual interface sub-classes
+ tagged_stream_block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ const std::string &length_tag_key);
+
+ /*!
+ * \brief Parse all tags on the first sample of a PDU, return the
+ * number of items per input and prune the length tags.
+ *
+ * In most cases, you don't need to override this, unless the
+ * number of items read is not directly coded in one single tag.
+ *
+ * Default behaviour:
+ * - Go through all input ports
+ * - On every input port, search for the tag with the key specified in \p length_tag_key
+ * - Copy that value as an int to the corresponding position in \p n_input_items_reqd
+ * - Remove the length tag.
+ *
+ * \param[in] tags All the tags found on the first item of every input port.
+ * \param[out] n_input_items_reqd Number of items which will be read from every input
+ */
+ virtual void parse_length_tags(const std::vector<std::vector<tag_t> > &tags,
+ gr_vector_int &n_input_items_reqd);
+
+ /*!
+ * \brief Calculate the number of output items.
+ *
+ * This is basically the inverse function to forecast(): Given a
+ * number of input items, it returns the maximum number of output
+ * items.
+ *
+ * You most likely need to override this function, unless your
+ * block is a sync block or integer interpolator/decimator.
+ */
+ virtual int calculate_output_stream_length(const gr_vector_int &ninput_items);
+
+ /*!
+ * \brief Set the new length tags on the output stream
+ *
+ * Default behaviour: Set a tag with key \p length_tag_key and the
+ * number of produced items on every output port.
+ *
+ * For anything else, override this.
+ *
+ * \param n_produced Length of the new PDU
+ * \param n_ports Number of output ports
+ */
+ virtual void update_length_tags(int n_produced, int n_ports);
+
+ public:
+ /*! \brief Don't override this.
+ */
+ void /* final */ forecast (int noutput_items, gr_vector_int &ninput_items_required);
+
+ /*!
+ * - Reads the number of input items from the tags using parse_length_tags()
+ * - Checks there's enough data on the input and output buffers
+ * - If not, inform the scheduler and do nothing
+ * - Calls work() with the exact number of items per PDU
+ * - Updates the tags using update_length_tags()
+ */
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ /*!
+ * \brief Just like gr::block::general_work, but makes sure the input is valid
+ *
+ * The user must override work to define the signal processing
+ * code. Check the documentation for general_work() to see what
+ * happens here.
+ *
+ * Like gr::sync_block, this calls consume() for you (it consumes
+ * ninput_items[i] items from the i-th port).
+ *
+ * A note on tag propagation: The PDU length tags are handled by
+ * other functions, but all other tags are handled just as in any
+ * other \p gr::block. So, most likely, you either set the tag
+ * propagation policy to TPP_DONT and handle the tag propagation
+ * manually, or you propagate tags through the scheduler and don't
+ * do anything here.
+ *
+ * \param noutput_items The size of the writable output buffer
+ * \param ninput_items The exact size of the items on every input for this particular PDU.
+ * These will be consumed if a length tag key is provided!
+ * \param input_items See gr::block
+ * \param output_items See gr::block
+ */
+ virtual int work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items) = 0;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_TAGGED_STREAM_BLOCK_H */
+
diff --git a/gnuradio-runtime/include/gnuradio/tags.h b/gnuradio-runtime/include/gnuradio/tags.h
new file mode 100644
index 0000000000..5600601741
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/tags.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TAGS_H
+#define INCLUDED_GR_TAGS_H
+
+#include <gnuradio/api.h>
+#include <pmt/pmt.h>
+
+namespace gr {
+
+ struct GR_RUNTIME_API tag_t
+ {
+ //! the item \p tag occurred at (as a uint64_t)
+ uint64_t offset;
+
+ //! the key of \p tag (as a PMT symbol)
+ pmt::pmt_t key;
+
+ //! the value of \p tag (as a PMT)
+ pmt::pmt_t value;
+
+ //! the source ID of \p tag (as a PMT)
+ pmt::pmt_t srcid;
+
+ /*!
+ * Comparison function to test which tag, \p x or \p y, came
+ * first in time
+ */
+ static inline bool offset_compare(const tag_t &x,
+ const tag_t &y)
+ {
+ return x.offset < y.offset;
+ }
+
+ inline bool operator == (const tag_t &t) const
+ {
+ return (t.key == key) && (t.value == value) && \
+ (t.srcid == srcid) && (t.offset == offset);
+ }
+ };
+
+} /* namespace gr */
+
+#endif /*INCLUDED_GR_TAGS_H*/
diff --git a/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt
new file mode 100644
index 0000000000..8ea4bfc66e
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/thread/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+ thread.h
+ thread_body_wrapper.h
+ thread_group.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/thread
+ COMPONENT "runtime_devel"
+)
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h
new file mode 100644
index 0000000000..04d67d0821
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h
@@ -0,0 +1,144 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_THREAD_H
+#define INCLUDED_THREAD_H
+
+#include <gnuradio/api.h>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <vector>
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#endif
+
+namespace gr {
+ namespace thread {
+
+ typedef boost::thread thread;
+ typedef boost::mutex mutex;
+ typedef boost::unique_lock<boost::mutex> scoped_lock;
+ typedef boost::condition_variable condition_variable;
+
+ /*! \brief a system-dependent typedef for the underlying thread type.
+ */
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+ typedef HANDLE gr_thread_t;
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+ typedef pthread_t gr_thread_t;
+#else
+ typedef pthread_t gr_thread_t;
+#endif
+
+ /*! \brief Get the current thread's ID as a gr_thread_t
+ *
+ * We use this when setting the thread affinity or any other
+ * low-level thread settings. Can be called withing a GNU Radio
+ * block to get a reference to its current thread ID.
+ */
+ GR_RUNTIME_API gr_thread_t get_current_thread_id();
+
+ /*! \brief Bind the current thread to a set of cores.
+ *
+ * Wrapper for system-dependent calls to set the affinity of the
+ * current thread to the processor mask. The mask is simply a
+ * 1-demensional vector containing the processor or core number
+ * from 0 to N-1 for N cores.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_bind_to_processor(const std::vector<int> &mask);
+
+ /*! \brief Convineince function to bind the current thread to a single core.
+ *
+ * Wrapper for system-dependent calls to set the affinity of the
+ * current thread to a given core from 0 to N-1 for N cores.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_bind_to_processor(int n);
+
+ /*! \brief Bind a thread to a set of cores.
+ *
+ * Wrapper for system-dependent calls to set the affinity of the
+ * given thread ID to the processor mask. The mask is simply a
+ * 1-demensional vector containing the processor or core number
+ * from 0 to N-1 for N cores.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread,
+ const std::vector<int> &mask);
+
+
+ /*! \brief Convineince function to bind the a thread to a single core.
+ *
+ * Wrapper for system-dependent calls to set the affinity of the
+ * given thread ID to a given core from 0 to N-1 for N cores.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread,
+ unsigned int n);
+
+ /*! \brief Remove any thread-processor affinity for the current thread.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_unbind();
+
+ /*! \brief Remove any thread-processor affinity for a given thread ID.
+ *
+ * Note: this does not work on OSX; it is a nop call since OSX
+ * does not support the concept of thread affinity (and what they
+ * do support in this way since 10.5 is not what we want or can
+ * use in this fashion).
+ */
+ GR_RUNTIME_API void thread_unbind(gr_thread_t thread);
+
+ } /* namespace thread */
+} /* namespace gr */
+
+#endif /* INCLUDED_THREAD_H */
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread_body_wrapper.h b/gnuradio-runtime/include/gnuradio/thread/thread_body_wrapper.h
new file mode 100644
index 0000000000..9761d3fbe2
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/thread/thread_body_wrapper.h
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_THREAD_BODY_WRAPPER_H
+#define INCLUDED_THREAD_BODY_WRAPPER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread.h>
+#include <exception>
+#include <iostream>
+
+namespace gr {
+ namespace thread {
+
+ GR_RUNTIME_API void mask_signals();
+
+ template <class F>
+ class thread_body_wrapper
+ {
+ private:
+ F d_f;
+ std::string d_name;
+
+ public:
+ explicit thread_body_wrapper(F f, const std::string &name="")
+ : d_f(f), d_name(name) {}
+
+ void operator()()
+ {
+ mask_signals();
+
+ try {
+ d_f();
+ }
+ catch(boost::thread_interrupted const &)
+ {
+ }
+ catch(std::exception const &e)
+ {
+ std::cerr << "thread[" << d_name << "]: "
+ << e.what() << std::endl;
+ }
+ catch(...)
+ {
+ std::cerr << "thread[" << d_name << "]: "
+ << "caught unrecognized exception\n";
+ }
+ }
+ };
+
+ } /* namespace thread */
+} /* namespace gr */
+
+#endif /* INCLUDED_THREAD_BODY_WRAPPER_H */
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread_group.h b/gnuradio-runtime/include/gnuradio/thread/thread_group.h
new file mode 100644
index 0000000000..830017d11e
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/thread/thread_group.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright (C) 2001-2003 William E. Kempf
+ * Copyright (C) 2007 Anthony Williams
+ * Copyright 2008,2009 Free Software Foundation, Inc.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+/*
+ * This was extracted from Boost 1.35.0 and fixed.
+ */
+
+#ifndef INCLUDED_THREAD_GROUP_H
+#define INCLUDED_THREAD_GROUP_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread.h>
+#include <boost/utility.hpp>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/function.hpp>
+
+namespace gr {
+ namespace thread {
+
+ class GR_RUNTIME_API thread_group : public boost::noncopyable
+ {
+ public:
+ thread_group();
+ ~thread_group();
+
+ boost::thread* create_thread(const boost::function0<void>& threadfunc);
+ void add_thread(boost::thread* thrd);
+ void remove_thread(boost::thread* thrd);
+ void join_all();
+ void interrupt_all();
+ size_t size() const;
+
+ private:
+ std::list<boost::thread*> m_threads;
+ mutable boost::shared_mutex m_mutex;
+ };
+
+ } /* namespace thread */
+} /* namespace gr */
+
+#endif /* INCLUDED_THREAD_GROUP_H */
diff --git a/gnuradio-runtime/include/gnuradio/timer.h b/gnuradio-runtime/include/gnuradio/timer.h
new file mode 100644
index 0000000000..d685fd9a19
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/timer.h
@@ -0,0 +1,84 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef INCLUDED_GR_TIMER_H
+#define INCLUDED_GR_TIMER_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+
+class gr_timer;
+
+typedef boost::shared_ptr<gr_timer> gr_timer_sptr;
+
+GR_RUNTIME_API typedef void (*gr_timer_hook)(gr_timer *, void *);
+
+/*!
+ * \brief create a timeout.
+ *
+ * \ingroup misc
+ * gr_timer_hook is called when timer fires.
+ */
+GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+
+/*!
+ * \brief implement timeouts
+ */
+class GR_RUNTIME_API gr_timer {
+ double d_expiry;
+ double d_period;
+ gr_timer_hook d_hook;
+ void *d_hook_arg;
+
+ friend GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+
+ gr_timer (...);
+
+public:
+ ~gr_timer ();
+
+ //! return absolute current time (seconds since the epoc).
+ static double now ();
+
+ /*!
+ * \brief schedule timer to fire at abs_when
+ * \param abs_when absolute time in seconds since the epoc.
+ */
+ void schedule_at (double abs_when);
+
+ /*!
+ * \brief schedule timer to fire rel_when seconds from now.
+ * \param rel_when relative time in seconds from now.
+ */
+ void schedule_after (double rel_when); // relative time in seconds
+
+ /*!
+ * \brief schedule a periodic timeout.
+ * \param abs_when absolute time to fire first time
+ * \param period time between firings
+ */
+ void schedule_periodic (double abs_when, double period);
+
+ //! cancel timer
+ void unschedule ();
+};
+
+#endif /* INCLUDED_GR_TIMER_H */
diff --git a/gnuradio-runtime/include/gnuradio/top_block.h b/gnuradio-runtime/include/gnuradio/top_block.h
new file mode 100644
index 0000000000..b3692e09e2
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/top_block.h
@@ -0,0 +1,146 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007-2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TOP_BLOCK_H
+#define INCLUDED_GR_TOP_BLOCK_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/hier_block2.h>
+
+namespace gr {
+
+ class top_block_impl;
+
+ GR_RUNTIME_API top_block_sptr make_top_block(const std::string &name);
+
+ /*!
+ *\brief Top-level hierarchical block representing a flowgraph
+ * \ingroup container_blk
+ */
+ class GR_RUNTIME_API top_block : public hier_block2
+ {
+ private:
+ friend GR_RUNTIME_API top_block_sptr
+ make_top_block(const std::string &name);
+
+ top_block_impl *d_impl;
+
+ protected:
+ top_block(const std::string &name);
+
+ public:
+ ~top_block();
+
+ /*!
+ * \brief The simple interface to running a flowgraph.
+ *
+ * Calls start() then wait(). Used to run a flowgraph that will
+ * stop on its own, or when another thread will call stop().
+ *
+ * \param max_noutput_items the maximum number of output items
+ * allowed for any block in the flowgraph. This passes through to
+ * the start function; see that function for more details.
+ */
+ void run(int max_noutput_items=100000000);
+
+ /*!
+ * Start the contained flowgraph. Creates one or more threads to
+ * execute the flow graph. Returns to the caller once the threads
+ * are created. Calling start() on a top_block that is already
+ * started IS an error.
+ *
+ * \param max_noutput_items the maximum number of output items
+ * allowed for any block in the flowgraph; the noutput_items can
+ * always be less than this, but this will cap it as a
+ * maximum. Use this to adjust the maximum latency a flowgraph can
+ * exhibit.
+ */
+ void start(int max_noutput_items=100000000);
+
+ /*!
+ * Stop the running flowgraph. Notifies each thread created by the
+ * scheduler to shutdown, then returns to caller. Calling stop()
+ * on a top_block that is already stopped IS NOT an error.
+ */
+ void stop();
+
+ /*!
+ * Wait for a flowgraph to complete. Flowgraphs complete when
+ * either (1) all blocks indicate that they are done (typically
+ * only when using blocks.file_source, or blocks.head, or (2)
+ * after stop() has been called to request shutdown. Calling wait
+ * on a top_block that is not running IS NOT an error (wait
+ * returns w/o blocking).
+ */
+ void wait();
+
+ /*!
+ * Lock a flowgraph in preparation for reconfiguration. When an
+ * equal number of calls to lock() and unlock() have occurred, the
+ * flowgraph will be reconfigured.
+ *
+ * N.B. lock() and unlock() may not be called from a flowgraph
+ * thread (E.g., block::work method) or deadlock will occur
+ * when reconfiguration happens.
+ */
+ virtual void lock();
+
+ /*!
+ * Unlock a flowgraph in preparation for reconfiguration. When an
+ * equal number of calls to lock() and unlock() have occurred, the
+ * flowgraph will be reconfigured.
+ *
+ * N.B. lock() and unlock() may not be called from a flowgraph thread
+ * (E.g., block::work method) or deadlock will occur when
+ * reconfiguration happens.
+ */
+ virtual void unlock();
+
+ /*!
+ * Returns a string that lists the edge connections in the
+ * flattened flowgraph.
+ */
+ std::string edge_list();
+
+ /*!
+ * Displays flattened flowgraph edges and block connectivity
+ */
+ void dump();
+
+ //! Get the number of max noutput_items in the flowgraph
+ int max_noutput_items();
+
+ //! Set the maximum number of noutput_items in the flowgraph
+ void set_max_noutput_items(int nmax);
+
+ top_block_sptr to_top_block(); // Needed for Python type coercion
+
+ void setup_rpc();
+ };
+
+ inline top_block_sptr cast_to_top_block_sptr(basic_block_sptr block) {
+ return boost::dynamic_pointer_cast<top_block, basic_block>(block);
+ }
+
+} /* namespce gr */
+
+#endif /* INCLUDED_GR_TOP_BLOCK_H */
diff --git a/gnuradio-runtime/include/gnuradio/tpb_detail.h b/gnuradio-runtime/include/gnuradio/tpb_detail.h
new file mode 100644
index 0000000000..9b7454b508
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/tpb_detail.h
@@ -0,0 +1,93 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_TPB_DETAIL_H
+#define INCLUDED_GR_TPB_DETAIL_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread.h>
+#include <deque>
+#include <pmt/pmt.h>
+
+namespace gr {
+
+ class block_detail;
+
+ /*!
+ * \brief used by thread-per-block scheduler
+ */
+ struct GR_RUNTIME_API tpb_detail {
+ gr::thread::mutex mutex; //< protects all vars
+ bool input_changed;
+ gr::thread::condition_variable input_cond;
+ bool output_changed;
+ gr::thread::condition_variable output_cond;
+
+ public:
+ tpb_detail()
+ : input_changed(false), output_changed(false) { }
+
+ //! Called by us to tell all our upstream blocks that their output
+ //! may have changed.
+ void notify_upstream(block_detail *d);
+
+ //! Called by us to tell all our downstream blocks that their
+ //! input may have changed.
+ void notify_downstream(block_detail *d);
+
+ //! Called by us to notify both upstream and downstream
+ void notify_neighbors(block_detail *d);
+
+ //! Called by pmt msg posters
+ void notify_msg() {
+ input_cond.notify_one();
+ output_cond.notify_one();
+ }
+
+ //! Called by us
+ void clear_changed()
+ {
+ gr::thread::scoped_lock guard(mutex);
+ input_changed = false;
+ output_changed = false;
+ }
+
+ private:
+ //! Used by notify_downstream
+ void set_input_changed()
+ {
+ gr::thread::scoped_lock guard(mutex);
+ input_changed = true;
+ input_cond.notify_one();
+ }
+
+ //! Used by notify_upstream
+ void set_output_changed()
+ {
+ gr::thread::scoped_lock guard(mutex);
+ output_changed = true;
+ output_cond.notify_one();
+ }
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TPB_DETAIL_H */
diff --git a/gnuradio-runtime/include/gnuradio/types.h b/gnuradio-runtime/include/gnuradio/types.h
new file mode 100644
index 0000000000..6cb0f72834
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/types.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TYPES_H
+#define INCLUDED_GR_TYPES_H
+
+#include <gnuradio/api.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <stddef.h> // size_t
+
+#include <gnuradio/gr_complex.h>
+
+typedef std::vector<int> gr_vector_int;
+typedef std::vector<unsigned int> gr_vector_uint;
+typedef std::vector<float> gr_vector_float;
+typedef std::vector<double> gr_vector_double;
+typedef std::vector<void *> gr_vector_void_star;
+typedef std::vector<const void *> gr_vector_const_void_star;
+
+/*
+ * #include <config.h> must be placed beforehand
+ * in the source file including gnuradio/types.h for
+ * the following to work correctly
+ */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+typedef int16_t gr_int16;
+typedef int32_t gr_int32;
+typedef int64_t gr_int64;
+typedef uint16_t gr_uint16;
+typedef uint32_t gr_uint32;
+typedef uint64_t gr_uint64;
+#else
+/*
+ * Note: these defaults may be wrong on 64-bit systems
+ */
+typedef short gr_int16;
+typedef int gr_int32;
+typedef long long gr_int64;
+typedef unsigned short gr_uint16;
+typedef unsigned int gr_uint32;
+typedef unsigned long long gr_uint64;
+#endif /* HAVE_STDINT_H */
+
+#endif /* INCLUDED_GR_TYPES_H */
diff --git a/gnuradio-runtime/include/gnuradio/unittests.h b/gnuradio-runtime/include/gnuradio/unittests.h
new file mode 100644
index 0000000000..209c3ab32a
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/unittests.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/api.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string>
+
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+
+static std::string get_unittest_path(const std::string &filename){
+ boost::filesystem::path path = boost::filesystem::current_path() / ".unittests";
+ if (!boost::filesystem::is_directory(path)) boost::filesystem::create_directory(path);
+ return (path / filename).string();
+}
diff --git a/gnuradio-runtime/include/gr_basic_block.h b/gnuradio-runtime/include/gr_basic_block.h
deleted file mode 100644
index beb54dbb6b..0000000000
--- a/gnuradio-runtime/include/gr_basic_block.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2008,2009,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BASIC_BLOCK_H
-#define INCLUDED_GR_BASIC_BLOCK_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-#include <gr_sptr_magic.h>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/function.hpp>
-#include <gr_msg_accepter.h>
-#include <string>
-#include <deque>
-#include <map>
-#include <gr_io_signature.h>
-#include <thread/thread.h>
-#include <boost/foreach.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <iostream>
-
-#ifdef GR_CTRLPORT
-#include <rpcregisterhelpers.h>
-#endif
-
-/*!
- * \brief The abstract base class for all signal processing blocks.
- * \ingroup internal
- *
- * Basic blocks are the bare abstraction of an entity that has a name,
- * a set of inputs and outputs, and a message queue. These are never instantiated
- * directly; rather, this is the abstract parent class of both gr_hier_block,
- * which is a recursive container, and gr_block, which implements actual
- * signal processing functions.
- */
-
-class GR_RUNTIME_API gr_basic_block : public gr_msg_accepter, public boost::enable_shared_from_this<gr_basic_block>
-{
- typedef boost::function<void(pmt::pmt_t)> msg_handler_t;
-
- private:
-
- //msg_handler_t d_msg_handler;
- typedef std::map<pmt::pmt_t , msg_handler_t, pmt::comperator> d_msg_handlers_t;
- d_msg_handlers_t d_msg_handlers;
-
- typedef std::deque<pmt::pmt_t> msg_queue_t;
- typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comperator> msg_queue_map_t;
- typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comperator>::iterator msg_queue_map_itr;
- std::map<pmt::pmt_t, boost::shared_ptr<boost::condition_variable>, pmt::comperator> msg_queue_ready;
-
- gr::thread::mutex mutex; //< protects all vars
-
- protected:
- friend class gr_flowgraph;
- friend class gr_flat_flowgraph; // TODO: will be redundant
- friend class gr_tpb_thread_body;
-
- enum vcolor { WHITE, GREY, BLACK };
-
- std::string d_name;
- gr_io_signature_sptr d_input_signature;
- gr_io_signature_sptr d_output_signature;
- long d_unique_id;
- long d_symbolic_id;
- std::string d_symbol_name;
- std::string d_symbol_alias;
- vcolor d_color;
- bool d_rpc_set;
-
- msg_queue_map_t msg_queue;
- std::vector<boost::any> d_rpc_vars; // container for all RPC variables
-
- gr_basic_block(void){} //allows pure virtual interface sub-classes
-
- //! Protected constructor prevents instantiation by non-derived classes
- gr_basic_block(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
- //! may only be called during constructor
- void set_input_signature(gr_io_signature_sptr iosig) {
- d_input_signature = iosig;
- }
-
- //! may only be called during constructor
- void set_output_signature(gr_io_signature_sptr iosig) {
- d_output_signature = iosig;
- }
-
- /*!
- * \brief Allow the flowgraph to set for sorting and partitioning
- */
- void set_color(vcolor color) { d_color = color; }
- vcolor color() const { return d_color; }
-
- /*!
- * \brief Tests if there is a handler attached to port \p which_port
- */
- bool has_msg_handler(pmt::pmt_t which_port) {
- return (d_msg_handlers.find(which_port) != d_msg_handlers.end());
- }
-
- /*
- * This function is called by the runtime system to dispatch messages.
- *
- * The thread-safety guarantees mentioned in set_msg_handler are implemented
- * by the callers of this method.
- */
- virtual void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- // AA Update this
- if(has_msg_handler(which_port)) { // Is there a handler?
- d_msg_handlers[which_port](msg); // Yes, invoke it.
- }
- }
-
- // Message passing interface
- pmt::pmt_t message_subscribers;
-
- public:
- virtual ~gr_basic_block();
- long unique_id() const { return d_unique_id; }
- long symbolic_id() const { return d_symbolic_id; }
- std::string name() const { return d_name; }
- std::string symbol_name() const { return d_symbol_name; }
- gr_io_signature_sptr input_signature() const { return d_input_signature; }
- gr_io_signature_sptr output_signature() const { return d_output_signature; }
- gr_basic_block_sptr to_basic_block(); // Needed for Python type coercion
- bool alias_set() { return !d_symbol_alias.empty(); }
- std::string alias(){ return alias_set()?d_symbol_alias:symbol_name(); }
- pmt::pmt_t alias_pmt(){ return pmt::intern(alias()); }
- void set_block_alias(std::string name);
-
- // ** Message passing interface **
- void message_port_register_in(pmt::pmt_t port_id);
- void message_port_register_out(pmt::pmt_t port_id);
- void message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg);
- void message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target);
- void message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target);
-
- virtual bool message_port_is_hier(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier\n"; return false; }
- virtual bool message_port_is_hier_in(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_in\n"; return false; }
- virtual bool message_port_is_hier_out(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_out\n"; return false; }
-
- /*!
- * \brief Get input message port names.
- *
- * Returns the available input message ports for a block. The
- * return object is a PMT vector that is filled with PMT symbols.
- */
- pmt::pmt_t message_ports_in();
-
- /*!
- * \brief Get output message port names.
- *
- * Returns the available output message ports for a block. The
- * return object is a PMT vector that is filled with PMT symbols.
- */
- pmt::pmt_t message_ports_out();
-
- /*!
- * Accept msg, place in queue, arrange for thread to be awakened if it's not already.
- */
- void _post(pmt::pmt_t which_port, pmt::pmt_t msg);
-
- //! is the queue empty?
- //bool empty_p(const pmt::pmt_t &which_port) const { return msg_queue[which_port].empty(); }
- bool empty_p(pmt::pmt_t which_port) {
- if(msg_queue.find(which_port) == msg_queue.end())
- throw std::runtime_error("port does not exist!");
- return msg_queue[which_port].empty();
- }
- bool empty_p() {
- bool rv = true;
- BOOST_FOREACH(msg_queue_map_t::value_type &i, msg_queue) {
- rv &= msg_queue[i.first].empty();
- }
- return rv;
- }
-
- //! How many messages in the queue?
- size_t nmsgs(pmt::pmt_t which_port) {
- if(msg_queue.find(which_port) == msg_queue.end())
- throw std::runtime_error("port does not exist!");
- return msg_queue[which_port].size();
- }
-
- //| Acquires and release the mutex
- void insert_tail( pmt::pmt_t which_port, pmt::pmt_t msg);
- /*!
- * \returns returns pmt at head of queue or pmt_t() if empty.
- */
- pmt::pmt_t delete_head_nowait( pmt::pmt_t which_port);
-
- /*!
- * \returns returns pmt at head of queue or pmt_t() if empty.
- */
- pmt::pmt_t delete_head_blocking( pmt::pmt_t which_port);
-
- msg_queue_t::iterator get_iterator(pmt::pmt_t which_port){
- return msg_queue[which_port].begin();
- }
-
- void erase_msg(pmt::pmt_t which_port, msg_queue_t::iterator it){
- msg_queue[which_port].erase(it);
- }
-
- virtual bool has_msg_port(pmt::pmt_t which_port){
- if(msg_queue.find(which_port) != msg_queue.end()){
- return true;
- }
- if(pmt::dict_has_key(message_subscribers, which_port)){
- return true;
- }
- return false;
- }
-
-#ifdef GR_CTRLPORT
- /*!
- * \brief Add an RPC variable (get or set).
- *
- * Using controlport, we create new getters/setters and need to
- * store them. Each block has a vector to do this, and these never
- * need to be accessed again once they are registered with the RPC
- * backend. This function takes a
- * boost::shared_sptr<rpcbasic_base> so that when the block is
- * deleted, all RPC registered variables are cleaned up.
- *
- * \param s an rpcbasic_sptr of the new RPC variable register to store.
- */
- void add_rpc_variable(rpcbasic_sptr s)
- {
- d_rpc_vars.push_back(s);
- }
-#endif /* GR_CTRLPORT */
-
- /*!
- * \brief Set up the RPC registered variables.
- *
- * This must be overloaded by a block that wants to use
- * controlport. This is where rpcbasic_register_{get,set} pointers
- * are created, which then get wrapped as shared pointers
- * (rpcbasic_sptr(...)) and stored using add_rpc_variable.
- */
- virtual void setup_rpc() {};
-
- /*!
- * \brief Ask if this block has been registered to the RPC.
- *
- * We can only register a block once, so we use this to protect us
- * from calling it multiple times.
- */
- bool is_rpc_set() { return d_rpc_set; }
-
- /*!
- * \brief When the block is registered with the RPC, set this.
- */
- void rpc_set() { d_rpc_set = true; }
-
- /*!
- * \brief Confirm that ninputs and noutputs is an acceptable combination.
- *
- * \param ninputs number of input streams connected
- * \param noutputs number of output streams connected
- *
- * \returns true if this is a valid configuration for this block.
- *
- * This function is called by the runtime system whenever the
- * topology changes. Most classes do not need to override this.
- * This check is in addition to the constraints specified by the input
- * and output gr_io_signatures.
- */
- virtual bool check_topology(int ninputs, int noutputs) { (void) ninputs; (void) noutputs; return true; }
-
- /*!
- * \brief Set the callback that is fired when messages are available.
- *
- * \p msg_handler can be any kind of function pointer or function object
- * that has the signature:
- * <pre>
- * void msg_handler(pmt::pmt msg);
- * </pre>
- *
- * (You may want to use boost::bind to massage your callable into
- * the correct form. See gr::blocks::nop for an example that sets
- * up a class method as the callback.)
- *
- * Blocks that desire to handle messages must call this method in their
- * constructors to register the handler that will be invoked when messages
- * are available.
- *
- * If the block inherits from gr_block, the runtime system will ensure that
- * msg_handler is called in a thread-safe manner, such that work and
- * msg_handler will never be called concurrently. This allows msg_handler
- * to update state variables without having to worry about thread-safety
- * issues with work, general_work or another invocation of msg_handler.
- *
- * If the block inherits from gr_hier_block2, the runtime system will
- * ensure that no reentrant calls are made to msg_handler.
- */
- template <typename T> void set_msg_handler(pmt::pmt_t which_port, T msg_handler){
- if(msg_queue.find(which_port) == msg_queue.end()){
- throw std::runtime_error("attempt to set_msg_handler() on bad input message port!"); }
- d_msg_handlers[which_port] = msg_handler_t(msg_handler);
- }
-};
-
-inline bool operator<(gr_basic_block_sptr lhs, gr_basic_block_sptr rhs)
-{
- return lhs->unique_id() < rhs->unique_id();
-}
-
-typedef std::vector<gr_basic_block_sptr> gr_basic_block_vector_t;
-typedef std::vector<gr_basic_block_sptr>::iterator gr_basic_block_viter_t;
-
-GR_RUNTIME_API long gr_basic_block_ncurrently_allocated();
-
-inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr basic_block)
-{
- os << basic_block->name() << "(" << basic_block->unique_id() << ")";
- return os;
-}
-
-#endif /* INCLUDED_GR_BASIC_BLOCK_H */
diff --git a/gnuradio-runtime/include/gr_block.h b/gnuradio-runtime/include/gr_block.h
deleted file mode 100644
index 77ca3f3f72..0000000000
--- a/gnuradio-runtime/include/gr_block.h
+++ /dev/null
@@ -1,700 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007,2009,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BLOCK_H
-#define INCLUDED_GR_BLOCK_H
-
-#include <gr_runtime_api.h>
-#include <gr_basic_block.h>
-#include <gr_tags.h>
-#include <gr_logger.h>
-
-/*!
- * \brief The abstract base class for all 'terminal' processing blocks.
- * \ingroup base_blk
- *
- * A signal processing flow is constructed by creating a tree of
- * hierarchical blocks, which at any level may also contain terminal nodes
- * that actually implement signal processing functions. This is the base
- * class for all such leaf nodes.
-
- * Blocks have a set of input streams and output streams. The
- * input_signature and output_signature define the number of input
- * streams and output streams respectively, and the type of the data
- * items in each stream.
- *
- * Although blocks may consume data on each input stream at a
- * different rate, all outputs streams must produce data at the same
- * rate. That rate may be different from any of the input rates.
- *
- * User derived blocks override two methods, forecast and general_work,
- * to implement their signal processing behavior. forecast is called
- * by the system scheduler to determine how many items are required on
- * each input stream in order to produce a given number of output
- * items.
- *
- * general_work is called to perform the signal processing in the block.
- * It reads the input items and writes the output items.
- */
-
-class GR_RUNTIME_API gr_block : public gr_basic_block {
-
- public:
-
- //! Magic return values from general_work
- enum {
- WORK_CALLED_PRODUCE = -2,
- WORK_DONE = -1
- };
-
- enum tag_propagation_policy_t {
- TPP_DONT = 0,
- TPP_ALL_TO_ALL = 1,
- TPP_ONE_TO_ONE = 2
- };
-
- virtual ~gr_block ();
-
- /*!
- * Assume block computes y_i = f(x_i, x_i-1, x_i-2, x_i-3...)
- * History is the number of x_i's that are examined to produce one y_i.
- * This comes in handy for FIR filters, where we use history to
- * ensure that our input contains the appropriate "history" for the
- * filter. History should be equal to the number of filter taps.
- */
- unsigned history () const { return d_history; }
- void set_history (unsigned history) { d_history = history; }
-
- /*!
- * \brief Return true if this block has a fixed input to output rate.
- *
- * If true, then fixed_rate_in_to_out and fixed_rate_out_to_in may be called.
- */
- bool fixed_rate() const { return d_fixed_rate; }
-
- // ----------------------------------------------------------------
- // override these to define your behavior
- // ----------------------------------------------------------------
-
- /*!
- * \brief Estimate input requirements given output request
- *
- * \param noutput_items number of output items to produce
- * \param ninput_items_required number of input items required on each input stream
- *
- * Given a request to product \p noutput_items, estimate the number of
- * data items required on each input stream. The estimate doesn't have
- * to be exact, but should be close.
- */
- virtual void forecast (int noutput_items,
- gr_vector_int &ninput_items_required);
-
- /*!
- * \brief compute output items from input items
- *
- * \param noutput_items number of output items to write on each output stream
- * \param ninput_items number of input items available on each input stream
- * \param input_items vector of pointers to the input items, one entry per input stream
- * \param output_items vector of pointers to the output items, one entry per output stream
- *
- * \returns number of items actually written to each output stream, or -1 on EOF.
- * It is OK to return a value less than noutput_items. -1 <= return value <= noutput_items
- *
- * general_work must call consume or consume_each to indicate how many items
- * were consumed on each input stream.
- */
- virtual int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- /*!
- * \brief Called to enable drivers, etc for i/o devices.
- *
- * This allows a block to enable an associated driver to begin
- * transfering data just before we start to execute the scheduler.
- * The end result is that this reduces latency in the pipeline when
- * dealing with audio devices, usrps, etc.
- */
- virtual bool start();
-
- /*!
- * \brief Called to disable drivers, etc for i/o devices.
- */
- virtual bool stop();
-
- // ----------------------------------------------------------------
-
- /*!
- * \brief Constrain the noutput_items argument passed to forecast and general_work
- *
- * set_output_multiple causes the scheduler to ensure that the noutput_items
- * argument passed to forecast and general_work will be an integer multiple
- * of \param multiple The default value of output multiple is 1.
- */
- void set_output_multiple (int multiple);
- int output_multiple () const { return d_output_multiple; }
- bool output_multiple_set () const { return d_output_multiple_set; }
-
- /*!
- * \brief Constrains buffers to work on a set item alignment (for SIMD)
- *
- * set_alignment_multiple causes the scheduler to ensure that the noutput_items
- * argument passed to forecast and general_work will be an integer multiple
- * of \param multiple The default value is 1.
- *
- * This control is similar to the output_multiple setting, except
- * that if the number of items passed to the block is less than the
- * output_multiple, this value is ignored and the block can produce
- * like normal. The d_unaligned value is set to the number of items
- * the block is off by. In the next call to general_work, the
- * noutput_items is set to d_unaligned or less until
- * d_unaligned==0. The buffers are now aligned again and the aligned
- * calls can be performed again.
- */
- void set_alignment (int multiple);
- int alignment () const { return d_output_multiple; }
-
- void set_unaligned (int na);
- int unaligned () const { return d_unaligned; }
- void set_is_unaligned (bool u);
- bool is_unaligned () const { return d_is_unaligned; }
-
- /*!
- * \brief Tell the scheduler \p how_many_items of input stream \p which_input were consumed.
- */
- void consume (int which_input, int how_many_items);
-
- /*!
- * \brief Tell the scheduler \p how_many_items were consumed on each input stream.
- */
- void consume_each (int how_many_items);
-
- /*!
- * \brief Tell the scheduler \p how_many_items were produced on output stream \p which_output.
- *
- * If the block's general_work method calls produce, \p general_work must return WORK_CALLED_PRODUCE.
- */
- void produce (int which_output, int how_many_items);
-
- /*!
- * \brief Set the approximate output rate / input rate
- *
- * Provide a hint to the buffer allocator and scheduler.
- * The default relative_rate is 1.0
- *
- * decimators have relative_rates < 1.0
- * interpolators have relative_rates > 1.0
- */
- void set_relative_rate (double relative_rate);
-
- /*!
- * \brief return the approximate output rate / input rate
- */
- double relative_rate () const { return d_relative_rate; }
-
- /*
- * The following two methods provide special case info to the
- * scheduler in the event that a block has a fixed input to output
- * ratio. gr_sync_block, gr_sync_decimator and gr_sync_interpolator
- * override these. If you're fixed rate, subclass one of those.
- */
- /*!
- * \brief Given ninput samples, return number of output samples that will be produced.
- * N.B. this is only defined if fixed_rate returns true.
- * Generally speaking, you don't need to override this.
- */
- virtual int fixed_rate_ninput_to_noutput(int ninput);
-
- /*!
- * \brief Given noutput samples, return number of input samples required to produce noutput.
- * N.B. this is only defined if fixed_rate returns true.
- * Generally speaking, you don't need to override this.
- */
- virtual int fixed_rate_noutput_to_ninput(int noutput);
-
- /*!
- * \brief Return the number of items read on input stream which_input
- */
- uint64_t nitems_read(unsigned int which_input);
-
- /*!
- * \brief Return the number of items written on output stream which_output
- */
- uint64_t nitems_written(unsigned int which_output);
-
- /*!
- * \brief Asks for the policy used by the scheduler to moved tags downstream.
- */
- tag_propagation_policy_t tag_propagation_policy();
-
- /*!
- * \brief Set the policy by the scheduler to determine how tags are moved downstream.
- */
- void set_tag_propagation_policy(tag_propagation_policy_t p);
-
- /*!
- * \brief Return the minimum number of output items this block can
- * produce during a call to work.
- *
- * Should be 0 for most blocks. Useful if we're dealing with packets and
- * the block produces one packet per call to work.
- */
- int min_noutput_items() const { return d_min_noutput_items; }
-
- /*!
- * \brief Set the minimum number of output items this block can
- * produce during a call to work.
- *
- * \param m the minimum noutput_items this block can produce.
- */
- void set_min_noutput_items(int m) { d_min_noutput_items = m; }
-
- /*!
- * \brief Return the maximum number of output items this block will
- * handle during a call to work.
- */
- int max_noutput_items();
-
- /*!
- * \brief Set the maximum number of output items this block will
- * handle during a call to work.
- *
- * \param m the maximum noutput_items this block will handle.
- */
- void set_max_noutput_items(int m);
-
- /*!
- * \brief Clear the switch for using the max_noutput_items value of this block.
- *
- * When is_set_max_noutput_items() returns 'true', the scheduler
- * will use the value returned by max_noutput_items() to limit the
- * size of the number of items possible for this block's work
- * function. If is_set_max_notput_items() returns 'false', then the
- * scheduler ignores the internal value and uses the value set
- * globally in the top_block.
- *
- * Use this value to clear the 'is_set' flag so the scheduler will
- * ignore this. Use the set_max_noutput_items(m) call to both set a
- * new value for max_noutput_items and to reenable its use in the
- * scheduler.
- */
- void unset_max_noutput_items();
-
- /*!
- * \brief Ask the block if the flag is or is not set to use the
- * internal value of max_noutput_items during a call to work.
- */
- bool is_set_max_noutput_items();
-
- /*
- * Used to expand the vectors that hold the min/max buffer sizes.
- *
- * Specifically, when -1 is used, the vectors are just initialized
- * with 1 value; this is used by the flat_flowgraph to expand when
- * required to add a new value for new ports on these blocks.
- */
- void expand_minmax_buffer(int port) {
- if((size_t)port >= d_max_output_buffer.size())
- set_max_output_buffer(port, -1);
- if((size_t)port >= d_min_output_buffer.size())
- set_min_output_buffer(port, -1);
- }
-
- /*!
- * \brief Returns max buffer size on output port \p i.
- */
- long max_output_buffer(size_t i) {
- if(i >= d_max_output_buffer.size())
- throw std::invalid_argument("gr_basic_block::max_output_buffer: port out of range.");
- return d_max_output_buffer[i];
- }
-
- /*!
- * \brief Sets max buffer size on all output ports.
- */
- void set_max_output_buffer(long max_output_buffer) {
- for(int i = 0; i < output_signature()->max_streams(); i++) {
- set_max_output_buffer(i, max_output_buffer);
- }
- }
-
- /*!
- * \brief Sets max buffer size on output port \p port.
- */
- void set_max_output_buffer(int port, long max_output_buffer) {
- if((size_t)port >= d_max_output_buffer.size())
- d_max_output_buffer.push_back(max_output_buffer);
- else
- d_max_output_buffer[port] = max_output_buffer;
- }
-
- /*!
- * \brief Returns min buffer size on output port \p i.
- */
- long min_output_buffer(size_t i) {
- if(i >= d_min_output_buffer.size())
- throw std::invalid_argument("gr_basic_block::min_output_buffer: port out of range.");
- return d_min_output_buffer[i];
- }
-
- /*!
- * \brief Sets min buffer size on all output ports.
- */
- void set_min_output_buffer(long min_output_buffer) {
- for(int i=0; i<output_signature()->max_streams(); i++) {
- set_min_output_buffer(i, min_output_buffer);
- }
- }
-
- /*!
- * \brief Sets min buffer size on output port \p port.
- */
- void set_min_output_buffer(int port, long min_output_buffer) {
- if((size_t)port >= d_min_output_buffer.size())
- d_min_output_buffer.push_back(min_output_buffer);
- else
- d_min_output_buffer[port] = min_output_buffer;
- }
-
- // --------------- Performance counter functions -------------
-
- /*!
- * \brief Gets instantaneous noutput_items performance counter.
- */
- float pc_noutput_items();
-
- /*!
- * \brief Gets average noutput_items performance counter.
- */
- float pc_noutput_items_avg();
-
- /*!
- * \brief Gets variance of noutput_items performance counter.
- */
- float pc_noutput_items_var();
-
- /*!
- * \brief Gets instantaneous num items produced performance counter.
- */
- float pc_nproduced();
-
- /*!
- * \brief Gets average num items produced performance counter.
- */
- float pc_nproduced_avg();
-
- /*!
- * \brief Gets variance of num items produced performance counter.
- */
- float pc_nproduced_var();
-
- /*!
- * \brief Gets instantaneous fullness of \p which input buffer.
- */
- float pc_input_buffers_full(int which);
-
- /*!
- * \brief Gets average fullness of \p which input buffer.
- */
- float pc_input_buffers_full_avg(int which);
-
- /*!
- * \brief Gets variance of fullness of \p which input buffer.
- */
- float pc_input_buffers_full_var(int which);
-
- /*!
- * \brief Gets instantaneous fullness of all input buffers.
- */
- std::vector<float> pc_input_buffers_full();
-
- /*!
- * \brief Gets average fullness of all input buffers.
- */
- std::vector<float> pc_input_buffers_full_avg();
-
- /*!
- * \brief Gets variance of fullness of all input buffers.
- */
- std::vector<float> pc_input_buffers_full_var();
-
- /*!
- * \brief Gets instantaneous fullness of \p which input buffer.
- */
- float pc_output_buffers_full(int which);
-
- /*!
- * \brief Gets average fullness of \p which input buffer.
- */
- float pc_output_buffers_full_avg(int which);
-
- /*!
- * \brief Gets variance of fullness of \p which input buffer.
- */
- float pc_output_buffers_full_var(int which);
-
- /*!
- * \brief Gets instantaneous fullness of all output buffers.
- */
- std::vector<float> pc_output_buffers_full();
-
- /*!
- * \brief Gets average fullness of all output buffers.
- */
- std::vector<float> pc_output_buffers_full_avg();
-
- /*!
- * \brief Gets variance of fullness of all output buffers.
- */
- std::vector<float> pc_output_buffers_full_var();
-
- /*!
- * \brief Gets instantaneous clock cycles spent in work.
- */
- float pc_work_time();
-
- /*!
- * \brief Gets average clock cycles spent in work.
- */
- float pc_work_time_avg();
-
- /*!
- * \brief Gets average clock cycles spent in work.
- */
- float pc_work_time_var();
-
- /*!
- * \brief Resets the performance counters
- */
- void reset_perf_counters();
-
- /*!
- * \brief Sets up export of perf. counters to ControlPort. Only
- * called by the scheduler.
- */
- void setup_pc_rpc();
-
- /*!
- * \brief Checks if this block is already exporting perf. counters
- * to ControlPort.
- */
- bool is_pc_rpc_set() { return d_pc_rpc_set; }
-
- /*!
- * \brief If the block calls this in its constructor, it's
- * perf. counters will not be exported.
- */
- void no_pc_rpc() { d_pc_rpc_set = true; }
-
-
- // ----------------------------------------------------------------------------
- // Functions to handle thread affinity
-
- /*!
- * \brief Set the thread's affinity to processor core \p n.
- *
- * \param mask a vector of ints of the core numbers available to this block.
- */
- void set_processor_affinity(const std::vector<int> &mask);
-
- /*!
- * \brief Remove processor affinity to a specific core.
- */
- void unset_processor_affinity();
-
- /*!
- * \brief Get the current processor affinity.
- */
- std::vector<int> processor_affinity() { return d_affinity; }
-
- // ----------------------------------------------------------------------------
-
- private:
-
- int d_output_multiple;
- bool d_output_multiple_set;
- int d_unaligned;
- bool d_is_unaligned;
- double d_relative_rate; // approx output_rate / input_rate
- gr_block_detail_sptr d_detail; // implementation details
- unsigned d_history;
- bool d_fixed_rate;
- bool d_max_noutput_items_set; // if d_max_noutput_items is valid
- int d_max_noutput_items; // value of max_noutput_items for this block
- int d_min_noutput_items;
- tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream
- std::vector<int> d_affinity; // thread affinity proc. mask
- bool d_pc_rpc_set;
-
- protected:
- gr_block (void){} //allows pure virtual interface sub-classes
- gr_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
- void set_fixed_rate(bool fixed_rate){ d_fixed_rate = fixed_rate; }
-
-
- /*!
- * \brief Adds a new tag onto the given output buffer.
- *
- * \param which_output an integer of which output stream to attach the tag
- * \param abs_offset a uint64 number of the absolute item number
- * assicated with the tag. Can get from nitems_written.
- * \param key the tag key as a PMT symbol
- * \param value any PMT holding any value for the given key
- * \param srcid optional source ID specifier; defaults to PMT_F
- */
- inline void add_item_tag(unsigned int which_output,
- uint64_t abs_offset,
- const pmt::pmt_t &key,
- const pmt::pmt_t &value,
- const pmt::pmt_t &srcid=pmt::PMT_F)
- {
- gr_tag_t tag;
- tag.offset = abs_offset;
- tag.key = key;
- tag.value = value;
- tag.srcid = srcid;
- this->add_item_tag(which_output, tag);
- }
-
- /*!
- * \brief Adds a new tag onto the given output buffer.
- *
- * \param which_output an integer of which output stream to attach the tag
- * \param tag the tag object to add
- */
- void add_item_tag(unsigned int which_output, const gr_tag_t &tag);
-
- /*!
- * \brief Removes a tag from the given input buffer.
- *
- * \param which_input an integer of which input stream to remove the tag from
- * \param abs_offset a uint64 number of the absolute item number
- * assicated with the tag. Can get from nitems_written.
- * \param key the tag key as a PMT symbol
- * \param value any PMT holding any value for the given key
- * \param srcid optional source ID specifier; defaults to PMT_F
- *
- * If no such tag is found, does nothing.
- */
- inline void remove_item_tag(unsigned int which_input,
- uint64_t abs_offset,
- const pmt::pmt_t &key,
- const pmt::pmt_t &value,
- const pmt::pmt_t &srcid=pmt::PMT_F)
- {
- gr_tag_t tag;
- tag.offset = abs_offset;
- tag.key = key;
- tag.value = value;
- tag.srcid = srcid;
- this->remove_item_tag(which_input, tag);
- }
-
- /*!
- * \brief Removes a tag from the given input buffer.
- *
- * If no such tag is found, does nothing.
- *
- * \param which_input an integer of which input stream to remove the tag from
- * \param tag the tag object to remove
- */
- void remove_item_tag(unsigned int which_input, const gr_tag_t &tag);
-
- /*!
- * \brief Given a [start,end), returns a vector of all tags in the range.
- *
- * Range of counts is from start to end-1.
- *
- * Tags are tuples of:
- * (item count, source id, key, value)
- *
- * \param v a vector reference to return tags into
- * \param which_input an integer of which input stream to pull from
- * \param abs_start a uint64 count of the start of the range of interest
- * \param abs_end a uint64 count of the end of the range of interest
- */
- void get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end);
-
- /*!
- * \brief Given a [start,end), returns a vector of all tags in the range
- * with a given key.
- *
- * Range of counts is from start to end-1.
- *
- * Tags are tuples of:
- * (item count, source id, key, value)
- *
- * \param v a vector reference to return tags into
- * \param which_input an integer of which input stream to pull from
- * \param abs_start a uint64 count of the start of the range of interest
- * \param abs_end a uint64 count of the end of the range of interest
- * \param key a PMT symbol key to filter only tags of this key
- */
- void get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end,
- const pmt::pmt_t &key);
-
- std::vector<long> d_max_output_buffer;
- std::vector<long> d_min_output_buffer;
-
- /*! Used by block's setters and work functions to make
- * setting/resetting of parameters thread-safe.
- *
- * Used by calling gr::thread::scoped_lock l(d_setlock);
- */
- gr::thread::mutex d_setlock;
-
- /*! Used by blocks to access the logger system.
- */
- gr_logger_ptr d_logger;
- gr_logger_ptr d_debug_logger;
-
- // These are really only for internal use, but leaving them public avoids
- // having to work up an ever-varying list of friend GR_RUNTIME_APIs
-
- public:
- gr_block_detail_sptr detail () const { return d_detail; }
- void set_detail (gr_block_detail_sptr detail) { d_detail = detail; }
-};
-
-typedef std::vector<gr_block_sptr> gr_block_vector_t;
-typedef std::vector<gr_block_sptr>::iterator gr_block_viter_t;
-
-inline gr_block_sptr cast_to_block_sptr(gr_basic_block_sptr p)
-{
- return boost::dynamic_pointer_cast<gr_block, gr_basic_block>(p);
-}
-
-
-std::ostream&
-operator << (std::ostream& os, const gr_block *m);
-
-#endif /* INCLUDED_GR_BLOCK_H */
diff --git a/gnuradio-runtime/include/gr_block_detail.h b/gnuradio-runtime/include/gr_block_detail.h
deleted file mode 100644
index 14886c0a74..0000000000
--- a/gnuradio-runtime/include/gr_block_detail.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more detail.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BLOCK_DETAIL_H
-#define INCLUDED_GR_BLOCK_DETAIL_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-#include <gr_tpb_detail.h>
-#include <gr_tags.h>
-#include <high_res_timer.h>
-#include <stdexcept>
-
-/*!
- * \brief Implementation details to support the signal processing abstraction
- * \ingroup internal
- *
- * This class contains implementation detail that should be "out of sight"
- * of almost all users of GNU Radio. This decoupling also means that
- * we can make changes to the guts without having to recompile everything.
- */
-class GR_RUNTIME_API gr_block_detail {
- public:
- ~gr_block_detail ();
-
- int ninputs () const { return d_ninputs; }
- int noutputs () const { return d_noutputs; }
- bool sink_p () const { return d_noutputs == 0; }
- bool source_p () const { return d_ninputs == 0; }
-
- void set_done (bool done);
- bool done () const { return d_done; }
-
- void set_input (unsigned int which, gr_buffer_reader_sptr reader);
- gr_buffer_reader_sptr input (unsigned int which)
- {
- if (which >= d_ninputs)
- throw std::invalid_argument ("gr_block_detail::input");
- return d_input[which];
- }
-
- void set_output (unsigned int which, gr_buffer_sptr buffer);
- gr_buffer_sptr output (unsigned int which)
- {
- if (which >= d_noutputs)
- throw std::invalid_argument ("gr_block_detail::output");
- return d_output[which];
- }
-
- /*!
- * \brief Tell the scheduler \p how_many_items of input stream \p which_input were consumed.
- */
- void consume (int which_input, int how_many_items);
-
- /*!
- * \brief Tell the scheduler \p how_many_items were consumed on each input stream.
- */
- void consume_each (int how_many_items);
-
- /*!
- * \brief Tell the scheduler \p how_many_items were produced on output stream \p which_output.
- */
- void produce (int which_output, int how_many_items);
-
- /*!
- * \brief Tell the scheduler \p how_many_items were produced on each output stream.
- */
- void produce_each (int how_many_items);
-
- // Return the number of items read on input stream which_input
- uint64_t nitems_read(unsigned int which_input);
-
- // Return the number of items written on output stream which_output
- uint64_t nitems_written(unsigned int which_output);
-
-
- /*!
- * \brief Adds a new tag to the given output stream.
- *
- * Calls gr_buffer::add_item_tag(),
- * which appends the tag onto its deque.
- *
- * \param which_output an integer of which output stream to attach the tag
- * \param tag the tag object to add
- */
- void add_item_tag(unsigned int which_output, const gr_tag_t &tag);
-
- /*!
- * \brief Removes a tag from the given input stream.
- *
- * Calls gr_buffer::remove_item_tag(), which removes the tag from its deque.
- *
- * \param which_input an integer of which input stream to remove the tag from
- * \param tag the tag object to add
- */
- void remove_item_tag(unsigned int which_input, const gr_tag_t &tag);
-
- /*!
- * \brief Given a [start,end), returns a vector of all tags in the range.
- *
- * Pass-through function to gr_buffer_reader to get a vector of tags
- * in given range. Range of counts is from start to end-1.
- *
- * Tags are tuples of:
- * (item count, source id, key, value)
- *
- * \param v a vector reference to return tags into
- * \param which_input an integer of which input stream to pull from
- * \param abs_start a uint64 count of the start of the range of interest
- * \param abs_end a uint64 count of the end of the range of interest
- */
- void get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end);
-
- /*!
- * \brief Given a [start,end), returns a vector of all tags in the range
- * with a given key.
- *
- * Calls get_tags_in_range(which_input, abs_start, abs_end) to get a vector of
- * tags from the buffers. This function then provides a secondary filter to
- * the tags to extract only tags with the given 'key'.
- *
- * Tags are tuples of:
- * (item count, source id, key, value)
- *
- * \param v a vector reference to return tags into
- * \param which_input an integer of which input stream to pull from
- * \param abs_start a uint64 count of the start of the range of interest
- * \param abs_end a uint64 count of the end of the range of interest
- * \param key a PMT symbol to select only tags of this key
- */
- void get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end,
- const pmt::pmt_t &key);
-
- /*!
- * \brief Set core affinity of block to the cores in the vector mask.
- *
- * \param mask a vector of ints of the core numbers available to this block.
- */
- void set_processor_affinity(const std::vector<int> &mask);
-
- /*!
- * \brief Unset core affinity.
- */
- void unset_processor_affinity();
-
- bool threaded; // set if thread is currently running.
- gr::thread::gr_thread_t thread; // portable thread handle
-
- void start_perf_counters();
- void stop_perf_counters(int noutput_items, int nproduced);
- void reset_perf_counters();
-
- // Calls to get performance counter items
- float pc_noutput_items();
- float pc_nproduced();
- float pc_input_buffers_full(size_t which);
- std::vector<float> pc_input_buffers_full();
- float pc_output_buffers_full(size_t which);
- std::vector<float> pc_output_buffers_full();
- float pc_work_time();
-
- float pc_noutput_items_avg();
- float pc_nproduced_avg();
- float pc_input_buffers_full_avg(size_t which);
- std::vector<float> pc_input_buffers_full_avg();
- float pc_output_buffers_full_avg(size_t which);
- std::vector<float> pc_output_buffers_full_avg();
- float pc_work_time_avg();
-
- float pc_noutput_items_var();
- float pc_nproduced_var();
- float pc_input_buffers_full_var(size_t which);
- std::vector<float> pc_input_buffers_full_var();
- float pc_output_buffers_full_var(size_t which);
- std::vector<float> pc_output_buffers_full_var();
- float pc_work_time_var();
-
- gr_tpb_detail d_tpb; // used by thread-per-block scheduler
- int d_produce_or;
-
- // ----------------------------------------------------------------------------
-
- private:
- unsigned int d_ninputs;
- unsigned int d_noutputs;
- std::vector<gr_buffer_reader_sptr> d_input;
- std::vector<gr_buffer_sptr> d_output;
- bool d_done;
-
- // Performance counters
- float d_ins_noutput_items;
- float d_avg_noutput_items;
- float d_var_noutput_items;
- float d_ins_nproduced;
- float d_avg_nproduced;
- float d_var_nproduced;
- std::vector<float> d_ins_input_buffers_full;
- std::vector<float> d_avg_input_buffers_full;
- std::vector<float> d_var_input_buffers_full;
- std::vector<float> d_ins_output_buffers_full;
- std::vector<float> d_avg_output_buffers_full;
- std::vector<float> d_var_output_buffers_full;
- gr::high_res_timer_type d_start_of_work, d_end_of_work;
- float d_ins_work_time;
- float d_avg_work_time;
- float d_var_work_time;
- float d_pc_counter;
-
- gr_block_detail (unsigned int ninputs, unsigned int noutputs);
-
- friend struct gr_tpb_detail;
-
- friend GR_RUNTIME_API gr_block_detail_sptr
- gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
-};
-
-GR_RUNTIME_API gr_block_detail_sptr
-gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
-
-GR_RUNTIME_API long
-gr_block_detail_ncurrently_allocated ();
-
-#endif /* INCLUDED_GR_BLOCK_DETAIL_H */
diff --git a/gnuradio-runtime/include/gr_block_registry.h b/gnuradio-runtime/include/gr_block_registry.h
deleted file mode 100644
index 9b038287bc..0000000000
--- a/gnuradio-runtime/include/gr_block_registry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef GR_BLOCK_REGISTRY_H
-#define GR_BLOCK_REGISTRY_H
-
-#include <gr_runtime_api.h>
-#include <map>
-#include <gr_basic_block.h>
-
-#ifndef GR_BASIC_BLOCK_H
-class gr_basic_block;
-class gr_block;
-#endif
-
-class GR_RUNTIME_API gr_block_registry {
- public:
- gr_block_registry();
-
- long block_register(gr_basic_block* block);
- void block_unregister(gr_basic_block* block);
-
- std::string register_symbolic_name(gr_basic_block* block);
- void register_symbolic_name(gr_basic_block* block, std::string name);
-
- gr_basic_block_sptr block_lookup(pmt::pmt_t symbol);
-
- void register_primitive(std::string blk, gr_block* ref);
- void unregister_primitive(std::string blk);
- void notify_blk(std::string blk);
-
- private:
-
- //typedef std::map< long, gr_basic_block_sptr > blocksubmap_t;
- typedef std::map< long, gr_basic_block* > blocksubmap_t;
- typedef std::map< std::string, blocksubmap_t > blockmap_t;
-
- blockmap_t d_map;
- pmt::pmt_t d_ref_map;
- std::map< std::string, gr_block*> primitive_map;
-
-};
-
-GR_RUNTIME_API extern gr_block_registry global_block_registry;
-
-#endif
-
diff --git a/gnuradio-runtime/include/gr_buffer.h b/gnuradio-runtime/include/gr_buffer.h
deleted file mode 100644
index 810879b7ea..0000000000
--- a/gnuradio-runtime/include/gr_buffer.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2010,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BUFFER_H
-#define INCLUDED_GR_BUFFER_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-#include <boost/weak_ptr.hpp>
-#include <thread/thread.h>
-#include <gr_tags.h>
-#include <deque>
-
-class gr_vmcircbuf;
-
-/*!
- * \brief Allocate a buffer that holds at least \p nitems of size \p sizeof_item.
- *
- * The total size of the buffer will be rounded up to a system
- * dependent boundary. This is typically the system page size, but
- * under MS windows is 64KB.
- *
- * \param nitems is the minimum number of items the buffer will hold.
- * \param sizeof_item is the size of an item in bytes.
- * \param link is the block that writes to this buffer.
- */
-GR_RUNTIME_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link=gr_block_sptr());
-
-
-/*!
- * \brief Single writer, multiple reader fifo.
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_buffer {
- public:
-
- virtual ~gr_buffer ();
-
- /*!
- * \brief return number of items worth of space available for writing
- */
- int space_available ();
-
- /*!
- * \brief return size of this buffer in items
- */
- int bufsize() const { return d_bufsize; }
-
- /*!
- * \brief return pointer to write buffer.
- *
- * The return value points at space that can hold at least
- * space_available() items.
- */
- void *write_pointer ();
-
- /*!
- * \brief tell buffer that we wrote \p nitems into it
- */
- void update_write_pointer (int nitems);
-
- void set_done (bool done);
- bool done () const { return d_done; }
-
- /*!
- * \brief Return the block that writes to this buffer.
- */
- gr_block_sptr link() { return gr_block_sptr(d_link); }
-
- size_t nreaders() const { return d_readers.size(); }
- gr_buffer_reader* reader(size_t index) { return d_readers[index]; }
-
- gr::thread::mutex *mutex() { return &d_mutex; }
-
- uint64_t nitems_written() { return d_abs_write_offset; }
-
- size_t get_sizeof_item() { return d_sizeof_item; }
-
- /*!
- * \brief Adds a new tag to the buffer.
- *
- * \param tag the new tag
- */
- void add_item_tag(const gr_tag_t &tag);
-
- /*!
- * \brief Removes an existing tag from the buffer.
- *
- * If no such tag is found, does nothing.
- *
- * \param tag the tag that needs to be removed
- */
- void remove_item_tag(const gr_tag_t &tag);
-
- /*!
- * \brief Removes all tags before \p max_time from buffer
- *
- * \param max_time the time (item number) to trim up until.
- */
- void prune_tags(uint64_t max_time);
-
- std::deque<gr_tag_t>::iterator get_tags_begin() { return d_item_tags.begin(); }
- std::deque<gr_tag_t>::iterator get_tags_end() { return d_item_tags.end(); }
-
- // -------------------------------------------------------------------------
-
- private:
-
- friend class gr_buffer_reader;
- friend GR_RUNTIME_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
- friend GR_RUNTIME_API gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
-
- protected:
- char *d_base; // base address of buffer
- unsigned int d_bufsize; // in items
- private:
- gr_vmcircbuf *d_vmcircbuf;
- size_t d_sizeof_item; // in bytes
- std::vector<gr_buffer_reader *> d_readers;
- boost::weak_ptr<gr_block> d_link; // block that writes to this buffer
-
- //
- // The mutex protects d_write_index, d_abs_write_offset, d_done, d_item_tags
- // and the d_read_index's and d_abs_read_offset's in the buffer readers.
- //
- gr::thread::mutex d_mutex;
- unsigned int d_write_index; // in items [0,d_bufsize)
- uint64_t d_abs_write_offset; // num items written since the start
- bool d_done;
- std::deque<gr_tag_t> d_item_tags;
- uint64_t d_last_min_items_read;
-
- unsigned
- index_add (unsigned a, unsigned b)
- {
- unsigned s = a + b;
-
- if (s >= d_bufsize)
- s -= d_bufsize;
-
- assert (s < d_bufsize);
- return s;
- }
-
- unsigned
- index_sub (unsigned a, unsigned b)
- {
- int s = a - b;
-
- if (s < 0)
- s += d_bufsize;
-
- assert ((unsigned) s < d_bufsize);
- return s;
- }
-
- virtual bool allocate_buffer (int nitems, size_t sizeof_item);
-
- /*!
- * \brief constructor is private. Use gr_make_buffer to create instances.
- *
- * Allocate a buffer that holds at least \p nitems of size \p sizeof_item.
- *
- * \param nitems is the minimum number of items the buffer will hold.
- * \param sizeof_item is the size of an item in bytes.
- * \param link is the block that writes to this buffer.
- *
- * The total size of the buffer will be rounded up to a system
- * dependent boundary. This is typically the system page size, but
- * under MS windows is 64KB.
- */
- gr_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
-
- /*!
- * \brief disassociate \p reader from this buffer
- */
- void drop_reader (gr_buffer_reader *reader);
-
-};
-
-/*!
- * \brief Create a new gr_buffer_reader and attach it to buffer \p buf
- * \param buf is the buffer the \p gr_buffer_reader reads from.
- * \param nzero_preload -- number of zero items to "preload" into buffer.
- * \param link is the block that reads from the buffer using this gr_buffer_reader.
- */
-GR_RUNTIME_API gr_buffer_reader_sptr
-gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link=gr_block_sptr());
-
-//! returns # of gr_buffers currently allocated
-GR_RUNTIME_API long gr_buffer_ncurrently_allocated ();
-
-
-// ---------------------------------------------------------------------------
-
-/*!
- * \brief How we keep track of the readers of a gr_buffer.
- * \ingroup internal
- */
-
-class GR_RUNTIME_API gr_buffer_reader {
- public:
-
- ~gr_buffer_reader ();
-
- /*!
- * \brief Return number of items available for reading.
- */
- int items_available () const;
-
- /*!
- * \brief Return buffer this reader reads from.
- */
- gr_buffer_sptr buffer () const { return d_buffer; }
-
-
- /*!
- * \brief Return maximum number of items that could ever be available for reading.
- * This is used as a sanity check in the scheduler to avoid looping forever.
- */
- int max_possible_items_available () const { return d_buffer->d_bufsize - 1; }
-
- /*!
- * \brief return pointer to read buffer.
- *
- * The return value points to items_available() number of items
- */
- const void *read_pointer ();
-
- /*
- * \brief tell buffer we read \p items from it
- */
- void update_read_pointer (int nitems);
-
- void set_done (bool done) { d_buffer->set_done (done); }
- bool done () const { return d_buffer->done (); }
-
- gr::thread::mutex *mutex() { return d_buffer->mutex(); }
-
-
- uint64_t nitems_read() { return d_abs_read_offset; }
-
- size_t get_sizeof_item() { return d_buffer->get_sizeof_item(); }
-
- /*!
- * \brief Return the block that reads via this reader.
- *
- */
- gr_block_sptr link() { return gr_block_sptr(d_link); }
-
-
- /*!
- * \brief Given a [start,end), returns a vector all tags in the range.
- *
- * Get a vector of tags in given range. Range of counts is from start to end-1.
- *
- * Tags are tuples of:
- * (item count, source id, key, value)
- *
- * \param v a vector reference to return tags into
- * \param abs_start a uint64 count of the start of the range of interest
- * \param abs_end a uint64 count of the end of the range of interest
- */
- void get_tags_in_range(std::vector<gr_tag_t> &v,
- uint64_t abs_start,
- uint64_t abs_end);
-
- // -------------------------------------------------------------------------
-
- private:
-
- friend class gr_buffer;
- friend GR_RUNTIME_API gr_buffer_reader_sptr
- gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
-
-
- gr_buffer_sptr d_buffer;
- unsigned int d_read_index; // in items [0,d->buffer.d_bufsize)
- uint64_t d_abs_read_offset; // num items seen since the start
- boost::weak_ptr<gr_block> d_link; // block that reads via this buffer reader
-
- //! constructor is private. Use gr_buffer::add_reader to create instances
- gr_buffer_reader (gr_buffer_sptr buffer, unsigned int read_index, gr_block_sptr link);
-};
-
-//! returns # of gr_buffer_readers currently allocated
-GR_RUNTIME_API long gr_buffer_reader_ncurrently_allocated ();
-
-
-#endif /* INCLUDED_GR_BUFFER_H */
diff --git a/gnuradio-runtime/include/gr_complex.h b/gnuradio-runtime/include/gr_complex.h
deleted file mode 100644
index 6166c0b142..0000000000
--- a/gnuradio-runtime/include/gr_complex.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_COMPLEX_H
-#define INCLUDED_GR_COMPLEX_H
-
-#include <complex>
-typedef std::complex<float> gr_complex;
-typedef std::complex<double> gr_complexd;
-
-inline bool is_complex (gr_complex x) { (void) x; return true;}
-inline bool is_complex (gr_complexd x) { (void) x; return true;}
-inline bool is_complex (float x) { (void) x; return false;}
-inline bool is_complex (double x) { (void) x; return false;}
-inline bool is_complex (int x) { (void) x; return false;}
-inline bool is_complex (char x) { (void) x; return false;}
-inline bool is_complex (short x) { (void) x; return false;}
-
-// this doesn't really belong here, but there are worse places for it...
-
-#define CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected,actual,delta) \
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.real(), actual.real(), delta); \
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.imag(), actual.imag(), delta);
-
-#endif /* INCLUDED_GR_COMPLEX_H */
-
diff --git a/gnuradio-runtime/include/gr_constants.h b/gnuradio-runtime/include/gr_constants.h
deleted file mode 100644
index 3534166bc0..0000000000
--- a/gnuradio-runtime/include/gr_constants.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_CONSTANTS_H
-#define INCLUDED_GR_CONSTANTS_H
-
-#include <gr_runtime_api.h>
-#include <string>
-
-/*!
- * \brief return ./configure --prefix argument. Typically /usr/local
- */
-GR_RUNTIME_API const std::string gr_prefix();
-
-/*!
- * \brief return ./configure --sysconfdir argument. Typically $prefix/etc or /etc
- */
-GR_RUNTIME_API const std::string gr_sysconfdir();
-
-/*!
- * \brief return preferences file directory. Typically $sysconfdir/etc/conf.d
- */
-GR_RUNTIME_API const std::string gr_prefsdir();
-
-/*!
- * \brief return date/time of build, as set when 'bootstrap' is run
- */
-GR_RUNTIME_API const std::string gr_build_date();
-
-/*!
- * \brief return version string defined in configure.ac
- */
-GR_RUNTIME_API const std::string gr_version();
-
-#endif /* INCLUDED_GR_CONSTANTS_H */
diff --git a/gnuradio-runtime/include/gr_dispatcher.h b/gnuradio-runtime/include/gr_dispatcher.h
deleted file mode 100644
index 7a9e80c9fe..0000000000
--- a/gnuradio-runtime/include/gr_dispatcher.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_DISPATCHER_H
-#define INCLUDED_GR_DISPATCHER_H
-
-#include <gr_runtime_api.h>
-#include <gr_select_handler.h>
-#include <vector>
-
-class gr_dispatcher;
-typedef boost::shared_ptr<gr_dispatcher> gr_dispatcher_sptr;
-
-GR_RUNTIME_API gr_dispatcher_sptr gr_dispatcher_singleton();
-GR_RUNTIME_API gr_dispatcher_sptr gr_make_dispatcher();
-
-/*!
- * \brief invoke callbacks based on select.
- * \ingroup internal
- *
- * \sa gr_select_handler
- */
-class GR_RUNTIME_API gr_dispatcher
-{
- gr_dispatcher();
- friend GR_RUNTIME_API gr_dispatcher_sptr gr_make_dispatcher();
-
- std::vector<gr_select_handler_sptr> d_handler;
- int d_max_index;
-
-public:
- ~gr_dispatcher();
-
- bool add_handler(gr_select_handler_sptr handler);
- bool del_handler(gr_select_handler_sptr handler);
- bool del_handler(gr_select_handler *handler);
-
- /*!
- * \brief Event dispatching loop.
- *
- * Enter a polling loop that only terminates after all gr_select_handlers
- * have been removed. \p timeout sets the timeout parameter to the select()
- * call, measured in seconds.
- *
- * \param timeout maximum number of seconds to block in select.
- */
- void loop(double timeout=10);
-};
-
-#endif /* INCLUDED_GR_DISPATCHER_H */
diff --git a/gnuradio-runtime/include/gr_endianness.h b/gnuradio-runtime/include/gr_endianness.h
deleted file mode 100644
index c4ecb1383e..0000000000
--- a/gnuradio-runtime/include/gr_endianness.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_ENDIANNESS_H
-#define INCLUDED_GR_ENDIANNESS_H
-
-typedef enum {GR_MSB_FIRST, GR_LSB_FIRST} gr_endianness_t;
-
-#endif /* INCLUDED_GR_ENDIANNESS_H */
diff --git a/gnuradio-runtime/include/gr_error_handler.h b/gnuradio-runtime/include/gr_error_handler.h
deleted file mode 100644
index 4d326a6ba1..0000000000
--- a/gnuradio-runtime/include/gr_error_handler.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-/*
- * This code is based on error.hh from the "Click Modular Router".
- * Original copyright follows:
- */
-/*
- * error.{cc,hh} -- flexible classes for error reporting
- * Eddie Kohler
- *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, subject to the conditions
- * listed in the Click LICENSE file. These conditions include: you must
- * preserve this copyright notice, and you cannot mention the copyright
- * holders in advertising related to the Software without their permission.
- * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
- * notice is a summary of the Click LICENSE file; the license in that file is
- * legally binding.
- */
-
-#ifndef INCLUDED_GR_ERROR_HANDLER_H
-#define INCLUDED_GR_ERROR_HANDLER_H
-
-#include <gr_runtime_api.h>
-#include <stdarg.h>
-#include <string>
-#include <cstdio> // for FILE
-
-/*!
- * \brief abstract error handler
- * \ingroup base
- */
-class GR_RUNTIME_API gr_error_handler {
-public:
- enum seriousness {
- ERR_DEBUG = 0x00000000,
- ERR_MESSAGE = 0x00010000,
- ERR_WARNING = 0x00020000,
- ERR_ERROR = 0x00030000,
- ERR_FATAL = 0x00040000
- };
-
- gr_error_handler() {}
- virtual ~gr_error_handler();
-
- static gr_error_handler *default_handler();
- static gr_error_handler *silent_handler();
-
- static bool has_default_handler();
- static void set_default_handler(gr_error_handler *errh);
-
- void debug(const char *format, ...);
- void message(const char *format, ...);
- void warning(const char *format, ...);
- void error(const char *format, ...);
- void fatal(const char *format, ...);
-
- virtual int nwarnings() const = 0;
- virtual int nerrors() const = 0;
- virtual void reset_counts() = 0;
-
- void verror(seriousness s, const char *format, va_list);
- void verror_text(seriousness s, const std::string &text);
-
-protected:
- virtual void count_error(seriousness s) = 0;
- virtual void handle_text(seriousness s, const std::string &str) = 0;
- std::string make_text(seriousness s, const char *format, va_list);
-};
-
-
-class GR_RUNTIME_API gr_base_error_handler : public gr_error_handler {
- int d_nwarnings;
- int d_nerrors;
-
-public:
- gr_base_error_handler() : d_nwarnings(0), d_nerrors(0) {}
- int nwarnings() const { return d_nwarnings; }
- int nerrors() const { return d_nerrors; }
- void reset_counts() { d_nwarnings = d_nerrors = 0; }
- void count_error(seriousness s);
-};
-
-class GR_RUNTIME_API gr_file_error_handler : public gr_base_error_handler {
- FILE *d_file;
- int d_fd;
-public:
- gr_file_error_handler(FILE *file);
- gr_file_error_handler(int file_descriptor);
- ~gr_file_error_handler();
-
- void handle_text(seriousness s, const std::string &str);
-};
-
-#endif /* INCLUDED_GR_ERROR_HANDLER_H */
diff --git a/gnuradio-runtime/include/gr_expj.h b/gnuradio-runtime/include/gr_expj.h
deleted file mode 100644
index 56291a0a6a..0000000000
--- a/gnuradio-runtime/include/gr_expj.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_EXPJ_H
-#define INCLUDED_GR_EXPJ_H
-
-#include <gr_runtime_api.h>
-#include <gr_sincos.h>
-#include <gr_types.h>
-
-static inline gr_complex
-gr_expj(float phase)
-{
- float t_imag, t_real;
- gr_sincosf(phase, &t_imag, &t_real);
- return gr_complex(t_real, t_imag);
-}
-
-
-#endif /* INCLUDED_GR_EXPJ_H */
diff --git a/gnuradio-runtime/include/gr_feval.h b/gnuradio-runtime/include/gr_feval.h
deleted file mode 100644
index 07df592e58..0000000000
--- a/gnuradio-runtime/include/gr_feval.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_FEVAL_H
-#define INCLUDED_GR_FEVAL_H
-
-#include <gr_runtime_api.h>
-#include <gr_complex.h>
-#include <pmt/pmt.h>
-
-/*!
- * \brief base class for evaluating a function: double -> double
- * \ingroup misc
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places. It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- *
- * Override eval to define the behavior.
- * Use calleval to invoke eval (this kludge is required to allow a
- * python specific "shim" to be inserted.
- */
-class GR_RUNTIME_API gr_feval_dd
-{
-protected:
- /*!
- * \brief override this to define the function
- */
- virtual double eval(double x);
-
-public:
- gr_feval_dd() {}
- virtual ~gr_feval_dd();
-
- virtual double calleval(double x); // invoke "eval"
-};
-
-/*!
- * \brief base class for evaluating a function: complex -> complex
- * \ingroup misc
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places. It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- *
- * Override eval to define the behavior.
- * Use calleval to invoke eval (this kludge is required to allow a
- * python specific "shim" to be inserted.
- */
-class GR_RUNTIME_API gr_feval_cc
-{
-protected:
- /*!
- * \brief override this to define the function
- */
- virtual gr_complex eval(gr_complex x);
-
-public:
- gr_feval_cc() {}
- virtual ~gr_feval_cc();
-
- virtual gr_complex calleval(gr_complex x); // invoke "eval"
-};
-
-/*!
- * \brief base class for evaluating a function: long -> long
- * \ingroup misc
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places. It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- *
- * Override eval to define the behavior.
- * Use calleval to invoke eval (this kludge is required to allow a
- * python specific "shim" to be inserted.
- */
-class GR_RUNTIME_API gr_feval_ll
-{
-protected:
- /*!
- * \brief override this to define the function
- */
- virtual long eval(long x);
-
-public:
- gr_feval_ll() {}
- virtual ~gr_feval_ll();
-
- virtual long calleval(long x); // invoke "eval"
-};
-
-/*!
- * \brief base class for evaluating a function: void -> void
- * \ingroup misc
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places. It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- *
- * Override eval to define the behavior.
- * Use calleval to invoke eval (this kludge is required to allow a
- * python specific "shim" to be inserted.
- */
-class GR_RUNTIME_API gr_feval
-{
-protected:
- /*!
- * \brief override this to define the function
- */
- virtual void eval();
-
-public:
- gr_feval() {}
- virtual ~gr_feval();
-
- virtual void calleval(); // invoke "eval"
-};
-
-/*!
- * \brief base class for evaluating a function: pmt -> void
- * \ingroup misc
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places. It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- *
- * Override eval to define the behavior.
- * Use calleval to invoke eval (this kludge is required to allow a
- * python specific "shim" to be inserted.
- */
-class GR_RUNTIME_API gr_feval_p
-{
-protected:
- /*!
- * \brief override this to define the function
- */
- virtual void eval(pmt::pmt_t x);
-
-public:
- gr_feval_p() {}
- virtual ~gr_feval_p();
-
- virtual void calleval(pmt::pmt_t x); // invoke "eval"
-};
-
-/*!
- * \brief trivial examples / test cases showing C++ calling Python code
- */
-GR_RUNTIME_API double gr_feval_dd_example(gr_feval_dd *f, double x);
-GR_RUNTIME_API gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
-GR_RUNTIME_API long gr_feval_ll_example(gr_feval_ll *f, long x);
-GR_RUNTIME_API void gr_feval_example(gr_feval *f);
-
-#endif /* INCLUDED_GR_FEVAL_H */
diff --git a/gnuradio-runtime/include/gr_flowgraph.h b/gnuradio-runtime/include/gr_flowgraph.h
deleted file mode 100644
index 107c50b7b6..0000000000
--- a/gnuradio-runtime/include/gr_flowgraph.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FLOWGRAPH_H
-#define INCLUDED_GR_FLOWGRAPH_H
-
-#include <gr_runtime_api.h>
-#include <gr_basic_block.h>
-#include <iostream>
-
-/*!
- * \brief Class representing a specific input or output graph endpoint
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_endpoint
-{
-private:
- gr_basic_block_sptr d_basic_block;
- int d_port;
-
-public:
- gr_endpoint() : d_basic_block(), d_port(0) { }
- gr_endpoint(gr_basic_block_sptr block, int port) { d_basic_block = block; d_port = port; }
- gr_basic_block_sptr block() const { return d_basic_block; }
- int port() const { return d_port; }
-
- bool operator==(const gr_endpoint &other) const;
-};
-
-inline bool gr_endpoint::operator==(const gr_endpoint &other) const
-{
- return (d_basic_block == other.d_basic_block &&
- d_port == other.d_port);
-}
-
-class GR_RUNTIME_API gr_msg_endpoint
-{
-private:
- gr_basic_block_sptr d_basic_block;
- pmt::pmt_t d_port;
- bool d_is_hier;
-public:
- gr_msg_endpoint() : d_basic_block(), d_port(pmt::PMT_NIL) { }
- gr_msg_endpoint(gr_basic_block_sptr block, pmt::pmt_t port, bool is_hier=false){ d_basic_block = block; d_port = port; d_is_hier = is_hier;}
- gr_basic_block_sptr block() const { return d_basic_block; }
- pmt::pmt_t port() const { return d_port; }
- bool is_hier() const { return d_is_hier; }
- void set_hier(bool h) { d_is_hier = h; }
-
- bool operator==(const gr_msg_endpoint &other) const;
-
-};
-
-inline bool gr_msg_endpoint::operator==(const gr_msg_endpoint &other) const
-{
- return (d_basic_block == other.d_basic_block &&
- pmt::equal(d_port, other.d_port));
-}
-
-
-// Hold vectors of gr_endpoint objects
-typedef std::vector<gr_endpoint> gr_endpoint_vector_t;
-typedef std::vector<gr_endpoint>::iterator gr_endpoint_viter_t;
-
-/*!
- *\brief Class representing a connection between to graph endpoints
- *
- */
-class GR_RUNTIME_API gr_edge
-{
-public:
- gr_edge() : d_src(), d_dst() { };
- gr_edge(const gr_endpoint &src, const gr_endpoint &dst) : d_src(src), d_dst(dst) { }
- ~gr_edge();
-
- const gr_endpoint &src() const { return d_src; }
- const gr_endpoint &dst() const { return d_dst; }
-
-private:
- gr_endpoint d_src;
- gr_endpoint d_dst;
-};
-
-
-// Hold vectors of gr_edge objects
-typedef std::vector<gr_edge> gr_edge_vector_t;
-typedef std::vector<gr_edge>::iterator gr_edge_viter_t;
-
-
-/*!
- *\brief Class representing a msg connection between to graph msg endpoints
- *
- */
-class GR_RUNTIME_API gr_msg_edge
-{
-public:
- gr_msg_edge() : d_src(), d_dst() { };
- gr_msg_edge(const gr_msg_endpoint &src, const gr_msg_endpoint &dst) : d_src(src), d_dst(dst) { }
- ~gr_msg_edge() {}
-
- const gr_msg_endpoint &src() const { return d_src; }
- const gr_msg_endpoint &dst() const { return d_dst; }
-
-private:
- gr_msg_endpoint d_src;
- gr_msg_endpoint d_dst;
-};
-
-// Hold vectors of gr_edge objects
-typedef std::vector<gr_msg_edge> gr_msg_edge_vector_t;
-typedef std::vector<gr_msg_edge>::iterator gr_msg_edge_viter_t;
-
-// Create a shared pointer to a heap allocated flowgraph
-// (types defined in gr_runtime_types.h)
-GR_RUNTIME_API gr_flowgraph_sptr gr_make_flowgraph();
-
-/*!
- * \brief Class representing a directed, acyclic graph of basic blocks
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_flowgraph
-{
-public:
- friend GR_RUNTIME_API gr_flowgraph_sptr gr_make_flowgraph();
-
- // Destruct an arbitrary flowgraph
- ~gr_flowgraph();
-
- // Connect two endpoints
- void connect(const gr_endpoint &src, const gr_endpoint &dst);
-
- // Disconnect two endpoints
- void disconnect(const gr_endpoint &src, const gr_endpoint &dst);
-
- // Connect an output port to an input port (convenience)
- void connect(gr_basic_block_sptr src_block, int src_port,
- gr_basic_block_sptr dst_block, int dst_port);
-
- // Disconnect an input port from an output port (convenience)
- void disconnect(gr_basic_block_sptr src_block, int src_port,
- gr_basic_block_sptr dst_block, int dst_port);
-
- // Connect two msg endpoints
- void connect(const gr_msg_endpoint &src, const gr_msg_endpoint &dst);
-
- // Disconnect two msg endpoints
- void disconnect(const gr_msg_endpoint &src, const gr_msg_endpoint &dst);
-
- // Validate connectivity, raise exception if invalid
- void validate();
-
- // Clear existing flowgraph
- void clear();
-
- // Return vector of edges
- const gr_edge_vector_t &edges() const { return d_edges; }
-
- // Return vector of msg edges
- const gr_msg_edge_vector_t &msg_edges() const { return d_msg_edges; }
-
- // Return vector of connected blocks
- gr_basic_block_vector_t calc_used_blocks();
-
- // Return toplogically sorted vector of blocks. All the sources come first.
- gr_basic_block_vector_t topological_sort(gr_basic_block_vector_t &blocks);
-
- // Return vector of vectors of disjointly connected blocks, topologically
- // sorted.
- std::vector<gr_basic_block_vector_t> partition();
-
-protected:
- gr_basic_block_vector_t d_blocks;
- gr_edge_vector_t d_edges;
- gr_msg_edge_vector_t d_msg_edges;
-
- gr_flowgraph();
- std::vector<int> calc_used_ports(gr_basic_block_sptr block, bool check_inputs);
- gr_basic_block_vector_t calc_downstream_blocks(gr_basic_block_sptr block, int port);
- gr_edge_vector_t calc_upstream_edges(gr_basic_block_sptr block);
- bool has_block_p(gr_basic_block_sptr block);
- gr_edge calc_upstream_edge(gr_basic_block_sptr block, int port);
-
-private:
-
- void check_valid_port(gr_io_signature_sptr sig, int port);
- void check_valid_port(const gr_msg_endpoint &e);
- void check_dst_not_used(const gr_endpoint &dst);
- void check_type_match(const gr_endpoint &src, const gr_endpoint &dst);
- gr_edge_vector_t calc_connections(gr_basic_block_sptr block, bool check_inputs); // false=use outputs
- void check_contiguity(gr_basic_block_sptr block, const std::vector<int> &used_ports, bool check_inputs);
-
- gr_basic_block_vector_t calc_downstream_blocks(gr_basic_block_sptr block);
- gr_basic_block_vector_t calc_reachable_blocks(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks);
- void reachable_dfs_visit(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks);
- gr_basic_block_vector_t calc_adjacent_blocks(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks);
- gr_basic_block_vector_t sort_sources_first(gr_basic_block_vector_t &blocks);
- bool source_p(gr_basic_block_sptr block);
- void topological_dfs_visit(gr_basic_block_sptr block, gr_basic_block_vector_t &output);
-};
-
-// Convenience functions
-inline
-void gr_flowgraph::connect(gr_basic_block_sptr src_block, int src_port,
- gr_basic_block_sptr dst_block, int dst_port)
-{
- connect(gr_endpoint(src_block, src_port),
- gr_endpoint(dst_block, dst_port));
-}
-
-inline
-void gr_flowgraph::disconnect(gr_basic_block_sptr src_block, int src_port,
- gr_basic_block_sptr dst_block, int dst_port)
-{
- disconnect(gr_endpoint(src_block, src_port),
- gr_endpoint(dst_block, dst_port));
-}
-
-inline std::ostream&
-operator <<(std::ostream &os, const gr_endpoint endp)
-{
- os << endp.block()->alias() << ":" << endp.port();
- return os;
-}
-
-inline std::ostream&
-operator <<(std::ostream &os, const gr_edge edge)
-{
- os << edge.src() << "->" << edge.dst();
- return os;
-}
-
-#endif /* INCLUDED_GR_FLOWGRAPH_H */
diff --git a/gnuradio-runtime/include/gr_fxpt.h b/gnuradio-runtime/include/gr_fxpt.h
deleted file mode 100644
index b7e3518ffb..0000000000
--- a/gnuradio-runtime/include/gr_fxpt.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_FXPT_H
-#define INCLUDED_GR_FXPT_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-
-/*!
- * \brief fixed point sine and cosine and friends.
- * \ingroup misc
- *
- * fixed pt radians
- * --------- --------
- * -2**31 -pi
- * 0 0
- * 2**31-1 pi - epsilon
- *
- */
-class GR_RUNTIME_API gr_fxpt
-{
- static const int WORDBITS = 32;
- static const int NBITS = 10;
- static const float s_sine_table[1 << NBITS][2];
- static const float PI;
- static const float TWO_TO_THE_31;
-public:
-
- static gr_int32
- float_to_fixed (float x)
- {
- // Fold x into -PI to PI.
- int d = (int)floor(x/2/PI+0.5);
- x -= d*2*PI;
- // And convert to an integer.
- return (gr_int32) ((float) x * TWO_TO_THE_31 / PI);
- }
-
- static float
- fixed_to_float (gr_int32 x)
- {
- return x * (PI / TWO_TO_THE_31);
- }
-
- /*!
- * \brief Given a fixed point angle x, return float sine (x)
- */
- static float
- sin (gr_int32 x)
- {
- gr_uint32 ux = x;
- int index = ux >> (WORDBITS - NBITS);
- return s_sine_table[index][0] * (ux >> 1) + s_sine_table[index][1];
- }
-
- /*
- * \brief Given a fixed point angle x, return float cosine (x)
- */
- static float
- cos (gr_int32 x)
- {
- gr_uint32 ux = x + 0x40000000;
- int index = ux >> (WORDBITS - NBITS);
- return s_sine_table[index][0] * (ux >> 1) + s_sine_table[index][1];
- }
-
- /*
- * \brief Given a fixedpoint angle x, return float cos(x) and sin (x)
- */
- static void sincos(gr_int32 x, float *s, float *c)
- {
- gr_uint32 ux = x;
- int sin_index = ux >> (WORDBITS - NBITS);
- *s = s_sine_table[sin_index][0] * (ux >> 1) + s_sine_table[sin_index][1];
-
- ux = x + 0x40000000;
- int cos_index = ux >> (WORDBITS - NBITS);
- *c = s_sine_table[cos_index][0] * (ux >> 1) + s_sine_table[cos_index][1];
-
- return;
- }
-
-};
-
-#endif /* INCLUDED_GR_FXPT_H */
diff --git a/gnuradio-runtime/include/gr_fxpt_nco.h b/gnuradio-runtime/include/gr_fxpt_nco.h
deleted file mode 100644
index 36b99ee132..0000000000
--- a/gnuradio-runtime/include/gr_fxpt_nco.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_FXPT_NCO_H
-#define INCLUDED_GR_FXPT_NCO_H
-
-#include <gr_runtime_api.h>
-#include <gr_fxpt.h>
-#include <gr_complex.h>
-
-/*!
- * \brief Numerically Controlled Oscillator (NCO)
- * \ingroup misc
- */
-class /*GR_RUNTIME_API*/ gr_fxpt_nco {
- gr_uint32 d_phase;
- gr_int32 d_phase_inc;
-
-public:
- gr_fxpt_nco () : d_phase (0), d_phase_inc (0) {}
-
- ~gr_fxpt_nco () {}
-
- // radians
- void set_phase (float angle) {
- d_phase = gr_fxpt::float_to_fixed (angle);
- }
-
- void adjust_phase (float delta_phase) {
- d_phase += gr_fxpt::float_to_fixed (delta_phase);
- }
-
- // angle_rate is in radians / step
- void set_freq (float angle_rate){
- d_phase_inc = gr_fxpt::float_to_fixed (angle_rate);
- }
-
- // angle_rate is a delta in radians / step
- void adjust_freq (float delta_angle_rate)
- {
- d_phase_inc += gr_fxpt::float_to_fixed (delta_angle_rate);
- }
-
- // increment current phase angle
-
- void step ()
- {
- d_phase += d_phase_inc;
- }
-
- void step (int n)
- {
- d_phase += d_phase_inc * n;
- }
-
- // units are radians / step
- float get_phase () const { return gr_fxpt::fixed_to_float (d_phase); }
- float get_freq () const { return gr_fxpt::fixed_to_float (d_phase_inc); }
-
- // compute sin and cos for current phase angle
- void sincos (float *sinx, float *cosx) const
- {
- *sinx = gr_fxpt::sin (d_phase);
- *cosx = gr_fxpt::cos (d_phase);
- }
-
- // compute cos and sin for a block of phase angles
- void sincos (gr_complex *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = gr_complex(gr_fxpt::cos (d_phase) * ampl, gr_fxpt::sin (d_phase) * ampl);
- step ();
- }
- }
-
- // compute sin for a block of phase angles
- void sin (float *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (float)(gr_fxpt::sin (d_phase) * ampl);
- step ();
- }
- }
-
- // compute cos for a block of phase angles
- void cos (float *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (float)(gr_fxpt::cos (d_phase) * ampl);
- step ();
- }
- }
-
- // compute sin for a block of phase angles
- void sin (short *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (short)(gr_fxpt::sin (d_phase) * ampl);
- step ();
- }
- }
-
- // compute cos for a block of phase angles
- void cos (short *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (short)(gr_fxpt::cos (d_phase) * ampl);
- step ();
- }
- }
-
- // compute sin for a block of phase angles
- void sin (int *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (int)(gr_fxpt::sin (d_phase) * ampl);
- step ();
- }
- }
-
- // compute cos for a block of phase angles
- void cos (int *output, int noutput_items, double ampl=1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (int)(gr_fxpt::cos (d_phase) * ampl);
- step ();
- }
- }
-
- // compute cos or sin for current phase angle
- float cos () const { return gr_fxpt::cos (d_phase); }
- float sin () const { return gr_fxpt::sin (d_phase); }
-};
-
-#endif /* INCLUDED_GR_FXPT_NCO_H */
diff --git a/gnuradio-runtime/include/gr_fxpt_vco.h b/gnuradio-runtime/include/gr_fxpt_vco.h
deleted file mode 100644
index 15e7327f79..0000000000
--- a/gnuradio-runtime/include/gr_fxpt_vco.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004,2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_FXPT_VCO_H
-#define INCLUDED_GR_FXPT_VCO_H
-
-#include <gr_runtime_api.h>
-#include <gr_fxpt.h>
-#include <gr_complex.h>
-
-/*!
- * \brief Voltage Controlled Oscillator (VCO)
- * \ingroup misc
- */
-class /*GR_RUNTIME_API*/ gr_fxpt_vco {
- gr_int32 d_phase;
-
-public:
- gr_fxpt_vco () : d_phase (0) {}
-
- ~gr_fxpt_vco () {}
-
- // radians
- void set_phase (float angle) {
- d_phase = gr_fxpt::float_to_fixed (angle);
- }
-
- void adjust_phase (float delta_phase) {
- d_phase += gr_fxpt::float_to_fixed (delta_phase);
- }
-
- float get_phase () const { return gr_fxpt::fixed_to_float (d_phase); }
-
- // compute sin and cos for current phase angle
- void sincos (float *sinx, float *cosx) const
- {
- *sinx = gr_fxpt::sin (d_phase);
- *cosx = gr_fxpt::cos (d_phase);
- }
-
- // compute a block at a time
- void cos (float *output, const float *input, int noutput_items, float k, float ampl = 1.0)
- {
- for (int i = 0; i < noutput_items; i++){
- output[i] = (float)(gr_fxpt::cos (d_phase) * ampl);
- adjust_phase(input[i] * k);
- }
- }
-
- // compute cos or sin for current phase angle
- float cos () const { return gr_fxpt::cos (d_phase); }
- float sin () const { return gr_fxpt::sin (d_phase); }
-};
-
-#endif /* INCLUDED_GR_FXPT_VCO_H */
diff --git a/gnuradio-runtime/include/gr_hier_block2.h b/gnuradio-runtime/include/gr_hier_block2.h
deleted file mode 100644
index c39a98f6d7..0000000000
--- a/gnuradio-runtime/include/gr_hier_block2.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_HIER_BLOCK2_H
-#define INCLUDED_GR_HIER_BLOCK2_H
-
-#include <gr_runtime_api.h>
-#include <gr_basic_block.h>
-
-/*!
- * \brief public constructor for gr_hier_block2
-
- */
-GR_RUNTIME_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
-class gr_hier_block2_detail;
-
-/*!
- * \brief Hierarchical container class for gr_block's and gr_hier_block2's
- * \ingroup container_blk
- * \ingroup base_blk
- *
- */
-class GR_RUNTIME_API gr_hier_block2 : public gr_basic_block
-{
-private:
- friend class gr_hier_block2_detail;
- friend GR_RUNTIME_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
- /*!
- * \brief Private implementation details of gr_hier_block2
- */
- gr_hier_block2_detail *d_detail;
-
-protected:
- gr_hier_block2 (void){} //allows pure virtual interface sub-classes
- gr_hier_block2(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
-public:
- virtual ~gr_hier_block2();
-
- /*!
- * \brief typedef for object returned from self().
- *
- * This type is only guaranteed to be passable to connect and disconnect.
- * No other assumptions should be made about it.
- */
- typedef gr_basic_block_sptr opaque_self;
-
- /*!
- * \brief Return an object, representing the current block, which can be passed to connect.
- *
- * The returned object may only be used as an argument to connect or disconnect.
- * Any other use of self() results in unspecified (erroneous) behavior.
- */
- opaque_self self();
-
- /*!
- * \brief Add a stand-alone (possibly hierarchical) block to internal graph
- *
- * This adds a gr-block or hierarchical block to the internal graph
- * without wiring it to anything else.
- */
- void connect(gr_basic_block_sptr block);
-
- /*!
- * \brief Add gr-blocks or hierarchical blocks to internal graph and wire together
- *
- * This adds (if not done earlier by another connect) a pair of gr-blocks or
- * hierarchical blocks to the internal flowgraph, and wires the specified output
- * port to the specified input port.
- */
- void connect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port);
-
- /*!
- * \brief Add gr-blocks or hierarchical blocks to internal graph and wire together
- *
- * This adds (if not done earlier by another connect) a pair of gr-blocks or
- * hierarchical blocks to the internal message port subscription
- */
- void msg_connect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport);
- void msg_connect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport);
- void msg_disconnect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport);
- void msg_disconnect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport);
-
- /*!
- * \brief Remove a gr-block or hierarchical block from the internal flowgraph.
- *
- * This removes a gr-block or hierarchical block from the internal flowgraph,
- * disconnecting it from other blocks as needed.
- *
- */
- void disconnect(gr_basic_block_sptr block);
-
- /*!
- * \brief Disconnect a pair of gr-blocks or hierarchical blocks in internal
- * flowgraph.
- *
- * This disconnects the specified input port from the specified output port
- * of a pair of gr-blocks or hierarchical blocks.
- */
- void disconnect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port);
-
- /*!
- * \brief Disconnect all connections in the internal flowgraph.
- *
- * This call removes all output port to input port connections in the internal
- * flowgraph.
- */
- void disconnect_all();
-
- /*!
- * Lock a flowgraph in preparation for reconfiguration. When an equal
- * number of calls to lock() and unlock() have occurred, the flowgraph
- * will be reconfigured.
- *
- * N.B. lock() and unlock() may not be called from a flowgraph thread
- * (E.g., gr_block::work method) or deadlock will occur when
- * reconfiguration happens.
- */
- virtual void lock();
-
- /*!
- * Unlock a flowgraph in preparation for reconfiguration. When an equal
- * number of calls to lock() and unlock() have occurred, the flowgraph
- * will be reconfigured.
- *
- * N.B. lock() and unlock() may not be called from a flowgraph thread
- * (E.g., gr_block::work method) or deadlock will occur when
- * reconfiguration happens.
- */
- virtual void unlock();
-
- // This is a public method for ease of code organization, but should be
- // ignored by the user.
- gr_flat_flowgraph_sptr flatten() const;
-
- gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
-
- bool has_msg_port(pmt::pmt_t which_port){
- return message_port_is_hier(which_port) || gr_basic_block::has_msg_port(which_port);
- }
-
- bool message_port_is_hier(pmt::pmt_t port_id){
- return message_port_is_hier_in(port_id) || message_port_is_hier_out(port_id);
- }
- bool message_port_is_hier_in(pmt::pmt_t port_id){
- return pmt::list_has(hier_message_ports_in, port_id);
- }
- bool message_port_is_hier_out(pmt::pmt_t port_id){
- return pmt::list_has(hier_message_ports_out, port_id);
- }
-
- pmt::pmt_t hier_message_ports_in;
- pmt::pmt_t hier_message_ports_out;
-
- void message_port_register_hier_in(pmt::pmt_t port_id){
- if(pmt::list_has(hier_message_ports_in, port_id))
- throw std::invalid_argument("hier msg in port by this name already registered");
- if(msg_queue.find(port_id) != msg_queue.end())
- throw std::invalid_argument("block already has a primitive input port by this name");
- hier_message_ports_in = pmt::list_add(hier_message_ports_in, port_id);
- }
- void message_port_register_hier_out(pmt::pmt_t port_id){
- if(pmt::list_has(hier_message_ports_out, port_id))
- throw std::invalid_argument("hier msg out port by this name already registered");
- if(pmt::dict_has_key(message_subscribers, port_id))
- throw std::invalid_argument("block already has a primitive output port by this name");
- hier_message_ports_out = pmt::list_add(hier_message_ports_out, port_id);
- }
-
-};
-
-inline gr_hier_block2_sptr cast_to_hier_block2_sptr(gr_basic_block_sptr block) {
- return boost::dynamic_pointer_cast<gr_hier_block2, gr_basic_block>(block);
-}
-
-#endif /* INCLUDED_GR_HIER_BLOCK2_H */
diff --git a/gnuradio-runtime/include/gr_io_signature.h b/gnuradio-runtime/include/gr_io_signature.h
deleted file mode 100644
index 345cd6b9d2..0000000000
--- a/gnuradio-runtime/include/gr_io_signature.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_IO_SIGNATURE_H
-#define INCLUDED_IO_SIGNATURE_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-
-/*!
- * \brief Create an i/o signature
- *
- * \ingroup internal
- * \param min_streams specify minimum number of streams (>= 0)
- * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
- * \param sizeof_stream_item specify the size of the items in each stream
- */
-GR_RUNTIME_API gr_io_signature_sptr
-gr_make_io_signature(int min_streams, int max_streams,
- int sizeof_stream_item);
-
-/*!
- * \brief Create an i/o signature
- *
- * \param min_streams specify minimum number of streams (>= 0)
- * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
- * \param sizeof_stream_item1 specify the size of the items in the first stream
- * \param sizeof_stream_item2 specify the size of the items in the second and subsequent streams
- */
-GR_RUNTIME_API gr_io_signature_sptr
-gr_make_io_signature2(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2
- );
-
-/*!
- * \brief Create an i/o signature
- *
- * \param min_streams specify minimum number of streams (>= 0)
- * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
- * \param sizeof_stream_item1 specify the size of the items in the first stream
- * \param sizeof_stream_item2 specify the size of the items in the second stream
- * \param sizeof_stream_item3 specify the size of the items in the third and subsequent streams
- */
-GR_RUNTIME_API gr_io_signature_sptr
-gr_make_io_signature3(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2,
- int sizeof_stream_item3
- );
-
-/*!
- * \brief Create an i/o signature
- *
- * \param min_streams specify minimum number of streams (>= 0)
- * \param max_streams specify maximum number of streams (>= min_streams or -1 -> infinite)
- * \param sizeof_stream_items specify the size of the items in the streams
- *
- * If there are more streams than there are entries in sizeof_stream_items, the
- * value of the last entry in sizeof_stream_items is used for the missing values.
- * sizeof_stream_items must contain at least 1 entry.
- */
-GR_RUNTIME_API gr_io_signature_sptr
-gr_make_io_signaturev(int min_streams, int max_streams,
- const std::vector<int> &sizeof_stream_items);
-
-
-/*!
- * \brief i/o signature for input and output ports.
- * \brief misc
- */
-class GR_RUNTIME_API gr_io_signature {
- int d_min_streams;
- int d_max_streams;
- std::vector<int> d_sizeof_stream_item;
-
- gr_io_signature(int min_streams, int max_streams,
- const std::vector<int> &sizeof_stream_items);
-
- friend GR_RUNTIME_API gr_io_signature_sptr
- gr_make_io_signaturev(int min_streams,
- int max_streams,
- const std::vector<int> &sizeof_stream_items);
-
- public:
-
- static const int IO_INFINITE = -1;
-
- ~gr_io_signature ();
-
- int min_streams () const { return d_min_streams; }
- int max_streams () const { return d_max_streams; }
- int sizeof_stream_item (int index) const;
- std::vector<int> sizeof_stream_items() const;
-};
-
-
-#endif /* INCLUDED_IO_SIGNATURE_H */
diff --git a/gnuradio-runtime/include/gr_logger.h b/gnuradio-runtime/include/gr_logger.h
deleted file mode 100644
index 0e82c5134e..0000000000
--- a/gnuradio-runtime/include/gr_logger.h
+++ /dev/null
@@ -1,648 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*******************************************************************************
-* Author: Mark Plett
-* Description:
-* The gr_logger module wraps the log4cpp library for logging in gnuradio
-*******************************************************************************/
-
-#ifndef INCLUDED_GR_LOGGER_H
-#define INCLUDED_GR_LOGGER_H
-
-/*!
-* \file gr_logger.h
-* \ingroup logging
-* \brief GNURADIO logging wrapper for log4cpp library (C++ port of log4j)
-*
-*/
-
-#include <gr_runtime_api.h>
-#include <assert.h>
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
-#include <boost/format.hpp>
-
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-typedef int mode_t;
-#endif
-
-#ifdef ENABLE_GR_LOG
-
-// We have three configurations... first logging to stdout/stderr
-#ifndef HAVE_LOG4CPP
-//#warning GR logging Enabled and using std::cout
-
-typedef std::string gr_logger_ptr;
-
-#define GR_LOG_DECLARE_LOGPTR(logger)
-#define GR_LOG_ASSIGN_LOGPTR(logger,name)
-#define GR_CONFIG_LOGGER(config)
-#define GR_CONFIG_AND_WATCH_LOGGER(config,period)
-#define GR_LOG_GETLOGGER(logger, name)
-#define GR_SET_LEVEL(name, level)
-#define GR_LOG_SET_LEVEL(logger, level)
-#define GR_GET_LEVEL(name, level)
-#define GR_LOG_GET_LEVEL(logger, level)
-#define GR_ADD_CONSOLE_APPENDER(logger,target,pattern)
-#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern)
-#define GR_ADD_FILE_APPENDER(name,filename,append,pattern)
-#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern)
-#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern)
-#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern)
-#define GR_GET_LOGGER_NAMES(names)
-#define GR_RESET_CONFIGURATION()
-#define GR_DEBUG(name, msg) std::cout<<"DEBUG: "<<msg<<std::endl
-#define GR_INFO(name, msg) std::cout<<"INFO: "<<msg<<std::endl
-#define GR_NOTICE(name, msg) std::cout<<"NOTICE: "<<msg<<std::endl
-#define GR_WARN(name, msg) std::cerr<<"WARN: "<<msg<<std::endl
-#define GR_ERROR(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
-#define GR_ALERT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
-#define GR_CRIT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl
-#define GR_FATAL(name, msg) std::cerr<<"FATAL: "<<msg<<std::endl
-#define GR_EMERG(name, msg) std::cerr<<"EMERG: "<<msg<<std::endl
-#define GR_ERRORIF(name, cond, msg) {if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl;}
-#define GR_ASSERT(name, cond, msg) {if(!(cond)) std::cerr<<"FATAL: "<<msg<<std::endl; assert(cond);}
-#define GR_LOG_DEBUG(logger, msg) std::cout<<"DEBUG: "<<msg<<std::endl
-#define GR_LOG_INFO(logger, msg) std::cout<<"INFO: "<<msg<<std::endl
-#define GR_LOG_NOTICE(logger, msg) std::cout<<"NOTICE: "<<msg<<std::endl
-#define GR_LOG_WARN(logger, msg) std::cerr<<"WARN: "<<msg<<std::endl
-#define GR_LOG_ERROR(logger, msg) std::cerr<<"ERROR: "<<msg<<std::endl
-#define GR_LOG_ALERT(logger, msg) std::cerr<<"ALERT: "<<msg<<std::endl
-#define GR_LOG_CRIT(logger, msg) std::cerr<<"CRIT: "<<msg<<std::endl
-#define GR_LOG_FATAL(logger, msg) std::cerr<<"FATAL: "<<msg<<std::endl
-#define GR_LOG_EMERG(logger, msg) std::cerr<<"EMERG: "<<msg<<std::endl
-#define GR_LOG_ERRORIF(logger, cond, msg) {\
- if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl;}
-#define GR_LOG_ASSERT(logger, cond, msg) {\
- if(!(cond)) {std::cerr<<"FATAL: "<<msg<<std::endl; assert(cond);};}
-
-#else /* HAVE_LOG4CPP */
-// Second configuration...logging to log4cpp
-
-#include <log4cpp/Category.hh>
-#include <log4cpp/PropertyConfigurator.hh>
-#include <log4cpp/FileAppender.hh>
-#include <log4cpp/RollingFileAppender.hh>
-#include <log4cpp/OstreamAppender.hh>
-#include <log4cpp/PatternLayout.hh>
-
-/*!
- * \brief GR_LOG macros
- * \ingroup logging
- *
- * These macros wrap the standard LOG4CPP_LEVEL macros. The availablie macros
- * are:
- * GR_LOG_DEBUG
- * GR_LOG_INFO
- * GR_LOG_WARN
- * GR_LOG_TRACE
- * GR_LOG_ERROR
- * GR_LOG_ALERT
- * GR_LOG_CRIT
- * GR_LOG_FATAL
- * GR_LOG_EMERG
- */
-typedef log4cpp::Category* gr_logger_ptr;
-
-/* Macros for Programmatic Configuration */
-#define GR_LOG_DECLARE_LOGPTR(logger) \
- gr_logger_ptr logger;
-
-#define GR_LOG_ASSIGN_LOGPTR(logger,name) \
- logger = logger_get_logger(name);
-
-#define GR_CONFIG_LOGGER(config) \
- logger_config::load_config(config)
-
-#define GR_CONFIG_AND_WATCH_LOGGER(config,period) \
- logger_config::load_config(config,period)
-
-#define GR_LOG_GETLOGGER(logger, name) \
- gr_logger_ptr logger = logger_get_logger(name);
-
-#define GR_SET_LEVEL(name, level){ \
- gr_logger_ptr logger = logger_get_logger(name);\
- logger_set_level(logger,level);}
-
-#define GR_LOG_SET_LEVEL(logger, level) \
- logger_set_level(logger, level);
-
-#define GR_GET_LEVEL(name, level){ \
- gr_logger_ptr logger = logger_get_logger(name);\
- logger_get_level(logger,level);}
-
-#define GR_LOG_GET_LEVEL(logger, level) \
- logger_get_level(logger,level);
-
-#define GR_ADD_CONSOLE_APPENDER(name,target,pattern){\
- gr_logger_ptr logger = logger_get_logger(name);\
- logger_add_console_appender(logger,target,pattern);}
-
-#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern){\
- logger_add_console_appender(logger,target,pattern);}
-
-#define GR_ADD_FILE_APPENDER(name,filename,append,pattern){\
- gr_logger_ptr logger = logger_get_logger(name);\
- logger_add_file_appender(logger,filename,append,pattern);}
-
-#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern){\
- logger_add_file_appender(logger,filename,append,pattern);}
-
-#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern){\
- gr_logger_ptr logger = logger_get_logger(name);\
- logger_add_rollingfile_appender(logger,filename,filesize,bkup_index,append,mode,pattern);}
-
-#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern){\
- logger_add_rollingfile_appender(logger,filename,filesize,bkup_index,append,mode,pattern);}
-
-#define GR_GET_LOGGER_NAMES(names){ \
- names = logger_get_logger_names();}
-
-#define GR_RESET_CONFIGURATION(){ \
- logger_config::reset_config();}
-
-/* Logger name referenced macros */
-#define GR_DEBUG(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::DEBUG << msg << log4cpp::eol;}
-
-#define GR_INFO(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::INFO << msg << log4cpp::eol;}
-
-#define GR_NOTICE(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger << log4cpp::Priority::NOTICE << msg;}
-
-#define GR_WARN(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::WARN << msg << log4cpp::eol;}
-
-#define GR_ERROR(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;}
-
-#define GR_CRIT(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::CRIT << msg << log4cpp::eol;}
-
-#define GR_ALERT(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::ALERT << msg << log4cpp::eol;}
-
-#define GR_FATAL(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::FATAL << msg << log4cpp::eol;}
-
-#define GR_EMERG(name, msg) { \
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol;}
-
-#define GR_ERRORIF(name, cond, msg) { \
-if((cond)){\
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;};\
-};
-
-#define GR_ASSERT(name, cond, msg) { \
-if(!(cond)){\
- gr_logger_ptr logger = logger_get_logger(name);\
- *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol;};\
- assert(0);\
-};
-
-/* LoggerPtr Referenced Macros */
-#define GR_LOG_DEBUG(logger, msg) { \
- *logger << log4cpp::Priority::DEBUG << msg << log4cpp::eol;}
-
-#define GR_LOG_INFO(logger, msg) { \
- *logger << log4cpp::Priority::INFO << msg << log4cpp::eol;}
-
-#define GR_LOG_NOTICE(logger, msg) { \
- *logger << log4cpp::Priority::NOTICE << msg << log4cpp::eol;}
-
-#define GR_LOG_WARN(logger, msg) { \
- *logger << log4cpp::Priority::WARN << msg << log4cpp::eol;}
-
-#define GR_LOG_ERROR(logger, msg) { \
- *logger << log4cpp::Priority::ERROR << msg << log4cpp::eol;}
-
-#define GR_LOG_CRIT(logger, msg) { \
- *logger << log4cpp::Priority::CRIT << msg << log4cpp::eol;}
-
-#define GR_LOG_ALERT(logger, msg) { \
- *logger << log4cpp::Priority::ALERT << msg << log4cpp::eol;}
-
-#define GR_LOG_FATAL(logger, msg) { \
- *logger << log4cpp::Priority::FATAL << msg << log4cpp::eol;}
-
-#define GR_LOG_EMERG(logger, msg) { \
- *logger << log4cpp::Priority::EMERG << msg << log4cpp::eol;}
-
-#define GR_LOG_ERRORIF(logger,cond, msg) { \
-if((cond)){\
- *logger<< log4cpp::Priority::ERROR << msg << log4cpp::eol;};\
-};
-
-#define GR_LOG_ASSERT(logger, cond, msg) { \
-if(!(cond)){\
- *logger<< log4cpp::Priority::EMERG << msg << log4cpp::eol;\
- assert(0);};\
-};
-
-/*!
- * \brief Class to control configuration of logger.
- * This is a singleton that cna launch a thread to wathc a config file for changes
- * \ingroup logging
- */
-class logger_config {
-private:
- /*! \brief filename of logger config file */
- std::string filename;
- /*! \brief Period (seconds) over which watcher thread checks config file for changes */
- unsigned int watch_period;
- /*! \brief Pointer to watch thread for config file changes */
- boost::thread *watch_thread;
-
- /*! \brief Watcher thread method
- * /param filename Name of configuration file
- * /param watch_period Seconds between checks for changes in config file
- */
- static void watch_file(std::string filename,unsigned int watch_period);
-
- logger_config(){}; //!< Constructor
- logger_config(logger_config const&); //!<Copy constructor
- void operator=(logger_config const&); //!<Assignment Operator
-
- /*! \brief destrcutor stops watch thread before exits */
- ~logger_config(){
- stop_watch();
- };
-
- /*! \brief Instance getter for singleton. Only used by class. */
- static logger_config& get_instance(void);
-
-public:
- /*! \brief Getter for config filename */
- static std::string get_filename();
- /*! \brief Getter for watch period */
- static unsigned int get_watch_period();
- /*! \brief Method to load configuration
- * /param filename Name of configuration file
- * /param watch_period Seconds between checks for changes in config file
- */
- static void load_config(std::string filename,unsigned int watch_period=0);
- /*! \brief Method to stop watcher thread */
- static void stop_watch();
- /*! \brief method to reset logger configuration */
- static void reset_config(void);
-};
-
-/*!
- * \brief Retrieve a pointer to a logger by name
- *
- * Retrives a logger pointer
- * \p name.
- *
- * \param name Name of the logger for which a pointer is requested
- */
-GR_RUNTIME_API gr_logger_ptr logger_get_logger(std::string name);
-
-/*!
- * \brief Load logger's configuration file.
- *
- * Initialize the GNU Radio logger by loading the configuration file
- * \p config_filename.
- *
- * \param config_filename The configuration file. Set to "" for the
- * basic logger that outputs to the console.
- */
-GR_RUNTIME_API void logger_load_config(const std::string &config_filename="");
-
-/*!
- * \brief Reset logger's configuration file.
- *
- * Remove all appenders from loggers
- */
-GR_RUNTIME_API void logger_reset_config(void);
-
-GR_RUNTIME_API void logger_load_config_and_watch(const std::string &config_filename,
- unsigned int watch_period);
-
-
-/*!
- * \brief Set the logger's output level.
- *
- * Sets the level of the logger. This takes a string that is
- * translated to the standard levels and can be (case insensitive):
- *
- * \li off , notset
- * \li debug
- * \li info
- * \li notice
- * \li warn
- * \li error
- * \li crit
- * \li alert
- * \li fatal
- * \li emerg
- *
- * \param logger the logger to set the level of.
- * \param level string to set the level to.
- */
-GR_RUNTIME_API void logger_set_level(gr_logger_ptr logger, const std::string &level);
-
-/*!
- * \brief Set the logger's output level.
- *
- * Sets the level of the logger. This takes the actual Log4cpp::Priority
- * data type, which can be:
- *
- * \li log4cpp::Priority::NOTSET
- * \li log4cpp::Priority::DEBUG
- * \li log4cpp::Priority::INFO
- * \li log4cpp::Priority::NOTICE
- * \li log4cpp::Priority::WARN
- * \li log4cpp::Priority::ERROR
- * \li log4cpp::Priority::CRIT
- * \li log4cpp::Priority::ALERT
- * \li log4cpp::Priority::FATAL
- * \li log4cpp::Priority::EMERG
- *
- * \param logger the logger to set the level of.
- * \param level new logger level of type Log4cpp::Priority
- */
-GR_RUNTIME_API void logger_set_level(gr_logger_ptr logger, log4cpp::Priority::Value level);
-
-
-/*!
- * \brief Get the logger's output level.
- *
- * Gets the level of the logger. This returns a string that
- * corresponds to the standard levels and can be (case insensitive):
- *
- * \li notset
- * \li debug
- * \li info
- * \li notice
- * \li warn
- * \li error
- * \li crit
- * \li alert
- * \li fatal
- * \li emerg
- *
- * \param logger the logger to get the level of.
- * \param level string to get the level into.
- */
-GR_RUNTIME_API void logger_get_level(gr_logger_ptr logger, std::string &level);
-
-/*!
- * \brief Get the logger's output level.
- *
- * Gets the level of the logger. This returns the actual Log4cpp::Level
- * data type, which can be:
- *
- * \li log4cpp::Priority::NOTSET
- * \li log4cpp::Priority::DEBUG
- * \li log4cpp::Priority::INFO
- * \li log4cpp::Priority::NOTICE
- * \li log4cpp::Priority::WARN
- * \li log4cpp::Priority::ERROR
- * \li log4cpp::Priority::CRIT
- * \li log4cpp::Priority::ALERT
- * \li log4cpp::Priority::FATAL
- * \li log4cpp::Priority::EMERG
- *
- * \param logger the logger to get the level of.
- * \param level of the logger.
- */
-GR_RUNTIME_API void logger_get_level(gr_logger_ptr logger, log4cpp::Priority::Value &level);
-
-/*!
- * \brief Add console appender to a given logger
- *
- * Add console appender to a given logger
- *
- * \param logger Logger to which appender will be added
- * \param target Std target to write 'cout' or 'cerr' (default is cout)
- * \param pattern Formating pattern for log messages
- */
-GR_RUNTIME_API void logger_add_console_appender(gr_logger_ptr logger,std::string target,std::string pattern);
-
-/*!
- * \brief Add file appender to a given logger
- *
- * Add file appender to a given logger
- *
- * \param logger Logger to which appender will be added
- * \param filename File to which log will be written
- * \param append Overwrite or append to log file
- * \param pattern Formating pattern for log messages
- */
-GR_RUNTIME_API void logger_add_file_appender(gr_logger_ptr logger,std::string filename,bool append,std::string pattern);
-
-/*!
- * \brief Add rolling file appender to a given logger
- *
- * Add rolling file appender to a given logger
- *
- * \param logger Logger to which appender will be added
- * \param filename File to which log will be written
- * \param filesize Sizez of files to write
- * \param bkup_index Number of files to write
- * \param append Overwrite or append to log file
- * \param mode Permissions to set on log file
- * \param pattern Formating pattern for log messages
- */
-GR_RUNTIME_API void logger_add_rollingfile_appender(gr_logger_ptr logger,std::string filename,
- size_t filesize,int bkup_index,bool append,mode_t mode,std::string pattern);
-
-
-/*!
- * \brief Add rolling file appender to a given logger
- *
- * Add rolling file appender to a given logger
- *
- * \return vector of string names of loggers
- */
-GR_RUNTIME_API std::vector<std::string> logger_get_logger_names(void);
-
-#endif /* HAVE_LOG4CPP */
-
-
-// If Logger disable do nothing
-#else /* ENABLE_GR_LOG */
-
-typedef void* gr_logger_ptr;
-
-#define GR_LOG_DECLARE_LOGPTR(logger)
-#define GR_LOG_ASSIGN_LOGPTR(logger,name)
-#define GR_CONFIG_LOGGER(config)
-#define GR_CONFIG_AND_WATCH_LOGGER(config,period)
-#define GR_LOG_GETLOGGER(logger, name)
-#define GR_SET_LEVEL(name, level)
-#define GR_LOG_SET_LEVEL(logger, level)
-#define GR_GET_LEVEL(name, level)
-#define GR_LOG_GET_LEVEL(logger, level)
-#define GR_ADD_CONSOLE_APPENDER(logger,target,pattern)
-#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern)
-#define GR_ADD_FILE_APPENDER(name,filename,append,pattern)
-#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern)
-#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern)
-#define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern)
-#define GR_GET_LOGGER_NAMES(names)
-#define GR_RESET_CONFIGURATION()
-#define GR_DEBUG(name, msg)
-#define GR_INFO(name, msg)
-#define GR_NOTICE(name, msg)
-#define GR_WARN(name, msg)
-#define GR_ERROR(name, msg)
-#define GR_ALERT(name, msg)
-#define GR_CRIT(name, msg)
-#define GR_FATAL(name, msg)
-#define GR_EMERG(name, msg)
-#define GR_ERRORIF(name, cond, msg)
-#define GR_ASSERT(name, cond, msg)
-#define GR_LOG_DEBUG(logger, msg)
-#define GR_LOG_INFO(logger, msg)
-#define GR_LOG_NOTICE(logger, msg)
-#define GR_LOG_WARN(logger, msg)
-#define GR_LOG_ERROR(logger, msg)
-#define GR_LOG_ALERT(logger, msg)
-#define GR_LOG_CRIT(logger, msg)
-#define GR_LOG_FATAL(logger, msg)
-#define GR_LOG_EMERG(logger, msg)
-#define GR_LOG_ERRORIF(logger, cond, msg)
-#define GR_LOG_ASSERT(logger, cond, msg)
-
-#endif /* ENABLE_GR_LOG */
-
-// Even if logger is disabled we'll need for methods below to exist in python.
-// The macros these call will be disabled if ENABLE_GR_LOG is undefined
-
-/********************* Start Classes and Methods for Python ******************/
-/*!
- * \brief Logger class for referencing loggers in python. Not needed in C++ (use macros)
- * Wraps and manipulates loggers for python as python has no macros
- * \ingroup logging
- *
- */
-class gr_logger
-{
- private:
- /*! \brief logger pointer to logger associated wiith this wrapper class */
- gr_logger_ptr d_logger;
- public:
- /*!
- * \brief contructor Provide name of logger to associate with this class
- * \param logger_name Name of logger associated with class
- */
- gr_logger(std::string logger_name) {
- GR_LOG_ASSIGN_LOGPTR(d_logger,logger_name);
- };
-
- /*! \brief Destructor */
- ~gr_logger(){;};
-
- // Wrappers for logging macros
- /*! \brief inline function, wrapper to set the logger level */
- void set_level(std::string level){GR_LOG_SET_LEVEL(d_logger,level);}
-
- /*! \brief inline function, wrapper to get the logger level */
- void get_level(std::string &level){GR_LOG_GET_LEVEL(d_logger,level);}
-
- /*! \brief inline function, wrapper for LOG4CPP_DEBUG for DEBUG message */
- void debug(std::string msg){GR_LOG_DEBUG(d_logger,msg);};
-
- /*! \brief inline function, wrapper for LOG4CPP_INFO for INFO message */
- void info(std::string msg){GR_LOG_INFO(d_logger,msg);};
-
- /*! \brief inline function, wrapper for NOTICE message */
- void notice(std::string msg){GR_LOG_NOTICE(d_logger,msg);};
-
- /*! \brief inline function, wrapper for LOG4CPP_WARN for WARN message */
- void warn(std::string msg){GR_LOG_WARN(d_logger,msg);};
-
- /*! \brief inline function, wrapper for LOG4CPP_ERROR for ERROR message */
- void error(std::string msg){GR_LOG_ERROR(d_logger,msg);};
-
- /*! \brief inline function, wrapper for NOTICE message */
- void crit(std::string msg){GR_LOG_CRIT(d_logger,msg);};
-
- /*! \brief inline function, wrapper for ALERT message */
- void alert(std::string msg){GR_LOG_ALERT(d_logger,msg);};
-
- /*! \brief inline function, wrapper for FATAL message */
- void fatal(std::string msg){GR_LOG_FATAL(d_logger,msg);};
-
- /*! \brief inline function, wrapper for EMERG message */
- void emerg(std::string msg){GR_LOG_EMERG(d_logger,msg);};
-
- /*! \brief inline function, wrapper for LOG4CPP_ASSERT for conditional ERROR message */
- void errorIF(bool cond,std::string msg){GR_LOG_ERRORIF(d_logger,cond,msg);};
-
- /*! \brief inline function, wrapper for LOG4CPP_ASSERT for conditional ERROR message */
- void log_assert(bool cond,std::string msg){GR_LOG_ASSERT(d_logger,cond,msg);};
-
- /*! \brief inline function, Method to add console appender to logger */
- void add_console_appender(std::string target,std::string pattern){
- GR_LOG_ADD_CONSOLE_APPENDER(d_logger,target,pattern);
- };
-
- /*! \brief inline function, Method to add file appender to logger */
- void add_file_appender(std::string filename,bool append,std::string pattern){
- GR_LOG_ADD_FILE_APPENDER(d_logger,filename,append,pattern);
- };
-
- /*! \brief inline function, Method to add rolling file appender to logger */
- void add_rollingfile_appender(std::string filename,size_t filesize,
- int bkup_index,bool append,mode_t mode,std::string pattern){
- GR_LOG_ADD_ROLLINGFILE_APPENDER(d_logger,filename,filesize,
- bkup_index,append,mode,pattern);
- };
-};
-
-/**************** Start Configuration Class and Methods for Python ************/
-/*!
- * \brief Function to call configuration macro from python.
- * Note: Configuration is only updated if filename or watch_period has changed.
- * \param config_filename Name of configuration file
- * \param watch_period Seconds to wait between checking for changes in conf file.
- * Watch_period defaults to 0 in which case the file is not watched for changes
- */
-GR_RUNTIME_API void gr_logger_config(const std::string config_filename, unsigned int watch_period = 0);
-/*!
- * \brief Function to return logger names to python
- * \return Vector of name strings
- *
- */
-GR_RUNTIME_API std::vector<std::string> gr_logger_get_logger_names(void);
-/*!
- * \brief Function to reset logger configuration from python
- *
- */
-GR_RUNTIME_API void gr_logger_reset_config(void);
-
-#endif /* INCLUDED_GR_LOGGER_H */
diff --git a/gnuradio-runtime/include/gr_math.h b/gnuradio-runtime/include/gr_math.h
deleted file mode 100644
index c7efe8facb..0000000000
--- a/gnuradio-runtime/include/gr_math.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2005,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * mathematical odds and ends.
- */
-
-#ifndef _GR_MATH_H_
-#define _GR_MATH_H_
-
-#include <gr_runtime_api.h>
-#include <gr_complex.h>
-
-static inline bool
-gr_is_power_of_2(long x)
-{
- return x != 0 && (x & (x-1)) == 0;
-}
-
-/*!
- * \brief Fast arc tangent using table lookup and linear interpolation
- * \ingroup misc
- *
- * \param y component of input vector
- * \param x component of input vector
- * \returns float angle angle of vector (x, y) in radians
- *
- * This function calculates the angle of the vector (x,y) based on a
- * table lookup and linear interpolation. The table uses a 256 point
- * table covering -45 to +45 degrees and uses symetry to determine the
- * final angle value in the range of -180 to 180 degrees. Note that
- * this function uses the small angle approximation for values close
- * to zero. This routine calculates the arc tangent with an average
- * error of +/- 0.045 degrees.
- */
-GR_RUNTIME_API float gr_fast_atan2f(float y, float x);
-
-static inline float gr_fast_atan2f(gr_complex z)
-{
- return gr_fast_atan2f(z.imag(), z.real());
-}
-
-/* This bounds x by +/- clip without a branch */
-static inline float gr_branchless_clip(float x, float clip)
-{
- float x1 = fabsf(x+clip);
- float x2 = fabsf(x-clip);
- x1 -= x2;
- return 0.5*x1;
-}
-
-static inline float gr_clip(float x, float clip)
-{
- float y = x;
- if(x > clip)
- y = clip;
- else if(x < -clip)
- y = -clip;
- return y;
-}
-
-// Slicer Functions
-static inline unsigned int gr_binary_slicer(float x)
-{
- if(x >= 0)
- return 1;
- else
- return 0;
-}
-
-static inline unsigned int gr_quad_45deg_slicer(float r, float i)
-{
- unsigned int ret = 0;
- if((r >= 0) && (i >= 0))
- ret = 0;
- else if((r < 0) && (i >= 0))
- ret = 1;
- else if((r < 0) && (i < 0))
- ret = 2;
- else
- ret = 3;
- return ret;
-}
-
-static inline unsigned int gr_quad_0deg_slicer(float r, float i)
-{
- unsigned int ret = 0;
- if(fabsf(r) > fabsf(i)) {
- if(r > 0)
- ret = 0;
- else
- ret = 2;
- }
- else {
- if(i > 0)
- ret = 1;
- else
- ret = 3;
- }
-
- return ret;
-}
-
-static inline unsigned int gr_quad_45deg_slicer(gr_complex x)
-{
- return gr_quad_45deg_slicer(x.real(), x.imag());
-}
-
-static inline unsigned int gr_quad_0deg_slicer(gr_complex x)
-{
- return gr_quad_0deg_slicer(x.real(), x.imag());
-}
-
-// Branchless Slicer Functions
-static inline unsigned int gr_branchless_binary_slicer(float x)
-{
- return (x >= 0);
-}
-
-static inline unsigned int gr_branchless_quad_0deg_slicer(float r, float i)
-{
- unsigned int ret = 0;
- ret = (fabsf(r) > fabsf(i)) * (((r < 0) << 0x1)); // either 0 (00) or 2 (10)
- ret |= (fabsf(i) > fabsf(r)) * (((i < 0) << 0x1) | 0x1); // either 1 (01) or 3 (11)
-
- return ret;
-}
-
-static inline unsigned int gr_branchless_quad_0deg_slicer(gr_complex x)
-{
- return gr_branchless_quad_0deg_slicer(x.real(), x.imag());
-}
-
-static inline unsigned int gr_branchless_quad_45deg_slicer(float r, float i)
-{
- char ret = (r <= 0);
- ret |= ((i <= 0) << 1);
- return (ret ^ ((ret & 0x2) >> 0x1));
-}
-
-static inline unsigned int gr_branchless_quad_45deg_slicer(gr_complex x)
-{
- return gr_branchless_quad_45deg_slicer(x.real(), x.imag());
-}
-
-/*!
- * \param x any value
- * \param pow2 must be a power of 2
- * \returns \p x rounded down to a multiple of \p pow2.
- */
-static inline size_t
-gr_p2_round_down(size_t x, size_t pow2)
-{
- return x & -pow2;
-}
-
-/*!
- * \param x any value
- * \param pow2 must be a power of 2
- * \returns \p x rounded up to a multiple of \p pow2.
- */
-static inline size_t
-gr_p2_round_up(size_t x, size_t pow2)
-{
- return gr_p2_round_down(x + pow2 - 1, pow2);
-}
-
-/*!
- * \param x any value
- * \param pow2 must be a power of 2
- * \returns \p x modulo \p pow2.
- */
-static inline size_t
-gr_p2_modulo(size_t x, size_t pow2)
-{
- return x & (pow2 - 1);
-}
-
-/*!
- * \param x any value
- * \param pow2 must be a power of 2
- * \returns \p pow2 - (\p x modulo \p pow2).
- */
-static inline size_t
-gr_p2_modulo_neg(size_t x, size_t pow2)
-{
- return pow2 - gr_p2_modulo(x, pow2);
-}
-
-#endif /* _GR_MATH_H_ */
diff --git a/gnuradio-runtime/include/gr_message.h b/gnuradio-runtime/include/gr_message.h
deleted file mode 100644
index 941821617b..0000000000
--- a/gnuradio-runtime/include/gr_message.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_MESSAGE_H
-#define INCLUDED_GR_MESSAGE_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-#include <string>
-
-class gr_message;
-typedef boost::shared_ptr<gr_message> gr_message_sptr;
-
-/*!
- * \brief public constructor for gr_message
- */
-GR_RUNTIME_API gr_message_sptr
-gr_make_message(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
-
-GR_RUNTIME_API gr_message_sptr
-gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0, double arg2 = 0);
-
-/*!
- * \brief Message class.
- *
- * \ingroup misc
- * The ideas and method names for adjustable message length were
- * lifted from the click modular router "Packet" class.
- */
-class GR_RUNTIME_API gr_message {
- gr_message_sptr d_next; // link field for msg queue
- long d_type; // type of the message
- double d_arg1; // optional arg1
- double d_arg2; // optional arg2
-
- unsigned char *d_buf_start; // start of allocated buffer
- unsigned char *d_msg_start; // where the msg starts
- unsigned char *d_msg_end; // one beyond end of msg
- unsigned char *d_buf_end; // one beyond end of allocated buffer
-
- gr_message (long type, double arg1, double arg2, size_t length);
-
- friend GR_RUNTIME_API gr_message_sptr
- gr_make_message (long type, double arg1, double arg2, size_t length);
-
- friend GR_RUNTIME_API gr_message_sptr
- gr_make_message_from_string (const std::string s, long type, double arg1, double arg2);
-
- friend class gr_msg_queue;
-
- unsigned char *buf_data() const { return d_buf_start; }
- size_t buf_len() const { return d_buf_end - d_buf_start; }
-
-public:
- ~gr_message ();
-
- long type() const { return d_type; }
- double arg1() const { return d_arg1; }
- double arg2() const { return d_arg2; }
-
- void set_type(long type) { d_type = type; }
- void set_arg1(double arg1) { d_arg1 = arg1; }
- void set_arg2(double arg2) { d_arg2 = arg2; }
-
- unsigned char *msg() const { return d_msg_start; }
- size_t length() const { return d_msg_end - d_msg_start; }
- std::string to_string() const;
-
-};
-
-GR_RUNTIME_API long gr_message_ncurrently_allocated ();
-
-#endif /* INCLUDED_GR_MESSAGE_H */
diff --git a/gnuradio-runtime/include/gr_misc.h b/gnuradio-runtime/include/gr_misc.h
deleted file mode 100644
index 182ae87de6..0000000000
--- a/gnuradio-runtime/include/gr_misc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MISC_H
-#define INCLUDED_GR_MISC_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-
-GR_RUNTIME_API unsigned int
-gr_rounduppow2(unsigned int n);
-
-// FIXME should be template
-GR_RUNTIME_API void gr_zero_vector(std::vector<float> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<double> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<int> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<gr_complex> &v);
-
-
-#endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-runtime/include/gr_msg_accepter.h b/gnuradio-runtime/include/gr_msg_accepter.h
deleted file mode 100644
index e7feac4686..0000000000
--- a/gnuradio-runtime/include/gr_msg_accepter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GR_MSG_ACCEPTER_H
-#define INCLUDED_GR_MSG_ACCEPTER_H
-
-#include <gr_runtime_api.h>
-#include <messages/msg_accepter.h>
-#include <pmt/pmt.h>
-
-/*!
- * \brief Accepts messages and inserts them into a message queue, then notifies
- * subclass gr_basic_block there is a message pending.
- */
-class GR_RUNTIME_API gr_msg_accepter : public gr::messages::msg_accepter
-{
-public:
- gr_msg_accepter();
- ~gr_msg_accepter();
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg);
-
-};
-
-#endif /* INCLUDED_GR_MSG_ACCEPTER_H */
diff --git a/gnuradio-runtime/include/gr_msg_handler.h b/gnuradio-runtime/include/gr_msg_handler.h
deleted file mode 100644
index 06d583a38b..0000000000
--- a/gnuradio-runtime/include/gr_msg_handler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_MSG_HANDLER_H
-#define INCLUDED_GR_MSG_HANDLER_H
-
-#include <gr_runtime_api.h>
-#include <gr_message.h>
-
-class gr_msg_handler;
-typedef boost::shared_ptr<gr_msg_handler> gr_msg_handler_sptr;
-
-/*!
- * \brief abstract class of message handlers
- * \ingroup base
- */
-class GR_RUNTIME_API gr_msg_handler {
-public:
- virtual ~gr_msg_handler ();
-
- //! handle \p msg
- virtual void handle (gr_message_sptr msg) = 0;
-};
-
-#endif /* INCLUDED_GR_MSG_HANDLER_H */
diff --git a/gnuradio-runtime/include/gr_msg_queue.h b/gnuradio-runtime/include/gr_msg_queue.h
deleted file mode 100644
index ac85729c81..0000000000
--- a/gnuradio-runtime/include/gr_msg_queue.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_MSG_QUEUE_H
-#define INCLUDED_GR_MSG_QUEUE_H
-
-#include <gr_runtime_api.h>
-#include <gr_msg_handler.h>
-#include <thread/thread.h>
-
-class gr_msg_queue;
-typedef boost::shared_ptr<gr_msg_queue> gr_msg_queue_sptr;
-
-GR_RUNTIME_API gr_msg_queue_sptr gr_make_msg_queue(unsigned int limit=0);
-
-/*!
- * \brief thread-safe message queue
- * \ingroup misc
- */
-class GR_RUNTIME_API gr_msg_queue : public gr_msg_handler {
-
- gr::thread::mutex d_mutex;
- gr::thread::condition_variable d_not_empty;
- gr::thread::condition_variable d_not_full;
- gr_message_sptr d_head;
- gr_message_sptr d_tail;
- unsigned int d_count; // # of messages in queue.
- unsigned int d_limit; // max # of messages in queue. 0 -> unbounded
-
-public:
- gr_msg_queue(unsigned int limit);
- ~gr_msg_queue();
-
- //! Generic msg_handler method: insert the message.
- void handle(gr_message_sptr msg) { insert_tail (msg); }
-
- /*!
- * \brief Insert message at tail of queue.
- * \param msg message
- *
- * Block if queue if full.
- */
- void insert_tail(gr_message_sptr msg);
-
- /*!
- * \brief Delete message from head of queue and return it.
- * Block if no message is available.
- */
- gr_message_sptr delete_head();
-
- /*!
- * \brief If there's a message in the q, delete it and return it.
- * If no message is available, return 0.
- */
- gr_message_sptr delete_head_nowait();
-
- //! Delete all messages from the queue
- void flush();
-
- //! is the queue empty?
- bool empty_p() const { return d_count == 0; }
-
- //! is the queue full?
- bool full_p() const { return d_limit != 0 && d_count >= d_limit; }
-
- //! return number of messages in queue
- unsigned int count() const { return d_count; }
-
- //! return limit on number of message in queue. 0 -> unbounded
- unsigned int limit() const { return d_limit; }
-
-};
-
-#endif /* INCLUDED_GR_MSG_QUEUE_H */
diff --git a/gnuradio-runtime/include/gr_nco.h b/gnuradio-runtime/include/gr_nco.h
deleted file mode 100644
index fb51106aab..0000000000
--- a/gnuradio-runtime/include/gr_nco.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _GR_NCO_H_
-#define _GR_NCO_H_
-
-
-#include <vector>
-#include <gr_sincos.h>
-#include <cmath>
-#include <gr_complex.h>
-
-/*!
- * \brief base class template for Numerically Controlled Oscillator (NCO)
- * \ingroup misc
- */
-
-
-//FIXME Eventually generalize this to fixed point
-
-template<class o_type, class i_type>
-class gr_nco {
-public:
- gr_nco () : phase (0), phase_inc(0) {}
-
- virtual ~gr_nco () {}
-
- // radians
- void set_phase (double angle) {
- phase = angle;
- }
-
- void adjust_phase (double delta_phase) {
- phase += delta_phase;
- }
-
-
- // angle_rate is in radians / step
- void set_freq (double angle_rate){
- phase_inc = angle_rate;
- }
-
- // angle_rate is a delta in radians / step
- void adjust_freq (double delta_angle_rate)
- {
- phase_inc += delta_angle_rate;
- }
-
- // increment current phase angle
-
- void step ()
- {
- phase += phase_inc;
- if (fabs (phase) > M_PI){
-
- while (phase > M_PI)
- phase -= 2*M_PI;
-
- while (phase < -M_PI)
- phase += 2*M_PI;
- }
- }
-
- void step (int n)
- {
- phase += phase_inc * n;
- if (fabs (phase) > M_PI){
-
- while (phase > M_PI)
- phase -= 2*M_PI;
-
- while (phase < -M_PI)
- phase += 2*M_PI;
- }
- }
-
- // units are radians / step
- double get_phase () const { return phase; }
- double get_freq () const { return phase_inc; }
-
- // compute sin and cos for current phase angle
- void sincos (float *sinx, float *cosx) const;
-
- // compute cos or sin for current phase angle
- float cos () const { return std::cos (phase); }
- float sin () const { return std::sin (phase); }
-
- // compute a block at a time
- void sin (float *output, int noutput_items, double ampl = 1.0);
- void cos (float *output, int noutput_items, double ampl = 1.0);
- void sincos (gr_complex *output, int noutput_items, double ampl = 1.0);
- void sin (short *output, int noutput_items, double ampl = 1.0);
- void cos (short *output, int noutput_items, double ampl = 1.0);
- void sin (int *output, int noutput_items, double ampl = 1.0);
- void cos (int *output, int noutput_items, double ampl = 1.0);
-
-protected:
- double phase;
- double phase_inc;
-};
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::sincos (float *sinx, float *cosx) const
-{
- gr_sincosf (phase, sinx, cosx);
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::sin (float *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (float)(sin () * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::cos (float *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (float)(cos () * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::sin (short *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (short)(sin() * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::cos (short *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (short)(cos () * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::sin (int *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (int)(sin () * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::cos (int *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = (int)(cos () * ampl);
- step ();
- }
-}
-
-template<class o_type, class i_type>
-void
-gr_nco<o_type,i_type>::sincos (gr_complex *output, int noutput_items, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- float cosx, sinx;
- sincos (&sinx, &cosx);
- output[i] = gr_complex(cosx * ampl, sinx * ampl);
- step ();
- }
-}
-#endif /* _NCO_H_ */
diff --git a/gnuradio-runtime/include/gr_preferences.h b/gnuradio-runtime/include/gr_preferences.h
deleted file mode 100644
index df5aecacba..0000000000
--- a/gnuradio-runtime/include/gr_preferences.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_PREFERENCES_H_
-#define _GR_PREFERENCES_H_
-
-#include <gr_runtime_api.h>
-
-class GR_RUNTIME_API gr_preferences {
- public:
- static const char *get (const char *key);
- static void set (const char *key, const char *value);
-};
-
-#endif /* _GR_PREFERENCES_H_ */
\ No newline at end of file
diff --git a/gnuradio-runtime/include/gr_prefs.h b/gnuradio-runtime/include/gr_prefs.h
deleted file mode 100644
index 0f82c46fae..0000000000
--- a/gnuradio-runtime/include/gr_prefs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_PREFS_H
-#define INCLUDED_GR_PREFS_H
-
-#include <gr_runtime_api.h>
-#include <string>
-#include <map>
-#include <thread/thread.h>
-
-typedef std::map< std::string, std::map<std::string, std::string> > gr_config_map_t;
-typedef std::map< std::string, std::map<std::string, std::string> >::iterator gr_config_map_itr;
-typedef std::map<std::string, std::string> gr_config_map_elem_t;
-typedef std::map<std::string, std::string>::iterator gr_config_map_elem_itr;
-
-/*!
- * \brief Base class for representing user preferences a la windows INI files.
- * \ingroup misc
- *
- * The real implementation is in Python, and is accessable from C++
- * via the magic of SWIG directors.
- */
-
-class GR_RUNTIME_API gr_prefs
-{
-public:
- static gr_prefs *singleton();
- static void set_singleton(gr_prefs *p);
-
- gr_prefs();
- virtual ~gr_prefs();
-
- /*!
- * \brief Returns the configuration options as a string.
- */
- std::string to_string();
-
- /*!
- * \brief Saves the configuration settings to ${HOME}/.gnuradio/config.conf.
- *
- * WARNING: this will overwrite your current config.conf file.
- */
- void save();
-
- /*!
- * \brief Does \p section exist?
- */
- virtual bool has_section(const std::string §ion);
-
- /*!
- * \brief Does \p option exist?
- */
- virtual bool has_option(const std::string §ion, const std::string &option);
-
- /*!
- * \brief If option exists return associated value; else default_val.
- */
- virtual const std::string get_string(const std::string §ion,
- const std::string &option,
- const std::string &default_val);
-
- /*!
- * \brief Set or add a string \p option to \p section with value \p val.
- */
- virtual void set_string(const std::string §ion,
- const std::string &option,
- const std::string &val);
-
- /*!
- * \brief If option exists and value can be converted to bool, return it; else default_val.
- */
- virtual bool get_bool(const std::string §ion,
- const std::string &option,
- bool default_val);
-
- /*!
- * \brief Set or add a bool \p option to \p section with value \p val.
- */
- virtual void set_bool(const std::string §ion,
- const std::string &option,
- bool val);
-
- /*!
- * \brief If option exists and value can be converted to long, return it; else default_val.
- */
- virtual long get_long(const std::string §ion,
- const std::string &option,
- long default_val);
-
- /*!
- * \brief Set or add a long \p option to \p section with value \p val.
- */
- virtual void set_long(const std::string §ion,
- const std::string &option,
- long val);
-
- /*!
- * \brief If option exists and value can be converted to double, return it; else default_val.
- */
- virtual double get_double(const std::string §ion,
- const std::string &option,
- double default_val);
-
- /*!
- * \brief Set or add a double \p option to \p section with value \p val.
- */
- virtual void set_double(const std::string §ion,
- const std::string &option,
- double val);
-
- protected:
- virtual std::vector<std::string> _sys_prefs_filenames();
- virtual void _read_files();
- virtual void _convert_to_map(const std::string &conf);
- virtual char * option_to_env(std::string section, std::string option);
-
- private:
- gr::thread::mutex d_mutex;
- gr_config_map_t d_config_map;
-};
-
-
-#endif /* INCLUDED_GR_PREFS_H */
diff --git a/gnuradio-runtime/include/gr_py_feval.h b/gnuradio-runtime/include/gr_py_feval.h
deleted file mode 100644
index f2f6c801a8..0000000000
--- a/gnuradio-runtime/include/gr_py_feval.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <pmt/pmt.h>
-
-class gr_py_feval_dd : public gr_feval_dd
-{
- public:
- double calleval(double x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval_cc : public gr_feval_cc
-{
- public:
- gr_complex calleval(gr_complex x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval_ll : public gr_feval_ll
-{
- public:
- long calleval(long x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval : public gr_feval
-{
- public:
- void calleval()
- {
- ensure_py_gil_state _lock;
- eval();
- }
-};
-
-class gr_py_feval_p : public gr_feval_p
-{
- public:
- void calleval(pmt::pmt_t x)
- {
- ensure_py_gil_state _lock;
- eval(x);
- }
-};
diff --git a/gnuradio-runtime/include/gr_random.h b/gnuradio-runtime/include/gr_random.h
deleted file mode 100644
index 783c05f920..0000000000
--- a/gnuradio-runtime/include/gr_random.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_RANDOM_H
-#define INCLUDED_GR_RANDOM_H
-
-#include <gr_runtime_api.h>
-#include <gr_complex.h>
-
-/*!
- * \brief pseudo random number generator
- * \ingroup math_blk
- */
-class GR_RUNTIME_API gr_random {
-protected:
- static const int NTAB = 32;
- long d_seed;
- long d_iy;
- long d_iv[NTAB];
- int d_iset;
- float d_gset;
-
-
-public:
- gr_random (long seed=3021);
-
- void reseed (long seed);
-
- /*!
- * \brief uniform random deviate in the range [0.0, 1.0)
- */
- float ran1 ();
-
- /*!
- * \brief normally distributed deviate with zero mean and variance 1
- */
- float gasdev ();
-
- float laplacian ();
- float impulse (float factor);
- float rayleigh ();
- gr_complex rayleigh_complex ();
-};
-
-#endif /* INCLUDED_GR_RANDOM_H */
-
diff --git a/gnuradio-runtime/include/gr_realtime.h b/gnuradio-runtime/include/gr_realtime.h
deleted file mode 100644
index a1e5af69c4..0000000000
--- a/gnuradio-runtime/include/gr_realtime.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_REALTIME_H
-#define INCLUDED_GR_REALTIME_H
-
-#include <gr_runtime_api.h>
-#include <realtime.h>
-
-typedef gr::rt_status_t gr_rt_status_t;
-
-/*!
- * \brief If possible, enable high-priority "real time" scheduling.
- * \ingroup misc
- */
-GR_RUNTIME_API gr_rt_status_t gr_enable_realtime_scheduling();
-
-#endif /* INCLUDED_GR_REALTIME_H */
diff --git a/gnuradio-runtime/include/gr_runtime_api.h b/gnuradio-runtime/include/gr_runtime_api.h
deleted file mode 100644
index 02ef9ccdcd..0000000000
--- a/gnuradio-runtime/include/gr_runtime_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_RUNTIME_API_H
-#define INCLUDED_GR_RUNTIME_API_H
-
-#include <attributes.h>
-
-#ifdef gnuradio_runtime_EXPORTS
-# define GR_RUNTIME_API __GR_ATTR_EXPORT
-#else
-# define GR_RUNTIME_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_GR_RUNTIME_API_H */
diff --git a/gnuradio-runtime/include/gr_runtime_types.h b/gnuradio-runtime/include/gr_runtime_types.h
deleted file mode 100644
index 9af745b3fa..0000000000
--- a/gnuradio-runtime/include/gr_runtime_types.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_RUNTIME_TYPES_H
-#define INCLUDED_GR_RUNTIME_TYPES_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-
-/*
- * typedefs for smart pointers we use throughout the runtime system
- */
-
-class gr_basic_block;
-class gr_block;
-class gr_block_detail;
-class gr_hier_block2;
-class gr_io_signature;
-class gr_buffer;
-class gr_buffer_reader;
-class gr_flowgraph;
-class gr_flat_flowgraph;
-class gr_top_block;
-class gr_top_block_detail;
-
-typedef boost::shared_ptr<gr_basic_block> gr_basic_block_sptr;
-typedef boost::shared_ptr<gr_block> gr_block_sptr;
-typedef boost::shared_ptr<gr_block_detail> gr_block_detail_sptr;
-typedef boost::shared_ptr<gr_hier_block2> gr_hier_block2_sptr;
-typedef boost::shared_ptr<gr_io_signature> gr_io_signature_sptr;
-typedef boost::shared_ptr<gr_buffer> gr_buffer_sptr;
-typedef boost::shared_ptr<gr_buffer_reader> gr_buffer_reader_sptr;
-typedef boost::shared_ptr<gr_flowgraph> gr_flowgraph_sptr;
-typedef boost::shared_ptr<gr_flat_flowgraph> gr_flat_flowgraph_sptr;
-typedef boost::shared_ptr<gr_top_block> gr_top_block_sptr;
-
-#endif /* INCLUDED_GR_RUNTIME_TYPES_H */
diff --git a/gnuradio-runtime/include/gr_select_handler.h b/gnuradio-runtime/include/gr_select_handler.h
deleted file mode 100644
index ae4b9dfdb1..0000000000
--- a/gnuradio-runtime/include/gr_select_handler.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SELECT_HANDLER_H
-#define INCLUDED_GR_SELECT_HANDLER_H
-
-#include <gr_runtime_api.h>
-#include <boost/shared_ptr.hpp>
-
-class gr_select_handler;
-typedef boost::shared_ptr<gr_select_handler> gr_select_handler_sptr;
-
-
-/*!
- * \brief Abstract handler for select based notification.
- * \ingroup base
- *
- * \sa gr_dispatcher
- */
-class GR_RUNTIME_API gr_select_handler
-{
- int d_fd;
-
-protected:
- gr_select_handler(int file_descriptor);
-
-public:
- virtual ~gr_select_handler();
-
- int fd() const { return d_fd; }
- int file_descriptor() const { return d_fd; }
-
- /*!
- * \brief Called when file_descriptor is readable.
- *
- * Called when the dispatcher detects that file_descriptor can
- * be read without blocking.
- */
- virtual void handle_read() = 0;
-
- /*!
- * \brief Called when file_descriptor is writable.
- *
- * Called when dispatcher detects that file descriptor can be
- * written without blocking.
- */
- virtual void handle_write() = 0;
-
- /*!
- * Called each time around the dispatcher loop to determine whether
- * this handler's file descriptor should be added to the list on which
- * read events can occur. The default method returns true, indicating
- * that by default, all handlers are interested in read events.
- */
- virtual bool readable() { return true; }
-
- /*!
- * Called each time around the dispatcher loop to determine whether
- * this handler's file descriptor should be added to the list on which
- * write events can occur. The default method returns true, indicating
- * that by default, all handlers are interested in write events.
- */
- virtual bool writable() { return true; }
-};
-
-#endif /* INCLUDED_GR_SELECT_HANDLER_H */
diff --git a/gnuradio-runtime/include/gr_sincos.h b/gnuradio-runtime/include/gr_sincos.h
deleted file mode 100644
index 5a182081de..0000000000
--- a/gnuradio-runtime/include/gr_sincos.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SINCOS_H
-#define INCLUDED_GR_SINCOS_H
-
-#include <gr_runtime_api.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// compute sine and cosine at the same time
-
-GR_RUNTIME_API void gr_sincos (double x, double *sin, double *cos);
-GR_RUNTIME_API void gr_sincosf (float x, float *sin, float *cos);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* INCLUDED_GR_SINCOS_H */
diff --git a/gnuradio-runtime/include/gr_single_threaded_scheduler.h b/gnuradio-runtime/include/gr_single_threaded_scheduler.h
deleted file mode 100644
index d538fa3921..0000000000
--- a/gnuradio-runtime/include/gr_single_threaded_scheduler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
-#define INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-#include <fstream>
-
-class gr_single_threaded_scheduler;
-typedef boost::shared_ptr<gr_single_threaded_scheduler> gr_single_threaded_scheduler_sptr;
-
-
-/*!
- * \brief Simple scheduler for stream computations.
- * \ingroup internal
- */
-
-class GR_RUNTIME_API gr_single_threaded_scheduler {
- public:
- ~gr_single_threaded_scheduler ();
-
- void run ();
- void stop ();
-
- private:
- const std::vector<gr_block_sptr> d_blocks;
- volatile bool d_enabled;
- std::ofstream *d_log;
-
- gr_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
-
- void main_loop ();
-
- friend GR_RUNTIME_API gr_single_threaded_scheduler_sptr
- gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
-};
-
-GR_RUNTIME_API gr_single_threaded_scheduler_sptr
-gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
-
-#endif /* INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H */
diff --git a/gnuradio-runtime/include/gr_sptr_magic.h b/gnuradio-runtime/include/gr_sptr_magic.h
deleted file mode 100644
index 2a94806d18..0000000000
--- a/gnuradio-runtime/include/gr_sptr_magic.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_SPTR_MAGIC_H
-#define INCLUDED_GR_SPTR_MAGIC_H
-
-#include <gr_runtime_api.h>
-#include <boost/shared_ptr.hpp>
-
-class gr_basic_block;
-class gr_hier_block2;
-
-namespace gnuradio {
-
- namespace detail {
-
- class GR_RUNTIME_API sptr_magic {
- public:
- static boost::shared_ptr<gr_basic_block> fetch_initial_sptr(gr_basic_block *p);
- static void create_and_stash_initial_sptr(gr_hier_block2 *p);
- };
- };
-
- /*
- * \brief New! Improved! Standard method to get/create the boost::shared_ptr for a block.
- */
- template<class T>
- boost::shared_ptr<T>
- get_initial_sptr(T *p)
- {
- return boost::dynamic_pointer_cast<T, gr_basic_block>(detail::sptr_magic::fetch_initial_sptr(p));
- }
-};
-
-#endif /* INCLUDED_GR_SPTR_MAGIC_H */
diff --git a/gnuradio-runtime/include/gr_sync_block.h b/gnuradio-runtime/include/gr_sync_block.h
deleted file mode 100644
index 01eb646143..0000000000
--- a/gnuradio-runtime/include/gr_sync_block.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SYNC_BLOCK_H
-#define INCLUDED_GR_SYNC_BLOCK_H
-
-#include <gr_runtime_api.h>
-#include <gr_block.h>
-
-/*!
- * \brief synchronous 1:1 input to output with history
- * \ingroup base_blk
- *
- * Override work to provide the signal processing implementation.
- */
-class GR_RUNTIME_API gr_sync_block : public gr_block
-{
- protected:
- gr_sync_block (void){} //allows pure virtual interface sub-classes
- gr_sync_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
- public:
-
- /*!
- * \brief just like gr_block::general_work, only this arranges to call consume_each for you
- *
- * The user must override work to define the signal processing code
- */
- virtual int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items) = 0;
-
-
- // gr_sync_block overrides these to assist work
- void forecast (int noutput_items, gr_vector_int &ninput_items_required);
- int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- int fixed_rate_ninput_to_noutput(int ninput);
- int fixed_rate_noutput_to_ninput(int noutput);
-};
-
-#endif /* INCLUDED_GR_SYNC_BLOCK_H */
diff --git a/gnuradio-runtime/include/gr_sync_decimator.h b/gnuradio-runtime/include/gr_sync_decimator.h
deleted file mode 100644
index c799ee0f7c..0000000000
--- a/gnuradio-runtime/include/gr_sync_decimator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SYNC_DECIMATOR_H
-#define INCLUDED_GR_SYNC_DECIMATOR_H
-
-#include <gr_runtime_api.h>
-#include <gr_sync_block.h>
-
-/*!
- * \brief synchronous N:1 input to output with history
- * \ingroup base_blk
- *
- * Override work to provide the signal processing implementation.
- */
-class GR_RUNTIME_API gr_sync_decimator : public gr_sync_block
-{
- private:
- unsigned d_decimation;
-
- protected:
- gr_sync_decimator (void){} //allows pure virtual interface sub-classes
- gr_sync_decimator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned decimation);
- public:
-
- unsigned decimation () const { return d_decimation; }
- void set_decimation (unsigned decimation)
- {
- d_decimation = decimation;
- set_relative_rate (1.0 / decimation);
- }
-
- // gr_sync_decimator overrides these to assist work
- void forecast (int noutput_items, gr_vector_int &ninput_items_required);
- int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- // derived classes should override work
-
- int fixed_rate_ninput_to_noutput(int ninput);
- int fixed_rate_noutput_to_ninput(int noutput);
-};
-
-
-#endif /* INCLUDED_GR_SYNC_DECIMATOR_H */
diff --git a/gnuradio-runtime/include/gr_sync_interpolator.h b/gnuradio-runtime/include/gr_sync_interpolator.h
deleted file mode 100644
index f219916743..0000000000
--- a/gnuradio-runtime/include/gr_sync_interpolator.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SYNC_INTERPOLATOR_H
-#define INCLUDED_GR_SYNC_INTERPOLATOR_H
-
-#include <gr_runtime_api.h>
-#include <gr_sync_block.h>
-
-/*!
- * \brief synchronous 1:N input to output with history
- * \ingroup base_blk
- *
- * Override work to provide the signal processing implementation.
- */
-class GR_RUNTIME_API gr_sync_interpolator : public gr_sync_block
-{
- private:
- unsigned d_interpolation;
-
- protected:
- gr_sync_interpolator (void){} //allows pure virtual interface sub-classes
- gr_sync_interpolator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned interpolation);
- public:
-
- unsigned interpolation () const { return d_interpolation; }
- void set_interpolation (unsigned interpolation)
- {
- d_interpolation = interpolation;
- set_relative_rate (1.0 * interpolation);
- set_output_multiple (interpolation);
- }
-
- // gr_sync_interpolator overrides these to assist work
- void forecast (int noutput_items, gr_vector_int &ninput_items_required);
- int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- // derived classes should override work
-
- int fixed_rate_ninput_to_noutput(int ninput);
- int fixed_rate_noutput_to_ninput(int noutput);
-};
-
-
-#endif /* INCLUDED_GR_SYNC_INTERPOLATOR_H */
diff --git a/gnuradio-runtime/include/gr_sys_paths.h b/gnuradio-runtime/include/gr_sys_paths.h
deleted file mode 100644
index 6235e0e78f..0000000000
--- a/gnuradio-runtime/include/gr_sys_paths.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_SYS_PATHS_H_
-#define _GR_SYS_PATHS_H_
-
-#include <gr_runtime_api.h>
-
-//! directory to create temporary files
-GR_RUNTIME_API const char *gr_tmp_path();
-
-//! directory to store application data
-GR_RUNTIME_API const char *gr_appdata_path();
-
-#endif /* _GR_SYS_PATHS_H_ */
diff --git a/gnuradio-runtime/include/gr_tagged_stream_block.h b/gnuradio-runtime/include/gr_tagged_stream_block.h
deleted file mode 100644
index 67b144fb66..0000000000
--- a/gnuradio-runtime/include/gr_tagged_stream_block.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TAGGED_STREAM_BLOCK_H
-#define INCLUDED_GR_TAGGED_STREAM_BLOCK_H
-
-#include <gr_runtime_api.h>
-#include <gr_block.h>
-
-/*!
- * \brief Block that operates on PDUs in form of tagged streams
- * \ingroup base_blk
- *
- * Override work to provide the signal processing implementation.
- */
-class GR_RUNTIME_API gr_tagged_stream_block : public gr_block
-{
- private:
- pmt::pmt_t d_length_tag_key; //!< This is the key for the tag that stores the PDU length
- gr_vector_int d_n_input_items_reqd; //!< How many input items do I need to process the next PDU?
-
- protected:
- std::string d_length_tag_key_str;
- gr_tagged_stream_block (void){} //allows pure virtual interface sub-classes
- gr_tagged_stream_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- const std::string &length_tag_key);
-
- /*!
- * \brief Parse all tags on the first sample of a PDU, return the number of items per input
- * and prune the length tags.
- *
- * In most cases, you don't need to override this, unless the number of items read
- * is not directly coded in one single tag.
- *
- * Default behaviour:
- * - Go through all input ports
- * - On every input port, search for the tag with the key specified in \p length_tag_key
- * - Copy that value as an int to the corresponding position in \p n_input_items_reqd
- * - Remove the length tag.
- *
- * \param[in] tags All the tags found on the first item of every input port.
- * \param[out] n_input_items_reqd Number of items which will be read from every input
- */
- virtual void parse_length_tags(
- const std::vector<std::vector<gr_tag_t> > &tags,
- gr_vector_int &n_input_items_reqd
- );
-
- /*!
- * \brief Calculate the number of output items.
- *
- * This is basically the inverse function to forecast(): Given a number of input
- * items, it returns the maximum number of output items.
- *
- * You most likely need to override this function, unless your block is a sync
- * block or integer interpolator/decimator.
- *
- */
- virtual int calculate_output_stream_length(const gr_vector_int &ninput_items);
-
- /*!
- * \brief Set the new length tags on the output stream
- *
- * Default behaviour: Set a tag with key \p length_tag_key and
- * the number of produced items on every output port.
- *
- * For anything else, override this.
- *
- * \param n_produced Length of the new PDU
- * \param n_ports Number of output ports
- */
- virtual void update_length_tags(int n_produced, int n_ports);
-
- public:
-
- /*! \brief Don't override this.
- */
- void /* final */ forecast (int noutput_items, gr_vector_int &ninput_items_required);
-
- /*!
- * - Reads the number of input items from the tags using parse_length_tags()
- * - Checks there's enough data on the input and output buffers
- * - If not, inform the scheduler and do nothing
- * - Calls work() with the exact number of items per PDU
- * - Updates the tags using update_length_tags()
- */
- int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- /*!
- * \brief Just like gr_block::general_work, but makes sure the input is valid
- *
- * The user must override work to define the signal processing code.
- * Check the documentation for general_work() to see what happens here.
- *
- * Like gr_sync_block, this calls consume() for you (it consumes ninput_items[i]
- * items from the i-th port).
- *
- * A note on tag propagation: The PDU length tags are handled by other functions,
- * but all other tags are handled just as in any other \p gr_block. So, most likely,
- * you either set the tag propagation policy to TPP_DONT and handle the tag
- * propagation manually, or you propagate tags through the scheduler and don't
- * do anything here.
- *
- * \param noutput_items The size of the writable output buffer
- * \param ninput_items The exact size of the items on every input for this particular PDU.
- * These will be consumed if a length tag key is provided!
- * \param input_items See gr_block
- * \param output_items See gr_block
- */
- virtual int work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items) = 0;
-
-};
-
-#endif /* INCLUDED_GR_TAGGED_STREAM_BLOCK_H */
-
diff --git a/gnuradio-runtime/include/gr_tags.h b/gnuradio-runtime/include/gr_tags.h
deleted file mode 100644
index 668b2bf248..0000000000
--- a/gnuradio-runtime/include/gr_tags.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TAGS_H
-#define INCLUDED_GR_TAGS_H
-
-#include <gr_runtime_api.h>
-#include <pmt/pmt.h>
-
-struct GR_RUNTIME_API gr_tag_t{
-
- //! the item \p tag occurred at (as a uint64_t)
- uint64_t offset;
-
- //! the key of \p tag (as a PMT symbol)
- pmt::pmt_t key;
-
- //! the value of \p tag (as a PMT)
- pmt::pmt_t value;
-
- //! the source ID of \p tag (as a PMT)
- pmt::pmt_t srcid;
-
- //! Comparison function to test which tag, \p x or \p y, came first in time
- static inline bool offset_compare(
- const gr_tag_t &x, const gr_tag_t &y
- ){
- return x.offset < y.offset;
- }
-
- inline bool operator == (const gr_tag_t &t) const
- {
- return (t.key == key) && (t.value == value) && (t.srcid == srcid) && (t.offset == offset);
- }
-};
-
-#endif /*INCLUDED_GR_TAGS_H*/
diff --git a/gnuradio-runtime/include/gr_timer.h b/gnuradio-runtime/include/gr_timer.h
deleted file mode 100644
index 45b663b368..0000000000
--- a/gnuradio-runtime/include/gr_timer.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_TIMER_H
-#define INCLUDED_GR_TIMER_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-
-class gr_timer;
-
-typedef boost::shared_ptr<gr_timer> gr_timer_sptr;
-
-GR_RUNTIME_API typedef void (*gr_timer_hook)(gr_timer *, void *);
-
-/*!
- * \brief create a timeout.
- *
- * \ingroup misc
- * gr_timer_hook is called when timer fires.
- */
-GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
-
-/*!
- * \brief implement timeouts
- */
-class GR_RUNTIME_API gr_timer {
- double d_expiry;
- double d_period;
- gr_timer_hook d_hook;
- void *d_hook_arg;
-
- friend GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
-
- gr_timer (...);
-
-public:
- ~gr_timer ();
-
- //! return absolute current time (seconds since the epoc).
- static double now ();
-
- /*!
- * \brief schedule timer to fire at abs_when
- * \param abs_when absolute time in seconds since the epoc.
- */
- void schedule_at (double abs_when);
-
- /*!
- * \brief schedule timer to fire rel_when seconds from now.
- * \param rel_when relative time in seconds from now.
- */
- void schedule_after (double rel_when); // relative time in seconds
-
- /*!
- * \brief schedule a periodic timeout.
- * \param abs_when absolute time to fire first time
- * \param period time between firings
- */
- void schedule_periodic (double abs_when, double period);
-
- //! cancel timer
- void unschedule ();
-};
-
-#endif /* INCLUDED_GR_TIMER_H */
diff --git a/gnuradio-runtime/include/gr_top_block.h b/gnuradio-runtime/include/gr_top_block.h
deleted file mode 100644
index f523442cd0..0000000000
--- a/gnuradio-runtime/include/gr_top_block.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007-2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TOP_BLOCK_H
-#define INCLUDED_GR_TOP_BLOCK_H
-
-#include <gr_runtime_api.h>
-#include <gr_hier_block2.h>
-
-class gr_top_block_impl;
-
-GR_RUNTIME_API gr_top_block_sptr gr_make_top_block(const std::string &name);
-
-/*!
- *\brief Top-level hierarchical block representing a flowgraph
- * \ingroup container_blk
- *
- */
-class GR_RUNTIME_API gr_top_block : public gr_hier_block2
-{
-private:
- friend GR_RUNTIME_API gr_top_block_sptr gr_make_top_block(const std::string &name);
-
- gr_top_block_impl *d_impl;
-
-protected:
- gr_top_block(const std::string &name);
-
-public:
- ~gr_top_block();
-
- /*!
- * \brief The simple interface to running a flowgraph.
- *
- * Calls start() then wait(). Used to run a flowgraph that will stop
- * on its own, or when another thread will call stop().
- *
- * \param max_noutput_items the maximum number of output items
- * allowed for any block in the flowgraph. This passes through to
- * the start function; see that function for more details.
- */
- void run(int max_noutput_items=100000000);
-
- /*!
- * Start the contained flowgraph. Creates one or more threads to
- * execute the flow graph. Returns to the caller once the threads
- * are created. Calling start() on a top_block that is already
- * started IS an error.
- *
- * \param max_noutput_items the maximum number of output items
- * allowed for any block in the flowgraph; the noutput_items can
- * always be less than this, but this will cap it as a maximum. Use
- * this to adjust the maximum latency a flowgraph can exhibit.
- */
- void start(int max_noutput_items=100000000);
-
- /*!
- * Stop the running flowgraph. Notifies each thread created by the
- * scheduler to shutdown, then returns to caller. Calling stop() on
- * a top_block that is already stopped IS NOT an error.
- */
- void stop();
-
- /*!
- * Wait for a flowgraph to complete. Flowgraphs complete when
- * either (1) all blocks indicate that they are done (typically only
- * when using blocks.file_source, or blocks.head, or (2) after stop() has been
- * called to request shutdown. Calling wait on a top_block that is
- * not running IS NOT an error (wait returns w/o blocking).
- */
- void wait();
-
- /*!
- * Lock a flowgraph in preparation for reconfiguration. When an equal
- * number of calls to lock() and unlock() have occurred, the flowgraph
- * will be reconfigured.
- *
- * N.B. lock() and unlock() may not be called from a flowgraph thread
- * (E.g., gr_block::work method) or deadlock will occur when
- * reconfiguration happens.
- */
- virtual void lock();
-
- /*!
- * Unlock a flowgraph in preparation for reconfiguration. When an equal
- * number of calls to lock() and unlock() have occurred, the flowgraph
- * will be reconfigured.
- *
- * N.B. lock() and unlock() may not be called from a flowgraph thread
- * (E.g., gr_block::work method) or deadlock will occur when
- * reconfiguration happens.
- */
- virtual void unlock();
-
- /*!
- * Returns a string that lists the edge connections in the flattened
- * flowgraph.
- */
- std::string edge_list();
-
- /*!
- * Displays flattened flowgraph edges and block connectivity
- */
- void dump();
-
- //! Get the number of max noutput_items in the flowgraph
- int max_noutput_items();
-
- //! Set the maximum number of noutput_items in the flowgraph
- void set_max_noutput_items(int nmax);
-
- gr_top_block_sptr to_top_block(); // Needed for Python type coercion
-
- void setup_rpc();
-};
-
-inline gr_top_block_sptr cast_to_top_block_sptr(gr_basic_block_sptr block) {
- return boost::dynamic_pointer_cast<gr_top_block, gr_basic_block>(block);
-}
-
-
-#endif /* INCLUDED_GR_TOP_BLOCK_H */
diff --git a/gnuradio-runtime/include/gr_tpb_detail.h b/gnuradio-runtime/include/gr_tpb_detail.h
deleted file mode 100644
index f6f20917c9..0000000000
--- a/gnuradio-runtime/include/gr_tpb_detail.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_TPB_DETAIL_H
-#define INCLUDED_GR_TPB_DETAIL_H
-
-#include <gr_runtime_api.h>
-#include <thread/thread.h>
-#include <deque>
-#include <pmt/pmt.h>
-
-class gr_block_detail;
-
-/*!
- * \brief used by thread-per-block scheduler
- */
-struct GR_RUNTIME_API gr_tpb_detail {
-
- gr::thread::mutex mutex; //< protects all vars
- bool input_changed;
- gr::thread::condition_variable input_cond;
- bool output_changed;
- gr::thread::condition_variable output_cond;
-
-public:
- gr_tpb_detail()
- : input_changed(false), output_changed(false) { }
-
- //! Called by us to tell all our upstream blocks that their output may have changed.
- void notify_upstream(gr_block_detail *d);
-
- //! Called by us to tell all our downstream blocks that their input may have changed.
- void notify_downstream(gr_block_detail *d);
-
- //! Called by us to notify both upstream and downstream
- void notify_neighbors(gr_block_detail *d);
-
- //! Called by pmt msg posters
- void notify_msg(){
- input_cond.notify_one();
- output_cond.notify_one();
- }
-
- //! Called by us
- void clear_changed()
- {
- gr::thread::scoped_lock guard(mutex);
- input_changed = false;
- output_changed = false;
- }
-
-private:
-
- //! Used by notify_downstream
- void set_input_changed()
- {
- gr::thread::scoped_lock guard(mutex);
- input_changed = true;
- input_cond.notify_one();
- }
-
- //! Used by notify_upstream
- void set_output_changed()
- {
- gr::thread::scoped_lock guard(mutex);
- output_changed = true;
- output_cond.notify_one();
- }
-
-};
-
-#endif /* INCLUDED_GR_TPB_DETAIL_H */
diff --git a/gnuradio-runtime/include/gr_types.h b/gnuradio-runtime/include/gr_types.h
deleted file mode 100644
index 47e22469b0..0000000000
--- a/gnuradio-runtime/include/gr_types.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TYPES_H
-#define INCLUDED_GR_TYPES_H
-
-#include <gr_runtime_api.h>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-#include <stddef.h> // size_t
-
-#include <gr_complex.h>
-
-typedef std::vector<int> gr_vector_int;
-typedef std::vector<unsigned int> gr_vector_uint;
-typedef std::vector<float> gr_vector_float;
-typedef std::vector<double> gr_vector_double;
-typedef std::vector<void *> gr_vector_void_star;
-typedef std::vector<const void *> gr_vector_const_void_star;
-
-/*
- * #include <config.h> must be placed beforehand
- * in the source file including gr_types.h for
- * the following to work correctly
- */
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-typedef int16_t gr_int16;
-typedef int32_t gr_int32;
-typedef int64_t gr_int64;
-typedef uint16_t gr_uint16;
-typedef uint32_t gr_uint32;
-typedef uint64_t gr_uint64;
-#else
-/*
- * Note: these defaults may be wrong on 64-bit systems
- */
-typedef short gr_int16;
-typedef int gr_int32;
-typedef long long gr_int64;
-typedef unsigned short gr_uint16;
-typedef unsigned int gr_uint32;
-typedef unsigned long long gr_uint64;
-#endif /* HAVE_STDINT_H */
-
-#endif /* INCLUDED_GR_TYPES_H */
diff --git a/gnuradio-runtime/include/gr_unittests.h b/gnuradio-runtime/include/gr_unittests.h
deleted file mode 100644
index d160ba3354..0000000000
--- a/gnuradio-runtime/include/gr_unittests.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_runtime_api.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-
-static std::string get_unittest_path(const std::string &filename){
- boost::filesystem::path path = boost::filesystem::current_path() / ".unittests";
- if (!boost::filesystem::is_directory(path)) boost::filesystem::create_directory(path);
- return (path / filename).string();
-}
diff --git a/gnuradio-runtime/include/high_res_timer.h b/gnuradio-runtime/include/high_res_timer.h
deleted file mode 100644
index fc7b007c61..0000000000
--- a/gnuradio-runtime/include/high_res_timer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2011,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GNURADIO_HIGH_RES_TIMER_H
-#define INCLUDED_GNURADIO_HIGH_RES_TIMER_H
-
-namespace gr {
-
- //! Typedef for the timer tick count
- typedef signed long long high_res_timer_type;
-
- //! Get the current time in ticks
- high_res_timer_type high_res_timer_now(void);
-
- //! Get the number of ticks per second
- high_res_timer_type high_res_timer_tps(void);
-
- //! Get the tick count at the epoch
- high_res_timer_type high_res_timer_epoch(void);
-
-} /* namespace gr */
-
-////////////////////////////////////////////////////////////////////////
-// Use architecture defines to determine the implementation
-////////////////////////////////////////////////////////////////////////
-#if defined(linux) || defined(__linux) || defined(__linux__)
- #define GNURADIO_HRT_USE_CLOCK_GETTIME
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
- #define GNURADIO_HRT_USE_QUERY_PERFORMANCE_COUNTER
-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
- #define GNURADIO_HRT_USE_MACH_ABSOLUTE_TIME
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define GNURADIO_HRT_USE_CLOCK_GETTIME
-#else
- #define GNURADIO_HRT_USE_MICROSEC_CLOCK
-#endif
-
-////////////////////////////////////////////////////////////////////////
-#ifdef GNURADIO_HRT_USE_CLOCK_GETTIME
- #include <ctime>
-
- inline gr::high_res_timer_type gr::high_res_timer_now(void){
- timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts);
- return ts.tv_sec*high_res_timer_tps() + ts.tv_nsec;
- }
-
- inline gr::high_res_timer_type gr::high_res_timer_tps(void){
- return 1000000000UL;
- }
-#endif /* GNURADIO_HRT_USE_CLOCK_GETTIME */
-
-////////////////////////////////////////////////////////////////////////
-#ifdef GNURADIO_HRT_USE_MACH_ABSOLUTE_TIME
- #include <mach/mach_time.h>
-
- inline gr::high_res_timer_type gr::high_res_timer_now(void){
- return mach_absolute_time();
- }
-
- inline gr::high_res_timer_type gr::high_res_timer_tps(void){
- mach_timebase_info_data_t info;
- mach_timebase_info(&info);
- return gr::high_res_timer_type(info.numer*1000000000UL)/info.denom;
- }
-#endif
-
-////////////////////////////////////////////////////////////////////////
-#ifdef GNURADIO_HRT_USE_QUERY_PERFORMANCE_COUNTER
- #include <Windows.h>
-
- inline gr::high_res_timer_type gr::high_res_timer_now(void){
- LARGE_INTEGER counts;
- QueryPerformanceCounter(&counts);
- return counts.QuadPart;
- }
-
- inline gr::high_res_timer_type gr::high_res_timer_tps(void){
- LARGE_INTEGER freq;
- QueryPerformanceFrequency(&freq);
- return freq.QuadPart;
- }
-#endif
-
-////////////////////////////////////////////////////////////////////////
-#ifdef GNURADIO_HRT_USE_MICROSEC_CLOCK
- #include <boost/date_time/posix_time/posix_time.hpp>
-
- inline gr::high_res_timer_type gr::high_res_timer_now(void){
- static const boost::posix_time::ptime epoch(boost::posix_time::from_time_t(0));
- return (boost::posix_time::microsec_clock::universal_time() - epoch).ticks();
- }
-
- inline gr::high_res_timer_type gr::high_res_timer_tps(void){
- return boost::posix_time::time_duration::ticks_per_second();
- }
-#endif
-
-////////////////////////////////////////////////////////////////////////
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-inline gr::high_res_timer_type gr::high_res_timer_epoch(void){
- static const double hrt_ticks_per_utc_ticks = gr::high_res_timer_tps()/double(boost::posix_time::time_duration::ticks_per_second());
- boost::posix_time::time_duration utc = boost::posix_time::microsec_clock::universal_time() - boost::posix_time::from_time_t(0);
- return gr::high_res_timer_now() - utc.ticks()*hrt_ticks_per_utc_ticks;
-}
-
-#endif /* INCLUDED_GNURADIO_HIGH_RES_TIMER_H */
diff --git a/gnuradio-runtime/include/ice_application_base.h b/gnuradio-runtime/include/ice_application_base.h
deleted file mode 100644
index 64ec615e5c..0000000000
--- a/gnuradio-runtime/include/ice_application_base.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef ICE_APPLICATION_BASE_H
-#define ICE_APPLICATION_BASE_H
-
-#ifdef HAVE_WINDOWS_H
-#include <winsock2.h>
-#include <sys/time.h>
-#endif
-
-#include <gr_runtime_api.h>
-#include <gr_prefs.h>
-#include <Ice/Ice.h>
-#include <boost/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <stdio.h>
-#include <iostream>
-#include <set>
-#include <string>
-#include <stdio.h>
-
-namespace {
- static const unsigned int ICEAPPLICATION_ACTIVATION_TIMEOUT_MS(600);
-};
-
-class GR_RUNTIME_API ice_application_common : public Ice::Application
-{
- public:
- template<typename TserverBase, typename TserverClass> friend class ice_application_base;
- static boost::shared_ptr<ice_application_common> Instance();
- ~ice_application_common() {;}
- static int d_reacquire_attributes;
-
- protected:
- static bool d_main_called;
- static bool d_have_ice_config;
- static std::string d_endpointStr;
- static boost::shared_ptr<boost::thread> d_thread;
- ice_application_common() {;}
- int run(int, char*[]);
-};
-
-template<typename TserverBase, typename TserverClass>
-class ice_application_base
-{
-public:
- boost::shared_ptr<ice_application_common> d_application;
- ice_application_base(TserverClass* _this);
- ~ice_application_base() {;}
-
- static TserverBase* i();
- static const std::vector<std::string> endpoints();
-
-protected:
- bool have_ice_config() { return d_application->d_have_ice_config; }
- void set_endpoint(const std::string& endpoint) { d_application->d_endpointStr = endpoint;}
-
- //this one is the key... overwrite in templated/inherited variants
- virtual TserverBase* i_impl() = 0;
-
- //tools for the i_impl...
- //tell it when it has to resync with the communicator
- virtual bool reacquire_sync();
- virtual void sync_reacquire();
-
- static TserverClass* d_this;
-
- int d_reacquire;
- //static int d_reacquire_attributes;
-
-private:
- void starticeexample();
-
- bool application_started();
-
- int run(int, char*[]);
-
- static void kickoff();
-};
-
-template<typename TserverBase, typename TserverClass>
-TserverClass* ice_application_base<TserverBase, TserverClass>::d_this(0);
-
-//template<typename TserverBase, typename TserverClass>
-//int ice_application_base<TserverBase, TserverClass>::d_reacquire_attributes(0);
-
-template<typename TserverBase, typename TserverClass>
-ice_application_base<TserverBase, TserverClass>::ice_application_base(TserverClass* _this)
- : d_reacquire(0)
-{
- //d_reacquire_attributes = 0;
- d_this = _this;
- d_application = ice_application_common::Instance();
-}
-
-template<typename TserverBase, typename TserverClass>
-void ice_application_base<TserverBase, TserverClass>::starticeexample()
-{
- char* argv[2];
- argv[0] = (char*)"";
-
- std::string conffile = gr_prefs::singleton()->get_string("ControlPort", "config", "");
-
- if(conffile.size() > 0) {
- std::stringstream iceconf;
- ice_application_common::d_have_ice_config = true;
- ice_application_common::d_main_called = true;
- iceconf << conffile;
- d_application->main(0, argv, iceconf.str().c_str());
- }
- else {
- ice_application_common::d_have_ice_config = false;
- ice_application_common::d_main_called = true;
- d_application->main(0, argv);
- }
-}
-
-template<typename TserverBase, typename TserverClass>
-void ice_application_base<TserverBase, TserverClass>::kickoff()
-{
- static bool run_once = false;
-
- //if(!d_this->application_started()) {
- if(!run_once) {
- ++d_this->d_application->d_reacquire_attributes;
-
- ice_application_common::d_thread = boost::shared_ptr<boost::thread>
- (new boost::thread(boost::bind(&ice_application_base::starticeexample, d_this)));
-
- ::timespec timer_ts, rem_ts;
- timer_ts.tv_sec = 0; timer_ts.tv_nsec = ICEAPPLICATION_ACTIVATION_TIMEOUT_MS*1000;
-
- int iter = 0;
- while(!d_this->application_started()) {
- #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
- ::Sleep(timer_ts.tv_nsec / 1000000);
- #else
- ::nanosleep(&timer_ts, &rem_ts);
- #endif
- if(!d_this->application_started())
- std::cout << "@";
- if(iter++ > 100) {
- std::cout << "ice_application_base::kickoff(), timeout waiting to get communicator() d_application->main() might have failed?!" << std::endl;;
- break;
- }
- }
-
- run_once = true;
- }
-
- return;
-}
-
-
-template<typename TserverBase, typename TserverClass>
-bool ice_application_base<TserverBase, TserverClass>::reacquire_sync()
-{
- return (d_this->d_reacquire != d_application->d_reacquire_attributes);
-}
-
-template<typename TserverBase, typename TserverClass>
-void ice_application_base<TserverBase, TserverClass>::sync_reacquire()
-{
- d_this->d_reacquire = d_application->d_reacquire_attributes;
-}
-
-
-template<typename TserverBase, typename TserverClass>
-const std::vector<std::string> ice_application_base<TserverBase, TserverClass>::endpoints()
-{
- std::vector<std::string> ep; ep.push_back(d_this->d_application->d_endpointStr); return ep;
-}
-
-template<typename TserverBase, typename TserverClass>
-TserverBase* ice_application_base<TserverBase, TserverClass>::i()
-{
- //printf("indacall\n");
-
- assert(d_this != 0);
- if(!d_this->application_started()) {
- //printf("anotherkickoff\n");
- kickoff();
- }
- //printf("donekickedoff\n");
-
- /*else if(!d_proxy) {
- d_proxy = d_this->i_impl();
- assert(d_proxy != 0);
- }*/
-
- return d_this->i_impl();
-}
-
-/*template<typename TserverBase, typename TserverClass>
- int ice_application_base<TserverBase, TserverClass>::run(int argc, char* argv[]) {
- int implreturn(run_impl(argc, argv));
- ice_application_base<TserverBase, TserverClass>::communicator()->waitForShutdown();
- return implreturn;
- }*/
-
-template<typename TserverBase, typename TImplClass>
-bool ice_application_base<TserverBase, TImplClass>::application_started()
-{
- return ice_application_base<TserverBase, TImplClass>::d_this->d_application->communicator();
-}
-
-/*template<typename TserverBase, typename TImplClass>
-int ice_application_base<TserverBase, TImplClass>::run_impl(int argc, char* argv[]) { return EXIT_SUCCESS; }
-*/
-
-#endif
diff --git a/gnuradio-runtime/include/ice_server_template.h b/gnuradio-runtime/include/ice_server_template.h
deleted file mode 100644
index ff411b7f41..0000000000
--- a/gnuradio-runtime/include/ice_server_template.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef ICE_SERVER_TEMPLATE_H
-#define ICE_SERVER_TEMPLATE_H
-
-#include <rpcserver_ice.h>
-#include <ice_application_base.h>
-#include <iostream>
-
-template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
-class ice_server_template : public ice_application_base<TserverBase, TImplClass>
-{
-public:
- ice_server_template(TImplClass* _this,
- const std::string& contolPortName,
- const std::string& endpointName);
- ~ice_server_template();
-
-protected:
- //virtual bool application_started();
- TserverBase* i_impl();
- friend class ice_application_base<TserverBase, TImplClass>;
-
-private:
- //virtual int run_impl(int, char*[]);
- Ice::ObjectAdapterPtr d_adapter;
- TserverBase* d_iceserver;
- const std::string d_contolPortName, d_endpointName;
-};
-
-template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
-ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::ice_server_template
- (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName)
- : ice_application_base<TserverBase, TImplClass>(_this),
- d_iceserver(0),
- d_contolPortName(controlPortName),
- d_endpointName(endpointName)
-{;}
-
-template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
-ice_server_template<TserverBase, TserverClass,TImplClass, TIceClass>::~ice_server_template()
-{
- if(d_adapter) {
- d_adapter->deactivate();
- delete(d_iceserver);
- d_adapter = 0;
- }
-}
-
-template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
-TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::i_impl()
-{
- if(ice_application_base<TserverBase, TImplClass>::d_this->reacquire_sync()) {
- d_adapter = (ice_application_base<TserverBase, TImplClass>::d_this->have_ice_config()) ?
- ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapter(d_contolPortName) :
- ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapterWithEndpoints(d_contolPortName,"tcp -h *");
-
- TserverClass* server_ice(new TserverClass());
- TIceClass obj(server_ice);
-
- Ice::Identity id(ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->stringToIdentity(d_endpointName));
- d_adapter->add(obj, id);
- d_adapter->activate();
- ice_application_base<TserverBase, TImplClass>::d_this->set_endpoint(ice_application_common::communicator()->proxyToString(d_adapter->createDirectProxy(id)));
-
- std::cout << std::endl << "Ice Radio Endpoint: "
- << ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::endpoints()[0]
- << std::endl;
-
- d_iceserver = (TserverBase*) server_ice;
- ice_application_base<TserverBase, TImplClass>::d_this->sync_reacquire();
- }
-
- return d_iceserver;
-}
-
-#endif /* ICE_SERVER_TEMPLATE_H */
diff --git a/gnuradio-runtime/include/messages/CMakeLists.txt b/gnuradio-runtime/include/messages/CMakeLists.txt
deleted file mode 100644
index f79f2bd24f..0000000000
--- a/gnuradio-runtime/include/messages/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2013 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- msg_accepter.h
- msg_accepter_msgq.h
- msg_passing.h
- msg_producer.h
- msg_queue.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio/messages
- COMPONENT "runtime_devel"
-)
diff --git a/gnuradio-runtime/include/messages/msg_accepter.h b/gnuradio-runtime/include/messages/msg_accepter.h
deleted file mode 100644
index d3e89daf74..0000000000
--- a/gnuradio-runtime/include/messages/msg_accepter.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_MSG_ACCEPTER_H
-#define INCLUDED_MSG_ACCEPTER_H
-
-#include <gr_runtime_api.h>
-#include <pmt/pmt.h>
-#include <boost/shared_ptr.hpp>
-
-namespace gr {
- namespace messages {
-
- /*!
- * \brief Virtual base class that accepts messages
- */
- class GR_RUNTIME_API msg_accepter
- {
- public:
- msg_accepter() {};
- virtual ~msg_accepter();
-
- /*!
- * \brief send \p msg to \p msg_accepter on port \p which_port
- *
- * Sending a message is an asynchronous operation. The \p post
- * call will not wait for the message either to arrive at the
- * destination or to be received.
- */
- virtual void post(pmt::pmt_t which_port, pmt::pmt_t msg) = 0;
- };
-
- typedef boost::shared_ptr<msg_accepter> msg_accepter_sptr;
-
- } /* namespace messages */
-} /* namespace gr */
-
-#endif /* INCLUDED_MSG_ACCEPTER_H */
diff --git a/gnuradio-runtime/include/messages/msg_accepter_msgq.h b/gnuradio-runtime/include/messages/msg_accepter_msgq.h
deleted file mode 100644
index 5d1d4f7e27..0000000000
--- a/gnuradio-runtime/include/messages/msg_accepter_msgq.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_MSG_ACCEPTER_MSGQ_H
-#define INCLUDED_MSG_ACCEPTER_MSGQ_H
-
-#include <gr_runtime_api.h>
-#include <messages/msg_accepter.h>
-#include <messages/msg_queue.h>
-
-namespace gr {
- namespace messages {
-
- /*!
- * \brief Concrete class that accepts messages and inserts them
- * into a message queue.
- */
- class GR_RUNTIME_API msg_accepter_msgq : public msg_accepter
- {
- protected:
- msg_queue_sptr d_msg_queue;
-
- public:
- msg_accepter_msgq(msg_queue_sptr msgq);
- ~msg_accepter_msgq();
-
- virtual void post(pmt::pmt_t msg);
-
- msg_queue_sptr msg_queue() const { return d_msg_queue; }
- };
-
- } /* namespace messages */
-} /* namespace gr */
-
-#endif /* INCLUDED_MSG_ACCEPTER_MSGQ_H */
diff --git a/gnuradio-runtime/include/messages/msg_passing.h b/gnuradio-runtime/include/messages/msg_passing.h
deleted file mode 100644
index 3bfccda339..0000000000
--- a/gnuradio-runtime/include/messages/msg_passing.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_MSG_PASSING_H
-#define INCLUDED_MSG_PASSING_H
-
-/*!
- * \brief Include this header to use the message passing features
- */
-
-#include <gr_runtime_api.h>
-#include <pmt/pmt.h>
-#include <messages/msg_accepter.h>
-
-namespace gr {
- namespace messages {
-
- /*!
- * \brief send message to msg_accepter
- *
- * \param accepter is the target of the send.
- * \param which_port A pmt symbol describing the port by name.
- * \param msg is the message to send. It's usually a pmt tuple.
- *
- * Sending a message is an asynchronous operation. The \p send
- * call will not wait for the message either to arrive at the
- * destination or to be received.
- *
- * \returns msg
- */
- static inline pmt::pmt_t
- send(msg_accepter_sptr accepter, const pmt::pmt_t &which_port,
- const pmt::pmt_t &msg)
- {
- accepter->post(which_port, msg);
- return msg;
- }
-
- /*!
- * \brief send message to msg_accepter
- *
- * \param accepter is the target of the send.
- * \param which_port A pmt symbol describing the port by name.
- * \param msg is the message to send. It's usually a pmt tuple.
- *
- * Sending a message is an asynchronous operation. The \p send
- * call will not wait for the message either to arrive at the
- * destination or to be received.
- *
- * \returns msg
- */
- static inline pmt::pmt_t
- send(msg_accepter *accepter, const pmt::pmt_t &which_port,
- const pmt::pmt_t &msg)
- {
- accepter->post(which_port, msg);
- return msg;
- }
-
- /*!
- * \brief send message to msg_accepter
- *
- * \param accepter is the target of the send.
- * \param which_port A pmt symbol describing the port by name.
- * \param msg is the message to send. It's usually a pmt tuple.
- *
- * Sending a message is an asynchronous operation. The \p send
- * call will not wait for the message either to arrive at the
- * destination or to be received.
- *
- * \returns msg
- */
- static inline pmt::pmt_t
- send(msg_accepter &accepter, const pmt::pmt_t &which_port,
- const pmt::pmt_t &msg)
- {
- accepter.post(which_port, msg);
- return msg;
- }
-
- /*!
- * \brief send message to msg_accepter
- *
- * \param accepter is the target of the send.
- * aprecond: pmt::is_msg_accepter(accepter)
- * \param which_port A pmt symbol describing the port by name.
- * \param msg is the message to send. It's usually a pmt tuple.
- *
- * Sending a message is an asynchronous operation. The \p send
- * call will not wait for the message either to arrive at the
- * destination or to be received.
- *
- * \returns msg
- */
- static inline pmt::pmt_t
- send(pmt::pmt_t accepter, const pmt::pmt_t &which_port,
- const pmt::pmt_t &msg)
- {
- return send(pmt::msg_accepter_ref(accepter), which_port, msg);
- }
-
- } /* namespace messages */
-} /* namespace gr */
-
-#endif /* INCLUDED_MSG_PASSING_H */
diff --git a/gnuradio-runtime/include/messages/msg_producer.h b/gnuradio-runtime/include/messages/msg_producer.h
deleted file mode 100644
index 3167fc442a..0000000000
--- a/gnuradio-runtime/include/messages/msg_producer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_MSG_PRODUCER_H
-#define INCLUDED_MSG_PRODUCER_H
-
-#include <gr_runtime_api.h>
-#include <pmt/pmt.h>
-#include <boost/shared_ptr.hpp>
-
-namespace gr {
- namespace messages {
-
- /*!
- * \brief Virtual base class that produces messages
- */
- class GR_RUNTIME_API msg_producer
- {
- public:
- msg_producer() {}
- virtual ~msg_producer();
-
- /*!
- * \brief send \p msg to \p msg_producer
- */
- virtual pmt::pmt_t retrieve() = 0;
- };
-
- typedef boost::shared_ptr<msg_producer> msg_producer_sptr;
-
- } /* namespace messages */
-} /* namespace gr */
-
-#endif /* INCLUDED_MSG_PRODUCER_H */
diff --git a/gnuradio-runtime/include/messages/msg_queue.h b/gnuradio-runtime/include/messages/msg_queue.h
deleted file mode 100644
index 81531afcdf..0000000000
--- a/gnuradio-runtime/include/messages/msg_queue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_MSG_QUEUE_H
-#define INCLUDED_MSG_QUEUE_H
-
-#include <gr_runtime_api.h>
-#include <thread/thread.h>
-#include <pmt/pmt.h>
-#include <deque>
-
-namespace gr {
- namespace messages {
-
- class msg_queue;
- typedef boost::shared_ptr<msg_queue> msg_queue_sptr;
-
- msg_queue_sptr make_msg_queue(unsigned int limit=0);
-
- /*!
- * \brief thread-safe message queue
- */
- class GR_RUNTIME_API msg_queue
- {
- private:
- gr::thread::mutex d_mutex;
- gr::thread::condition_variable d_not_empty;
- gr::thread::condition_variable d_not_full;
- unsigned int d_limit; // max # of messages in queue. 0 -> unbounded
-
- std::deque<pmt::pmt_t> d_msgs;
-
- public:
- msg_queue(unsigned int limit);
- ~msg_queue();
-
- /*!
- * \brief Insert message at tail of queue.
- * \param msg message
- *
- * Block if queue if full.
- */
- void insert_tail(pmt::pmt_t msg);
-
- /*!
- * \brief Delete message from head of queue and return it.
- * Block if no message is available.
- */
- pmt::pmt_t delete_head();
-
- /*!
- * \brief If there's a message in the q, delete it and return it.
- * If no message is available, return pmt_t().
- */
- pmt::pmt_t delete_head_nowait();
-
- //! Delete all messages from the queue
- void flush();
-
- //! is the queue empty?
- bool empty_p() const { return d_msgs.empty(); }
-
- //! is the queue full?
- bool full_p() const { return d_limit != 0 && count() >= d_limit; }
-
- //! return number of messages in queue
- unsigned int count() const { return d_msgs.size(); }
-
- //! return limit on number of message in queue. 0 -> unbounded
- unsigned int limit() const { return d_limit; }
- };
-
- } /* namespace messages */
-} /* namespace gr */
-
-#endif /* INCLUDED_MSG_QUEUE_H */
diff --git a/gnuradio-runtime/include/pmt/api.h b/gnuradio-runtime/include/pmt/api.h
index 96f1f8c26b..69674dbd77 100644
--- a/gnuradio-runtime/include/pmt/api.h
+++ b/gnuradio-runtime/include/pmt/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_PMT_API_H
#define INCLUDED_PMT_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_pmt_EXPORTS
# define PMT_API __GR_ATTR_EXPORT
diff --git a/gnuradio-runtime/include/pmt/pmt_sugar.h b/gnuradio-runtime/include/pmt/pmt_sugar.h
index 09c9a5e3e4..870b81902e 100644
--- a/gnuradio-runtime/include/pmt/pmt_sugar.h
+++ b/gnuradio-runtime/include/pmt/pmt_sugar.h
@@ -27,7 +27,7 @@
* shorthand for making pmt objects
*/
-#include <messages/msg_accepter.h>
+#include <gnuradio/messages/msg_accepter.h>
namespace pmt {
diff --git a/gnuradio-runtime/include/pycallback_object.h b/gnuradio-runtime/include/pycallback_object.h
deleted file mode 100644
index 23782a42be..0000000000
--- a/gnuradio-runtime/include/pycallback_object.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <iostream>
-#include <rpcregisterhelpers.h>
-#include <ice_application_base.h>
-#include <IcePy_Communicator.h>
-#include <pythread.h>
-#include <boost/format.hpp>
-
-enum pyport_t {
- PYPORT_STRING,
- PYPORT_FLOAT
-};
-
-class Instance
-{
-public:
- static boost::shared_ptr<ice_application_common> get_application()
- {
- return ice_application_common::Instance();
- }
- static Ice::CommunicatorPtr get_swig_communicator()
- {
- return get_application()->communicator();
- }
-};
-
-int pycallback_object_count = 500;
-
-// a simple to-PMT converter template class-function
-template <class myType> class pmt_assist
-{
-public:
- static pmt::pmt_t make(myType _val)
- {
- return pmt::mp(_val);
- }
-};
-
-/* template specializations for vectors that cant use pmt::mp() */
-template<>
-pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val)
-{
- return pmt::init_f32vector(_val.size(), &_val[0]);
-}
-
-template<>
-pmt::pmt_t pmt_assist<std::vector<gr_complex> >::make(std::vector<gr_complex> _val)
-{
- return pmt::init_c32vector(_val.size(), &_val[0]);
-}
-
-template <class myType> class pycallback_object
-{
-public:
- pycallback_object(std::string name, std::string functionbase,
- std::string units, std::string desc,
- myType min, myType max, myType deflt,
- DisplayType dtype) :
- d_callback(NULL),
- d_functionbase(functionbase), d_units(units), d_desc(desc),
- d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype),
- d_name(name), d_id(pycallback_object_count++)
- {
- d_callback = NULL;
- setup_rpc();
- }
-
- void add_rpc_variable(rpcbasic_sptr s)
- {
- d_rpc_vars.push_back(s);
- }
-
- myType get() {
- myType rVal;
- if(d_callback == NULL) {
- printf("WARNING: pycallback_object get() called without py callback set!\n");
- return rVal;
- }
- else {
- // obtain PyGIL
- PyGILState_STATE state = PyGILState_Ensure();
-
- PyObject *func;
- //PyObject *arglist;
- PyObject *result;
-
- func = (PyObject *) d_callback; // Get Python function
- //arglist = Py_BuildValue(""); // Build argument list
- result = PyEval_CallObject(func,NULL); // Call Python
- //result = PyEval_CallObject(func,arglist); // Call Python
- //Py_DECREF(arglist); // Trash arglist
- if(result) { // If no errors, return double
- rVal = pyCast(result);
- }
- Py_XDECREF(result);
-
- // release PyGIL
- PyGILState_Release(state);
- return rVal;
- }
- }
-
- void set_callback(PyObject *cb)
- {
- d_callback = cb;
- }
-
- void setup_rpc()
- {
-#ifdef GR_CTRLPORT
- add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_get<pycallback_object, myType>(
- (boost::format("%s%d") % d_name % d_id).str() , d_functionbase.c_str(),
- this, &pycallback_object::get, pmt_assist<myType>::make(d_min),
- pmt_assist<myType>::make(d_max), pmt_assist<myType>::make(d_deflt),
- d_units.c_str(), d_desc.c_str(), RPC_PRIVLVL_MIN, d_dtype)));
-#endif /* GR_CTRLPORT */
- }
-
-private:
- PyObject* d_callback;
- std::string d_functionbase, d_units, d_desc;
- myType d_min, d_max, d_deflt;
- DisplayType d_dtype;
-
- myType pyCast(PyObject* obj) {
- printf("TYPE NOT IMPLEMENTED!\n");
- assert(0);
- };
- std::vector<boost::any> d_rpc_vars; // container for all RPC variables
- std::string d_name;
- int d_id;
-
-};
-
-
-// template specialization conversion functions
-// get data out of the PyObject and into the real world
-template<>
-std::string pycallback_object<std::string>::pyCast(PyObject* obj)
-{
- return std::string(PyString_AsString(obj));
-}
-
-template<>
-double pycallback_object<double>::pyCast(PyObject* obj)
-{
- return PyFloat_AsDouble(obj);
-}
-
-template<>
-float pycallback_object<float>::pyCast(PyObject* obj)
-{
- return (float)PyFloat_AsDouble(obj);
-}
-
-template<>
-int pycallback_object<int>::pyCast(PyObject* obj)
-{
- return PyInt_AsLong(obj);
-}
-
-template<>
-std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj)
-{
- int size = PyObject_Size(obj);
- std::vector<float> rval(size);
- for(int i=0; i<size; i++) {
- rval[i] = (float)PyFloat_AsDouble(PyList_GetItem(obj, i));
- }
- return rval;
-}
-
-template<>
-std::vector<gr_complex> pycallback_object<std::vector<gr_complex> >::pyCast(PyObject* obj)
-{
- int size = PyObject_Size(obj);
- std::vector<gr_complex> rval(size);
- for(int i=0; i<size; i++){ rval[i] = \
- gr_complex((float)PyComplex_RealAsDouble(PyList_GetItem(obj, i)),
- (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i)));
- }
- return rval;
-}
-// TODO: add more template specializations as needed!
diff --git a/gnuradio-runtime/include/random.h b/gnuradio-runtime/include/random.h
deleted file mode 100644
index c643c3e422..0000000000
--- a/gnuradio-runtime/include/random.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003, 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _RANDOM_H_
-#define _RANDOM_H_
-
-// While rand(3) specifies RAND_MAX, random(3) says that the output
-// ranges from 0 to 2^31-1 but does not specify a macro to denote
-// this. We define RANDOM_MAX for cleanliness. We must omit the
-// definition for systems that have made the same choice. (Note that
-// random(3) is from 4.2BSD, and not specified by POSIX.)
-
-#ifndef RANDOM_MAX
-static const int RANDOM_MAX = 2147483647; // 2^31-1
-#endif /* RANDOM_MAX */
-
-#include <stdlib.h>
-
-#endif // _RANDOM_H_
diff --git a/gnuradio-runtime/include/realtime.h b/gnuradio-runtime/include/realtime.h
deleted file mode 100644
index 9a51a6ba1d..0000000000
--- a/gnuradio-runtime/include/realtime.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GNURADIO_REALTIME_H
-#define INCLUDED_GNURADIO_REALTIME_H
-
-#include <gr_runtime_api.h>
-#include <stdexcept>
-
-/*!
- * \brief System independent way to ask for realtime scheduling
- *
- * \sa sys_pri.h
- */
-
-namespace gr {
-
- typedef enum {
- RT_OK = 0,
- RT_NOT_IMPLEMENTED,
- RT_NO_PRIVS,
- RT_OTHER_ERROR
- } rt_status_t;
-
-
- enum rt_sched_policy {
- RT_SCHED_RR = 0, // round robin
- RT_SCHED_FIFO = 1, // first in first out
- };
-
- /*
- * Define the range for our virtual priorities (don't change these)
- *
- * Processes (or threads) with numerically higher priority values
- * are scheduled before processes with numerically lower priority
- * values. Thus, the value returned by rt_priority_max() will be
- * greater than the value returned by rt_priority_min().
- */
- static inline int rt_priority_min() { return 0; }
- static inline int rt_priority_max() { return 15; }
- static inline int rt_priority_default() { return 1; }
-
- struct GR_RUNTIME_API rt_sched_param {
- int priority;
- rt_sched_policy policy;
-
- rt_sched_param()
- : priority(rt_priority_default()), policy(RT_SCHED_RR){}
-
- rt_sched_param(int priority_, rt_sched_policy policy_ = RT_SCHED_RR)
- {
- if (priority_ < rt_priority_min() || priority_ > rt_priority_max())
- throw std::invalid_argument("rt_sched_param: priority out of range");
-
- priority = priority_;
- policy = policy_;
- }
- };
-
- /*!
- * \brief If possible, enable "realtime" scheduling.
- * \ingroup misc
- *
- * In general, this means that the code will be scheduled before any
- * non-realtime (normal) processes. Note that if your code contains
- * an non-blocking infinite loop and you enable realtime scheduling,
- * it's possible to hang the system.
- */
-
- // NOTE: If you change this, you need to change the code in
- // gnuradio-core/src/lib/runtime/gr_realtime.i, see note there.
- rt_status_t
- GR_RUNTIME_API enable_realtime_scheduling(rt_sched_param = rt_sched_param());
-
-} // namespace gr
-
-#endif /* INCLUDED_GNURADIO_REALTIME_H */
diff --git a/gnuradio-runtime/include/rpccallbackregister_base.h b/gnuradio-runtime/include/rpccallbackregister_base.h
deleted file mode 100644
index f2cd1d8051..0000000000
--- a/gnuradio-runtime/include/rpccallbackregister_base.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCCALLBACKREGISTER_BASE_H
-#define RPCCALLBACKREGISTER_BASE_H
-
-#include <messages/msg_accepter.h>
-#include <messages/msg_producer.h>
-
-typedef uint32_t DisplayType;
-
-// DisplayType Plotting types
-const uint32_t DISPNULL = 0x0000;
-const uint32_t DISPTIME = 0x0001;
-const uint32_t DISPXY = 0x0002;
-const uint32_t DISPPSD = 0x0004;
-const uint32_t DISPSPEC = 0x0008;
-const uint32_t DISPRAST = 0x0010;
-
-// DisplayType Options
-const uint32_t DISPOPTCPLX = 0x0100;
-const uint32_t DISPOPTLOG = 0x0200;
-const uint32_t DISPOPTSTEM = 0x0400;
-const uint32_t DISPOPTSTRIP = 0x0800;
-const uint32_t DISPOPTSCATTER = 0x1000;
-
-enum priv_lvl_t {
- RPC_PRIVLVL_ALL = 0,
- RPC_PRIVLVL_MIN = 9,
- RPC_PRIVLVL_NONE = 10
-};
-
-enum KnobType {
- KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
- KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
- KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
- KNOBVECSTRING, KNOBVECLONG
-};
-
-struct callbackregister_base
-{
- struct callback_base_t
- {
- public:
- callback_base_t(const priv_lvl_t priv_, const std::string& units_,
- const DisplayType display_, const std::string& desc_,
- const pmt::pmt_t min_, const pmt::pmt_t max_, const pmt::pmt_t def)
- : priv(priv_), units(units_), description(desc_),
- min(min_), max(max_), defaultvalue(def), display(display_)
- {
- }
-
- priv_lvl_t priv;
- std::string units, description;
- pmt::pmt_t min, max, defaultvalue;
- DisplayType display;
- };
-
- template<typename T, typename Tsptr>
- class callback_t : public callback_base_t
- {
- public:
- callback_t(T* callback_, priv_lvl_t priv_,
- const std::string& units_, const DisplayType display_, const:: std::string& desc_,
- const pmt::pmt_t& min_, const pmt::pmt_t& max_, const pmt::pmt_t& def_) :
- callback_base_t(priv_, units_, display_, desc_, min_, max_, def_),
- callback(callback_)
- {
- }
-
- Tsptr callback;
- };
-
- typedef callback_t<gr::messages::msg_accepter, gr::messages::msg_accepter_sptr> configureCallback_t;
- typedef callback_t<gr::messages::msg_producer, gr::messages::msg_producer_sptr> queryCallback_t;
-
- callbackregister_base() {;}
- virtual ~callbackregister_base() {;}
-
- virtual void registerConfigureCallback(const std::string &id, const configureCallback_t callback) = 0;
- virtual void unregisterConfigureCallback(const std::string &id) = 0;
- virtual void registerQueryCallback(const std::string &id, const queryCallback_t callback) = 0;
- virtual void unregisterQueryCallback(const std::string &id) = 0;
-};
-
-#endif /* RPCCALLBACKREGISTER_BASE_H */
diff --git a/gnuradio-runtime/include/rpcmanager.h b/gnuradio-runtime/include/rpcmanager.h
deleted file mode 100644
index 6a385c8998..0000000000
--- a/gnuradio-runtime/include/rpcmanager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCMANAGER_H
-#define RPCMANAGER_H
-
-#include <gr_runtime_api.h>
-#include <rpcmanager_base.h>
-#include <rpcserver_booter_aggregator.h>
-#include <memory>
-#include <iostream>
-
-class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
-{
- public:
- rpcmanager();
- ~rpcmanager();
-
- static rpcserver_booter_base* get();
-
- static void register_booter(rpcserver_booter_base* booter);
-
- template<typename T> class rpcserver_booter_register_helper
- {
- public:
- rpcserver_booter_register_helper() {
- rpcmanager::register_booter(new T());
- }
-
- //TODO: unregister
- };
-
- private:
- static bool make_aggregator;
- static bool booter_registered;
- static bool aggregator_registered;
- static void rpcserver_booter_base_sptr_dest( rpcserver_booter_base* b) {;}
- static rpcserver_booter_base* boot;
- static std::auto_ptr<rpcserver_booter_aggregator> aggregator;
-};
-
-#endif /* RPCMANAGER_H */
diff --git a/gnuradio-runtime/include/rpcmanager_base.h b/gnuradio-runtime/include/rpcmanager_base.h
deleted file mode 100644
index 60425c4a15..0000000000
--- a/gnuradio-runtime/include/rpcmanager_base.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCMANAGER_BASE_H
-#define RPCMANAGER_BASE_H
-
-#include <boost/shared_ptr.hpp>
-
-class rpcserver_booter_base;
-//class rpcserver_booter_aggregator;
-
-class rpcmanager_base
-{
- public:
- typedef boost::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr;
-
- rpcmanager_base() {;}
- ~rpcmanager_base() {;}
-
- //static rpcserver_booter_base* get();
-
- //static void register_booter(rpcserver_booter_base_sptr booter);
-
-private:
-};
-
-#endif /* RPCMANAGER_BASE_H */
diff --git a/gnuradio-runtime/include/rpcpmtconverters_ice.h b/gnuradio-runtime/include/rpcpmtconverters_ice.h
deleted file mode 100644
index e592f4cdfb..0000000000
--- a/gnuradio-runtime/include/rpcpmtconverters_ice.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCPMTCONVERTERS_ICE_H
-#define RPCPMTCONVERTERS_ICE_H
-
-#include <pmt/pmt.h>
-#include <gnuradio.h>
-
-namespace rpcpmtconverter
-{
- pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c);
- GNURadio::KnobPtr from_pmt(const pmt::pmt_t& knob, const Ice::Current& c);
-}
-
-#endif /* RPCPMTCONVERTERS_ICE_H */
diff --git a/gnuradio-runtime/include/rpcregisterhelpers.h b/gnuradio-runtime/include/rpcregisterhelpers.h
deleted file mode 100644
index b09aae9704..0000000000
--- a/gnuradio-runtime/include/rpcregisterhelpers.h
+++ /dev/null
@@ -1,659 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCREGISTERHELPERS_H
-#define RPCREGISTERHELPERS_H
-
-#include <stdio.h>
-#include <sstream>
-#include <iostream>
-#include <rpcserver_booter_base.h>
-#include <rpcmanager.h>
-#include <rpcserver_selector.h>
-#include <rpcserver_base.h>
-#include <gr_block_registry.h>
-
-// Base classes
-template<typename T, typename Tto> class rpcextractor_base
- : public virtual gr::messages::msg_accepter
-{
-public:
- rpcextractor_base(T* source, void (T::*func)(Tto)) :
- _source(source), _func(func) {;}
- ~rpcextractor_base() {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
- throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
- }
-
-protected:
- T* _source;
- void (T::*_func)(Tto);
-};
-
-template<typename T, typename Tto>
-class rpcbasic_extractor : public virtual rpcextractor_base<T,Tto>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(Tto)) :
- rpcextractor_base<T,Tto>(source, func)
- {;}
-};
-
-template<typename T, typename Tfrom>
-class rpcinserter_base : public virtual gr::messages::msg_producer
-{
-public:
- rpcinserter_base(T* source, Tfrom (T::*func)()) : _source(source), _func(func) {;}
- rpcinserter_base() {;}
-
- pmt::pmt_t retrieve() { assert(0); return pmt::pmt_t(); }
-
-protected:
- T* _source;
- Tfrom (T::*_func)();
-};
-
-template<typename T, typename Tfrom>
-class rpcbasic_inserter :
- public virtual rpcinserter_base<T,Tfrom>
-{
-public:
- rpcbasic_inserter(T* source, Tfrom (T::*func)()const)
- : rpcinserter_base<T,Tfrom>(source, func)
- {;}
-
- rpcbasic_inserter(T* source, Tfrom (T::*func)())
- : rpcinserter_base<T,Tfrom>(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- return pmt::mp((rpcinserter_base<T,Tfrom>::
- _source->*rpcinserter_base<T,Tfrom>::_func)());
- }
-};
-
-// Specialized Extractor Templates
-template<typename T>
-class rpcbasic_extractor<T,double> : public virtual rpcextractor_base<T,double>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(double))
- : rpcextractor_base<T,double>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,double>::_source->*rpcextractor_base<T,double>::_func)
- (pmt::to_double(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,float> : public virtual rpcextractor_base<T,float>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(float))
- : rpcextractor_base<T,float>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,float>::_source->*rpcextractor_base<T,float>::_func)
- (pmt::to_double(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,long> : public virtual rpcextractor_base<T,long>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(long))
- : rpcextractor_base<T,long>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,long>::_source->*rpcextractor_base<T,long>::_func)
- (pmt::to_long(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,int> : public virtual rpcextractor_base<T,int>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(int))
- : rpcextractor_base<T,int>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,int>::_source->*rpcextractor_base<T,int>::_func)
- (pmt::to_long(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,bool> : public virtual rpcextractor_base<T,bool>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(bool))
- : rpcextractor_base<T,bool>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,bool>::_source->*rpcextractor_base<T,bool>::_func)
- (pmt::to_bool(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,std::complex<double> >
- : public virtual rpcextractor_base<T,std::complex<double> >
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(std::complex<double>))
- : rpcextractor_base<T,std::complex<double> >(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,std::complex<double> >::
- _source->*rpcextractor_base<T,std::complex<double> >::_func)(pmt::to_complex(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_extractor<T,std::string>
- : public virtual rpcextractor_base<T,std::string>
-{
-public:
- rpcbasic_extractor(T* source, void (T::*func)(std::string))
- : rpcextractor_base<T,std::string>(source, func)
- {;}
-
- void post(pmt::pmt_t which_port, pmt::pmt_t msg)
- {
- (rpcextractor_base<T,std::string>::
- _source->*rpcextractor_base<T,std::string>::_func)(pmt::symbol_to_string(msg));
- }
-};
-
-template<typename T>
-class rpcbasic_inserter<T,uint64_t> : public virtual rpcinserter_base<T,uint64_t>
-{
-public:
- rpcbasic_inserter(T* source, uint64_t (T::*func)() const)
- : rpcinserter_base<T,uint64_t>(source, func)
- {;}
-
- rpcbasic_inserter(T* source, uint64_t (T::*func)())
- : rpcinserter_base<T,uint64_t>(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- return pmt::from_uint64((rpcinserter_base<T,uint64_t>::
- _source->*rpcinserter_base<T,uint64_t>::_func)());
- }
-};
-
-template<typename T>
-class rpcbasic_inserter<T,std::vector< int > >
- : public virtual rpcinserter_base<T,std::vector< int > >
-{
-public:
- rpcbasic_inserter(T* source, std::vector<int > (T::*func)() const)
- : rpcinserter_base<T,std::vector<int > >(source, func)
- {;}
-
- rpcbasic_inserter(T* source, std::vector<int > (T::*func)())
- : rpcinserter_base<T,std::vector<int > >(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- std::vector< int >
- vec((rpcinserter_base<T,std::vector<int > >::
- _source->*rpcinserter_base<T,std::vector< int > >::_func)());
- return pmt::init_s32vector(vec.size(), &vec[0]);
- }
-};
-
-template<typename T>
-class rpcbasic_inserter<T,std::vector< std::complex<float> > >
- : public virtual rpcinserter_base<T,std::vector< std::complex<float> > >
-{
-public:
- rpcbasic_inserter(T* source, std::vector<std::complex<float> > (T::*func)() const)
- : rpcinserter_base<T,std::vector<std::complex<float> > >(source, func)
- {;}
-
- rpcbasic_inserter(T* source, std::vector<std::complex<float> > (T::*func)())
- : rpcinserter_base<T,std::vector<std::complex<float> > >(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- std::vector< std::complex<float> >
- vec((rpcinserter_base<T,std::vector<std::complex<float> > >::
- _source->*rpcinserter_base<T,std::vector< std::complex<float> > >::_func)());
- return pmt::init_c32vector(vec.size(), &vec[0]);
- }
-};
-
-template<typename T>
-class rpcbasic_inserter<T,std::vector< float> >
- : public virtual rpcinserter_base<T,std::vector< float > >
-{
-public:
- rpcbasic_inserter(T* source, std::vector<float> (T::*func)() const)
- : rpcinserter_base<T,std::vector<float > >(source, func)
- {;}
-
- rpcbasic_inserter(T* source, std::vector<float> (T::*func)())
- : rpcinserter_base<T,std::vector<float> >(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- std::vector< float > vec((rpcinserter_base<T,std::vector<float> >::
- _source->*rpcinserter_base<T,std::vector< float> >::_func)());
- return pmt::init_f32vector(vec.size(), &vec[0]);
- }
-};
-
-template<typename T>
-class rpcbasic_inserter<T,std::vector< uint8_t> >
- : public virtual rpcinserter_base<T,std::vector< uint8_t > > {
-public:
- rpcbasic_inserter(T* source, std::vector<uint8_t> (T::*func)() const)
- : rpcinserter_base<T,std::vector<uint8_t > >(source, func)
- {;}
-
- rpcbasic_inserter(T* source, std::vector<uint8_t> (T::*func)())
- : rpcinserter_base<T,std::vector<uint8_t> >(source, func)
- {;}
-
- pmt::pmt_t retrieve()
- {
- std::vector< uint8_t > vec((rpcinserter_base<T,std::vector<uint8_t> >::
- _source->*rpcinserter_base<T,std::vector< uint8_t> >::_func)());
- return pmt::init_u8vector(vec.size(), &vec[0]);
- }
-};
-
-template <typename T>
-struct rpc_register_base
-{
- rpc_register_base() {count++;}
-protected: static int count;
-};
-
-// Base class to inherit from and create universal shared pointers.
-class rpcbasic_base
-{
-public:
- rpcbasic_base() {}
- virtual ~rpcbasic_base() {};
-};
-
-typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr;
-
-template<typename T, typename Tto>
-struct rpcbasic_register_set : public rpcbasic_base
-{
- // Function used to add a 'set' RPC call using a gr_basic_block's alias.
- rpcbasic_register_set(const std::string& block_alias,
- const char* functionbase,
- void (T::*function)(Tto),
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::configureCallback_t
- extractor(new rpcbasic_extractor<T,Tto>(d_object, function),
- minpriv_, std::string(units_),
- display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << block_alias << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING SET: " << d_id << " " << desc_ << std::endl;
- rpcmanager::get()->i()->registerConfigureCallback(d_id, extractor);
-#endif
- }
-
- // Function used to add a 'set' RPC call using a name and the object
- rpcbasic_register_set(const std::string& name,
- const char* functionbase,
- T* obj,
- void (T::*function)(Tto),
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = obj;
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::configureCallback_t
- extractor(new rpcbasic_extractor<T,Tto>(d_object, function),
- minpriv_, std::string(units_),
- display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << name << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING SET: " << d_id << " " << desc_ << std::endl;
- rpcmanager::get()->i()->registerConfigureCallback(d_id, extractor);
-#endif
- }
-
- ~rpcbasic_register_set()
- {
-#ifdef RPCSERVER_ENABLED
- rpcmanager::get()->i()->unregisterConfigureCallback(d_id);
-#endif
- }
-
-
- pmt::pmt_t min() const { return d_min; }
- pmt::pmt_t max() const { return d_max; }
- pmt::pmt_t def() const { return d_def; }
- std::string units() const { return d_units; }
- std::string description() const { return d_desc; }
- priv_lvl_t privilege_level() const { return d_minpriv; }
- DisplayType default_display() const { return d_display; }
-
- void set_min(pmt::pmt_t p) { d_min = p; }
- void set_max(pmt::pmt_t p) { d_max = p; }
- void set_def(pmt::pmt_t p) { d_def = p; }
- void units(std::string u) { d_units = u; }
- void description(std::string d) { d_desc = d; }
- void privilege_level(priv_lvl_t p) { d_minpriv = p; }
- void default_display(DisplayType d) { d_display = d; }
-
-private:
- std::string d_id;
- pmt::pmt_t d_min, d_max, d_def;
- std::string d_units, d_desc;
- priv_lvl_t d_minpriv;
- DisplayType d_display;
- T *d_object;
-};
-
-
-template<typename T, typename Tfrom>
-class rpcbasic_register_get : public rpcbasic_base
-{
-public:
- // Function used to add a 'set' RPC call using a gr_basic_block's alias.
- // primary constructor to allow for T get() functions
- rpcbasic_register_get(const std::string& block_alias,
- const char* functionbase,
- Tfrom (T::*function)(),
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::queryCallback_t
- inserter(new rpcbasic_inserter<T,Tfrom>(d_object, function),
- minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << block_alias << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING GET: " << d_id << " " << desc_ << std::endl;
- rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
-#endif
- }
-
-
- // alternate constructor to allow for T get() const functions
- rpcbasic_register_get(const std::string& block_alias,
- const char* functionbase,
- Tfrom (T::*function)() const,
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::queryCallback_t
- inserter(new rpcbasic_inserter<T,Tfrom>(d_object, (Tfrom (T::*)())function),
- minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << block_alias << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING GET CONST: " << d_id << " " << desc_ << " " << display_ << std::endl;
- rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
-#endif
- }
-
- // Function used to add a 'set' RPC call using a name and the object
- // primary constructor to allow for T get() functions
- rpcbasic_register_get(const std::string& name,
- const char* functionbase,
- T* obj,
- Tfrom (T::*function)(),
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = obj;
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::queryCallback_t
- inserter(new rpcbasic_inserter<T,Tfrom>(d_object, function),
- minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << name << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING GET: " << d_id << " " << desc_ << std::endl;
- rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
-#endif
- }
-
-
- // alternate constructor to allow for T get() const functions
- rpcbasic_register_get(const std::string& name,
- const char* functionbase,
- T* obj,
- Tfrom (T::*function)() const,
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_ = DISPNULL)
- {
- d_min = min;
- d_max = max;
- d_def = def;
- d_units = units_;
- d_desc = desc_;
- d_minpriv = minpriv_;
- d_display = display_;
- d_object = obj;
-#ifdef RPCSERVER_ENABLED
- callbackregister_base::queryCallback_t
- inserter(new rpcbasic_inserter<T,Tfrom>(d_object, (Tfrom (T::*)())function),
- minpriv_, std::string(units_), display_, std::string(desc_), min, max, def);
- std::ostringstream oss(std::ostringstream::out);
- oss << name << "::" << functionbase;
- d_id = oss.str();
- //std::cerr << "REGISTERING GET CONST: " << d_id << " " << desc_ << " " << display_ << std::endl;
- rpcmanager::get()->i()->registerQueryCallback(d_id, inserter);
-#endif
- }
-
- ~rpcbasic_register_get()
- {
-#ifdef RPCSERVER_ENABLED
- rpcmanager::get()->i()->unregisterQueryCallback(d_id);
-#endif
- }
-
- pmt::pmt_t min() const { return d_min; }
- pmt::pmt_t max() const { return d_max; }
- pmt::pmt_t def() const { return d_def; }
- std::string units() const { return d_units; }
- std::string description() const { return d_desc; }
- priv_lvl_t privilege_level() const { return d_minpriv; }
- DisplayType default_display() const { return d_display; }
-
- void set_min(pmt::pmt_t p) { d_min = p; }
- void set_max(pmt::pmt_t p) { d_max = p; }
- void set_def(pmt::pmt_t p) { d_def = p; }
- void units(std::string u) { d_units = u; }
- void description(std::string d) { d_desc = d; }
- void privilege_level(priv_lvl_t p) { d_minpriv = p; }
- void default_display(DisplayType d) { d_display = d; }
-
-private:
- std::string d_id;
- pmt::pmt_t d_min, d_max, d_def;
- std::string d_units, d_desc;
- priv_lvl_t d_minpriv;
- DisplayType d_display;
- T *d_object;
-};
-
-/*
- * This class can wrap a pre-existing variable type for you
- * it will define the getter and rpcregister call for you.
- *
- * It should be used for read-only getters.
- *
- */
-template<typename Tfrom>
-class rpcbasic_register_variable : public rpcbasic_base
-{
-protected:
- rpcbasic_register_get< rpcbasic_register_variable<Tfrom>, Tfrom > d_rpc_reg;
- Tfrom *d_variable;
- Tfrom get() { return *d_variable; }
-public:
- // empty constructor which should never be called but needs to exist for ues in varous STL data structures
- void setptr(Tfrom* _variable){ rpcbasic_register_variable<Tfrom>::d_variable = _variable; }
- rpcbasic_register_variable() :
- d_rpc_reg("FAIL", "FAIL", this, &rpcbasic_register_variable::get,
- pmt::PMT_NIL, pmt::PMT_NIL, pmt::PMT_NIL, DISPNULL,
- "FAIL", "FAIL", RPC_PRIVLVL_MIN),
- d_variable(NULL)
- {
- throw std::runtime_error("ERROR: rpcbasic_register_variable called with no args. If this happens, someone has tried to use rpcbasic_register_variable incorrectly.");
- };
-
- rpcbasic_register_variable(const std::string& namebase,
- const char* functionbase,
- Tfrom *variable,
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv_ = RPC_PRIVLVL_MIN,
- DisplayType display_=DISPNULL) :
- d_rpc_reg(namebase, functionbase, this, &rpcbasic_register_variable::get,
- min, max, def, units_, desc_, minpriv_, display_),
- d_variable(variable)
- {
- //std::cerr << "REGISTERING VAR: " << " " << desc_ << std::endl;
- }
-};
-
-template<typename Tfrom> class rpcbasic_register_variable_rw : public rpcbasic_register_variable<Tfrom> {
- private:
- rpcbasic_register_set< rpcbasic_register_variable_rw<Tfrom>, Tfrom > d_rpc_regset;
- public:
- // empty constructor which should never be called but needs to exist for ues in varous STL data structures
- rpcbasic_register_variable_rw() :
- d_rpc_regset("FAIL","FAIL",this,&rpcbasic_register_variable<Tfrom>::get,pmt::PMT_NIL,pmt::PMT_NIL,pmt::PMT_NIL,DISPNULL,"FAIL","FAIL",RPC_PRIVLVL_MIN)
- {
- throw std::runtime_error("ERROR: rpcbasic_register_variable_rw called with no args. if this happens someone used rpcbasic_register_variable_rw incorrectly.\n");
- };
- void set(Tfrom _variable){ *(rpcbasic_register_variable<Tfrom>::d_variable) = _variable; }
- rpcbasic_register_variable_rw(
- const std::string& namebase,
- const char* functionbase,
- Tfrom *variable,
- const pmt::pmt_t &min, const pmt::pmt_t &max, const pmt::pmt_t &def,
- const char* units_ = "",
- const char* desc_ = "",
- priv_lvl_t minpriv = RPC_PRIVLVL_MIN,
- DisplayType display_=DISPNULL) :
- rpcbasic_register_variable<Tfrom>(namebase,functionbase,variable,min,max,def,units_,desc_),
- d_rpc_regset(namebase,functionbase,this,&rpcbasic_register_variable_rw::set,min,max,def,units_,desc_,minpriv,display_)
- {
- // no action
- }
-};
-
-
-
-
-#endif
diff --git a/gnuradio-runtime/include/rpcserver_aggregator.h b/gnuradio-runtime/include/rpcserver_aggregator.h
deleted file mode 100644
index 050d9bb1e5..0000000000
--- a/gnuradio-runtime/include/rpcserver_aggregator.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_AGGREGATOR_H
-#define RPCSERVER_AGGREGATOR_H
-
-#include <vector>
-#include <string>
-#include <rpcserver_base.h>
-#include <rpcmanager_base.h>
-
-class rpcserver_aggregator : public virtual rpcserver_base
-{
-public:
- rpcserver_aggregator();
- virtual ~rpcserver_aggregator();
-
- void registerConfigureCallback(const std::string &id, const configureCallback_t callback);
- void unregisterConfigureCallback(const std::string &id);
-
- void registerQueryCallback(const std::string &id, const queryCallback_t callback);
- void unregisterQueryCallback(const std::string &id);
-
- void registerServer(rpcmanager_base::rpcserver_booter_base_sptr server);
-
- const std::string& type();
-
- const std::vector<std::string>& registeredServers();
-
-private:
- template<class T, typename Tcallback>
- struct registerConfigureCallback_f: public std::unary_function<T,void>
- {
- registerConfigureCallback_f(const std::string &_id, const Tcallback _callback)
- : id(_id), callback(_callback)
- {;}
-
- void operator()(T& x) { x->i()->registerConfigureCallback(id, callback); }
- const std::string& id; const Tcallback& callback;
- };
-
- template<class T, typename Tcallback>
- struct unregisterConfigureCallback_f: public std::unary_function<T,void>
- {
- unregisterConfigureCallback_f(const std::string &_id)
- : id(_id)
- {;}
-
- void operator()(T& x) { x->i()->unregisterConfigureCallback(id); }
- const std::string& id;
- };
-
- template<class T, typename Tcallback>
- struct registerQueryCallback_f: public std::unary_function<T,void>
- {
- registerQueryCallback_f(const std::string &_id, const Tcallback _callback)
- : id(_id), callback(_callback)
- {;}
-
- void operator()(T& x) { x->i()->registerQueryCallback(id, callback); }
- const std::string& id; const Tcallback& callback;
- };
-
- template<class T, typename Tcallback>
- struct unregisterQueryCallback_f: public std::unary_function<T,void>
- {
- unregisterQueryCallback_f(const std::string &_id)
- : id(_id)
- {;}
-
- void operator()(T& x) { x->i()->unregisterQueryCallback(id); }
- const std::string& id;
- };
-
- const std::string d_type;
- typedef std::vector<rpcmanager_base::rpcserver_booter_base_sptr> rpcServerMap_t;
- std::vector<std::string> d_registeredServers;
- rpcServerMap_t d_serverlist;
-};
-
-#endif /* RPCSERVER_AGGREGATOR_H */
diff --git a/gnuradio-runtime/include/rpcserver_base.h b/gnuradio-runtime/include/rpcserver_base.h
deleted file mode 100644
index bc985c8d53..0000000000
--- a/gnuradio-runtime/include/rpcserver_base.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_BASE_H
-#define RPCSERVER_BASE_H
-
-#include <rpccallbackregister_base.h>
-
-class rpcserver_base : public virtual callbackregister_base
-{
-public:
- rpcserver_base() : cur_priv(RPC_PRIVLVL_ALL) {;}
- virtual ~rpcserver_base() {;}
-
- virtual void registerConfigureCallback(const std::string &id, const configureCallback_t callback) = 0;
- virtual void unregisterConfigureCallback(const std::string &id) = 0;
- virtual void registerQueryCallback(const std::string &id, const queryCallback_t callback) = 0;
- virtual void unregisterQueryCallback(const std::string &id) = 0;
- virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; }
-
- typedef boost::shared_ptr<rpcserver_base> rpcserver_base_sptr;
-protected:
- priv_lvl_t cur_priv;
-
-private:
-};
-
-#endif /* RPCSERVER_BASE_H */
diff --git a/gnuradio-runtime/include/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/rpcserver_booter_aggregator.h
deleted file mode 100644
index 38739a1b50..0000000000
--- a/gnuradio-runtime/include/rpcserver_booter_aggregator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_BOOTER_AGGREGATOR
-#define RPCSERVER_BOOTER_AGGREGATOR
-
-#include <gr_runtime_api.h>
-#include <rpcserver_booter_base.h>
-#include <rpcserver_aggregator.h>
-#include <boost/shared_ptr.hpp>
-#include <string>
-
-class rpcserver_server;
-
-class GR_RUNTIME_API rpcserver_booter_aggregator :
- public virtual rpcserver_booter_base
-{
- public:
- rpcserver_booter_aggregator();
- ~rpcserver_booter_aggregator();
-
- rpcserver_base* i();
- const std::string& type();
- const std::vector<std::string> endpoints();
-
- const std::vector<std::string>& registeredServers();
-
- protected:
- friend class rpcmanager;
- rpcserver_aggregator* agg();
-
-private:
- std::string d_type;
- boost::shared_ptr<rpcserver_aggregator> server;
-};
-
-#endif /* RPCSERVER_BOOTER_AGGREGATOR */
diff --git a/gnuradio-runtime/include/rpcserver_booter_base.h b/gnuradio-runtime/include/rpcserver_booter_base.h
deleted file mode 100644
index 682944dada..0000000000
--- a/gnuradio-runtime/include/rpcserver_booter_base.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_BOOTER_BASE
-#define RPCSERVER_BOOTER_BASE
-
-#include <string>
-#include <vector>
-
-class rpcserver_base;
-
-class rpcserver_booter_base
-{
-public:
- rpcserver_booter_base() {;}
- virtual ~rpcserver_booter_base() {;}
-
- virtual rpcserver_base* i()=0;
- virtual const std::vector<std::string> endpoints()=0;
- virtual const std::string& type()=0;
-
-private:
-};
-
-#endif /* RPCSERVER_BOOTER_BASE */
diff --git a/gnuradio-runtime/include/rpcserver_booter_ice.h b/gnuradio-runtime/include/rpcserver_booter_ice.h
deleted file mode 100644
index 69dfcc7602..0000000000
--- a/gnuradio-runtime/include/rpcserver_booter_ice.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_BOOTER_ICE_H
-#define RPCSERVER_BOOTER_ICE_H
-
-#include <rpcserver_booter_base.h>
-#include <ice_server_template.h>
-#include <gnuradio.h>
-
-class rpcserver_base;
-class rpcserver_ice;
-
-class rpcserver_booter_ice : public virtual rpcserver_booter_base,
- public virtual ice_server_template<rpcserver_base, rpcserver_ice,
- rpcserver_booter_ice, GNURadio::ControlPortPtr>
-{
-public:
- rpcserver_booter_ice();
- ~rpcserver_booter_ice();
-
- rpcserver_base* i();
- const std::string & type() {return d_type;}
- const std::vector<std::string> endpoints();
-
-private:
- std::string d_type;
-};
-
-#endif /* RPCSERVER_BOOTER_ICE_H */
diff --git a/gnuradio-runtime/include/rpcserver_ice.h b/gnuradio-runtime/include/rpcserver_ice.h
deleted file mode 100644
index 2c08f57dc7..0000000000
--- a/gnuradio-runtime/include/rpcserver_ice.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_ICE_H
-#define RPCSERVER_ICE_H
-
-#include <rpcserver_base.h>
-#include <rpcpmtconverters_ice.h>
-#include <string>
-#include <sstream>
-#include <map>
-#include <gnuradio.h>
-#include <Ice/Exception.h>
-#include <boost/format.hpp>
-
-class rpcserver_ice : public virtual rpcserver_base, public GNURadio::ControlPort
-{
-public:
- rpcserver_ice();
- virtual ~rpcserver_ice();
-
- void registerConfigureCallback(const std::string &id, const configureCallback_t callback);
- void unregisterConfigureCallback(const std::string &id);
-
- void registerQueryCallback(const std::string &id, const queryCallback_t callback);
- void unregisterQueryCallback(const std::string &id);
-
- virtual void set(const GNURadio::KnobMap&, const Ice::Current&);
-
- GNURadio::KnobMap get(const GNURadio::KnobIDList&, const Ice::Current&);
-
- GNURadio::KnobPropMap properties(const GNURadio::KnobIDList&, const Ice::Current&);
-
- virtual void shutdown(const Ice::Current&);
-
-private:
- typedef std::map<std::string, configureCallback_t> ConfigureCallbackMap_t;
- ConfigureCallbackMap_t d_setcallbackmap;
-
- typedef std::map<std::string, queryCallback_t> QueryCallbackMap_t;
- QueryCallbackMap_t d_getcallbackmap;
-
- template<typename T, typename TMap> struct set_f
- : public std::unary_function<T,void>
- {
- set_f(const Ice::Current& _c, TMap& _setcallbackmap, const priv_lvl_t& _cur_priv) :
- c(_c), d_setcallbackmap(_setcallbackmap), cur_priv(_cur_priv)
- {;}
-
- void operator()(const T& p)
- {
- ConfigureCallbackMap_t::const_iterator iter(d_setcallbackmap.find(p.first));
- if(iter != d_setcallbackmap.end()) {
- if(cur_priv <= iter->second.priv) {
- (*iter->second.callback).post(pmt::PMT_NIL, rpcpmtconverter::to_pmt(p.second,c));
- }
- else {
- std::cout << "Key " << p.first << " requires PRIVLVL <= "
- << iter->second.priv << " to set, currently at: "
- << cur_priv << std::endl;
- }
- }
- else {
- throw IceUtil::NullHandleException(__FILE__, __LINE__);
- }
- }
-
- const Ice::Current& c;
- TMap& d_setcallbackmap;
- const priv_lvl_t& cur_priv;
- };
-
- template<typename T, typename TMap>
- struct get_f : public std::unary_function<T,void>
- {
- get_f(const Ice::Current& _c, TMap& _getcallbackmap,
- const priv_lvl_t& _cur_priv, GNURadio::KnobMap& _outknobs) :
- c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
- {}
-
- void operator()(const T& p)
- {
- QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(p));
- if(iter != d_getcallbackmap.end()) {
- if(cur_priv <= iter->second.priv) {
- outknobs[p] = rpcpmtconverter::from_pmt((*iter->second.callback).retrieve(), c);
- }
- else {
- std::cout << "Key " << iter->first << " requires PRIVLVL: <= "
- << iter->second.priv << " to get, currently at: "
- << cur_priv << std::endl;
- }
- }
- else {
- std::stringstream ss;
- ss << "Ctrlport Key called with unregistered key (" << p << ")\n";
- std::cout << ss.str();
- throw IceUtil::IllegalArgumentException(__FILE__,__LINE__,ss.str().c_str());
- }
- }
-
- const Ice::Current& c;
- TMap& d_getcallbackmap;
- const priv_lvl_t& cur_priv;
- GNURadio::KnobMap& outknobs;
- };
-
- template<typename T, typename TMap, typename TKnobMap>
- struct get_all_f : public std::unary_function<T,void>
- {
- get_all_f(const Ice::Current& _c, TMap& _getcallbackmap,
- const priv_lvl_t& _cur_priv, TKnobMap& _outknobs) :
- c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
- {;}
-
- void operator()(const T& p)
- {
- if(cur_priv <= p.second.priv) {
- outknobs[p.first] = rpcpmtconverter::from_pmt(p.second.callback->retrieve(), c);
- }
- else {
- std::cout << "Key " << p.first << " requires PRIVLVL <= "
- << p.second.priv << " to get, currently at: "
- << cur_priv << std::endl;
- }
- }
-
- const Ice::Current& c;
- TMap& d_getcallbackmap;
- const priv_lvl_t& cur_priv;
- TKnobMap& outknobs;
- };
-
- template<typename T, typename TMap, typename TKnobMap>
- struct properties_all_f : public std::unary_function<T,void>
- {
- properties_all_f(const Ice::Current& _c, QueryCallbackMap_t& _getcallbackmap,
- const priv_lvl_t& _cur_priv, GNURadio::KnobPropMap& _outknobs) :
- c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
- {;}
-
- void operator()(const T& p)
- {
- if(cur_priv <= p.second.priv) {
- GNURadio::KnobProp prop;//(new GNURadio::KnobProp());
- prop.type = GNURadio::KNOBDOUBLE;
- prop.units = p.second.units;
- prop.description = p.second.description;
- prop.min = rpcpmtconverter::from_pmt(p.second.min, c);
- prop.max = rpcpmtconverter::from_pmt(p.second.max, c);
- prop.display = static_cast<uint32_t>(p.second.display);
- outknobs[p.first] = prop;
- }
- else {
- std::cout << "Key " << p.first << " requires PRIVLVL <= "
- << p.second.priv << " to get, currently at: "
- << cur_priv << std::endl;
- }
- }
-
- const Ice::Current& c;
- TMap& d_getcallbackmap;
- const priv_lvl_t& cur_priv;
- TKnobMap& outknobs;
- };
-
- template<class T, typename TMap, typename TKnobMap>
- struct properties_f : public std::unary_function<T,void>
- {
- properties_f(const Ice::Current& _c, TMap& _getcallbackmap,
- const priv_lvl_t& _cur_priv, TKnobMap& _outknobs) :
- c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
- {;}
-
- void operator()(const T& p)
- {
- typename TMap::const_iterator iter(d_getcallbackmap.find(p));
- if(iter != d_getcallbackmap.end()) {
- if(cur_priv <= iter->second.priv) {
- GNURadio::KnobProp prop;
- prop.type = GNURadio::KNOBDOUBLE;
- prop.units = iter->second.units;
- prop.description = iter->second.description;
- prop.min = rpcpmtconverter::from_pmt(iter->second.min, c);
- prop.max = rpcpmtconverter::from_pmt(iter->second.max, c);
- prop.display = static_cast<uint32_t>(iter->second.display);
- //outknobs[iter->first] = prop;
- outknobs[p] = prop;
- }
- else {
- std::cout << "Key " << iter->first << " requires PRIVLVL: <= " <<
- iter->second.priv << " to get, currently at: " << cur_priv << std::endl;
- }
- }
- else {
- throw IceUtil::NullHandleException(__FILE__, __LINE__);
- }
- }
-
- const Ice::Current& c;
- TMap& d_getcallbackmap;
- const priv_lvl_t& cur_priv;
- TKnobMap& outknobs;
- };
-};
-
-#endif /* RPCSERVER_ICE_H */
diff --git a/gnuradio-runtime/include/rpcserver_selector.h b/gnuradio-runtime/include/rpcserver_selector.h
deleted file mode 100644
index fa63c9a2dc..0000000000
--- a/gnuradio-runtime/include/rpcserver_selector.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RPCSERVER_SELECTOR
-#define RPCSERVER_SELECTOR
-
-#define RPCSERVER_ENABLED
-
-#define RPCSERVER_ICE
-//#define RPCSERVER_ERLANG
-//#define RPCSERVER_XMLRPC
-
-#endif
diff --git a/gnuradio-runtime/include/runtime_block_gateway.h b/gnuradio-runtime/include/runtime_block_gateway.h
deleted file mode 100644
index 390864376f..0000000000
--- a/gnuradio-runtime/include/runtime_block_gateway.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright 2011-2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_RUNTIME_BLOCK_GATEWAY_H
-#define INCLUDED_RUNTIME_BLOCK_GATEWAY_H
-
-#include <gr_runtime_api.h>
-#include <gr_block.h>
-#include <gr_feval.h>
-
-/*!
- * The work type enum tells the gateway what kind of block to implement.
- * The choices are familiar gnuradio block overloads (sync, decim, interp).
- */
-enum gr_block_gw_work_type{
- GR_BLOCK_GW_WORK_GENERAL,
- GR_BLOCK_GW_WORK_SYNC,
- GR_BLOCK_GW_WORK_DECIM,
- GR_BLOCK_GW_WORK_INTERP,
-};
-
-/*!
- * Shared message structure between python and gateway.
- * Each action type represents a scheduler-called function.
- */
-struct gr_block_gw_message_type{
- enum action_type{
- ACTION_GENERAL_WORK, //dispatch work
- ACTION_WORK, //dispatch work
- ACTION_FORECAST, //dispatch forecast
- ACTION_START, //dispatch start
- ACTION_STOP, //dispatch stop
- };
-
- action_type action;
-
- int general_work_args_noutput_items;
- std::vector<int> general_work_args_ninput_items;
- std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig cant int cast it right
- std::vector<void *> general_work_args_output_items;
- int general_work_args_return_value;
-
- int work_args_ninput_items;
- int work_args_noutput_items;
- std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig cant int cast it right
- std::vector<void *> work_args_output_items;
- int work_args_return_value;
-
- int forecast_args_noutput_items;
- std::vector<int> forecast_args_ninput_items_required;
-
- bool start_args_return_value;
-
- bool stop_args_return_value;
-};
-
-/*!
- * The gateway block which performs all the magic.
- *
- * The gateway provides access to all the gr_block routines.
- * The methods prefixed with gr_block__ are renamed
- * to class methods without the prefix in python.
- */
-class GR_RUNTIME_API runtime_block_gateway : virtual public gr_block{
-public:
- //! Provide access to the shared message object
- virtual gr_block_gw_message_type &gr_block_message(void) = 0;
-
- long gr_block__unique_id(void) const{
- return gr_block::unique_id();
- }
-
- std::string gr_block__name(void) const{
- return gr_block::name();
- }
-
- unsigned gr_block__history(void) const{
- return gr_block::history();
- }
-
- void gr_block__set_history(unsigned history){
- return gr_block::set_history(history);
- }
-
- void gr_block__set_fixed_rate(bool fixed_rate){
- return gr_block::set_fixed_rate(fixed_rate);
- }
-
- bool gr_block__fixed_rate(void) const{
- return gr_block::fixed_rate();
- }
-
- void gr_block__set_output_multiple(int multiple){
- return gr_block::set_output_multiple(multiple);
- }
-
- int gr_block__output_multiple(void) const{
- return gr_block::output_multiple();
- }
-
- void gr_block__consume(int which_input, int how_many_items){
- return gr_block::consume(which_input, how_many_items);
- }
-
- void gr_block__consume_each(int how_many_items){
- return gr_block::consume_each(how_many_items);
- }
-
- void gr_block__produce(int which_output, int how_many_items){
- return gr_block::produce(which_output, how_many_items);
- }
-
- void gr_block__set_relative_rate(double relative_rate){
- return gr_block::set_relative_rate(relative_rate);
- }
-
- double gr_block__relative_rate(void) const{
- return gr_block::relative_rate();
- }
-
- uint64_t gr_block__nitems_read(unsigned int which_input){
- return gr_block::nitems_read(which_input);
- }
-
- uint64_t gr_block__nitems_written(unsigned int which_output){
- return gr_block::nitems_written(which_output);
- }
-
- gr_block::tag_propagation_policy_t gr_block__tag_propagation_policy(void){
- return gr_block::tag_propagation_policy();
- }
-
- void gr_block__set_tag_propagation_policy(gr_block::tag_propagation_policy_t p){
- return gr_block::set_tag_propagation_policy(p);
- }
-
- void gr_block__add_item_tag(
- unsigned int which_output, const gr_tag_t &tag
- ){
- return gr_block::add_item_tag(which_output, tag);
- }
-
- void gr_block__add_item_tag(
- unsigned int which_output,
- uint64_t abs_offset,
- const pmt::pmt_t &key,
- const pmt::pmt_t &value,
- const pmt::pmt_t &srcid=pmt::PMT_F
- ){
- return gr_block::add_item_tag(which_output, abs_offset, key, value, srcid);
- }
-
- std::vector<gr_tag_t> gr_block__get_tags_in_range(
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end
- ){
- std::vector<gr_tag_t> tags;
- gr_block::get_tags_in_range(tags, which_input, abs_start, abs_end);
- return tags;
- }
-
- std::vector<gr_tag_t> gr_block__get_tags_in_range(
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end,
- const pmt::pmt_t &key
- ){
- std::vector<gr_tag_t> tags;
- gr_block::get_tags_in_range(tags, which_input, abs_start, abs_end, key);
- return tags;
- }
-
- /* Message passing interface */
- void gr_block__message_port_register_in(pmt::pmt_t port_id){
- gr_basic_block::message_port_register_in(port_id);
- }
-
- void gr_block__message_port_register_out(pmt::pmt_t port_id){
- gr_basic_block::message_port_register_out(port_id);
- }
-
- void gr_block__message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg){
- gr_basic_block::message_port_pub(port_id, msg);
- }
-
- void gr_block__message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target){
- gr_basic_block::message_port_sub(port_id, target);
- }
-
- void gr_block__message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target){
- gr_basic_block::message_port_unsub(port_id, target);
- }
-
- pmt::pmt_t gr_block__message_ports_in(){
- return gr_basic_block::message_ports_in();
- }
-
- pmt::pmt_t gr_block__message_ports_out(){
- return gr_basic_block::message_ports_out();
- }
-
- void set_msg_handler_feval(pmt::pmt_t which_port, gr_feval_p *msg_handler)
- {
- if(msg_queue.find(which_port) == msg_queue.end()){
- throw std::runtime_error("attempt to set_msg_handler_feval() on bad input message port!");
- }
- d_msg_handlers_feval[which_port] = msg_handler;
- }
-
-protected:
- typedef std::map<pmt::pmt_t, gr_feval_p *, pmt::comperator> msg_handlers_feval_t;
- msg_handlers_feval_t d_msg_handlers_feval;
-
- void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg){
- // Is there a handler?
- if (d_msg_handlers_feval.find(which_port) != d_msg_handlers_feval.end()){
- d_msg_handlers_feval[which_port]->calleval(msg); // Yes, invoke it.
- }
- else {
- // Pass to generic dispatcher if not found
- gr_basic_block::dispatch_msg(which_port, msg);
- }
- }
-};
-
-/*!
- * Make a new gateway block.
- * \param handler the swig director object with callback
- * \param name the name of the block (Ex: "Shirley")
- * \param in_sig the input signature for this block
- * \param out_sig the output signature for this block
- * \param work_type the type of block overload to implement
- * \param factor the decimation or interpolation factor
- * \return a new gateway block
- */
-GR_RUNTIME_API boost::shared_ptr<runtime_block_gateway>
-runtime_make_block_gateway(
- gr_feval_ll *handler,
- const std::string &name,
- gr_io_signature_sptr in_sig,
- gr_io_signature_sptr out_sig,
- const gr_block_gw_work_type work_type,
- const unsigned factor
-);
-
-#endif /* INCLUDED_RUNTIME_BLOCK_GATEWAY_H */
diff --git a/gnuradio-runtime/include/sys_pri.h b/gnuradio-runtime/include/sys_pri.h
deleted file mode 100644
index 745176e681..0000000000
--- a/gnuradio-runtime/include/sys_pri.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GNURADIO_SYS_PRI_H
-#define INCLUDED_GNURADIO_SYS_PRI_H
-
-#include <gr_runtime_api.h>
-#include <realtime.h>
-
-/*
- * A single place to define real-time priorities used by the system itself
- */
-namespace gr {
-
- struct GR_RUNTIME_API sys_pri {
- static rt_sched_param python(); // python code
- static rt_sched_param normal(); // normal blocks
- static rt_sched_param gcell_event_handler();
- static rt_sched_param usrp2_backend(); // thread that services the ethernet
- };
-
-} /* namespace gr */
-
-#endif /* INCLUDED_GNURADIO_SYS_PRI_H */
diff --git a/gnuradio-runtime/include/thread/CMakeLists.txt b/gnuradio-runtime/include/thread/CMakeLists.txt
deleted file mode 100644
index 8ea4bfc66e..0000000000
--- a/gnuradio-runtime/include/thread/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2013 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- thread.h
- thread_body_wrapper.h
- thread_group.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio/thread
- COMPONENT "runtime_devel"
-)
diff --git a/gnuradio-runtime/include/thread/thread.h b/gnuradio-runtime/include/thread/thread.h
deleted file mode 100644
index 548d76e9a5..0000000000
--- a/gnuradio-runtime/include/thread/thread.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_THREAD_H
-#define INCLUDED_THREAD_H
-
-#include <gr_runtime_api.h>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <vector>
-
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-
-#endif
-
-namespace gr {
- namespace thread {
-
- typedef boost::thread thread;
- typedef boost::mutex mutex;
- typedef boost::unique_lock<boost::mutex> scoped_lock;
- typedef boost::condition_variable condition_variable;
-
- /*! \brief a system-dependent typedef for the underlying thread type.
- */
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
- typedef HANDLE gr_thread_t;
-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
- typedef pthread_t gr_thread_t;
-#else
- typedef pthread_t gr_thread_t;
-#endif
-
- /*! \brief Get the current thread's ID as a gr_thread_t
- *
- * We use this when setting the thread affinity or any other
- * low-level thread settings. Can be called withing a GNU Radio
- * block to get a reference to its current thread ID.
- */
- GR_RUNTIME_API gr_thread_t get_current_thread_id();
-
- /*! \brief Bind the current thread to a set of cores.
- *
- * Wrapper for system-dependent calls to set the affinity of the
- * current thread to the processor mask. The mask is simply a
- * 1-demensional vector containing the processor or core number
- * from 0 to N-1 for N cores.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_bind_to_processor(const std::vector<int> &mask);
-
- /*! \brief Convineince function to bind the current thread to a single core.
- *
- * Wrapper for system-dependent calls to set the affinity of the
- * current thread to a given core from 0 to N-1 for N cores.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_bind_to_processor(int n);
-
- /*! \brief Bind a thread to a set of cores.
- *
- * Wrapper for system-dependent calls to set the affinity of the
- * given thread ID to the processor mask. The mask is simply a
- * 1-demensional vector containing the processor or core number
- * from 0 to N-1 for N cores.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread,
- const std::vector<int> &mask);
-
-
- /*! \brief Convineince function to bind the a thread to a single core.
- *
- * Wrapper for system-dependent calls to set the affinity of the
- * given thread ID to a given core from 0 to N-1 for N cores.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread,
- unsigned int n);
-
- /*! \brief Remove any thread-processor affinity for the current thread.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_unbind();
-
- /*! \brief Remove any thread-processor affinity for a given thread ID.
- *
- * Note: this does not work on OSX; it is a nop call since OSX
- * does not support the concept of thread affinity (and what they
- * do support in this way since 10.5 is not what we want or can
- * use in this fashion).
- */
- GR_RUNTIME_API void thread_unbind(gr_thread_t thread);
-
- } /* namespace thread */
-} /* namespace gr */
-
-#endif /* INCLUDED_THREAD_H */
diff --git a/gnuradio-runtime/include/thread/thread_body_wrapper.h b/gnuradio-runtime/include/thread/thread_body_wrapper.h
deleted file mode 100644
index dcf8cff48e..0000000000
--- a/gnuradio-runtime/include/thread/thread_body_wrapper.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_THREAD_BODY_WRAPPER_H
-#define INCLUDED_THREAD_BODY_WRAPPER_H
-
-#include <gr_runtime_api.h>
-#include <thread/thread.h>
-#include <exception>
-#include <iostream>
-
-namespace gr {
- namespace thread {
-
- GR_RUNTIME_API void mask_signals();
-
- template <class F>
- class thread_body_wrapper
- {
- private:
- F d_f;
- std::string d_name;
-
- public:
- explicit thread_body_wrapper(F f, const std::string &name="")
- : d_f(f), d_name(name) {}
-
- void operator()()
- {
- mask_signals();
-
- try {
- d_f();
- }
- catch(boost::thread_interrupted const &)
- {
- }
- catch(std::exception const &e)
- {
- std::cerr << "thread[" << d_name << "]: "
- << e.what() << std::endl;
- }
- catch(...)
- {
- std::cerr << "thread[" << d_name << "]: "
- << "caught unrecognized exception\n";
- }
- }
- };
-
- } /* namespace thread */
-} /* namespace gr */
-
-#endif /* INCLUDED_THREAD_BODY_WRAPPER_H */
diff --git a/gnuradio-runtime/include/thread/thread_group.h b/gnuradio-runtime/include/thread/thread_group.h
deleted file mode 100644
index 81b561bd64..0000000000
--- a/gnuradio-runtime/include/thread/thread_group.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright (C) 2001-2003 William E. Kempf
- * Copyright (C) 2007 Anthony Williams
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-/*
- * This was extracted from Boost 1.35.0 and fixed.
- */
-
-#ifndef INCLUDED_THREAD_GROUP_H
-#define INCLUDED_THREAD_GROUP_H
-
-#include <gr_runtime_api.h>
-#include <thread/thread.h>
-#include <boost/utility.hpp>
-#include <boost/thread/shared_mutex.hpp>
-#include <boost/function.hpp>
-
-namespace gr {
- namespace thread {
-
- class GR_RUNTIME_API thread_group : public boost::noncopyable
- {
- public:
- thread_group();
- ~thread_group();
-
- boost::thread* create_thread(const boost::function0<void>& threadfunc);
- void add_thread(boost::thread* thrd);
- void remove_thread(boost::thread* thrd);
- void join_all();
- void interrupt_all();
- size_t size() const;
-
- private:
- std::list<boost::thread*> m_threads;
- mutable boost::shared_mutex m_mutex;
- };
-
- } /* namespace thread */
-} /* namespace gr */
-
-#endif /* INCLUDED_THREAD_GROUP_H */
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt
index 98db673f5d..5193b98f57 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -27,8 +27,8 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
"import time;print time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime())"
OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
)
-message(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
-message(STATUS "Loading version ${VERSION} into gr_constants...")
+message(STATUS "Loading build date ${BUILD_DATE} into constants...")
+message(STATUS "Loading version ${VERSION} into constants...")
#double escape for windows backslash path separators
string(REPLACE "\\" "\\\\" prefix ${prefix})
@@ -36,11 +36,11 @@ string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
string(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.cc.in
- ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/constants.cc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/constants.cc
@ONLY)
-list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
+list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
########################################################################
# Include subdirs rather to populate to the sources lists.
@@ -63,67 +63,62 @@ include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
GR_INCLUDE_SUBDIRECTORY(pmt)
GR_INCLUDE_SUBDIRECTORY(messages)
GR_INCLUDE_SUBDIRECTORY(thread)
+GR_INCLUDE_SUBDIRECTORY(math)
########################################################################
# Setup library
########################################################################
list(APPEND gnuradio_runtime_sources
complex_vec_test.cc
- gr_basic_block.cc
- gr_block.cc
- gr_block_detail.cc
- gr_block_executor.cc
- gr_block_registry.cc
- gr_buffer.cc
- gr_circular_file.cc
- gr_dispatcher.cc
- gr_error_handler.cc
- gr_fast_atan2f.cc
- gr_feval.cc
- gr_flat_flowgraph.cc
- gr_flowgraph.cc
- gr_fxpt.cc
- gr_hier_block2.cc
- gr_hier_block2_detail.cc
- gri_debugger_hook.cc
- gr_io_signature.cc
- gr_local_sighandler.cc
- gr_logger.cc
- gr_message.cc
- gr_misc.cc
- gr_msg_accepter.cc
- gr_msg_handler.cc
- gr_msg_queue.cc
- gr_pagesize.cc
- gr_preferences.cc
- gr_prefs.cc
- gr_random.cc
- gr_realtime.cc
- gr_reverse.cc
- gr_scheduler.cc
- gr_scheduler_sts.cc
- gr_scheduler_tpb.cc
- gr_select_handler.cc
- gr_sincos.c
- gr_single_threaded_scheduler.cc
- gr_sptr_magic.cc
- gr_sync_block.cc
- gr_sync_decimator.cc
- gr_sync_interpolator.cc
- gr_sys_paths.cc
- gr_tagged_stream_block.cc
- gr_test.cc
- gr_top_block.cc
- gr_top_block_impl.cc
- gr_tpb_detail.cc
- gr_tpb_thread_body.cc
- gr_vmcircbuf.cc
- gr_vmcircbuf_createfilemapping.cc
- gr_vmcircbuf_mmap_shm_open.cc
- gr_vmcircbuf_mmap_tmpfile.cc
- gr_vmcircbuf_sysv_shm.cc
malloc16.c
- runtime_block_gateway.cc
+ basic_block.cc
+ block.cc
+ block_detail.cc
+ block_executor.cc
+ block_gateway_impl.cc
+ block_registry.cc
+ buffer.cc
+ circular_file.cc
+ dispatcher.cc
+ error_handler.cc
+ feval.cc
+ flat_flowgraph.cc
+ flowgraph.cc
+ hier_block2.cc
+ hier_block2_detail.cc
+ io_signature.cc
+ local_sighandler.cc
+ logger.cc
+ message.cc
+ misc.cc
+ msg_accepter.cc
+ msg_handler.cc
+ msg_queue.cc
+ pagesize.cc
+ prefs.cc
+ tagged_stream_block.cc
+ test.cc
+ top_block.cc
+ top_block_impl.cc
+ realtime.cc
+ scheduler.cc
+ scheduler_sts.cc
+ scheduler_tpb.cc
+ select_handler.cc
+ single_threaded_scheduler.cc
+ sptr_magic.cc
+ sync_block.cc
+ sync_decimator.cc
+ sync_interpolator.cc
+ sys_paths.cc
+ tpb_detail.cc
+ tpb_thread_body.cc
+ vmcircbuf.cc
+ vmcircbuf_createfilemapping.cc
+ vmcircbuf_mmap_shm_open.cc
+ vmcircbuf_mmap_tmpfile.cc
+ vmcircbuf_prefs.cc
+ vmcircbuf_sysv_shm.cc
)
# PowerPC workaround for posix_memalign
@@ -154,50 +149,7 @@ if(LINUX)
list(APPEND gnuradio_runtime_libs rt)
endif()
-if(ENABLE_GR_CTRLPORT)
-
-include_directories(${ICE_INCLUDE_DIR})
-
-# Add definition so we can compile in ControlPort to the blocks.
-ADD_DEFINITIONS(-DGR_CTRLPORT)
-
-########################################################################
-# Run ICE To compile Slice files
-########################################################################
-EXECUTE_PROCESS(
- COMMAND "${ICE_SLICE2CPP}" "-I${CMAKE_CURRENT_SOURCE_DIR}"
- "--output-dir=${CMAKE_CURRENT_BINARY_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}/gnuradio.ice"
- )
-
-list(APPEND gnuradio_runtime_sources
- ice_application_base.cc
- rpcmanager.cc
- rpcpmtconverters_ice.cc
- rpcserver_aggregator.cc
- rpcserver_booter_aggregator.cc
- rpcserver_booter_ice.cc
- rpcserver_ice.cc
- rpcserver_selector.cc
- rpcpmtconverters_ice.cc
-)
-
-# Append generated file in build directory
-list(APPEND gnuradio_runtime_sources
- ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
-)
-
-########################################################################
-# Add controlport stuff to gnuradio-runtime
-########################################################################
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-list(APPEND gnuradio_runtime_libs
- ${ICE_LIBRARIES}
-)
-
-endif(ENABLE_GR_CTRLPORT)
+GR_INCLUDE_SUBDIRECTORY(controlport)
########################################################################
# Add DLL resource file when using MSVC
@@ -257,23 +209,23 @@ include(GrTest)
# Append gnuradio-runtime test sources
########################################################################
list(APPEND test_gnuradio_runtime_sources
- qa_gr_buffer.cc
- qa_gr_circular_file.cc
- qa_gr_fxpt.cc
- qa_gr_fxpt_nco.cc
- qa_gr_fxpt_vco.cc
- qa_gr_io_signature.cc
- qa_gr_logger.cc
- qa_gr_math.cc
- qa_gr_vmcircbuf.cc
- qa_runtime.cc
- qa_sincos.cc
+ math/qa_fxpt.cc
+ math/qa_fxpt_nco.cc
+ math/qa_fxpt_vco.cc
+ math/qa_math.cc
+ math/qa_sincos.cc
pmt/qa_pmt.cc
pmt/qa_pmt_prims.cc
+ qa_buffer.cc
+ qa_io_signature.cc
+ qa_circular_file.cc
+ qa_logger.cc
+ qa_vmcircbuf.cc
+ qa_runtime.cc
${CMAKE_CURRENT_BINARY_DIR}/pmt/qa_pmt_unv.cc
)
-include_directories(${CPPUNIT_INCLUDE_DIRS})
+include_directories(${CPPUNIT_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/math)
link_directories(${CPPUNIT_LIBRARY_DIRS})
add_library(test-gnuradio-runtime SHARED ${test_gnuradio_runtime_sources})
diff --git a/gnuradio-runtime/lib/ICE_LICENSE b/gnuradio-runtime/lib/ICE_LICENSE
deleted file mode 100644
index 43ea7572d9..0000000000
--- a/gnuradio-runtime/lib/ICE_LICENSE
+++ /dev/null
@@ -1,54 +0,0 @@
-Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2 as
-published by the Free Software Foundation.
-
-Ice is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License version
-2 along with this program; if not, see http://www.gnu.org/licenses.
-
-Linking Ice statically or dynamically with other software (such as a
-library, module or application) is making a combined work based on Ice.
-Thus, the terms and conditions of the GNU General Public License version
-2 cover this combined work.
-
-If such software can only be used together with Ice, then not only the
-combined work but the software itself is a work derived from Ice and as
-such shall be licensed under the terms of the GNU General Public License
-version 2. This includes the situation where Ice is only being used
-through an abstraction layer.
-
-As a special exception to the above, ZeroC grants to the contributors for
-the following projects the permission to license their Ice-based software
-under the terms of the GNU Lesser General Public License (LGPL) version
-2.1 or of the BSD license:
-
- - Orca Robotics (http://orca-robotics.sourceforge.net)
-
- - Mumble (http://mumble.sourceforge.net)
-
-This exception does not extend to the parts of Ice used by these
-projects, or to any other derived work: as a whole, any work based on Ice
-shall be licensed under the terms and conditions of the GNU General
-Public License version 2.
-
-You may also combine Ice with any software not derived from Ice, provided
-the license of such software is compatible with the GNU General Public
-License version 2. In addition, as a special exception, ZeroC grants you
-permission to combine Ice with:
-
- - the OpenSSL library, or with a modified version of the OpenSSL library
- that uses the same license as OpenSSL
-
- - any library not derived from Ice and licensed under the terms of
- the Apache License, version 2.0
- (http://www.apache.org/licenses/LICENSE-2.0.html)
-
-If you modify this copy of Ice, you may extend any of the exceptions
-provided above to your version of Ice, but you are not obligated to
-do so.
diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc
new file mode 100644
index 0000000000..8060c5355c
--- /dev/null
+++ b/gnuradio-runtime/lib/basic_block.cc
@@ -0,0 +1,233 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/basic_block.h>
+#include <gnuradio/block_registry.h>
+#include <stdexcept>
+#include <sstream>
+#include <iostream>
+
+namespace gr {
+
+ static long s_next_id = 0;
+ static long s_ncurrently_allocated = 0;
+
+ long
+ basic_block_ncurrently_allocated()
+ {
+ return s_ncurrently_allocated;
+ }
+
+ basic_block::basic_block(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature)
+ : d_name(name),
+ d_input_signature(input_signature),
+ d_output_signature(output_signature),
+ d_unique_id(s_next_id++),
+ d_symbolic_id(global_block_registry.block_register(this)),
+ d_symbol_name(global_block_registry.register_symbolic_name(this)),
+ d_color(WHITE),
+ d_rpc_set(false),
+ message_subscribers(pmt::make_dict())
+ {
+ s_ncurrently_allocated++;
+ }
+
+ basic_block::~basic_block()
+ {
+ s_ncurrently_allocated--;
+ global_block_registry.block_unregister(this);
+ }
+
+ basic_block_sptr
+ basic_block::to_basic_block()
+ {
+ return shared_from_this();
+ }
+
+ void
+ basic_block::set_block_alias(std::string name)
+ {
+ global_block_registry.register_symbolic_name(this, name);
+ }
+
+ // ** Message passing interface **
+
+ // - register a new input message port
+ void
+ basic_block::message_port_register_in(pmt::pmt_t port_id)
+ {
+ if(!pmt::is_symbol(port_id)) {
+ throw std::runtime_error("message_port_register_in: bad port id");
+ }
+ msg_queue[port_id] = msg_queue_t();
+ msg_queue_ready[port_id] = boost::shared_ptr<boost::condition_variable>(new boost::condition_variable());
+ }
+
+ pmt::pmt_t
+ basic_block::message_ports_in()
+ {
+ pmt::pmt_t port_names = pmt::make_vector(msg_queue.size(), pmt::PMT_NIL);
+ msg_queue_map_itr itr = msg_queue.begin();
+ for(size_t i = 0; i < msg_queue.size(); i++) {
+ pmt::vector_set(port_names, i, (*itr).first);
+ itr++;
+ }
+ return port_names;
+ }
+
+ // - register a new output message port
+ void
+ basic_block::message_port_register_out(pmt::pmt_t port_id)
+ {
+ if(!pmt::is_symbol(port_id)) {
+ throw std::runtime_error("message_port_register_out: bad port id");
+ }
+ if(pmt::dict_has_key(message_subscribers, port_id)) {
+ throw std::runtime_error("message_port_register_out: port already in use");
+ }
+ message_subscribers = pmt::dict_add(message_subscribers, port_id, pmt::PMT_NIL);
+ }
+
+ pmt::pmt_t
+ basic_block::message_ports_out()
+ {
+ size_t len = pmt::length(message_subscribers);
+ pmt::pmt_t port_names = pmt::make_vector(len, pmt::PMT_NIL);
+ pmt::pmt_t keys = pmt::dict_keys(message_subscribers);
+ for(size_t i = 0; i < len; i++) {
+ pmt::vector_set(port_names, i, pmt::nth(i, keys));
+ }
+ return port_names;
+ }
+
+ // - publish a message on a message port
+ void basic_block::message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg)
+ {
+ if(!pmt::dict_has_key(message_subscribers, port_id)) {
+ throw std::runtime_error("port does not exist");
+ }
+
+ pmt::pmt_t currlist = pmt::dict_ref(message_subscribers, port_id, pmt::PMT_NIL);
+ // iterate through subscribers on port
+ while(pmt::is_pair(currlist)) {
+ pmt::pmt_t target = pmt::car(currlist);
+
+ pmt::pmt_t block = pmt::car(target);
+ pmt::pmt_t port = pmt::cdr(target);
+
+ currlist = pmt::cdr(currlist);
+ basic_block_sptr blk = global_block_registry.block_lookup(block);
+ //blk->post(msg);
+ blk->post(port, msg);
+ }
+ }
+
+ // - subscribe to a message port
+ void
+ basic_block::message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target){
+ if(!pmt::dict_has_key(message_subscribers, port_id)){
+ std::stringstream ss;
+ ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: "
+ << pmt::write_string(target) << std::endl;
+ throw std::runtime_error(ss.str());
+ }
+ pmt::pmt_t currlist = pmt::dict_ref(message_subscribers,port_id,pmt::PMT_NIL);
+
+ // ignore re-adds of the same target
+ if(!pmt::list_has(currlist, target))
+ message_subscribers = pmt::dict_add(message_subscribers,port_id,pmt::list_add(currlist,target));
+ }
+
+ void
+ basic_block::message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target)
+ {
+ if(!pmt::dict_has_key(message_subscribers, port_id)) {
+ std::stringstream ss;
+ ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: "
+ << pmt::write_string(target) << std::endl;
+ throw std::runtime_error(ss.str());
+ }
+
+ // ignore unsubs of unknown targets
+ pmt::pmt_t currlist = pmt::dict_ref(message_subscribers,port_id,pmt::PMT_NIL);
+ message_subscribers = pmt::dict_add(message_subscribers,port_id,pmt::list_rm(currlist,target));
+ }
+
+ void
+ basic_block::_post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ insert_tail(which_port, msg);
+ }
+
+ void
+ basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ gr::thread::scoped_lock guard(mutex);
+
+ if((msg_queue.find(which_port) == msg_queue.end()) || (msg_queue_ready.find(which_port) == msg_queue_ready.end())) {
+ std::cout << "target port = " << pmt::symbol_to_string(which_port) << std::endl;
+ throw std::runtime_error("attempted to insert_tail on invalid queue!");
+ }
+
+ msg_queue[which_port].push_back(msg);
+ msg_queue_ready[which_port]->notify_one();
+
+ // wake up thread if BLKD_IN or BLKD_OUT
+ global_block_registry.notify_blk(alias());
+ }
+
+ pmt::pmt_t
+ basic_block::delete_head_nowait(pmt::pmt_t which_port)
+ {
+ gr::thread::scoped_lock guard(mutex);
+
+ if(empty_p(which_port)) {
+ return pmt::pmt_t();
+ }
+
+ pmt::pmt_t m(msg_queue[which_port].front());
+ msg_queue[which_port].pop_front();
+
+ return m;
+ }
+
+ pmt::pmt_t
+ basic_block::delete_head_blocking(pmt::pmt_t which_port)
+ {
+ gr::thread::scoped_lock guard(mutex);
+
+ while(empty_p(which_port)) {
+ msg_queue_ready[which_port]->wait(guard);
+ }
+
+ pmt::pmt_t m(msg_queue[which_port].front());
+ msg_queue[which_port].pop_front();
+ return m;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
new file mode 100644
index 0000000000..b38377e856
--- /dev/null
+++ b/gnuradio-runtime/lib/block.cc
@@ -0,0 +1,689 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/block.h>
+#include <gnuradio/block_registry.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/prefs.h>
+#include <stdexcept>
+#include <iostream>
+
+namespace gr {
+
+ block::block(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature)
+ : basic_block(name, input_signature, output_signature),
+ d_output_multiple (1),
+ d_output_multiple_set(false),
+ d_unaligned(0),
+ d_is_unaligned(false),
+ d_relative_rate (1.0),
+ d_history(1),
+ d_fixed_rate(false),
+ d_max_noutput_items_set(false),
+ d_max_noutput_items(0),
+ d_min_noutput_items(0),
+ d_tag_propagation_policy(TPP_ALL_TO_ALL),
+ d_pc_rpc_set(false),
+ d_max_output_buffer(std::max(output_signature->max_streams(),1), -1),
+ d_min_output_buffer(std::max(output_signature->max_streams(),1), -1)
+ {
+ global_block_registry.register_primitive(alias(), this);
+
+#ifdef ENABLE_GR_LOG
+#ifdef HAVE_LOG4CPP
+ prefs *p = prefs::singleton();
+ std::string config_file = p->get_string("LOG", "log_config", "");
+ std::string log_level = p->get_string("LOG", "log_level", "off");
+ std::string log_file = p->get_string("LOG", "log_file", "");
+ std::string debug_level = p->get_string("LOG", "debug_level", "off");
+ std::string debug_file = p->get_string("LOG", "debug_file", "");
+
+ GR_CONFIG_LOGGER(config_file);
+
+ GR_LOG_GETLOGGER(LOG, "gr_log." + alias());
+ GR_LOG_SET_LEVEL(LOG, log_level);
+ if(log_file.size() > 0) {
+ if(log_file == "stdout") {
+ GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
+ }
+ else if(log_file == "stderr") {
+ GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
+ }
+ else {
+ GR_LOG_ADD_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
+ }
+ }
+ d_logger = LOG;
+
+ GR_LOG_GETLOGGER(DLOG, "gr_log_debug." + alias());
+ GR_LOG_SET_LEVEL(DLOG, debug_level);
+ if(debug_file.size() > 0) {
+ if(debug_file == "stdout") {
+ GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cout","gr::debug :%p: %c{1} - %m%n");
+ }
+ else if(debug_file == "stderr") {
+ GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cerr", "gr::debug :%p: %c{1} - %m%n");
+ }
+ else {
+ GR_LOG_ADD_FILE_APPENDER(DLOG, debug_file, true, "%r :%p: %c{1} - %m%n");
+ }
+ }
+ d_debug_logger = DLOG;
+#endif /* HAVE_LOG4CPP */
+#else /* ENABLE_GR_LOG */
+ d_logger = NULL;
+ d_debug_logger = NULL;
+#endif /* ENABLE_GR_LOG */
+ }
+
+ block::~block()
+ {
+ global_block_registry.unregister_primitive(alias());
+ }
+
+ // stub implementation: 1:1
+
+ void
+ block::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size ();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = noutput_items + history() - 1;
+ }
+
+ // default implementation
+
+ bool
+ block::start()
+ {
+ return true;
+ }
+
+ bool
+ block::stop()
+ {
+ return true;
+ }
+
+ void
+ block::set_output_multiple(int multiple)
+ {
+ if(multiple < 1)
+ throw std::invalid_argument("block::set_output_multiple");
+
+ d_output_multiple_set = true;
+ d_output_multiple = multiple;
+ }
+
+ void
+ block::set_alignment(int multiple)
+ {
+ if(multiple < 1)
+ throw std::invalid_argument("block::set_alignment_multiple");
+
+ d_output_multiple = multiple;
+ }
+
+ void
+ block::set_unaligned(int na)
+ {
+ // unaligned value must be less than 0 and it doesn't make sense
+ // that it's larger than the alignment value.
+ if((na < 0) || (na > d_output_multiple))
+ throw std::invalid_argument("block::set_unaligned");
+
+ d_unaligned = na;
+ }
+
+ void
+ block::set_is_unaligned(bool u)
+ {
+ d_is_unaligned = u;
+ }
+
+ void
+ block::set_relative_rate(double relative_rate)
+ {
+ if(relative_rate < 0.0)
+ throw std::invalid_argument("block::set_relative_rate");
+
+ d_relative_rate = relative_rate;
+ }
+
+ void
+ block::consume(int which_input, int how_many_items)
+ {
+ d_detail->consume(which_input, how_many_items);
+ }
+
+ void
+ block::consume_each(int how_many_items)
+ {
+ d_detail->consume_each(how_many_items);
+ }
+
+ void
+ block::produce(int which_output, int how_many_items)
+ {
+ d_detail->produce(which_output, how_many_items);
+ }
+
+ int
+ block::fixed_rate_ninput_to_noutput(int ninput)
+ {
+ throw std::runtime_error("Unimplemented");
+ }
+
+ int
+ block::fixed_rate_noutput_to_ninput(int noutput)
+ {
+ throw std::runtime_error("Unimplemented");
+ }
+
+ uint64_t
+ block::nitems_read(unsigned int which_input)
+ {
+ if(d_detail) {
+ return d_detail->nitems_read(which_input);
+ }
+ else {
+ //throw std::runtime_error("No block_detail associated with block yet");
+ return 0;
+ }
+ }
+
+ uint64_t
+ block::nitems_written(unsigned int which_output)
+ {
+ if(d_detail) {
+ return d_detail->nitems_written(which_output);
+ }
+ else {
+ //throw std::runtime_error("No block_detail associated with block yet");
+ return 0;
+ }
+ }
+
+ void
+ block::add_item_tag(unsigned int which_output,
+ const tag_t &tag)
+ {
+ d_detail->add_item_tag(which_output, tag);
+ }
+
+ void
+ block::remove_item_tag(unsigned int which_input,
+ const tag_t &tag)
+ {
+ d_detail->remove_item_tag(which_input, tag);
+ }
+
+ void
+ block::get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_output,
+ uint64_t start, uint64_t end)
+ {
+ d_detail->get_tags_in_range(v, which_output, start, end);
+ }
+
+ void
+ block::get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_output,
+ uint64_t start, uint64_t end,
+ const pmt::pmt_t &key)
+ {
+ d_detail->get_tags_in_range(v, which_output, start, end, key);
+ }
+
+ block::tag_propagation_policy_t
+ block::tag_propagation_policy()
+ {
+ return d_tag_propagation_policy;
+ }
+
+ void
+ block::set_tag_propagation_policy(tag_propagation_policy_t p)
+ {
+ d_tag_propagation_policy = p;
+ }
+
+ int
+ block::max_noutput_items()
+ {
+ return d_max_noutput_items;
+ }
+
+ void
+ block::set_max_noutput_items(int m)
+ {
+ if(m <= 0)
+ throw std::runtime_error("block::set_max_noutput_items: value for max_noutput_items must be greater than 0.\n");
+
+ d_max_noutput_items = m;
+ d_max_noutput_items_set = true;
+ }
+
+ void
+ block::unset_max_noutput_items()
+ {
+ d_max_noutput_items_set = false;
+ }
+
+ bool
+ block::is_set_max_noutput_items()
+ {
+ return d_max_noutput_items_set;
+ }
+
+ void
+ block::set_processor_affinity(const std::vector<int> &mask)
+ {
+ d_affinity = mask;
+ if(d_detail) {
+ d_detail->set_processor_affinity(d_affinity);
+ }
+ }
+
+ void
+ block::unset_processor_affinity()
+ {
+ d_affinity.clear();
+ if(d_detail) {
+ d_detail->unset_processor_affinity();
+ }
+ }
+
+ float
+ block::pc_noutput_items()
+ {
+ if(d_detail) {
+ return d_detail->pc_noutput_items();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_noutput_items_avg()
+ {
+ if(d_detail) {
+ return d_detail->pc_noutput_items_avg();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_noutput_items_var()
+ {
+ if(d_detail) {
+ return d_detail->pc_noutput_items_var();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_nproduced()
+ {
+ if(d_detail) {
+ return d_detail->pc_nproduced();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_nproduced_avg()
+ {
+ if(d_detail) {
+ return d_detail->pc_nproduced_avg();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_nproduced_var()
+ {
+ if(d_detail) {
+ return d_detail->pc_nproduced_var();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_input_buffers_full(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_input_buffers_full_avg(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full_avg(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_input_buffers_full_var(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full_var(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ std::vector<float>
+ block::pc_input_buffers_full()
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ std::vector<float>
+ block::pc_input_buffers_full_avg()
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full_avg();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ std::vector<float>
+ block::pc_input_buffers_full_var()
+ {
+ if(d_detail) {
+ return d_detail->pc_input_buffers_full_var();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ float
+ block::pc_output_buffers_full(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_output_buffers_full_avg(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full_avg(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_output_buffers_full_var(int which)
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full_var(static_cast<size_t>(which));
+ }
+ else {
+ return 0;
+ }
+ }
+
+ std::vector<float>
+ block::pc_output_buffers_full()
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ std::vector<float>
+ block::pc_output_buffers_full_avg()
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full_avg();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ std::vector<float>
+ block::pc_output_buffers_full_var()
+ {
+ if(d_detail) {
+ return d_detail->pc_output_buffers_full_var();
+ }
+ else {
+ return std::vector<float>(1,0);
+ }
+ }
+
+ float
+ block::pc_work_time()
+ {
+ if(d_detail) {
+ return d_detail->pc_work_time();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_work_time_avg()
+ {
+ if(d_detail) {
+ return d_detail->pc_work_time_avg();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ float
+ block::pc_work_time_var()
+ {
+ if(d_detail) {
+ return d_detail->pc_work_time_var();
+ }
+ else {
+ return 0;
+ }
+ }
+
+ void
+ block::reset_perf_counters()
+ {
+ if(d_detail) {
+ d_detail->reset_perf_counters();
+ }
+ }
+
+ void
+ block::setup_pc_rpc()
+ {
+ d_pc_rpc_set = true;
+#ifdef GR_CTRLPORT
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "noutput_items", &block::pc_noutput_items,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "noutput items", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "avg noutput_items", &block::pc_noutput_items_avg,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "Average noutput items", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "var noutput_items", &block::pc_noutput_items_var,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "Var. noutput items", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "nproduced", &block::pc_nproduced,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "items produced", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "avg nproduced", &block::pc_nproduced_avg,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "Average items produced", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "var nproduced", &block::pc_nproduced_var,
+ pmt::mp(0), pmt::mp(32768), pmt::mp(0),
+ "", "Var. items produced", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "work time", &block::pc_work_time,
+ pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
+ "", "clock cycles in call to work", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "avg work time", &block::pc_work_time_avg,
+ pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
+ "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ alias(), "var work time", &block::pc_work_time_var,
+ pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
+ "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "input \% full", &block::pc_input_buffers_full,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "how full input buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "avg input \% full", &block::pc_input_buffers_full_avg,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "Average of how full input buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "var input \% full", &block::pc_input_buffers_full_var,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "Var. of how full input buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "output \% full", &block::pc_output_buffers_full,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "how full output buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "avg output \% full", &block::pc_output_buffers_full_avg,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "Average of how full output buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float> >(
+ alias(), "var output \% full", &block::pc_output_buffers_full_var,
+ pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
+ "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP)));
+#endif /* GR_CTRLPORT */
+ }
+
+ std::ostream&
+ operator << (std::ostream& os, const block *m)
+ {
+ os << "<block " << m->name() << " (" << m->unique_id() << ")>";
+ return os;
+ }
+
+ int
+ block::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ throw std::runtime_error("block::general_work() not implemented");
+ return 0;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc
new file mode 100644
index 0000000000..a3ab4b3f7b
--- /dev/null
+++ b/gnuradio-runtime/lib/block_detail.cc
@@ -0,0 +1,474 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <iostream>
+
+namespace gr {
+
+ static long s_ncurrently_allocated = 0;
+
+ long
+ block_detail_ncurrently_allocated()
+ {
+ return s_ncurrently_allocated;
+ }
+
+ block_detail::block_detail(unsigned int ninputs, unsigned int noutputs)
+ : d_produce_or(0),
+ d_ninputs(ninputs), d_noutputs(noutputs),
+ d_input(ninputs), d_output(noutputs),
+ d_done(false),
+ d_ins_noutput_items(0),
+ d_avg_noutput_items(0),
+ d_var_noutput_items(0),
+ d_ins_nproduced(0),
+ d_avg_nproduced(0),
+ d_var_nproduced(0),
+ d_ins_input_buffers_full(ninputs, 0),
+ d_avg_input_buffers_full(ninputs, 0),
+ d_var_input_buffers_full(ninputs, 0),
+ d_ins_output_buffers_full(noutputs, 0),
+ d_avg_output_buffers_full(noutputs, 0),
+ d_var_output_buffers_full(noutputs, 0),
+ d_ins_work_time(0),
+ d_avg_work_time(0),
+ d_var_work_time(0),
+ d_pc_counter(0)
+ {
+ s_ncurrently_allocated++;
+ }
+
+ block_detail::~block_detail()
+ {
+ // should take care of itself
+ s_ncurrently_allocated--;
+ }
+
+ void
+ block_detail::set_input(unsigned int which, buffer_reader_sptr reader)
+ {
+ if(which >= d_ninputs)
+ throw std::invalid_argument("block_detail::set_input");
+
+ d_input[which] = reader;
+ }
+
+ void
+ block_detail::set_output(unsigned int which, buffer_sptr buffer)
+ {
+ if(which >= d_noutputs)
+ throw std::invalid_argument("block_detail::set_output");
+
+ d_output[which] = buffer;
+ }
+
+ block_detail_sptr
+ make_block_detail(unsigned int ninputs, unsigned int noutputs)
+ {
+ return block_detail_sptr (new block_detail(ninputs, noutputs));
+ }
+
+ void
+ block_detail::set_done(bool done)
+ {
+ d_done = done;
+ for(unsigned int i = 0; i < d_noutputs; i++)
+ d_output[i]->set_done(done);
+
+ for(unsigned int i = 0; i < d_ninputs; i++)
+ d_input[i]->set_done(done);
+ }
+
+ void
+ block_detail::consume(int which_input, int how_many_items)
+ {
+ if(how_many_items > 0) {
+ input(which_input)->update_read_pointer(how_many_items);
+ }
+ }
+
+ void
+ block_detail::consume_each(int how_many_items)
+ {
+ if(how_many_items > 0) {
+ for(int i = 0; i < ninputs (); i++) {
+ d_input[i]->update_read_pointer(how_many_items);
+ }
+ }
+ }
+
+ void
+ block_detail::produce(int which_output, int how_many_items)
+ {
+ if(how_many_items > 0) {
+ d_output[which_output]->update_write_pointer(how_many_items);
+ d_produce_or |= how_many_items;
+ }
+ }
+
+ void
+ block_detail::produce_each(int how_many_items)
+ {
+ if(how_many_items > 0) {
+ for(int i = 0; i < noutputs (); i++) {
+ d_output[i]->update_write_pointer (how_many_items);
+ }
+ d_produce_or |= how_many_items;
+ }
+ }
+
+ uint64_t
+ block_detail::nitems_read(unsigned int which_input)
+ {
+ if(which_input >= d_ninputs)
+ throw std::invalid_argument ("block_detail::n_input_items");
+ return d_input[which_input]->nitems_read();
+ }
+
+ uint64_t
+ block_detail::nitems_written(unsigned int which_output)
+ {
+ if(which_output >= d_noutputs)
+ throw std::invalid_argument ("block_detail::n_output_items");
+ return d_output[which_output]->nitems_written();
+ }
+
+ void
+ block_detail::add_item_tag(unsigned int which_output, const tag_t &tag)
+ {
+ if(!pmt::is_symbol(tag.key)) {
+ throw pmt::wrong_type("block_detail::add_item_tag key", tag.key);
+ }
+ else {
+ // Add tag to gr_buffer's deque tags
+ d_output[which_output]->add_item_tag(tag);
+ }
+ }
+
+ void
+ block_detail::remove_item_tag(unsigned int which_input, const tag_t &tag)
+ {
+ if(!pmt::is_symbol(tag.key)) {
+ throw pmt::wrong_type("block_detail::add_item_tag key", tag.key);
+ }
+ else {
+ // Add tag to gr_buffer's deque tags
+ d_input[which_input]->buffer()->remove_item_tag(tag);
+ }
+ }
+
+ void
+ block_detail::get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end)
+ {
+ // get from gr_buffer_reader's deque of tags
+ d_input[which_input]->get_tags_in_range(v, abs_start, abs_end);
+ }
+
+ void
+ block_detail::get_tags_in_range(std::vector<tag_t> &v,
+ unsigned int which_input,
+ uint64_t abs_start,
+ uint64_t abs_end,
+ const pmt::pmt_t &key)
+ {
+ std::vector<tag_t> found_items;
+
+ v.resize(0);
+
+ // get from gr_buffer_reader's deque of tags
+ d_input[which_input]->get_tags_in_range(found_items, abs_start, abs_end);
+
+ // Filter further by key name
+ pmt::pmt_t itemkey;
+ std::vector<tag_t>::iterator itr;
+ for(itr = found_items.begin(); itr != found_items.end(); itr++) {
+ itemkey = (*itr).key;
+ if(pmt::eqv(key, itemkey)) {
+ v.push_back(*itr);
+ }
+ }
+ }
+
+ void
+ block_detail::set_processor_affinity(const std::vector<int> &mask)
+ {
+ if(threaded) {
+ try {
+ gr::thread::thread_bind_to_processor(thread, mask);
+ }
+ catch (std::runtime_error e) {
+ std::cerr << "set_processor_affinity: invalid mask." << std::endl;;
+ }
+ }
+ }
+
+ void
+ block_detail::unset_processor_affinity()
+ {
+ if(threaded) {
+ gr::thread::thread_unbind(thread);
+ }
+ }
+
+ void
+ block_detail::start_perf_counters()
+ {
+ d_start_of_work = gr::high_res_timer_now();
+ }
+
+ void
+ block_detail::stop_perf_counters(int noutput_items, int nproduced)
+ {
+ d_end_of_work = gr::high_res_timer_now();
+ gr::high_res_timer_type diff = d_end_of_work - d_start_of_work;
+
+ if(d_pc_counter == 0) {
+ d_ins_work_time = diff;
+ d_avg_work_time = diff;
+ d_var_work_time = 0;
+ d_ins_nproduced = nproduced;
+ d_avg_nproduced = nproduced;
+ d_var_nproduced = 0;
+ d_ins_noutput_items = noutput_items;
+ d_avg_noutput_items = noutput_items;
+ d_var_noutput_items = 0;
+ for(size_t i=0; i < d_input.size(); i++) {
+ float pfull = static_cast<float>(d_input[i]->items_available()) /
+ static_cast<float>(d_input[i]->max_possible_items_available());
+ d_ins_input_buffers_full[i] = pfull;
+ d_avg_input_buffers_full[i] = pfull;
+ d_var_input_buffers_full[i] = 0;
+ }
+ for(size_t i=0; i < d_output.size(); i++) {
+ float pfull = 1.0f - static_cast<float>(d_output[i]->space_available()) /
+ static_cast<float>(d_output[i]->bufsize());
+ d_ins_output_buffers_full[i] = pfull;
+ d_avg_output_buffers_full[i] = pfull;
+ d_var_output_buffers_full[i] = 0;
+ }
+ }
+ else {
+ float d = diff - d_avg_work_time;
+ d_ins_work_time = diff;
+ d_avg_work_time = d_avg_work_time + d/d_pc_counter;
+ d_var_work_time = d_var_work_time + d*d;
+
+ d = nproduced - d_avg_nproduced;
+ d_ins_nproduced = nproduced;
+ d_avg_nproduced = d_avg_nproduced + d/d_pc_counter;
+ d_var_nproduced = d_var_nproduced + d*d;
+
+ d = noutput_items - d_avg_noutput_items;
+ d_ins_noutput_items = noutput_items;
+ d_avg_noutput_items = d_avg_noutput_items + d/d_pc_counter;
+ d_var_noutput_items = d_var_noutput_items + d*d;
+
+ for(size_t i=0; i < d_input.size(); i++) {
+ float pfull = static_cast<float>(d_input[i]->items_available()) /
+ static_cast<float>(d_input[i]->max_possible_items_available());
+
+ d = pfull - d_avg_input_buffers_full[i];
+ d_ins_input_buffers_full[i] = pfull;
+ d_avg_input_buffers_full[i] = d_avg_input_buffers_full[i] + d/d_pc_counter;
+ d_var_input_buffers_full[i] = d_var_input_buffers_full[i] + d*d;
+ }
+
+ for(size_t i=0; i < d_output.size(); i++) {
+ float pfull = 1.0f - static_cast<float>(d_output[i]->space_available()) /
+ static_cast<float>(d_output[i]->bufsize());
+
+ d = pfull - d_avg_output_buffers_full[i];
+ d_ins_output_buffers_full[i] = pfull;
+ d_avg_output_buffers_full[i] = d_avg_output_buffers_full[i] + d/d_pc_counter;
+ d_var_output_buffers_full[i] = d_var_output_buffers_full[i] + d*d;
+ }
+ }
+
+ d_pc_counter++;
+ }
+
+ void
+ block_detail::reset_perf_counters()
+ {
+ d_pc_counter = 0;
+ }
+
+ float
+ block_detail::pc_noutput_items()
+ {
+ return d_ins_noutput_items;
+ }
+
+ float
+ block_detail::pc_nproduced()
+ {
+ return d_ins_nproduced;
+ }
+
+ float
+ block_detail::pc_input_buffers_full(size_t which)
+ {
+ if(which < d_ins_input_buffers_full.size())
+ return d_ins_input_buffers_full[which];
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_input_buffers_full()
+ {
+ return d_ins_input_buffers_full;
+ }
+
+ float
+ block_detail::pc_output_buffers_full(size_t which)
+ {
+ if(which < d_ins_output_buffers_full.size())
+ return d_ins_output_buffers_full[which];
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_output_buffers_full()
+ {
+ return d_ins_output_buffers_full;
+ }
+
+ float
+ block_detail::pc_work_time()
+ {
+ return d_ins_work_time;
+ }
+
+ float
+ block_detail::pc_noutput_items_avg()
+ {
+ return d_avg_noutput_items;
+ }
+
+ float
+ block_detail::pc_nproduced_avg()
+ {
+ return d_avg_nproduced;
+ }
+
+ float
+ block_detail::pc_input_buffers_full_avg(size_t which)
+ {
+ if(which < d_avg_input_buffers_full.size())
+ return d_avg_input_buffers_full[which];
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_input_buffers_full_avg()
+ {
+ return d_avg_input_buffers_full;
+ }
+
+ float
+ block_detail::pc_output_buffers_full_avg(size_t which)
+ {
+ if(which < d_avg_output_buffers_full.size())
+ return d_avg_output_buffers_full[which];
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_output_buffers_full_avg()
+ {
+ return d_avg_output_buffers_full;
+ }
+
+ float
+ block_detail::pc_work_time_avg()
+ {
+ return d_avg_work_time;
+ }
+
+ float
+ block_detail::pc_noutput_items_var()
+ {
+ return d_var_noutput_items/(d_pc_counter-1);
+ }
+
+ float
+ block_detail::pc_nproduced_var()
+ {
+ return d_var_nproduced/(d_pc_counter-1);
+ }
+
+ float
+ block_detail::pc_input_buffers_full_var(size_t which)
+ {
+ if(which < d_avg_input_buffers_full.size())
+ return d_var_input_buffers_full[which]/(d_pc_counter-1);
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_input_buffers_full_var()
+ {
+ std::vector<float> var(d_avg_input_buffers_full.size(), 0);
+ for(size_t i = 0; i < d_avg_input_buffers_full.size(); i++)
+ var[i] = d_avg_input_buffers_full[i]/(d_pc_counter-1);
+ return var;
+ }
+
+ float
+ block_detail::pc_output_buffers_full_var(size_t which)
+ {
+ if(which < d_avg_output_buffers_full.size())
+ return d_var_output_buffers_full[which]/(d_pc_counter-1);
+ else
+ return 0;
+ }
+
+ std::vector<float>
+ block_detail::pc_output_buffers_full_var()
+ {
+ std::vector<float> var(d_avg_output_buffers_full.size(), 0);
+ for(size_t i = 0; i < d_avg_output_buffers_full.size(); i++)
+ var[i] = d_avg_output_buffers_full[i]/(d_pc_counter-1);
+ return var;
+ }
+
+ float
+ block_detail::pc_work_time_var()
+ {
+ return d_var_work_time/(d_pc_counter-1);
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc
new file mode 100644
index 0000000000..8059ea2d5a
--- /dev/null
+++ b/gnuradio-runtime/lib/block_executor.cc
@@ -0,0 +1,489 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008-2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <block_executor.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/prefs.h>
+#include <boost/thread.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+#include <limits>
+#include <assert.h>
+#include <stdio.h>
+
+namespace gr {
+
+// must be defined to either 0 or 1
+#define ENABLE_LOGGING 0
+
+#if (ENABLE_LOGGING)
+#define LOG(x) do { x; } while(0)
+#else
+#define LOG(x) do {;} while(0)
+#endif
+
+ static int which_scheduler = 0;
+
+ inline static unsigned int
+ round_up(unsigned int n, unsigned int multiple)
+ {
+ return ((n + multiple - 1) / multiple) * multiple;
+ }
+
+ inline static unsigned int
+ round_down(unsigned int n, unsigned int multiple)
+ {
+ return (n / multiple) * multiple;
+ }
+
+ //
+ // Return minimum available write space in all our downstream
+ // buffers or -1 if we're output blocked and the output we're
+ // blocked on is done.
+ //
+ static int
+ min_available_space(block_detail *d, int output_multiple, int min_noutput_items)
+ {
+ int min_space = std::numeric_limits<int>::max();
+ if(min_noutput_items == 0)
+ min_noutput_items = 1;
+ for(int i = 0; i < d->noutputs (); i++) {
+ gr::thread::scoped_lock guard(*d->output(i)->mutex());
+ int avail_n = round_down(d->output(i)->space_available(), output_multiple);
+ int best_n = round_down(d->output(i)->bufsize()/2, output_multiple);
+ if(best_n < min_noutput_items)
+ throw std::runtime_error("Buffer too small for min_noutput_items");
+ int n = std::min(avail_n, best_n);
+ if(n < min_noutput_items){ // We're blocked on output.
+ if(d->output(i)->done()){ // Downstream is done, therefore we're done.
+ return -1;
+ }
+ return 0;
+ }
+ min_space = std::min(min_space, n);
+ }
+ return min_space;
+ }
+
+ static bool
+ propagate_tags(block::tag_propagation_policy_t policy, block_detail *d,
+ const std::vector<uint64_t> &start_nitems_read, double rrate,
+ std::vector<tag_t> &rtags)
+ {
+ // Move tags downstream
+ // if a sink, we don't need to move downstream
+ if(d->sink_p()) {
+ return true;
+ }
+
+ switch(policy) {
+ case block::TPP_DONT:
+ return true;
+ break;
+ case block::TPP_ALL_TO_ALL:
+ // every tag on every input propogates to everyone downstream
+ for(int i = 0; i < d->ninputs(); i++) {
+ d->get_tags_in_range(rtags, i, start_nitems_read[i],
+ d->nitems_read(i));
+
+ std::vector<tag_t>::iterator t;
+ if(rrate == 1.0) {
+ for(t = rtags.begin(); t != rtags.end(); t++) {
+ for(int o = 0; o < d->noutputs(); o++)
+ d->output(o)->add_item_tag(*t);
+ }
+ }
+ else {
+ for(t = rtags.begin(); t != rtags.end(); t++) {
+ tag_t new_tag = *t;
+ new_tag.offset *= rrate;
+ for(int o = 0; o < d->noutputs(); o++)
+ d->output(o)->add_item_tag(new_tag);
+ }
+ }
+ }
+ break;
+ case block::TPP_ONE_TO_ONE:
+ // tags from input i only go to output i
+ // this requires d->ninputs() == d->noutputs; this is checked when this
+ // type of tag-propagation system is selected in block_detail
+ if(d->ninputs() == d->noutputs()) {
+ for(int i = 0; i < d->ninputs(); i++) {
+ d->get_tags_in_range(rtags, i, start_nitems_read[i],
+ d->nitems_read(i));
+
+ std::vector<tag_t>::iterator t;
+ for(t = rtags.begin(); t != rtags.end(); t++) {
+ tag_t new_tag = *t;
+ new_tag.offset *= rrate;
+ d->output(i)->add_item_tag(new_tag);
+ }
+ }
+ }
+ else {
+ std::cerr << "Error: block_executor: propagation_policy 'ONE-TO-ONE' requires ninputs == noutputs" << std::endl;
+ return false;
+ }
+
+ break;
+ default:
+ return true;
+ }
+ return true;
+ }
+
+ block_executor::block_executor(block_sptr block, int max_noutput_items)
+ : d_block(block), d_log(0), d_max_noutput_items(max_noutput_items)
+ {
+ if(ENABLE_LOGGING) {
+ std::string name = str(boost::format("sst-%03d.log") % which_scheduler++);
+ d_log = new std::ofstream(name.c_str());
+ std::unitbuf(*d_log); // make it unbuffered...
+ *d_log << "block_executor: "
+ << d_block << std::endl;
+ }
+
+#ifdef GR_PERFORMANCE_COUNTERS
+ prefs *prefs = prefs::singleton();
+ d_use_pc = prefs->get_bool("PerfCounters", "on", false);
+#endif /* GR_PERFORMANCE_COUNTERS */
+
+ d_block->start(); // enable any drivers, etc.
+ }
+
+ block_executor::~block_executor()
+ {
+ if(ENABLE_LOGGING)
+ delete d_log;
+
+ d_block->stop(); // stop any drivers, etc.
+ }
+
+ block_executor::state
+ block_executor::run_one_iteration()
+ {
+ int noutput_items;
+ int max_items_avail;
+ int max_noutput_items = d_max_noutput_items;
+ int new_alignment = 0;
+ int alignment_state = -1;
+
+ block *m = d_block.get();
+ block_detail *d = m->detail().get();
+
+ LOG(*d_log << std::endl << m);
+
+ if(d->done()){
+ assert(0);
+ return DONE;
+ }
+
+ if(d->source_p ()) {
+ d_ninput_items_required.resize(0);
+ d_ninput_items.resize(0);
+ d_input_items.resize(0);
+ d_input_done.resize(0);
+ d_output_items.resize(d->noutputs());
+ d_start_nitems_read.resize(0);
+
+ // determine the minimum available output space
+ noutput_items = min_available_space(d, m->output_multiple (), m->min_noutput_items ());
+ noutput_items = std::min(noutput_items, max_noutput_items);
+ LOG(*d_log << " source\n noutput_items = " << noutput_items << std::endl);
+ if(noutput_items == -1) // we're done
+ goto were_done;
+
+ if(noutput_items == 0){ // we're output blocked
+ LOG(*d_log << " BLKD_OUT\n");
+ return BLKD_OUT;
+ }
+
+ goto setup_call_to_work; // jump to common code
+ }
+
+ else if(d->sink_p ()) {
+ d_ninput_items_required.resize(d->ninputs ());
+ d_ninput_items.resize(d->ninputs ());
+ d_input_items.resize(d->ninputs ());
+ d_input_done.resize(d->ninputs());
+ d_output_items.resize (0);
+ d_start_nitems_read.resize(d->ninputs());
+ LOG(*d_log << " sink\n");
+
+ max_items_avail = 0;
+ for(int i = 0; i < d->ninputs (); i++) {
+ {
+ /*
+ * Acquire the mutex and grab local copies of items_available and done.
+ */
+ gr::thread::scoped_lock guard(*d->input(i)->mutex());
+ d_ninput_items[i] = d->input(i)->items_available();
+ d_input_done[i] = d->input(i)->done();
+ }
+
+ LOG(*d_log << " d_ninput_items[" << i << "] = " << d_ninput_items[i] << std::endl);
+ LOG(*d_log << " d_input_done[" << i << "] = " << d_input_done[i] << std::endl);
+
+ if (d_ninput_items[i] < m->output_multiple() && d_input_done[i])
+ goto were_done;
+
+ max_items_avail = std::max (max_items_avail, d_ninput_items[i]);
+ }
+
+ // take a swag at how much output we can sink
+ noutput_items = (int)(max_items_avail * m->relative_rate ());
+ noutput_items = round_down(noutput_items, m->output_multiple ());
+ noutput_items = std::min(noutput_items, max_noutput_items);
+ LOG(*d_log << " max_items_avail = " << max_items_avail << std::endl);
+ LOG(*d_log << " noutput_items = " << noutput_items << std::endl);
+
+ if(noutput_items == 0) { // we're blocked on input
+ LOG(*d_log << " BLKD_IN\n");
+ return BLKD_IN;
+ }
+
+ goto try_again; // Jump to code shared with regular case.
+ }
+
+ else {
+ // do the regular thing
+ d_ninput_items_required.resize (d->ninputs ());
+ d_ninput_items.resize (d->ninputs ());
+ d_input_items.resize (d->ninputs ());
+ d_input_done.resize(d->ninputs());
+ d_output_items.resize (d->noutputs ());
+ d_start_nitems_read.resize(d->ninputs());
+
+ max_items_avail = 0;
+ for(int i = 0; i < d->ninputs (); i++) {
+ {
+ /*
+ * Acquire the mutex and grab local copies of items_available and done.
+ */
+ gr::thread::scoped_lock guard(*d->input(i)->mutex());
+ d_ninput_items[i] = d->input(i)->items_available ();
+ d_input_done[i] = d->input(i)->done();
+ }
+ max_items_avail = std::max(max_items_avail, d_ninput_items[i]);
+ }
+
+ // determine the minimum available output space
+ noutput_items = min_available_space(d, m->output_multiple(), m->min_noutput_items());
+ if(ENABLE_LOGGING) {
+ *d_log << " regular ";
+ if(m->relative_rate() >= 1.0)
+ *d_log << "1:" << m->relative_rate() << std::endl;
+ else
+ *d_log << 1.0/m->relative_rate() << ":1\n";
+ *d_log << " max_items_avail = " << max_items_avail << std::endl;
+ *d_log << " noutput_items = " << noutput_items << std::endl;
+ }
+ if(noutput_items == -1) // we're done
+ goto were_done;
+
+ if(noutput_items == 0) { // we're output blocked
+ LOG(*d_log << " BLKD_OUT\n");
+ return BLKD_OUT;
+ }
+
+ try_again:
+ if(m->fixed_rate()) {
+ // try to work it forward starting with max_items_avail.
+ // We want to try to consume all the input we've got.
+ int reqd_noutput_items = m->fixed_rate_ninput_to_noutput(max_items_avail);
+
+ // only test this if we specifically set the output_multiple
+ if(m->output_multiple_set())
+ reqd_noutput_items = round_down(reqd_noutput_items, m->output_multiple());
+
+ if(reqd_noutput_items > 0 && reqd_noutput_items <= noutput_items)
+ noutput_items = reqd_noutput_items;
+
+ // if we need this many outputs, overrule the max_noutput_items setting
+ max_noutput_items = std::max(m->output_multiple(), max_noutput_items);
+ }
+ noutput_items = std::min(noutput_items, max_noutput_items);
+
+ // Check if we're still unaligned; use up items until we're
+ // aligned again. Otherwise, make sure we set the alignment
+ // requirement.
+ if(!m->output_multiple_set()) {
+ if(m->is_unaligned()) {
+ // When unaligned, don't just set noutput_items to the remaining
+ // samples to meet alignment; this causes too much overhead in
+ // requiring a premature call back here. Set the maximum amount
+ // of samples to handle unalignment and get us back aligned.
+ if(noutput_items >= m->unaligned()) {
+ noutput_items = round_up(noutput_items, m->alignment()) \
+ - (m->alignment() - m->unaligned());
+ new_alignment = 0;
+ }
+ else {
+ new_alignment = m->unaligned() - noutput_items;
+ }
+ alignment_state = 0;
+ }
+ else if(noutput_items < m->alignment()) {
+ // if we don't have enough for an aligned call, keep track of
+ // misalignment, set unaligned flag, and proceed.
+ new_alignment = m->alignment() - noutput_items;
+ m->set_unaligned(new_alignment);
+ m->set_is_unaligned(true);
+ alignment_state = 1;
+ }
+ else {
+ // enough to round down to the nearest alignment and process.
+ noutput_items = round_down(noutput_items, m->alignment());
+ m->set_is_unaligned(false);
+ alignment_state = 2;
+ }
+ }
+
+ // ask the block how much input they need to produce noutput_items
+ m->forecast (noutput_items, d_ninput_items_required);
+
+ // See if we've got sufficient input available
+ int i;
+ for(i = 0; i < d->ninputs (); i++)
+ if(d_ninput_items_required[i] > d_ninput_items[i]) // not enough
+ break;
+
+ if(i < d->ninputs()) { // not enough input on input[i]
+ // if we can, try reducing the size of our output request
+ if(noutput_items > m->output_multiple()) {
+ noutput_items /= 2;
+ noutput_items = round_up(noutput_items, m->output_multiple());
+ goto try_again;
+ }
+
+ // We're blocked on input
+ LOG(*d_log << " BLKD_IN\n");
+ if(d_input_done[i]) // If the upstream block is done, we're done
+ goto were_done;
+
+ // Is it possible to ever fulfill this request?
+ if(d_ninput_items_required[i] > d->input(i)->max_possible_items_available()) {
+ // Nope, never going to happen...
+ std::cerr << "\nsched: <block " << m->name()
+ << " (" << m->unique_id() << ")>"
+ << " is requesting more input data\n"
+ << " than we can provide.\n"
+ << " ninput_items_required = "
+ << d_ninput_items_required[i] << "\n"
+ << " max_possible_items_available = "
+ << d->input(i)->max_possible_items_available() << "\n"
+ << " If this is a filter, consider reducing the number of taps.\n";
+ goto were_done;
+ }
+
+ // If we were made unaligned in this round but return here without
+ // processing; reset the unalignment claim before next entry.
+ if(alignment_state == 1) {
+ m->set_unaligned(0);
+ m->set_is_unaligned(false);
+ }
+ return BLKD_IN;
+ }
+
+ // We've got enough data on each input to produce noutput_items.
+ // Finish setting up the call to work.
+ for(int i = 0; i < d->ninputs (); i++)
+ d_input_items[i] = d->input(i)->read_pointer();
+
+ setup_call_to_work:
+
+ d->d_produce_or = 0;
+ for(int i = 0; i < d->noutputs (); i++)
+ d_output_items[i] = d->output(i)->write_pointer();
+
+ // determine where to start looking for new tags
+ for(int i = 0; i < d->ninputs(); i++)
+ d_start_nitems_read[i] = d->nitems_read(i);
+
+#ifdef GR_PERFORMANCE_COUNTERS
+ if(d_use_pc)
+ d->start_perf_counters();
+#endif /* GR_PERFORMANCE_COUNTERS */
+
+ // Do the actual work of the block
+ int n = m->general_work(noutput_items, d_ninput_items,
+ d_input_items, d_output_items);
+
+#ifdef GR_PERFORMANCE_COUNTERS
+ if(d_use_pc)
+ d->stop_perf_counters(noutput_items, n);
+#endif /* GR_PERFORMANCE_COUNTERS */
+
+ LOG(*d_log << " general_work: noutput_items = " << noutput_items
+ << " result = " << n << std::endl);
+
+ // Adjust number of unaligned items left to process
+ if(m->is_unaligned()) {
+ m->set_unaligned(new_alignment);
+ m->set_is_unaligned(m->unaligned() != 0);
+ }
+
+ if(!propagate_tags(m->tag_propagation_policy(), d,
+ d_start_nitems_read, m->relative_rate(),
+ d_returned_tags))
+ goto were_done;
+
+ if(n == block::WORK_DONE)
+ goto were_done;
+
+ if(n != block::WORK_CALLED_PRODUCE)
+ d->produce_each (n); // advance write pointers
+
+ if(d->d_produce_or > 0) // block produced something
+ return READY;
+
+ // We didn't produce any output even though we called general_work.
+ // We have (most likely) consumed some input.
+
+ /*
+ // If this is a source, it's broken.
+ if(d->source_p()) {
+ std::cerr << "block_executor: source " << m
+ << " produced no output. We're marking it DONE.\n";
+ // FIXME maybe we ought to raise an exception...
+ goto were_done;
+ }
+ */
+
+ // Have the caller try again...
+ return READY_NO_OUTPUT;
+ }
+ assert(0);
+
+ were_done:
+ LOG(*d_log << " were_done\n");
+ d->set_done (true);
+ return DONE;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block_executor.h b/gnuradio-runtime/lib/block_executor.h
new file mode 100644
index 0000000000..4e1d2f1602
--- /dev/null
+++ b/gnuradio-runtime/lib/block_executor.h
@@ -0,0 +1,78 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_BLOCK_EXECUTOR_H
+#define INCLUDED_GR_RUNTIME_BLOCK_EXECUTOR_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/runtime_types.h>
+#include <gnuradio/tags.h>
+#include <fstream>
+
+namespace gr {
+
+ /*!
+ * \brief Manage the execution of a single block.
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API block_executor
+ {
+ protected:
+ block_sptr d_block; // The block we're trying to run
+ std::ofstream *d_log;
+
+ // These are allocated here so we don't have to on each iteration
+
+ gr_vector_int d_ninput_items_required;
+ gr_vector_int d_ninput_items;
+ gr_vector_const_void_star d_input_items;
+ std::vector<bool> d_input_done;
+ gr_vector_void_star d_output_items;
+ std::vector<uint64_t> d_start_nitems_read; //stores where tag counts are before work
+ std::vector<tag_t> d_returned_tags;
+ int d_max_noutput_items;
+
+#ifdef GR_PERFORMANCE_COUNTERS
+ bool d_use_pc;
+#endif /* GR_PERFORMANCE_COUNTERS */
+
+ public:
+ block_executor(block_sptr block, int max_noutput_items=100000);
+ ~block_executor();
+
+ enum state {
+ READY, // We made progress; everything's cool.
+ READY_NO_OUTPUT, // We consumed some input, but produced no output.
+ BLKD_IN, // no progress; we're blocked waiting for input data.
+ BLKD_OUT, // no progress; we're blocked waiting for output buffer space.
+ DONE, // we're done; don't call me again.
+ };
+
+ /*
+ * \brief Run one iteration.
+ */
+ state run_one_iteration();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_BLOCK_EXECUTOR_H */
diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc
new file mode 100644
index 0000000000..13f4326d7e
--- /dev/null
+++ b/gnuradio-runtime/lib/block_gateway_impl.cc
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2011-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "block_gateway_impl.h"
+#include <gnuradio/io_signature.h>
+#include <iostream>
+#include <boost/bind.hpp>
+
+namespace gr {
+
+ /***********************************************************************
+ * Helper routines
+ **********************************************************************/
+ template <typename OutType, typename InType>
+ void
+ copy_pointers(OutType &out, const InType &in)
+ {
+ out.resize(in.size());
+ for(size_t i = 0; i < in.size(); i++) {
+ out[i] = (void *)(in[i]);
+ }
+ }
+
+
+ block_gateway::sptr
+ block_gateway::make(feval_ll *handler,
+ const std::string &name,
+ gr::io_signature::sptr in_sig,
+ gr::io_signature::sptr out_sig,
+ const block_gw_work_type work_type,
+ const unsigned factor)
+ {
+ return block_gateway::sptr
+ (new block_gateway_impl(handler, name, in_sig, out_sig,
+ work_type, factor));
+ }
+
+ block_gateway_impl::block_gateway_impl(feval_ll *handler,
+ const std::string &name,
+ gr::io_signature::sptr in_sig,
+ gr::io_signature::sptr out_sig,
+ const block_gw_work_type work_type,
+ const unsigned factor)
+ : block(name, in_sig, out_sig),
+ _handler(handler),
+ _work_type(work_type)
+ {
+ switch(_work_type) {
+ case GR_BLOCK_GW_WORK_GENERAL:
+ _decim = 1; //not relevant, but set anyway
+ _interp = 1; //not relevant, but set anyway
+ break;
+
+ case GR_BLOCK_GW_WORK_SYNC:
+ _decim = 1;
+ _interp = 1;
+ this->set_fixed_rate(true);
+ break;
+
+ case GR_BLOCK_GW_WORK_DECIM:
+ _decim = factor;
+ _interp = 1;
+ break;
+
+ case GR_BLOCK_GW_WORK_INTERP:
+ _decim = 1;
+ _interp = factor;
+ this->set_output_multiple(_interp);
+ break;
+ }
+ }
+
+ void
+ block_gateway_impl::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ switch(_work_type) {
+ case GR_BLOCK_GW_WORK_GENERAL:
+ _message.action = block_gw_message_type::ACTION_FORECAST;
+ _message.forecast_args_noutput_items = noutput_items;
+ _message.forecast_args_ninput_items_required = ninput_items_required;
+ _handler->calleval(0);
+ ninput_items_required = _message.forecast_args_ninput_items_required;
+ return;
+
+ default:
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+ return;
+ }
+ }
+
+ int
+ block_gateway_impl::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ switch(_work_type) {
+ case GR_BLOCK_GW_WORK_GENERAL:
+ _message.action = block_gw_message_type::ACTION_GENERAL_WORK;
+ _message.general_work_args_noutput_items = noutput_items;
+ _message.general_work_args_ninput_items = ninput_items;
+ copy_pointers(_message.general_work_args_input_items, input_items);
+ _message.general_work_args_output_items = output_items;
+ _handler->calleval(0);
+ return _message.general_work_args_return_value;
+
+ default:
+ int r = work (noutput_items, input_items, output_items);
+ if(r > 0)
+ consume_each(r*_decim/_interp);
+ return r;
+ }
+ }
+
+ int
+ block_gateway_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ _message.action = block_gw_message_type::ACTION_WORK;
+ _message.work_args_ninput_items = fixed_rate_noutput_to_ninput(noutput_items);
+ if(_message.work_args_ninput_items == 0)
+ return -1;
+ _message.work_args_noutput_items = noutput_items;
+ copy_pointers(_message.work_args_input_items, input_items);
+ _message.work_args_output_items = output_items;
+ _handler->calleval(0);
+ return _message.work_args_return_value;
+ }
+
+ int
+ block_gateway_impl::fixed_rate_noutput_to_ninput(int noutput_items)
+ {
+ return (noutput_items*_decim/_interp) + history() - 1;
+ }
+
+ int
+ block_gateway_impl::fixed_rate_ninput_to_noutput(int ninput_items)
+ {
+ return std::max(0, ninput_items - (int)history() + 1)*_interp/_decim;
+ }
+
+ bool
+ block_gateway_impl::start(void)
+ {
+ _message.action = block_gw_message_type::ACTION_START;
+ _handler->calleval(0);
+ return _message.start_args_return_value;
+ }
+
+ bool
+ block_gateway_impl::stop(void)
+ {
+ _message.action = block_gw_message_type::ACTION_STOP;
+ _handler->calleval(0);
+ return _message.stop_args_return_value;
+ }
+
+ block_gw_message_type&
+ block_gateway_impl::block_message(void)
+ {
+ return _message;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block_gateway_impl.h b/gnuradio-runtime/lib/block_gateway_impl.h
new file mode 100644
index 0000000000..1707ecf1c8
--- /dev/null
+++ b/gnuradio-runtime/lib/block_gateway_impl.h
@@ -0,0 +1,75 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_RUNTIME_BLOCK_GATEWAY_IMPL_H
+#define INCLUDED_RUNTIME_BLOCK_GATEWAY_IMPL_H
+
+#include <gnuradio/block_gateway.h>
+
+namespace gr {
+
+ /***********************************************************************
+ * The gr::block gateway implementation class
+ **********************************************************************/
+ class block_gateway_impl : public block_gateway
+ {
+ public:
+ block_gateway_impl(feval_ll *handler,
+ const std::string &name,
+ gr::io_signature::sptr in_sig,
+ gr::io_signature::sptr out_sig,
+ const block_gw_work_type work_type,
+ const unsigned factor);
+
+ /*******************************************************************
+ * Overloads for various scheduler-called functions
+ ******************************************************************/
+ void forecast(int noutput_items,
+ gr_vector_int &ninput_items_required);
+
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int fixed_rate_noutput_to_ninput(int noutput_items);
+ int fixed_rate_ninput_to_noutput(int ninput_items);
+
+ bool start(void);
+ bool stop(void);
+
+ block_gw_message_type& block_message(void);
+
+ private:
+ feval_ll *_handler;
+ block_gw_message_type _message;
+ const block_gw_work_type _work_type;
+ unsigned _decim, _interp;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_RUNTIME_BLOCK_GATEWAY_H */
diff --git a/gnuradio-runtime/lib/block_registry.cc b/gnuradio-runtime/lib/block_registry.cc
new file mode 100644
index 0000000000..f17e3e4af9
--- /dev/null
+++ b/gnuradio-runtime/lib/block_registry.cc
@@ -0,0 +1,120 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/basic_block.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/block_registry.h>
+#include <gnuradio/tpb_detail.h>
+#include <stdio.h>
+
+gr::block_registry global_block_registry;
+
+namespace gr {
+
+ block_registry::block_registry()
+ {
+ d_ref_map = pmt::make_dict();
+ }
+
+ long
+ block_registry::block_register(basic_block* block)
+ {
+ if(d_map.find(block->name()) == d_map.end()) {
+ d_map[block->name()] = blocksubmap_t();
+ d_map[block->name()][0] = block;
+ return 0;
+ }
+ else {
+ for(size_t i=0; i<=d_map[block->name()].size(); i++){
+ if(d_map[block->name()].find(i) == d_map[block->name()].end()){
+ d_map[block->name()][i] = block;
+ return i;
+ }
+ }
+ }
+ throw std::runtime_error("should not reach this");
+ }
+
+ void
+ block_registry::block_unregister(basic_block* block)
+ {
+ d_map[block->name()].erase( d_map[block->name()].find(block->symbolic_id()));
+ d_ref_map = pmt::dict_delete(d_ref_map, pmt::intern(block->symbol_name()));
+ if(block->alias_set()) {
+ d_ref_map = pmt::dict_delete(d_ref_map, pmt::intern(block->alias()));
+ }
+ }
+
+ std::string
+ block_registry::register_symbolic_name(basic_block* block)
+ {
+ std::stringstream ss;
+ ss << block->name() << block->symbolic_id();
+ //std::cout << "register_symbolic_name: " << ss.str() << std::endl;
+ register_symbolic_name(block, ss.str());
+ return ss.str();
+ }
+
+ void
+ block_registry::register_symbolic_name(basic_block* block, std::string name)
+ {
+ if(pmt::dict_has_key(d_ref_map, pmt::intern(name))) {
+ throw std::runtime_error("symbol already exists, can not re-use!");
+ }
+ d_ref_map = pmt::dict_add(d_ref_map, pmt::intern(name), pmt::make_any(block));
+ }
+
+ basic_block_sptr
+ block_registry::block_lookup(pmt::pmt_t symbol)
+ {
+ pmt::pmt_t ref = pmt::dict_ref(d_ref_map, symbol, pmt::PMT_NIL);
+ if(pmt::eq(ref, pmt::PMT_NIL)) {
+ throw std::runtime_error("block lookup failed! block not found!");
+ }
+ basic_block* blk = boost::any_cast<basic_block*>(pmt::any_ref(ref));
+ return blk->shared_from_this();
+ }
+
+ void
+ block_registry::register_primitive(std::string blk, block* ref)
+ {
+ primitive_map[blk] = ref;
+ }
+
+ void
+ block_registry::unregister_primitive(std::string blk)
+ {
+ primitive_map.erase(primitive_map.find(blk));
+ }
+
+ void
+ block_registry::notify_blk(std::string blk)
+ {
+ if(primitive_map.find(blk) == primitive_map.end()) {
+ return;
+ }
+ if(primitive_map[blk]->detail().get())
+ primitive_map[blk]->detail()->d_tpb.notify_msg();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
new file mode 100644
index 0000000000..1bcfc2a6e4
--- /dev/null
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -0,0 +1,343 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/buffer.h>
+#include <gnuradio/math.h>
+#include "vmcircbuf.h"
+#include <stdexcept>
+#include <iostream>
+#include <assert.h>
+#include <algorithm>
+#include <boost/math/common_factor_rt.hpp>
+
+namespace gr {
+
+ static long s_buffer_count = 0; // counts for debugging storage mgmt
+ static long s_buffer_reader_count = 0;
+
+ /* ----------------------------------------------------------------------------
+ Notes on storage management
+
+ Pretty much all the fundamental classes are now using the
+ shared_ptr stuff for automatic reference counting. To ensure that
+ no mistakes are made, we make the constructors for classes private,
+ and then provide a free factory function that returns a smart
+ pointer to the desired class.
+
+ gr::buffer and gr::buffer_reader are no exceptions. However, they
+ both want pointers to each other, and unless we do something, we'll
+ never delete any of them because of the circular structure.
+ They'll always have a reference count of at least one. We could
+ use boost::weak_ptr's from gr::buffer to gr::buffer_reader but that
+ introduces it's own problems. (gr::buffer_reader's destructor needs
+ to call gr::buffer::drop_reader, but has no easy way to get a
+ shared_ptr to itself.)
+
+ Instead, we solve this problem by having gr::buffer hold a raw
+ pointer to gr::buffer_reader in its d_reader vector.
+ gr::buffer_reader's destructor calls gr::buffer::drop_reader, so
+ we're never left with an dangling pointer. gr::buffer_reader still
+ has a shared_ptr to the buffer ensuring that the buffer doesn't go
+ away under it. However, when the reference count of a
+ gr::buffer_reader goes to zero, we can successfully reclaim it.
+ ---------------------------------------------------------------------------- */
+
+ /*
+ * Compute the minimum number of buffer items that work (i.e.,
+ * address space wrap-around works). To work is to satisfy this
+ * contraint for integer buffer_size and k:
+ *
+ * type_size * nitems == k * page_size
+ */
+ static long
+ minimum_buffer_items(long type_size, long page_size)
+ {
+ return page_size / boost::math::gcd (type_size, page_size);
+ }
+
+
+ buffer::buffer(int nitems, size_t sizeof_item, block_sptr link)
+ : d_base(0), d_bufsize(0), d_vmcircbuf(0),
+ d_sizeof_item(sizeof_item), d_link(link),
+ d_write_index(0), d_abs_write_offset(0), d_done(false),
+ d_last_min_items_read(0)
+ {
+ if(!allocate_buffer (nitems, sizeof_item))
+ throw std::bad_alloc ();
+
+ s_buffer_count++;
+ }
+
+ buffer_sptr
+ make_buffer(int nitems, size_t sizeof_item, block_sptr link)
+ {
+ return buffer_sptr(new buffer(nitems, sizeof_item, link));
+ }
+
+ buffer::~buffer()
+ {
+ delete d_vmcircbuf;
+ assert(d_readers.size() == 0);
+ s_buffer_count--;
+ }
+
+ /*!
+ * sets d_vmcircbuf, d_base, d_bufsize.
+ * returns true iff successful.
+ */
+ bool
+ buffer::allocate_buffer(int nitems, size_t sizeof_item)
+ {
+ int orig_nitems = nitems;
+
+ // Any buffersize we come up with must be a multiple of min_nitems.
+ int granularity = gr::vmcircbuf_sysconfig::granularity();
+ int min_nitems = minimum_buffer_items(sizeof_item, granularity);
+
+ // Round-up nitems to a multiple of min_nitems.
+ if(nitems % min_nitems != 0)
+ nitems = ((nitems / min_nitems) + 1) * min_nitems;
+
+ // If we rounded-up a whole bunch, give the user a heads up.
+ // This only happens if sizeof_item is not a power of two.
+
+ if(nitems > 2 * orig_nitems && nitems * (int) sizeof_item > granularity){
+ std::cerr << "gr::buffer::allocate_buffer: warning: tried to allocate\n"
+ << " " << orig_nitems << " items of size "
+ << sizeof_item << ". Due to alignment requirements\n"
+ << " " << nitems << " were allocated. If this isn't OK, consider padding\n"
+ << " your structure to a power-of-two bytes.\n"
+ << " On this platform, our allocation granularity is " << granularity << " bytes.\n";
+ }
+
+ d_bufsize = nitems;
+ d_vmcircbuf = gr::vmcircbuf_sysconfig::make(d_bufsize * d_sizeof_item);
+ if(d_vmcircbuf == 0){
+ std::cerr << "gr::buffer::allocate_buffer: failed to allocate buffer of size "
+ << d_bufsize * d_sizeof_item / 1024 << " KB\n";
+ return false;
+ }
+
+ d_base = (char*)d_vmcircbuf->pointer_to_first_copy();
+ return true;
+ }
+
+ int
+ buffer::space_available()
+ {
+ if(d_readers.empty())
+ return d_bufsize - 1; // See comment below
+
+ else {
+ // Find out the maximum amount of data available to our readers
+
+ int most_data = d_readers[0]->items_available();
+ uint64_t min_items_read = d_readers[0]->nitems_read();
+ for(size_t i = 1; i < d_readers.size (); i++) {
+ most_data = std::max(most_data, d_readers[i]->items_available());
+ min_items_read = std::min(min_items_read, d_readers[i]->nitems_read());
+ }
+
+ if(min_items_read != d_last_min_items_read) {
+ prune_tags(d_last_min_items_read);
+ d_last_min_items_read = min_items_read;
+ }
+
+ // The -1 ensures that the case d_write_index == d_read_index is
+ // unambiguous. It indicates that there is no data for the reader
+ return d_bufsize - most_data - 1;
+ }
+ }
+
+ void *
+ buffer::write_pointer()
+ {
+ return &d_base[d_write_index * d_sizeof_item];
+ }
+
+ void
+ buffer::update_write_pointer(int nitems)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+ d_write_index = index_add(d_write_index, nitems);
+ d_abs_write_offset += nitems;
+ }
+
+ void
+ buffer::set_done(bool done)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+ d_done = done;
+ }
+
+ buffer_reader_sptr
+ buffer_add_reader(buffer_sptr buf, int nzero_preload, block_sptr link)
+ {
+ if(nzero_preload < 0)
+ throw std::invalid_argument("buffer_add_reader: nzero_preload must be >= 0");
+
+ buffer_reader_sptr r(new buffer_reader(buf,
+ buf->index_sub(buf->d_write_index,
+ nzero_preload),
+ link));
+ buf->d_readers.push_back(r.get ());
+
+ return r;
+ }
+
+ void
+ buffer::drop_reader(buffer_reader *reader)
+ {
+ std::vector<buffer_reader *>::iterator result =
+ std::find(d_readers.begin(), d_readers.end(), reader);
+
+ if(result == d_readers.end())
+ throw std::invalid_argument("buffer::drop_reader"); // we didn't find it...
+
+ d_readers.erase(result);
+ }
+
+ void
+ buffer::add_item_tag(const tag_t &tag)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+ d_item_tags.push_back(tag);
+ }
+
+ void
+ buffer::remove_item_tag(const tag_t &tag)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+ for(std::deque<tag_t>::iterator it = d_item_tags.begin(); it != d_item_tags.end(); ++it) {
+ if(*it == tag) {
+ d_item_tags.erase(it);
+ break;
+ }
+ }
+ }
+
+ void
+ buffer::prune_tags(uint64_t max_time)
+ {
+ /* NOTE: this function _should_ lock the mutex before editing
+ d_item_tags. In practice, this function is only called at
+ runtime by min_available_space in block_executor.cc, which
+ locks the mutex itself.
+
+ If this function is used elsewhere, remember to lock the
+ buffer's mutex al la the scoped_lock line below.
+ */
+ //gr::thread::scoped_lock guard(*mutex());
+ std::deque<tag_t>::iterator itr = d_item_tags.begin();
+
+ uint64_t item_time;
+
+ // Since tags are not guarenteed to be in any particular order, we
+ // need to erase here instead of pop_front. An erase in the middle
+ // invalidates all iterators; so this resets the iterator to find
+ // more. Mostly, we wil be erasing from the front and
+ // therefore lose little time this way.
+ while(itr != d_item_tags.end()) {
+ item_time = (*itr).offset;
+ if(item_time < max_time) {
+ d_item_tags.erase(itr);
+ itr = d_item_tags.begin();
+ }
+ else
+ itr++;
+ }
+ }
+
+ long
+ buffer_ncurrently_allocated()
+ {
+ return s_buffer_count;
+ }
+
+ // ----------------------------------------------------------------------------
+
+ buffer_reader::buffer_reader(buffer_sptr buffer, unsigned int read_index,
+ block_sptr link)
+ : d_buffer(buffer), d_read_index(read_index), d_abs_read_offset(0), d_link(link)
+ {
+ s_buffer_reader_count++;
+ }
+
+ buffer_reader::~buffer_reader()
+ {
+ d_buffer->drop_reader(this);
+ s_buffer_reader_count--;
+ }
+
+ int
+ buffer_reader::items_available() const
+ {
+ return d_buffer->index_sub(d_buffer->d_write_index, d_read_index);
+ }
+
+ const void *
+ buffer_reader::read_pointer()
+ {
+ return &d_buffer->d_base[d_read_index * d_buffer->d_sizeof_item];
+ }
+
+ void
+ buffer_reader::update_read_pointer(int nitems)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+ d_read_index = d_buffer->index_add (d_read_index, nitems);
+ d_abs_read_offset += nitems;
+ }
+
+ void
+ buffer_reader::get_tags_in_range(std::vector<tag_t> &v,
+ uint64_t abs_start,
+ uint64_t abs_end)
+ {
+ gr::thread::scoped_lock guard(*mutex());
+
+ v.resize(0);
+ std::deque<tag_t>::iterator itr = d_buffer->get_tags_begin();
+
+ uint64_t item_time;
+ while(itr != d_buffer->get_tags_end()) {
+ item_time = (*itr).offset;
+
+ if((item_time >= abs_start) && (item_time < abs_end)) {
+ v.push_back(*itr);
+ }
+
+ itr++;
+ }
+ }
+
+ long
+ buffer_reader_ncurrently_allocated()
+ {
+ return s_buffer_reader_count;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc
new file mode 100644
index 0000000000..4d7d06082a
--- /dev/null
+++ b/gnuradio-runtime/lib/circular_file.cc
@@ -0,0 +1,208 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "circular_file.h"
+
+#include <unistd.h>
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#include <algorithm>
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
+namespace gr {
+
+ static const int HEADER_SIZE = 4096;
+ static const int HEADER_MAGIC = 0xEB021026;
+
+ static const int HD_MAGIC = 0;
+ static const int HD_HEADER_SIZE = 1; // integer offsets into header
+ static const int HD_BUFFER_SIZE = 2;
+ static const int HD_BUFFER_BASE = 3;
+ static const int HD_BUFFER_CURRENT = 4;
+
+ circular_file::circular_file(const char *filename,
+ bool writable, int size)
+ : d_fd(-1), d_header(0), d_buffer(0), d_mapped_size(0), d_bytes_read(0)
+ {
+ int mm_prot;
+ if(writable) {
+#ifdef HAVE_MMAP
+ mm_prot = PROT_READ | PROT_WRITE;
+#endif
+ d_fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0664);
+ if(d_fd < 0) {
+ perror(filename);
+ exit(1);
+ }
+#ifdef HAVE_MMAP /* FIXME */
+ if(ftruncate(d_fd, size + HEADER_SIZE) != 0) {
+ perror(filename);
+ exit(1);
+ }
+#endif
+ }
+ else {
+#ifdef HAVE_MMAP
+ mm_prot = PROT_READ;
+#endif
+ d_fd = open (filename, O_RDONLY);
+ if(d_fd < 0) {
+ perror(filename);
+ exit(1);
+ }
+ }
+
+ struct stat statbuf;
+ if(fstat (d_fd, &statbuf) < 0) {
+ perror(filename);
+ exit(1);
+ }
+
+ if(statbuf.st_size < HEADER_SIZE) {
+ fprintf(stderr, "%s: file too small to be circular buffer\n", filename);
+ exit(1);
+ }
+
+ d_mapped_size = statbuf.st_size;
+#ifdef HAVE_MMAP
+ void *p = mmap (0, d_mapped_size, mm_prot, MAP_SHARED, d_fd, 0);
+ if(p == MAP_FAILED) {
+ perror("gr::circular_file: mmap failed");
+ exit(1);
+ }
+
+ d_header = (int*)p;
+#else
+ perror("gr::circular_file: mmap unsupported by this system");
+ exit(1);
+#endif
+
+ if(writable) { // init header
+
+ if(size < 0) {
+ fprintf(stderr, "gr::circular_buffer: size must be > 0 when writable\n");
+ exit(1);
+ }
+
+ d_header[HD_MAGIC] = HEADER_MAGIC;
+ d_header[HD_HEADER_SIZE] = HEADER_SIZE;
+ d_header[HD_BUFFER_SIZE] = size;
+ d_header[HD_BUFFER_BASE] = HEADER_SIZE; // right after header
+ d_header[HD_BUFFER_CURRENT] = 0;
+ }
+
+ // sanity check (the asserts are a bit unforgiving...)
+
+ assert(d_header[HD_MAGIC] == HEADER_MAGIC);
+ assert(d_header[HD_HEADER_SIZE] == HEADER_SIZE);
+ assert(d_header[HD_BUFFER_SIZE] > 0);
+ assert(d_header[HD_BUFFER_BASE] >= d_header[HD_HEADER_SIZE]);
+ assert(d_header[HD_BUFFER_BASE] + d_header[HD_BUFFER_SIZE] <= d_mapped_size);
+ assert(d_header[HD_BUFFER_CURRENT] >= 0 &&
+ d_header[HD_BUFFER_CURRENT] < d_header[HD_BUFFER_SIZE]);
+
+ d_bytes_read = 0;
+ d_buffer = (unsigned char*)d_header + d_header[HD_BUFFER_BASE];
+ }
+
+ circular_file::~circular_file()
+ {
+#ifdef HAVE_MMAP
+ if(munmap ((char *) d_header, d_mapped_size) < 0) {
+ perror("gr::circular_file: munmap");
+ exit(1);
+ }
+#endif
+ close(d_fd);
+ }
+
+ bool
+ circular_file::write(void *vdata, int nbytes)
+ {
+ unsigned char *data = (unsigned char*)vdata;
+ int buffer_size = d_header[HD_BUFFER_SIZE];
+ int buffer_current = d_header[HD_BUFFER_CURRENT];
+
+ while(nbytes > 0) {
+ int n = std::min(nbytes, buffer_size - buffer_current);
+ memcpy(d_buffer + buffer_current, data, n);
+
+ buffer_current += n;
+ if(buffer_current >= buffer_size)
+ buffer_current = 0;
+
+ data += n;
+ nbytes -= n;
+ }
+
+ d_header[HD_BUFFER_CURRENT] = buffer_current;
+ return true;
+ }
+
+ int
+ circular_file::read(void *vdata, int nbytes)
+ {
+ unsigned char *data = (unsigned char *) vdata;
+ int buffer_current = d_header[HD_BUFFER_CURRENT];
+ int buffer_size = d_header[HD_BUFFER_SIZE];
+ int total = 0;
+
+ nbytes = std::min(nbytes, buffer_size - d_bytes_read);
+
+ while(nbytes > 0) {
+ int offset = (buffer_current + d_bytes_read) % buffer_size;
+ int n = std::min (nbytes, buffer_size - offset);
+ memcpy(data, d_buffer + offset, n);
+ data += n;
+ d_bytes_read += n;
+ total += n;
+ nbytes -= n;
+ }
+ return total;
+ }
+
+ void
+ circular_file::reset_read_pointer()
+ {
+ d_bytes_read = 0;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/circular_file.h b/gnuradio-runtime/lib/circular_file.h
new file mode 100644
index 0000000000..1dc431d69a
--- /dev/null
+++ b/gnuradio-runtime/lib/circular_file.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_CIRCULAR_FILE_H
+#define GR_CIRCULAR_FILE_H
+
+#include <gnuradio/api.h>
+
+namespace gr {
+
+ /*
+ * writes input data into a circular buffer on disk.
+ *
+ * the file contains a fixed header:
+ * 0x0000: int32 magic (0xEB021026)
+ * 0x0004: int32 size in bytes of header (constant 4096)
+ * 0x0008: int32 size in bytes of circular buffer (not including header)
+ * 0x000C: int32 file offset to beginning of circular buffer
+ * 0x0010: int32 byte offset from beginning of circular buffer to
+ * current start of data
+ */
+ class GR_RUNTIME_API circular_file
+ {
+ private:
+ int d_fd;
+ int *d_header;
+ unsigned char *d_buffer;
+ int d_mapped_size;
+ int d_bytes_read;
+
+ public:
+ circular_file(const char *filename, bool writable = false, int size = 0);
+ ~circular_file();
+
+ bool write(void *data, int nbytes);
+
+ // returns # of bytes actually read or 0 if end of buffer, or -1 on error.
+ int read(void *data, int nbytes);
+
+ // reset read pointer to beginning of buffer.
+ void reset_read_pointer();
+ };
+
+} /* namespace gr */
+
+#endif /* GR_CIRCULAR_FILE_H */
diff --git a/gnuradio-runtime/lib/complex_vec_test.h b/gnuradio-runtime/lib/complex_vec_test.h
index bcfa732f41..d69d523374 100644
--- a/gnuradio-runtime/lib/complex_vec_test.h
+++ b/gnuradio-runtime/lib/complex_vec_test.h
@@ -1,4 +1,26 @@
-#include <gr_runtime_api.h>
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/api.h>
#include <vector>
#include <complex>
diff --git a/gnuradio-runtime/lib/constants.cc.in b/gnuradio-runtime/lib/constants.cc.in
new file mode 100644
index 0000000000..828c4397f7
--- /dev/null
+++ b/gnuradio-runtime/lib/constants.cc.in
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/constants.h>
+
+namespace gr {
+
+ const std::string
+ prefix()
+ {
+ return "@prefix@";
+ }
+
+ const std::string
+ sysconfdir()
+ {
+ return "@SYSCONFDIR@";
+ }
+
+ const std::string
+ prefsdir()
+ {
+ return "@GR_PREFSDIR@";
+ }
+
+ const std::string
+ build_date()
+ {
+ return "@BUILD_DATE@";
+ }
+
+ const std::string
+ version()
+ {
+ return "@VERSION@";
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt
new file mode 100644
index 0000000000..c05a82bf4f
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+if(ENABLE_GR_CTRLPORT)
+
+include_directories(${ICE_INCLUDE_DIR})
+
+# Add definition so we can compile in ControlPort to the blocks.
+ADD_DEFINITIONS(-DGR_CTRLPORT)
+
+########################################################################
+# Run ICE To compile Slice files
+########################################################################
+EXECUTE_PROCESS(
+ COMMAND "${ICE_SLICE2CPP}" "-I${CMAKE_CURRENT_SOURCE_DIR}"
+ "--output-dir=${CMAKE_CURRENT_BINARY_DIR}/"
+ "${CMAKE_CURRENT_SOURCE_DIR}/gnuradio.ice"
+ )
+
+list(APPEND gnuradio_runtime_sources
+ ${CMAKE_CURRENT_SOURCE_DIR}/ice_application_base.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcpmtconverters_ice.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_aggregator.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_aggregator.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_ice.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_ice.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
+)
+
+# Append generated file in build directory
+list(APPEND gnuradio_runtime_sources
+ ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
+)
+
+########################################################################
+# Add controlport stuff to gnuradio-runtime
+########################################################################
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+list(APPEND gnuradio_runtime_libs
+ ${ICE_LIBRARIES}
+)
+
+endif(ENABLE_GR_CTRLPORT)
diff --git a/gnuradio-runtime/lib/controlport/ICE_LICENSE b/gnuradio-runtime/lib/controlport/ICE_LICENSE
new file mode 100644
index 0000000000..43ea7572d9
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/ICE_LICENSE
@@ -0,0 +1,54 @@
+Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+
+This copy of Ice is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
+
+Ice is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+details.
+
+You should have received a copy of the GNU General Public License version
+2 along with this program; if not, see http://www.gnu.org/licenses.
+
+Linking Ice statically or dynamically with other software (such as a
+library, module or application) is making a combined work based on Ice.
+Thus, the terms and conditions of the GNU General Public License version
+2 cover this combined work.
+
+If such software can only be used together with Ice, then not only the
+combined work but the software itself is a work derived from Ice and as
+such shall be licensed under the terms of the GNU General Public License
+version 2. This includes the situation where Ice is only being used
+through an abstraction layer.
+
+As a special exception to the above, ZeroC grants to the contributors for
+the following projects the permission to license their Ice-based software
+under the terms of the GNU Lesser General Public License (LGPL) version
+2.1 or of the BSD license:
+
+ - Orca Robotics (http://orca-robotics.sourceforge.net)
+
+ - Mumble (http://mumble.sourceforge.net)
+
+This exception does not extend to the parts of Ice used by these
+projects, or to any other derived work: as a whole, any work based on Ice
+shall be licensed under the terms and conditions of the GNU General
+Public License version 2.
+
+You may also combine Ice with any software not derived from Ice, provided
+the license of such software is compatible with the GNU General Public
+License version 2. In addition, as a special exception, ZeroC grants you
+permission to combine Ice with:
+
+ - the OpenSSL library, or with a modified version of the OpenSSL library
+ that uses the same license as OpenSSL
+
+ - any library not derived from Ice and licensed under the terms of
+ the Apache License, version 2.0
+ (http://www.apache.org/licenses/LICENSE-2.0.html)
+
+If you modify this copy of Ice, you may extend any of the exceptions
+provided above to your version of Ice, but you are not obligated to
+do so.
diff --git a/gnuradio-runtime/lib/controlport/frontend.ice b/gnuradio-runtime/lib/controlport/frontend.ice
new file mode 100644
index 0000000000..b7474f37bf
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/frontend.ice
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio.ice>
+
+[["python:package:gnuradio.ctrlport"]]
+module GNURadio {
+ module Frontend {
+
+ // primitive types
+ dictionary<string, string> StrStrDict;
+ dictionary<string, string> TunerArgs;
+ struct F32Range
+ {
+ float min;
+ float max;
+ };
+
+ // exception types
+ exception NotSupported {};
+ exception InvalidSetting { string msg; };
+ exception ReceiverFailure { string msg; };
+ exception NotExist {};
+
+
+ // Status Types
+ struct TunerStatus {
+ float freq;
+ float rate;
+ int a2dbits;
+ float gain;
+ F32Range gainrange;
+ bool isInverted;
+ StrStrDict info;
+ };
+
+ struct StreamInfo {
+ string uri;
+ StrStrDict info;
+ };
+
+ struct ReceiverInfo {
+ string uid;
+ string name;
+ StrStrDict info;
+ };
+
+ struct ChannelStatus {
+ string uid;
+ string name;
+ bool active;
+ float freq;
+ float bandwidth;
+ bool isComplex;
+ StrStrDict info;
+ };
+
+ struct ChannelizerStatus {
+ string uid;
+ string name;
+ StrStrDict info;
+ };
+
+ // Interfaces
+ interface Component {
+ void setName(string newName);
+ };
+
+ interface AbstractReceiver extends Component {
+ idempotent ReceiverInfo getReceiverInfo();
+ };
+
+ interface Tuner extends Component {
+ TunerStatus configureTuner(TunerArgs args) throws ReceiverFailure, InvalidSetting;
+ idempotent TunerStatus status();
+ idempotent float setGain(float gain) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent bool setInversion(bool inverted) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent float setCenterFreq(float freq) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent float setBandwidth(float bw) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
+ };
+
+ interface Channel {
+ void start();
+ void stop();
+ void destroyChannel() throws NotSupported;
+ idempotent bool active();
+ idempotent ChannelStatus status();
+ idempotent StreamInfo stream();
+ idempotent bool setComplex(bool complex) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
+ idempotent void setStreamInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
+ };
+
+ sequence<Tuner*> TunerSeq;
+ sequence<Channel*> ChannelSeq;
+
+ interface Channelizer extends AbstractReceiver {
+ idempotent ChannelizerStatus status();
+ idempotent Tuner* getTuner();
+ idempotent ChannelSeq getChannels();
+ idempotent ChannelSeq getActiveChannels();
+ idempotent ChannelSeq getInactiveChannels();
+ Channel* createChannel(float freq, float bw, StrStrDict args) throws NotSupported;
+ };
+
+ sequence<Channelizer*> ChannelizerSeq;
+
+ interface Receiver extends AbstractReceiver {
+ idempotent ChannelizerSeq getInputs();
+ idempotent Channel* getChannelByID(string id) throws NotExist;
+ idempotent Channelizer* getChannelizerByID(string id) throws NotExist;
+ idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
+ };
+
+ };
+
+ module Booter {
+ dictionary<string, string> WaveformArgs;
+ exception WaveformRunningError {
+ string waveformClass;
+ float centerFrequencyHz;
+ };
+ exception SignalSourceError {string msg; };
+ interface WaveformBooter extends Frontend::Receiver, ControlPort {
+ string launchWaveform(string waveformClass, WaveformArgs args)
+ throws WaveformRunningError, SignalSourceError;
+ WaveformArgMap getDriverEnum();
+ WaveformArgMap getSourceInfo();
+ idempotent bool waveformRunning();
+ idempotent string getWaveformClass();
+ };
+ };
+};
diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice
new file mode 100644
index 0000000000..731cbea956
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/gnuradio.ice
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[["python:package:gnuradio.ctrlport"]]
+
+#ifndef GNURADIO_DEBUG
+#define GNURADIO_DEBUG
+
+module GNURadio {
+class Knob {};
+class KnobB extends Knob { bool value; };
+class KnobC extends Knob { byte value; };
+class KnobI extends Knob { int value; };
+class KnobF extends Knob { float value; };
+class KnobD extends Knob { double value; };
+class KnobL extends Knob { long value; };
+class KnobS extends Knob { string value; };
+
+sequence<bool> VectorB; sequence<byte> VectorC;
+sequence<int> VectorI; sequence<float> VectorF;
+sequence<double> VectorD; sequence<string> VectorS;
+sequence<long> VectorL;
+
+class KnobVecB extends Knob { VectorB value; };
+class KnobVecC extends Knob { VectorC value; };
+class KnobVecI extends Knob { VectorI value; };
+class KnobVecF extends Knob { VectorF value; };
+class KnobVecD extends Knob { VectorD value; };
+class KnobVecL extends Knob { VectorL value; };
+class KnobVecS extends Knob { VectorS value; };
+
+enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
+ KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
+ KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
+ KNOBVECSTRING, KNOBVECLONG };
+
+const int DISPNULL = 0x0000;
+const int DISPTIME = 0x0001;
+const int DISPXY = 0x0002;
+const int DISPPSD = 0x0004;
+const int DISPSPEC = 0x0008;
+const int DISPRAST = 0x0010;
+const int DISPOPTCPLX = 0x0100;
+const int DISPOPTLOG = 0x0200;
+const int DISPOPTSTEM = 0x0400;
+const int DISPOPTSTRIP = 0x0800;
+const int DISPOPTSCATTER = 0x1000;
+
+struct KnobProp {
+ KnobType type;
+ string units;
+ string description;
+ int display;
+ Knob min;
+ Knob max;
+ Knob defaultvalue;
+};
+
+sequence<string> KnobIDList;
+dictionary<string, Knob> KnobMap;
+dictionary<string, KnobProp> KnobPropMap;
+dictionary<string, string> WaveformArgMap;
+
+interface StreamReceiver {
+ void push(VectorC data);
+};
+
+interface ControlPort {
+ void set(KnobMap knobs);
+ idempotent KnobMap get(KnobIDList knobs);
+ idempotent KnobPropMap properties(KnobIDList knobs);
+ void shutdown();
+};
+
+};
+
+#endif
diff --git a/gnuradio-runtime/lib/controlport/ice_application_base.cc b/gnuradio-runtime/lib/controlport/ice_application_base.cc
new file mode 100644
index 0000000000..b390c77c84
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/ice_application_base.cc
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/ice_application_base.h>
+
+int ice_application_common::d_reacquire_attributes(0);
+bool ice_application_common::d_main_called(false);
+bool ice_application_common::d_have_ice_config(false);
+boost::shared_ptr<boost::thread> ice_application_common::d_thread;
+std::string ice_application_common::d_endpointStr("");
+
+boost::shared_ptr<ice_application_common>
+ice_application_common::Instance()
+{
+ static boost::shared_ptr<ice_application_common>
+ instance(new ice_application_common());
+ return instance;
+}
+
+int ice_application_common::run(int, char**)
+{
+ communicator()->waitForShutdown();
+ return EXIT_SUCCESS;
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc
new file mode 100644
index 0000000000..59ec518960
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcmanager.h>
+#include <iostream>
+#include <stdexcept>
+
+bool rpcmanager::booter_registered(false);
+bool rpcmanager::aggregator_registered(false);
+rpcserver_booter_base* rpcmanager::boot(0);
+std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
+
+rpcmanager::rpcmanager() {;}
+
+rpcmanager::~rpcmanager()
+{
+ if(boot)
+ delete boot;
+}
+
+rpcserver_booter_base*
+rpcmanager::get()
+{
+ if(aggregator_registered) {
+ return aggregator.get();
+ }
+ else if(booter_registered) {
+ return boot;
+ }
+ assert(booter_registered || aggregator_registered);
+ return boot;
+}
+
+void
+rpcmanager::register_booter(rpcserver_booter_base* booter)
+{
+ if(make_aggregator && !aggregator_registered) {
+ aggregator.reset(new rpcserver_booter_aggregator());
+ aggregator_registered = true;
+ }
+
+ if(aggregator_registered) {
+ rpcmanager::rpcserver_booter_base_sptr bootreg(booter);
+ aggregator->agg()->registerServer(bootreg);
+ }
+ else if(!booter_registered) {
+ boot = booter;
+ booter_registered = true;
+ }
+ else {
+ throw std::runtime_error("rpcmanager: Aggregator not in use, and a rpc booter is already registered\n");
+ }
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc b/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
new file mode 100644
index 0000000000..18b73faeba
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcpmtconverters_ice.cc
@@ -0,0 +1,123 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcpmtconverters_ice.h>
+#include <Ice/Ice.h>
+#include <gnuradio.h>
+
+GNURadio::KnobPtr
+rpcpmtconverter::from_pmt(const pmt::pmt_t& knob, const Ice::Current& c)
+{
+ if(pmt::is_real(knob)) {
+ return new GNURadio::KnobD(Ice::Double(pmt::to_double(knob)));
+ }
+ else if(pmt::is_symbol(knob)) {
+ std::string stuff = pmt::symbol_to_string(knob);
+ return new GNURadio::KnobS(stuff);
+ }
+ else if(pmt::is_integer(knob)) {
+ return new GNURadio::KnobI(pmt::to_long(knob));
+ }
+ else if(pmt::is_bool(knob)) {
+ return new GNURadio::KnobB(pmt::to_bool(knob));
+ }
+ else if(pmt::is_uint64(knob)) {
+ return new GNURadio::KnobL(pmt::to_uint64(knob));
+ //const std::complex<float> *c32vector_elements(pmt_t v, size_t &len); //< len is in elements
+ }
+ else if(pmt::is_c32vector(knob)) { // c32 sent as interleaved floats
+ size_t size(pmt::length(knob));
+ const float* start((const float*) pmt::c32vector_elements(knob,size));
+ return new GNURadio::KnobVecF(std::vector<float>(start,start+size*2));
+ }
+ else if (pmt::is_s32vector(knob)) {
+ size_t size(pmt::length(knob));
+ const int* start((const int*) pmt::s32vector_elements(knob,size));
+ return new GNURadio::KnobVecI(std::vector<int>(start,start+size));
+ }
+ else if(pmt::is_f32vector(knob)) {
+ size_t size(pmt::length(knob));
+ const float* start((const float*) pmt::f32vector_elements(knob,size));
+ return new GNURadio::KnobVecF(std::vector<float>(start,start+size));
+ }
+ else if (pmt::is_u8vector(knob)) {
+ size_t size(pmt::length(knob));
+ const uint8_t* start((const uint8_t*) pmt::u8vector_elements(knob,size));
+ return new GNURadio::KnobVecC(std::vector<Ice::Byte>(start,start+size));
+ }
+ else {
+ std::cerr << "Error: Don't know how to handle Knob Type (from): " << std::endl; assert(0);}
+ //TODO: VECTORS!!!
+ return new GNURadio::Knob();
+}
+
+pmt::pmt_t
+rpcpmtconverter::to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c)
+{
+ std::string id(knob->ice_id(c).substr(12));
+ if(id == "KnobD") {
+ GNURadio::KnobDPtr k(GNURadio::KnobDPtr::dynamicCast(knob));
+ return pmt::mp(k->value);
+ }
+ else if(id == "KnobF") {
+ GNURadio::KnobFPtr k(GNURadio::KnobFPtr::dynamicCast(knob));
+ return pmt::mp(k->value);
+ }
+ else if(id == "KnobI") {
+ GNURadio::KnobIPtr k(GNURadio::KnobIPtr::dynamicCast(knob));
+ return pmt::mp(k->value);
+ }
+ else if(id == "KnobS") {
+ GNURadio::KnobSPtr k(GNURadio::KnobSPtr::dynamicCast(knob));
+ return pmt::string_to_symbol(k->value);
+ }
+ else if(id == "KnobB") {
+ GNURadio::KnobBPtr k(GNURadio::KnobBPtr::dynamicCast(knob));
+ return pmt::mp(k->value);
+ }
+ else if(id == "KnobC") {
+ GNURadio::KnobCPtr k(GNURadio::KnobCPtr::dynamicCast(knob));
+ return pmt::mp(k->value);
+ }
+ else if(id == "KnobL") {
+ GNURadio::KnobLPtr k(GNURadio::KnobLPtr::dynamicCast(knob));
+ return pmt::mp((long)k->value);
+ }
+ else if(id == "KnobVecC") {
+ GNURadio::KnobVecCPtr k(GNURadio::KnobVecCPtr::dynamicCast(knob));
+ return pmt::init_u8vector(k->value.size(), &k->value[0]);
+ }
+ else if(id == "KnobVecI") {
+ GNURadio::KnobVecIPtr k(GNURadio::KnobVecIPtr::dynamicCast(knob));
+ return pmt::init_s32vector(k->value.size(), &k->value[0]);
+ }
+ //else if(id == "KnobVecF") {
+ // GNURadio::KnobVecFPtr k(GNURadio::KnobVecFPtr::dynamicCast(knob));
+ // return pmt::mp(k->value);
+ //TODO: FLOAT!!!
+ //TODO: VECTORS!!!
+ else {
+ std::cerr << "Error: Don't know how to handle Knob Type: " << id << std::endl; assert(0);
+ }
+
+ return pmt::pmt_t();
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
new file mode 100644
index 0000000000..3ff553af69
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
@@ -0,0 +1,93 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcserver_aggregator.h>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+
+rpcserver_aggregator::rpcserver_aggregator()
+ : d_type(std::string("aggregator"))
+{;}
+
+rpcserver_aggregator::~rpcserver_aggregator()
+{;}
+
+const std::string&
+rpcserver_aggregator::type()
+{
+ return d_type;
+}
+
+const std::vector<std::string>&
+rpcserver_aggregator::registeredServers()
+{
+ return d_registeredServers;
+}
+
+void
+rpcserver_aggregator::registerConfigureCallback(const std::string &id,
+ const configureCallback_t callback)
+{
+ std::for_each(d_serverlist.begin(), d_serverlist.end(),
+ registerConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id, callback));
+}
+
+void
+rpcserver_aggregator::unregisterConfigureCallback(const std::string &id)
+{
+ std::for_each(d_serverlist.begin(), d_serverlist.end(),
+ unregisterConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id));
+}
+
+void
+rpcserver_aggregator::registerQueryCallback(const std::string &id, const queryCallback_t callback)
+{
+ std::for_each(d_serverlist.begin(), d_serverlist.end(),
+ registerQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id, callback));
+}
+
+void
+rpcserver_aggregator::unregisterQueryCallback(const std::string &id)
+{
+ std::for_each(d_serverlist.begin(), d_serverlist.end(),
+ unregisterQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id));
+}
+
+void
+rpcserver_aggregator::registerServer(rpcmanager_base::rpcserver_booter_base_sptr server)
+{
+ std::vector<std::string>::iterator it(std::find(d_registeredServers.begin(),
+ d_registeredServers.end(),
+ server->type()));
+ if(it != d_registeredServers.end()) {
+ d_serverlist.push_back(server);
+ d_registeredServers.push_back(server->type());
+ }
+ else {
+ std::stringstream s;
+ s << "rpcserver_aggregator::registerServer: server of type "
+ << server->type() << " already registered" << std::endl;
+ throw std::runtime_error(s.str().c_str());
+ }
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
new file mode 100644
index 0000000000..e86306910d
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcserver_booter_aggregator.h>
+
+rpcserver_booter_aggregator::rpcserver_booter_aggregator() :
+ d_type(std::string("aggregator")), server(new rpcserver_aggregator())
+{;}
+
+rpcserver_booter_aggregator::~rpcserver_booter_aggregator()
+{;}
+
+rpcserver_base*
+rpcserver_booter_aggregator::i()
+{
+ return &(*server);
+}
+
+const std::string&
+rpcserver_booter_aggregator::type()
+{
+ return d_type;
+}
+
+const std::vector<std::string>
+rpcserver_booter_aggregator::endpoints()
+{
+ std::vector<std::string> ep;
+ ep.push_back(std::string("TODO"));
+ return ep;
+}
+
+const std::vector<std::string>&
+rpcserver_booter_aggregator::registeredServers()
+{
+ return server->registeredServers();
+}
+
+rpcserver_aggregator*
+rpcserver_booter_aggregator::agg()
+{
+ return &(*server);
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
new file mode 100644
index 0000000000..cffa268a6d
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcserver_ice.h>
+#include <gnuradio/rpcserver_booter_ice.h>
+
+namespace {
+ static const char* const CONTROL_PORT_CLASS("ice");
+ static const char* const CONTROL_PORT_NAME("ControlPort");
+ static const char* const ENDPOINT_NAME("gnuradio");
+};
+
+rpcserver_booter_ice::rpcserver_booter_ice() :
+ ice_server_template<rpcserver_base, rpcserver_ice,
+ rpcserver_booter_ice, GNURadio::ControlPortPtr>
+ (this, std::string(CONTROL_PORT_NAME), std::string(ENDPOINT_NAME)),
+ d_type(std::string(CONTROL_PORT_CLASS))
+{;}
+
+rpcserver_booter_ice::~rpcserver_booter_ice()
+{;}
+
+rpcserver_base*
+rpcserver_booter_ice::i()
+{
+ return ice_server_template<rpcserver_base, rpcserver_ice,
+ rpcserver_booter_ice, GNURadio::ControlPortPtr>::i();
+}
+
+const std::vector<std::string>
+rpcserver_booter_ice::endpoints()
+{
+ return ice_server_template<rpcserver_base, rpcserver_ice,
+ rpcserver_booter_ice, GNURadio::ControlPortPtr>::endpoints();
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
new file mode 100644
index 0000000000..045d7ba4f1
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
@@ -0,0 +1,165 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcserver_ice.h>
+#include <IceUtil/IceUtil.h>
+#include <Ice/Ice.h>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+#include <pmt/pmt.h>
+
+#define DEBUG 0
+
+using namespace rpcpmtconverter;
+
+rpcserver_ice::rpcserver_ice()
+{}
+
+rpcserver_ice::~rpcserver_ice()
+{}
+
+void
+rpcserver_ice::registerConfigureCallback(const std::string &id,
+ const configureCallback_t callback)
+{
+ {
+ ConfigureCallbackMap_t::const_iterator iter(d_setcallbackmap.find(id));
+ if(iter != d_setcallbackmap.end()) {
+ std::stringstream s;
+ s << "rpcserver_ice:: rpcserver_ice ERROR registering set, already registered: "
+ << id << std::endl;
+ throw std::runtime_error(s.str().c_str());
+ }
+ }
+
+ if(DEBUG)
+ std::cout << "rpcserver_ice registering set: " << id << std::endl;
+
+ d_setcallbackmap.insert(ConfigureCallbackMap_t::value_type(id, callback));
+}
+
+void
+rpcserver_ice::unregisterConfigureCallback(const std::string &id)
+{
+ ConfigureCallbackMap_t::iterator iter(d_setcallbackmap.find(id));
+ if(iter == d_setcallbackmap.end()) {
+ std::stringstream s;
+ s << "rpcserver_ice:: rpcserver_ice ERROR unregistering set, not registered: "
+ << id << std::endl;
+ throw std::runtime_error(s.str().c_str());
+ }
+
+ if(DEBUG)
+ std::cout << "rpcserver_ice unregistering set: " << id << std::endl;
+
+ d_setcallbackmap.erase(iter);
+}
+
+void
+rpcserver_ice::registerQueryCallback(const std::string &id,
+ const queryCallback_t callback)
+{
+ {
+ QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(id));
+ if(iter != d_getcallbackmap.end()) {
+ std::stringstream s;
+ s << "rpcserver_ice:: rpcserver_ice ERROR registering get, already registered: "
+ << id << std::endl;
+ throw std::runtime_error(s.str().c_str());
+ }
+ }
+
+ if(DEBUG)
+ std::cout << "rpcserver_ice registering get: " << id << std::endl;
+
+ d_getcallbackmap.insert(QueryCallbackMap_t::value_type(id, callback));
+}
+
+void
+rpcserver_ice::unregisterQueryCallback(const std::string &id)
+{
+ QueryCallbackMap_t::iterator iter(d_getcallbackmap.find(id));
+ if(iter == d_getcallbackmap.end()) {
+ std::stringstream s;
+ s << "rpcserver_ice:: rpcserver_ice ERROR unregistering get, registered: "
+ << id << std::endl;
+ throw std::runtime_error(s.str().c_str());
+ }
+
+ if(DEBUG)
+ std::cout << "rpcserver_ice unregistering get: " << id << std::endl;
+
+ d_getcallbackmap.erase(iter);
+}
+
+void
+rpcserver_ice::set(const GNURadio::KnobMap& knobs, const Ice::Current& c)
+{
+ std::for_each(knobs.begin(), knobs.end(),
+ set_f<GNURadio::KnobMap::value_type,ConfigureCallbackMap_t>
+ (c, d_setcallbackmap, cur_priv));
+}
+
+GNURadio::KnobMap
+rpcserver_ice::get(const GNURadio::KnobIDList& knobs, const Ice::Current& c)
+{
+ GNURadio::KnobMap outknobs;
+
+ if(knobs.size() == 0) {
+ std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(),
+ get_all_f<QueryCallbackMap_t::value_type, QueryCallbackMap_t, GNURadio::KnobMap>
+ (c, d_getcallbackmap, cur_priv, outknobs));
+ }
+ else {
+ std::for_each(knobs.begin(), knobs.end(),
+ get_f<GNURadio::KnobIDList::value_type, QueryCallbackMap_t>
+ (c, d_getcallbackmap, cur_priv, outknobs));
+ }
+ return outknobs;
+}
+
+GNURadio::KnobPropMap
+rpcserver_ice::properties(const GNURadio::KnobIDList& knobs, const Ice::Current& c)
+{
+ GNURadio::KnobPropMap outknobs;
+
+ if(knobs.size() == 0) {
+ std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(),
+ properties_all_f<QueryCallbackMap_t::value_type,
+ QueryCallbackMap_t,GNURadio::KnobPropMap>(c, d_getcallbackmap, cur_priv, outknobs));
+ }
+ else {
+ std::for_each(knobs.begin(), knobs.end(),
+ properties_f<GNURadio::KnobIDList::value_type,
+ QueryCallbackMap_t, GNURadio::KnobPropMap>(c, d_getcallbackmap, cur_priv, outknobs));
+ }
+ return outknobs;
+}
+
+void
+rpcserver_ice::shutdown(const Ice::Current& c)
+{
+ if(DEBUG)
+ std::cout << "Shutting down..." << std::endl;
+ c.adapter->getCommunicator()->shutdown();
+}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
new file mode 100644
index 0000000000..697ec497b1
--- /dev/null
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/rpcserver_booter_aggregator.h>
+#include <gnuradio/rpcmanager.h>
+#include <gnuradio/rpcserver_selector.h>
+
+bool rpcmanager::make_aggregator(false);
+
+#ifdef RPCSERVER_ICE
+ #include <gnuradio/rpcserver_booter_ice.h>
+ rpcmanager::rpcserver_booter_register_helper<rpcserver_booter_ice> boot_ice;
+#endif
+
+#ifdef RPCSERVER_ERLANG
+ #error TODO ERLANG
+#endif
+
+#ifdef RPCSERVER_XMLRPC
+ #error TODO XMLRPC
+#endif
diff --git a/gnuradio-runtime/lib/dispatcher.cc b/gnuradio-runtime/lib/dispatcher.cc
new file mode 100644
index 0000000000..7c9e13c5a6
--- /dev/null
+++ b/gnuradio-runtime/lib/dispatcher.cc
@@ -0,0 +1,195 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/dispatcher.h>
+#include <math.h>
+#include <errno.h>
+#include <stdio.h>
+
+#ifdef HAVE_SELECT
+# ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+# else
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# endif
+# ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
+# endif
+#endif
+
+namespace gr {
+
+ static dispatcher_sptr s_singleton;
+
+ dispatcher_sptr
+ make_dispatcher()
+ {
+ return dispatcher_sptr(new dispatcher());
+ }
+
+ dispatcher_sptr
+ dispatcher_singleton()
+ {
+ if(s_singleton)
+ return s_singleton;
+
+ s_singleton = make_dispatcher();
+ return s_singleton;
+ }
+
+#if !defined(HAVE_SELECT) // Stub it out
+
+ dispatcher::dispatcher()
+ {
+ }
+
+ dispatcher::~dispatcher()
+ {
+ }
+
+ bool
+ dispatcher::add_handler(select_handler_sptr handler)
+ {
+ return true;
+ }
+
+ bool
+ dispatcher::del_handler(select_handler_sptr handler)
+ {
+ return true;
+ }
+
+ bool
+ dispatcher::del_handler(select_handler *handler)
+ {
+ return true;
+ }
+
+ void
+ dispatcher::loop(double timeout)
+ {
+ }
+
+#else // defined(HAVE_SELECT)
+
+ dispatcher::dispatcher()
+ : d_handler(FD_SETSIZE), d_max_index(-1)
+ {
+ }
+
+ dispatcher::~dispatcher()
+ {
+ }
+
+ bool
+ dispatcher::add_handler(select_handler_sptr handler)
+ {
+ int fd = handler->fd();
+ if(fd < 0 || fd >= FD_SETSIZE)
+ return false;
+
+ d_max_index = std::max(d_max_index, fd);
+ d_handler[fd] = handler;
+ return true;
+ }
+
+ bool
+ dispatcher::del_handler(select_handler_sptr handler)
+ {
+ return del_handler(handler.get());
+ }
+
+ bool
+ dispatcher::del_handler(select_handler *handler)
+ {
+ int fd = handler->fd();
+ if(fd < 0 || fd >= FD_SETSIZE)
+ return false;
+
+ d_handler[fd].reset();
+
+ if(fd == d_max_index) {
+ int i;
+ for(i = fd - 1; i >= 0 && !d_handler[i]; i--)
+ ;
+ d_max_index = i;
+ }
+ return true;
+ }
+
+ void
+ dispatcher::loop(double timeout)
+ {
+ struct timeval master;
+ struct timeval tmp;
+ fd_set rd_set;
+ fd_set wr_set;
+
+ double secs = floor (timeout);
+ master.tv_sec = (long) secs;
+ master.tv_usec = (long) ((timeout - secs) * 1e6);
+
+ while(d_max_index >= 0) {
+ FD_ZERO(&rd_set);
+ FD_ZERO(&wr_set);
+
+ for(int i = 0; i <= d_max_index; i++) {
+ if(d_handler[i] && d_handler[i]->readable())
+ FD_SET(i, &rd_set);
+ if(d_handler[i] && d_handler[i]->writable())
+ FD_SET(i, &wr_set);
+ }
+
+ tmp = master;
+ int retval = select(d_max_index+1, &rd_set, &wr_set, 0, &tmp);
+ if(retval == 0) // timed out with nothing ready
+ continue;
+ if(retval < 0) {
+ if(errno == EINTR)
+ continue;
+ perror("gr_dispatcher/select");
+ return;
+ }
+
+ for(int i = 0; i <= d_max_index; i++) {
+ if(FD_ISSET(i, &rd_set))
+ if(d_handler[i])
+ d_handler[i]->handle_read();
+ if(FD_ISSET(i, &wr_set))
+ if(d_handler[i])
+ d_handler[i]->handle_write();
+ }
+ }
+ }
+
+} /* namespace gr */
+
+#endif /* HAVE_SELECT */
diff --git a/gnuradio-runtime/lib/error_handler.cc b/gnuradio-runtime/lib/error_handler.cc
new file mode 100644
index 0000000000..50db15d049
--- /dev/null
+++ b/gnuradio-runtime/lib/error_handler.cc
@@ -0,0 +1,249 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * This code is based on error.cc from the "Click Modular Router".
+ * Original copyright follows:
+ */
+/*
+ * error.{cc,hh} -- flexible classes for error reporting
+ * Eddie Kohler
+ *
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/error_handler.h>
+#include <assert.h>
+#include <stdexcept>
+#include <unistd.h>
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
+namespace gr {
+
+ static error_handler *s_default_handler = 0;
+ static error_handler *s_silent_handler = 0;
+
+ bool
+ error_handler::has_default_handler()
+ {
+ return s_default_handler != 0;
+ }
+
+ void
+ error_handler::set_default_handler(error_handler *errh)
+ {
+ s_default_handler = errh;
+ }
+
+ error_handler *
+ error_handler::default_handler()
+ {
+ assert(s_default_handler != 0);
+ return s_default_handler;
+ }
+
+ error_handler *
+ error_handler::silent_handler()
+ {
+ assert(s_silent_handler != 0);
+ return s_silent_handler;
+ }
+
+ // ----------------------------------------------------------------
+
+ error_handler::~error_handler()
+ {
+ // nop
+ }
+
+ void
+ error_handler::debug(const char *format, ...)
+ {
+ va_list val;
+ va_start(val, format);
+ verror(ERR_DEBUG, format, val);
+ va_end(val);
+ }
+
+ void
+ error_handler::message(const char *format, ...)
+ {
+ va_list val;
+ va_start(val, format);
+ verror(ERR_MESSAGE, format, val);
+ va_end(val);
+ }
+
+ void
+ error_handler::warning(const char *format, ...)
+ {
+ va_list val;
+ va_start(val, format);
+ verror(ERR_WARNING, format, val);
+ va_end(val);
+ }
+
+ void
+ error_handler::error(const char *format, ...)
+ {
+ va_list val;
+ va_start(val, format);
+ verror(ERR_ERROR, format, val);
+ va_end(val);
+ }
+
+ void
+ error_handler::fatal(const char *format, ...)
+ {
+ va_list val;
+ va_start(val, format);
+ verror(ERR_FATAL, format, val);
+ va_end(val);
+ }
+
+ void
+ error_handler::verror(seriousness s, const char *format, va_list val)
+ {
+ std::string text = make_text(s, format, val);
+ handle_text(s, text);
+ count_error(s);
+ }
+
+ void
+ error_handler::verror_text(seriousness s, const std::string &text)
+ {
+ // text is already made
+ handle_text(s, text);
+ count_error(s);
+ }
+
+ std::string
+ error_handler::make_text(seriousness s, const char *format, va_list val)
+ {
+ char text_buf[4096];
+ vsnprintf(text_buf, sizeof(text_buf), format, val);
+ text_buf[sizeof(text_buf)-1] = 0;
+ return text_buf;
+ }
+
+ // ----------------------------------------------------------------
+
+ void
+ base_error_handler::count_error(seriousness s)
+ {
+ if(s < ERR_WARNING)
+ /* do nothing */;
+ else if(s < ERR_ERROR)
+ d_nwarnings++;
+ else
+ d_nerrors++;
+ }
+
+ // ----------------------------------------------------------------
+
+ file_error_handler::file_error_handler(FILE *file)
+ : d_file(file), d_fd(-1)
+ {
+ }
+
+ file_error_handler::file_error_handler(int file_descriptor)
+ {
+ d_fd = dup(file_descriptor); // so we can fclose it
+ if(d_fd == -1){
+ perror("gr::file_error_handler:dup");
+ throw std::invalid_argument("gr::file_error_handler:dup");
+ }
+ d_file = fdopen(d_fd, "w");
+ if(d_file == 0){
+ perror("gr::file_error_handler:fdopen");
+ throw std::invalid_argument("gr::file_error_handler:fdopen");
+ }
+ }
+
+ file_error_handler::~file_error_handler()
+ {
+ if(d_fd != -1){
+ fclose(d_file);
+ }
+ }
+
+ void
+ file_error_handler::handle_text(seriousness s, const std::string &text)
+ {
+ if(text.length() <= 0)
+ return;
+
+ fwrite(text.data(), 1, text.length(), d_file);
+ if(text[text.length()-1] != '\n')
+ fwrite("\n", 1, 1, d_file);
+
+ if(d_fd != -1)
+ fflush(d_file); // keep synced with any other users of fd
+ }
+
+
+ // ----------------------------------------------------------------
+ // static error handlers
+ //
+
+ class silent_error_handler : public base_error_handler
+ {
+ public:
+ silent_error_handler() {}
+ void handle_text(seriousness s, const std::string &str);
+ };
+
+ void
+ silent_error_handler::handle_text(seriousness s, const std::string &str)
+ {
+ // nop
+ }
+
+ class force_init
+ {
+ public:
+ force_init()
+ {
+ s_default_handler = new file_error_handler(stdout);
+ s_silent_handler = new silent_error_handler();
+ }
+ };
+
+ static force_init kludge;
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/feval.cc b/gnuradio-runtime/lib/feval.cc
new file mode 100644
index 0000000000..93976c8ac7
--- /dev/null
+++ b/gnuradio-runtime/lib/feval.cc
@@ -0,0 +1,136 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/feval.h>
+
+namespace gr {
+
+ feval_dd::~feval_dd(){}
+
+ double
+ feval_dd::eval(double x)
+ {
+ return 0;
+ }
+
+ double
+ feval_dd::calleval(double x)
+ {
+ return eval(x);
+ }
+
+ // ----------------------------------------------------------------
+
+ feval_cc::~feval_cc(){}
+
+ gr_complex
+ feval_cc::eval(gr_complex x)
+ {
+ return 0;
+ }
+
+ gr_complex
+ feval_cc::calleval(gr_complex x)
+ {
+ return eval(x);
+ }
+
+ // ----------------------------------------------------------------
+
+ feval_ll::~feval_ll(){}
+
+ long
+ feval_ll::eval(long x)
+ {
+ return 0;
+ }
+
+ long
+ feval_ll::calleval(long x)
+ {
+ return eval(x);
+ }
+
+ // ----------------------------------------------------------------
+
+ feval::~feval(){}
+
+ void
+ feval::eval(void)
+ {
+ // nop
+ }
+
+ void
+ feval::calleval(void)
+ {
+ eval();
+ }
+
+ // ----------------------------------------------------------------
+
+ feval_p::~feval_p(){}
+
+ void
+ feval_p::eval(pmt::pmt_t x)
+ {
+ // nop
+ }
+
+ void
+ feval_p::calleval(pmt::pmt_t x)
+ {
+ eval(x);
+ }
+
+ /*
+ * Trivial examples showing C++ (transparently) calling Python
+ */
+ double
+ feval_dd_example(feval_dd *f, double x)
+ {
+ return f->calleval(x);
+ }
+
+ gr_complex
+ feval_cc_example(feval_cc *f, gr_complex x)
+ {
+ return f->calleval(x);
+ }
+
+ long
+ feval_ll_example(feval_ll *f, long x)
+ {
+ return f->calleval(x);
+ }
+
+ void
+ feval_example(feval *f)
+ {
+ f->calleval();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc
new file mode 100644
index 0000000000..8b188799a5
--- /dev/null
+++ b/gnuradio-runtime/lib/flat_flowgraph.cc
@@ -0,0 +1,436 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "flat_flowgraph.h"
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/prefs.h>
+#include <volk/volk.h>
+#include <iostream>
+#include <map>
+#include <boost/format.hpp>
+
+namespace gr {
+
+#define FLAT_FLOWGRAPH_DEBUG 0
+
+// 32Kbyte buffer size between blocks
+#define GR_FIXED_BUFFER_SIZE (32*(1L<<10))
+
+ static const unsigned int s_fixed_buffer_size = GR_FIXED_BUFFER_SIZE;
+
+ flat_flowgraph_sptr
+ make_flat_flowgraph()
+ {
+ return flat_flowgraph_sptr(new flat_flowgraph());
+ }
+
+ flat_flowgraph::flat_flowgraph()
+ {
+ }
+
+ flat_flowgraph::~flat_flowgraph()
+ {
+ }
+
+ void
+ flat_flowgraph::setup_connections()
+ {
+ basic_block_vector_t blocks = calc_used_blocks();
+
+ // Assign block details to blocks
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
+ cast_to_block_sptr(*p)->set_detail(allocate_block_detail(*p));
+
+ // Connect inputs to outputs for each block
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ connect_block_inputs(*p);
+
+ block_sptr block = cast_to_block_sptr(*p);
+ block->set_unaligned(0);
+ block->set_is_unaligned(false);
+ }
+
+ // Connect message ports connetions
+ for(msg_edge_viter_t i = d_msg_edges.begin(); i != d_msg_edges.end(); i++) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << boost::format("flat_fg connecting msg primitives: (%s, %s)->(%s, %s)\n") %
+ i->src().block() % i->src().port() %
+ i->dst().block() % i->dst().port();
+ i->src().block()->message_port_sub(i->src().port(), pmt::cons(i->dst().block()->alias_pmt(), i->dst().port()));
+ }
+ }
+
+ block_detail_sptr
+ flat_flowgraph::allocate_block_detail(basic_block_sptr block)
+ {
+ int ninputs = calc_used_ports(block, true).size();
+ int noutputs = calc_used_ports(block, false).size();
+ block_detail_sptr detail = make_block_detail(ninputs, noutputs);
+
+ block_sptr grblock = cast_to_block_sptr(block);
+ if(!grblock)
+ throw std::runtime_error("allocate_block_detail found non-gr::block");
+
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "Creating block detail for " << block << std::endl;
+
+ for(int i = 0; i < noutputs; i++) {
+ grblock->expand_minmax_buffer(i);
+
+ buffer_sptr buffer = allocate_buffer(block, i);
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "Allocated buffer for output " << block << ":" << i << std::endl;
+ detail->set_output(i, buffer);
+
+ // Update the block's max_output_buffer based on what was actually allocated.
+ grblock->set_max_output_buffer(i, buffer->bufsize());
+ }
+
+ return detail;
+ }
+
+ buffer_sptr
+ flat_flowgraph::allocate_buffer(basic_block_sptr block, int port)
+ {
+ block_sptr grblock = cast_to_block_sptr(block);
+ if(!grblock)
+ throw std::runtime_error("allocate_buffer found non-gr::block");
+ int item_size = block->output_signature()->sizeof_stream_item(port);
+
+ // *2 because we're now only filling them 1/2 way in order to
+ // increase the available parallelism when using the TPB scheduler.
+ // (We're double buffering, where we used to single buffer)
+ int nitems = s_fixed_buffer_size * 2 / item_size;
+
+ // Make sure there are at least twice the output_multiple no. of items
+ if(nitems < 2*grblock->output_multiple()) // Note: this means output_multiple()
+ nitems = 2*grblock->output_multiple(); // can't be changed by block dynamically
+
+ // If any downstream blocks are decimators and/or have a large output_multiple,
+ // ensure we have a buffer at least twice their decimation factor*output_multiple
+ basic_block_vector_t blocks = calc_downstream_blocks(block, port);
+
+ // limit buffer size if indicated
+ if(grblock->max_output_buffer(port) > 0) {
+ //std::cout << "constraining output items to " << block->max_output_buffer(port) << "\n";
+ nitems = std::min((long)nitems, (long)grblock->max_output_buffer(port));
+ nitems -= nitems%grblock->output_multiple();
+ if(nitems < 1)
+ throw std::runtime_error("problems allocating a buffer with the given max output buffer constraint!");
+ }
+ else if(grblock->min_output_buffer(port) > 0) {
+ nitems = std::max((long)nitems, (long)grblock->min_output_buffer(port));
+ nitems -= nitems%grblock->output_multiple();
+ if(nitems < 1)
+ throw std::runtime_error("problems allocating a buffer with the given min output buffer constraint!");
+ }
+
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ block_sptr dgrblock = cast_to_block_sptr(*p);
+ if(!dgrblock)
+ throw std::runtime_error("allocate_buffer found non-gr::block");
+
+ double decimation = (1.0/dgrblock->relative_rate());
+ int multiple = dgrblock->output_multiple();
+ int history = dgrblock->history();
+ nitems = std::max(nitems, static_cast<int>(2*(decimation*multiple+history)));
+ }
+
+ // std::cout << "make_buffer(" << nitems << ", " << item_size << ", " << grblock << "\n";
+ return make_buffer(nitems, item_size, grblock);
+ }
+
+ void
+ flat_flowgraph::connect_block_inputs(basic_block_sptr block)
+ {
+ block_sptr grblock = cast_to_block_sptr(block);
+ if (!grblock)
+ throw std::runtime_error("connect_block_inputs found non-gr::block");
+
+ // Get its detail and edges that feed into it
+ block_detail_sptr detail = grblock->detail();
+ edge_vector_t in_edges = calc_upstream_edges(block);
+
+ // For each edge that feeds into it
+ for(edge_viter_t e = in_edges.begin(); e != in_edges.end(); e++) {
+ // Set the buffer reader on the destination port to the output
+ // buffer on the source port
+ int dst_port = e->dst().port();
+ int src_port = e->src().port();
+ basic_block_sptr src_block = e->src().block();
+ block_sptr src_grblock = cast_to_block_sptr(src_block);
+ if(!src_grblock)
+ throw std::runtime_error("connect_block_inputs found non-gr::block");
+ buffer_sptr src_buffer = src_grblock->detail()->output(src_port);
+
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "Setting input " << dst_port << " from edge " << (*e) << std::endl;
+
+ detail->set_input(dst_port, buffer_add_reader(src_buffer, grblock->history()-1, grblock));
+ }
+ }
+
+ void
+ flat_flowgraph::merge_connections(flat_flowgraph_sptr old_ffg)
+ {
+ // Allocate block details if needed. Only new blocks that aren't pruned out
+ // by flattening will need one; existing blocks still in the new flowgraph will
+ // already have one.
+ for(basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ block_sptr block = cast_to_block_sptr(*p);
+
+ if(!block->detail()) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "merge: allocating new detail for block " << (*p) << std::endl;
+ block->set_detail(allocate_block_detail(block));
+ }
+ else
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "merge: reusing original detail for block " << (*p) << std::endl;
+ }
+
+ // Calculate the old edges that will be going away, and clear the
+ // buffer readers on the RHS.
+ for(edge_viter_t old_edge = old_ffg->d_edges.begin(); old_edge != old_ffg->d_edges.end(); old_edge++) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "merge: testing old edge " << (*old_edge) << "...";
+
+ edge_viter_t new_edge;
+ for(new_edge = d_edges.begin(); new_edge != d_edges.end(); new_edge++)
+ if(new_edge->src() == old_edge->src() &&
+ new_edge->dst() == old_edge->dst())
+ break;
+
+ if(new_edge == d_edges.end()) { // not found in new edge list
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "not in new edge list" << std::endl;
+ // zero the buffer reader on RHS of old edge
+ block_sptr block(cast_to_block_sptr(old_edge->dst().block()));
+ int port = old_edge->dst().port();
+ block->detail()->set_input(port, buffer_reader_sptr());
+ }
+ else {
+ if (FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "found in new edge list" << std::endl;
+ }
+ }
+
+ // Now connect inputs to outputs, reusing old buffer readers if they exist
+ for(basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ block_sptr block = cast_to_block_sptr(*p);
+
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "merge: merging " << (*p) << "...";
+
+ if(old_ffg->has_block_p(*p)) {
+ // Block exists in old flow graph
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "used in old flow graph" << std::endl;
+ block_detail_sptr detail = block->detail();
+
+ // Iterate through the inputs and see what needs to be done
+ int ninputs = calc_used_ports(block, true).size(); // Might be different now
+ for(int i = 0; i < ninputs; i++) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "Checking input " << block << ":" << i << "...";
+ edge edge = calc_upstream_edge(*p, i);
+
+ // Fish out old buffer reader and see if it matches correct buffer from edge list
+ block_sptr src_block = cast_to_block_sptr(edge.src().block());
+ block_detail_sptr src_detail = src_block->detail();
+ buffer_sptr src_buffer = src_detail->output(edge.src().port());
+ buffer_reader_sptr old_reader;
+ if(i < detail->ninputs()) // Don't exceed what the original detail has
+ old_reader = detail->input(i);
+
+ // If there's a match, use it
+ if(old_reader && (src_buffer == old_reader->buffer())) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "matched, reusing" << std::endl;
+ }
+ else {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "needs a new reader" << std::endl;
+
+ // Create new buffer reader and assign
+ detail->set_input(i, buffer_add_reader(src_buffer, block->history()-1, block));
+ }
+ }
+ }
+ else {
+ // Block is new, it just needs buffer readers at this point
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << "new block" << std::endl;
+ connect_block_inputs(block);
+
+ // Make sure all buffers are aligned
+ setup_buffer_alignment(block);
+ }
+
+ // Now deal with the fact that the block details might have
+ // changed numbers of inputs and outputs vs. in the old
+ // flowgraph.
+ }
+ }
+
+ void
+ flat_flowgraph::setup_buffer_alignment(block_sptr block)
+ {
+ const int alignment = volk_get_alignment();
+ for(int i = 0; i < block->detail()->ninputs(); i++) {
+ void *r = (void*)block->detail()->input(i)->read_pointer();
+ unsigned long int ri = (unsigned long int)r % alignment;
+ //std::cerr << "reader: " << r << " alignment: " << ri << std::endl;
+ if(ri != 0) {
+ size_t itemsize = block->detail()->input(i)->get_sizeof_item();
+ block->detail()->input(i)->update_read_pointer(alignment-ri/itemsize);
+ }
+ block->set_unaligned(0);
+ block->set_is_unaligned(false);
+ }
+
+ for(int i = 0; i < block->detail()->noutputs(); i++) {
+ void *w = (void*)block->detail()->output(i)->write_pointer();
+ unsigned long int wi = (unsigned long int)w % alignment;
+ //std::cerr << "writer: " << w << " alignment: " << wi << std::endl;
+ if(wi != 0) {
+ size_t itemsize = block->detail()->output(i)->get_sizeof_item();
+ block->detail()->output(i)->update_write_pointer(alignment-wi/itemsize);
+ }
+ block->set_unaligned(0);
+ block->set_is_unaligned(false);
+ }
+ }
+
+ std::string
+ flat_flowgraph::edge_list()
+ {
+ std::stringstream s;
+ for(edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
+ s << (*e) << std::endl;
+ return s.str();
+ }
+
+ void flat_flowgraph::dump()
+ {
+ for(edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
+ std::cout << " edge: " << (*e) << std::endl;
+
+ for(basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ std::cout << " block: " << (*p) << std::endl;
+ block_detail_sptr detail = cast_to_block_sptr(*p)->detail();
+ std::cout << " detail @" << detail << ":" << std::endl;
+
+ int ni = detail->ninputs();
+ int no = detail->noutputs();
+ for(int i = 0; i < no; i++) {
+ buffer_sptr buffer = detail->output(i);
+ std::cout << " output " << i << ": " << buffer << std::endl;
+ }
+
+ for(int i = 0; i < ni; i++) {
+ buffer_reader_sptr reader = detail->input(i);
+ std::cout << " reader " << i << ": " << reader
+ << " reading from buffer=" << reader->buffer() << std::endl;
+ }
+ }
+ }
+
+ block_vector_t
+ flat_flowgraph::make_block_vector(basic_block_vector_t &blocks)
+ {
+ block_vector_t result;
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ result.push_back(cast_to_block_sptr(*p));
+ }
+
+ return result;
+ }
+
+ void
+ flat_flowgraph::clear_endpoint(const msg_endpoint &e, bool is_src)
+ {
+ for(size_t i=0; i<d_msg_edges.size(); i++) {
+ if(is_src) {
+ if(d_msg_edges[i].src() == e) {
+ d_msg_edges.erase(d_msg_edges.begin() + i);
+ i--;
+ }
+ }
+ else {
+ if(d_msg_edges[i].dst() == e) {
+ d_msg_edges.erase(d_msg_edges.begin() + i);
+ i--;
+ }
+ }
+ }
+ }
+
+ void
+ flat_flowgraph::replace_endpoint(const msg_endpoint &e, const msg_endpoint &r, bool is_src)
+ {
+ size_t n_replr(0);
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << boost::format("flat_flowgraph::replace_endpoint( %s, %s, %d )\n") % e.block()% r.block()% is_src;
+ for(size_t i=0; i<d_msg_edges.size(); i++) {
+ if(is_src) {
+ if(d_msg_edges[i].src() == e) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << boost::format("flat_flowgraph::replace_endpoint() flattening to ( %s, %s )\n") \
+ % r.block()% d_msg_edges[i].dst().block();
+ d_msg_edges.push_back( msg_edge(r, d_msg_edges[i].dst() ) );
+ n_replr++;
+ }
+ }
+ else {
+ if(d_msg_edges[i].dst() == e) {
+ if(FLAT_FLOWGRAPH_DEBUG)
+ std::cout << boost::format("flat_flowgraph::replace_endpoint() flattening to ( %s, %s )\n") \
+ % r.block()% d_msg_edges[i].dst().block();
+ d_msg_edges.push_back( msg_edge(d_msg_edges[i].src(), r ) );
+ n_replr++;
+ }
+ }
+ }
+ }
+
+ void
+ flat_flowgraph::enable_pc_rpc()
+ {
+#ifdef GR_PERFORMANCE_COUNTERS
+ if(prefs::singleton()->get_bool("PerfCounters", "on", false)) {
+ basic_block_viter_t p;
+ for(p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ block_sptr block = cast_to_block_sptr(*p);
+ if(!block->is_pc_rpc_set())
+ block->setup_pc_rpc();
+ }
+ }
+#endif /* GR_PERFORMANCE_COUNTERS */
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h
new file mode 100644
index 0000000000..fe43969b6f
--- /dev/null
+++ b/gnuradio-runtime/lib/flat_flowgraph.h
@@ -0,0 +1,93 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_FLAT_FLOWGRAPH_H
+#define INCLUDED_GR_RUNTIME_FLAT_FLOWGRAPH_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/flowgraph.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+
+ // Create a shared pointer to a heap allocated gr::flat_flowgraph
+ // (types defined in gr_runtime_types.h)
+ GR_RUNTIME_API flat_flowgraph_sptr make_flat_flowgraph();
+
+ /*!
+ *\brief Class specializing gr_flat_flowgraph that has all nodes
+ * as blocks, with no hierarchy
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API flat_flowgraph : public flowgraph
+ {
+ public:
+ friend GR_RUNTIME_API flat_flowgraph_sptr make_flat_flowgraph();
+
+ // Destruct an arbitrary gr::flat_flowgraph
+ ~flat_flowgraph();
+
+ // Wire list of gr::block together in new flat_flowgraph
+ void setup_connections();
+
+ // Merge applicable connections from existing flat flowgraph
+ void merge_connections(flat_flowgraph_sptr sfg);
+
+ // Return a string list of edges
+ std::string edge_list();
+
+ void dump();
+
+ /*!
+ * Make a vector of gr::block from a vector of gr::basic_block
+ */
+ static block_vector_t make_block_vector(basic_block_vector_t &blocks);
+
+ void replace_endpoint(const msg_endpoint &e, const msg_endpoint &r, bool is_src);
+ void clear_endpoint(const msg_endpoint &e, bool is_src);
+
+ /*!
+ * Enables export of perf. counters to ControlPort on all blocks in
+ * the flowgraph.
+ */
+ void enable_pc_rpc();
+
+ private:
+ flat_flowgraph();
+
+ block_detail_sptr allocate_block_detail(basic_block_sptr block);
+ buffer_sptr allocate_buffer(basic_block_sptr block, int port);
+ void connect_block_inputs(basic_block_sptr block);
+
+ /* When reusing a flowgraph's blocks, this call makes sure all of
+ * the buffer's are aligned at the machine's alignment boundary
+ * and tells the blocks that they are aligned.
+ *
+ * Called from both setup_connections and merge_connections for
+ * start and restarts.
+ */
+ void setup_buffer_alignment(block_sptr block);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_FLAT_FLOWGRAPH_H */
diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
new file mode 100644
index 0000000000..0b0285088b
--- /dev/null
+++ b/gnuradio-runtime/lib/flowgraph.cc
@@ -0,0 +1,519 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/flowgraph.h>
+#include <stdexcept>
+#include <sstream>
+#include <iterator>
+
+namespace gr {
+
+#define FLOWGRAPH_DEBUG 0
+
+ edge::~edge()
+ {
+ }
+
+ flowgraph_sptr make_flowgraph()
+ {
+ return flowgraph_sptr(new flowgraph());
+ }
+
+ flowgraph::flowgraph()
+ {
+ }
+
+ flowgraph::~flowgraph()
+ {
+ }
+
+ template<class T>
+ static
+ std::vector<T>
+ unique_vector(std::vector<T> v)
+ {
+ std::vector<T> result;
+ std::insert_iterator<std::vector<T> > inserter(result, result.begin());
+
+ sort(v.begin(), v.end());
+ unique_copy(v.begin(), v.end(), inserter);
+ return result;
+ }
+
+ void
+ flowgraph::connect(const endpoint &src, const endpoint &dst)
+ {
+ check_valid_port(src.block()->output_signature(), src.port());
+ check_valid_port(dst.block()->input_signature(), dst.port());
+ check_dst_not_used(dst);
+ check_type_match(src, dst);
+
+ // All ist klar, Herr Kommisar
+ d_edges.push_back(edge(src,dst));
+ }
+
+ void
+ flowgraph::disconnect(const endpoint &src, const endpoint &dst)
+ {
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if(src == p->src() && dst == p->dst()) {
+ d_edges.erase(p);
+ return;
+ }
+ }
+
+ std::stringstream msg;
+ msg << "cannot disconnect edge " << edge(src, dst) << ", not found";
+ throw std::invalid_argument(msg.str());
+ }
+
+ void
+ flowgraph::validate()
+ {
+ d_blocks = calc_used_blocks();
+
+ for(basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ std::vector<int> used_ports;
+ int ninputs, noutputs;
+
+ if(FLOWGRAPH_DEBUG)
+ std::cout << "Validating block: " << (*p) << std::endl;
+
+ used_ports = calc_used_ports(*p, true); // inputs
+ ninputs = used_ports.size();
+ check_contiguity(*p, used_ports, true); // inputs
+
+ used_ports = calc_used_ports(*p, false); // outputs
+ noutputs = used_ports.size();
+ check_contiguity(*p, used_ports, false); // outputs
+
+ if(!((*p)->check_topology(ninputs, noutputs))) {
+ std::stringstream msg;
+ msg << "check topology failed on " << (*p)
+ << " using ninputs=" << ninputs
+ << ", noutputs=" << noutputs;
+ throw std::runtime_error(msg.str());
+ }
+ }
+ }
+
+ void
+ flowgraph::clear()
+ {
+ // Boost shared pointers will deallocate as needed
+ d_blocks.clear();
+ d_edges.clear();
+ }
+
+ void
+ flowgraph::check_valid_port(gr::io_signature::sptr sig, int port)
+ {
+ std::stringstream msg;
+
+ if(port < 0) {
+ msg << "negative port number " << port << " is invalid";
+ throw std::invalid_argument(msg.str());
+ }
+
+ int max = sig->max_streams();
+ if(max != io_signature::IO_INFINITE && port >= max) {
+ msg << "port number " << port << " exceeds max of ";
+ if(max == 0)
+ msg << "(none)";
+ else
+ msg << max-1;
+ throw std::invalid_argument(msg.str());
+ }
+ }
+
+ void
+ flowgraph::check_valid_port(const msg_endpoint &e)
+ {
+ if(FLOWGRAPH_DEBUG)
+ std::cout << "check_valid_port( " << e.block() << ", " << e.port() << ")\n";
+
+ if(!e.block()->has_msg_port(e.port()))
+ throw std::invalid_argument("invalid msg port in connect() or disconnect()");
+ }
+
+ void
+ flowgraph::check_dst_not_used(const endpoint &dst)
+ {
+ // A destination is in use if it is already on the edge list
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if(p->dst() == dst) {
+ std::stringstream msg;
+ msg << "destination already in use by edge " << (*p);
+ throw std::invalid_argument(msg.str());
+ }
+ }
+
+ void
+ flowgraph::check_type_match(const endpoint &src, const endpoint &dst)
+ {
+ int src_size = src.block()->output_signature()->sizeof_stream_item(src.port());
+ int dst_size = dst.block()->input_signature()->sizeof_stream_item(dst.port());
+
+ if(src_size != dst_size) {
+ std::stringstream msg;
+ msg << "itemsize mismatch: " << src << " using " << src_size
+ << ", " << dst << " using " << dst_size;
+ throw std::invalid_argument(msg.str());
+ }
+ }
+
+ basic_block_vector_t
+ flowgraph::calc_used_blocks()
+ {
+ basic_block_vector_t tmp;
+
+ // make sure free standing message blocks are included
+ for(msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
+ //for now only blocks receiving messages get a thread context - uncomment to allow senders to also obtain one
+ // tmp.push_back(p->src().block());
+ tmp.push_back(p->dst().block());
+ }
+
+ // Collect all blocks in the edge list
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ tmp.push_back(p->src().block());
+ tmp.push_back(p->dst().block());
+ }
+
+ return unique_vector<basic_block_sptr>(tmp);
+ }
+
+ std::vector<int>
+ flowgraph::calc_used_ports(basic_block_sptr block, bool check_inputs)
+ {
+ std::vector<int> tmp;
+
+ // Collect all seen ports
+ edge_vector_t edges = calc_connections(block, check_inputs);
+ for(edge_viter_t p = edges.begin(); p != edges.end(); p++) {
+ if(check_inputs == true)
+ tmp.push_back(p->dst().port());
+ else
+ tmp.push_back(p->src().port());
+ }
+
+ return unique_vector<int>(tmp);
+ }
+
+ edge_vector_t
+ flowgraph::calc_connections(basic_block_sptr block, bool check_inputs)
+ {
+ edge_vector_t result;
+
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if(check_inputs) {
+ if(p->dst().block() == block)
+ result.push_back(*p);
+ }
+ else {
+ if(p->src().block() == block)
+ result.push_back(*p);
+ }
+ }
+
+ return result; // assumes no duplicates
+ }
+
+ void
+ flowgraph::check_contiguity(basic_block_sptr block,
+ const std::vector<int> &used_ports,
+ bool check_inputs)
+ {
+ std::stringstream msg;
+
+ gr::io_signature::sptr sig =
+ check_inputs ? block->input_signature() : block->output_signature();
+
+ int nports = used_ports.size();
+ int min_ports = sig->min_streams();
+ int max_ports = sig->max_streams();
+
+ if(nports == 0 && min_ports == 0)
+ return;
+
+ if(nports < min_ports) {
+ msg << block << ": insufficient connected "
+ << (check_inputs ? "input ports " : "output ports ")
+ << "(" << min_ports << " needed, " << nports << " connected)";
+ throw std::runtime_error(msg.str());
+ }
+
+ if(nports > max_ports && max_ports != io_signature::IO_INFINITE) {
+ msg << block << ": too many connected "
+ << (check_inputs ? "input ports " : "output ports ")
+ << "(" << max_ports << " allowed, " << nports << " connected)";
+ throw std::runtime_error(msg.str());
+ }
+
+ if(used_ports[nports-1]+1 != nports) {
+ for(int i = 0; i < nports; i++) {
+ if(used_ports[i] != i) {
+ msg << block << ": missing connection "
+ << (check_inputs ? "to input port " : "from output port ")
+ << i;
+ throw std::runtime_error(msg.str());
+ }
+ }
+ }
+ }
+
+ basic_block_vector_t
+ flowgraph::calc_downstream_blocks(basic_block_sptr block, int port)
+ {
+ basic_block_vector_t tmp;
+
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if(p->src() == endpoint(block, port))
+ tmp.push_back(p->dst().block());
+
+ return unique_vector<basic_block_sptr>(tmp);
+ }
+
+ basic_block_vector_t
+ flowgraph::calc_downstream_blocks(basic_block_sptr block)
+ {
+ basic_block_vector_t tmp;
+
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if(p->src().block() == block)
+ tmp.push_back(p->dst().block());
+
+ return unique_vector<basic_block_sptr>(tmp);
+ }
+
+ edge_vector_t
+ flowgraph::calc_upstream_edges(basic_block_sptr block)
+ {
+ edge_vector_t result;
+
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if(p->dst().block() == block)
+ result.push_back(*p);
+
+ return result; // Assume no duplicates
+ }
+
+ bool
+ flowgraph::has_block_p(basic_block_sptr block)
+ {
+ basic_block_viter_t result;
+ result = std::find(d_blocks.begin(), d_blocks.end(), block);
+ return (result != d_blocks.end());
+ }
+
+ edge
+ flowgraph::calc_upstream_edge(basic_block_sptr block, int port)
+ {
+ edge result;
+
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if(p->dst() == endpoint(block, port)) {
+ result = (*p);
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ std::vector<basic_block_vector_t>
+ flowgraph::partition()
+ {
+ std::vector<basic_block_vector_t> result;
+ basic_block_vector_t blocks = calc_used_blocks();
+ basic_block_vector_t graph;
+
+ while(blocks.size() > 0) {
+ graph = calc_reachable_blocks(blocks[0], blocks);
+ assert(graph.size());
+ result.push_back(topological_sort(graph));
+
+ for(basic_block_viter_t p = graph.begin(); p != graph.end(); p++)
+ blocks.erase(find(blocks.begin(), blocks.end(), *p));
+ }
+
+ return result;
+ }
+
+ basic_block_vector_t
+ flowgraph::calc_reachable_blocks(basic_block_sptr block, basic_block_vector_t &blocks)
+ {
+ basic_block_vector_t result;
+
+ // Mark all blocks as unvisited
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
+ (*p)->set_color(basic_block::WHITE);
+
+ // Recursively mark all reachable blocks
+ reachable_dfs_visit(block, blocks);
+
+ // Collect all the blocks that have been visited
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
+ if((*p)->color() == basic_block::BLACK)
+ result.push_back(*p);
+
+ return result;
+ }
+
+ // Recursively mark all reachable blocks from given block and block list
+ void
+ flowgraph::reachable_dfs_visit(basic_block_sptr block, basic_block_vector_t &blocks)
+ {
+ // Mark the current one as visited
+ block->set_color(basic_block::BLACK);
+
+ // Recurse into adjacent vertices
+ basic_block_vector_t adjacent = calc_adjacent_blocks(block, blocks);
+
+ for(basic_block_viter_t p = adjacent.begin(); p != adjacent.end(); p++)
+ if((*p)->color() == basic_block::WHITE)
+ reachable_dfs_visit(*p, blocks);
+ }
+
+ // Return a list of block adjacent to a given block along any edge
+ basic_block_vector_t
+ flowgraph::calc_adjacent_blocks(basic_block_sptr block, basic_block_vector_t &blocks)
+ {
+ basic_block_vector_t tmp;
+
+ // Find any blocks that are inputs or outputs
+ for(edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if(p->src().block() == block)
+ tmp.push_back(p->dst().block());
+ if(p->dst().block() == block)
+ tmp.push_back(p->src().block());
+ }
+
+ return unique_vector<basic_block_sptr>(tmp);
+ }
+
+ basic_block_vector_t
+ flowgraph::topological_sort(basic_block_vector_t &blocks)
+ {
+ basic_block_vector_t tmp;
+ basic_block_vector_t result;
+ tmp = sort_sources_first(blocks);
+
+ // Start 'em all white
+ for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++)
+ (*p)->set_color(basic_block::WHITE);
+
+ for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) {
+ if((*p)->color() == basic_block::WHITE)
+ topological_dfs_visit(*p, result);
+ }
+
+ reverse(result.begin(), result.end());
+ return result;
+ }
+
+ basic_block_vector_t
+ flowgraph::sort_sources_first(basic_block_vector_t &blocks)
+ {
+ basic_block_vector_t sources, nonsources, result;
+
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ if(source_p(*p))
+ sources.push_back(*p);
+ else
+ nonsources.push_back(*p);
+ }
+
+ for(basic_block_viter_t p = sources.begin(); p != sources.end(); p++)
+ result.push_back(*p);
+
+ for(basic_block_viter_t p = nonsources.begin(); p != nonsources.end(); p++)
+ result.push_back(*p);
+
+ return result;
+ }
+
+ bool
+ flowgraph::source_p(basic_block_sptr block)
+ {
+ return (calc_upstream_edges(block).size() == 0);
+ }
+
+ void
+ flowgraph::topological_dfs_visit(basic_block_sptr block, basic_block_vector_t &output)
+ {
+ block->set_color(basic_block::GREY);
+ basic_block_vector_t blocks(calc_downstream_blocks(block));
+
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ switch((*p)->color()) {
+ case basic_block::WHITE:
+ topological_dfs_visit(*p, output);
+ break;
+
+ case basic_block::GREY:
+ throw std::runtime_error("flow graph has loops!");
+
+ case basic_block::BLACK:
+ continue;
+
+ default:
+ throw std::runtime_error("invalid color on block!");
+ }
+ }
+
+ block->set_color(basic_block::BLACK);
+ output.push_back(block);
+ }
+
+ void
+ flowgraph::connect(const msg_endpoint &src, const msg_endpoint &dst)
+ {
+ check_valid_port(src);
+ check_valid_port(dst);
+ for(msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
+ if(p->src() == src && p->dst() == dst){
+ throw std::runtime_error("connect called on already connected edge!");
+ }
+ }
+ d_msg_edges.push_back(msg_edge(src,dst));
+ }
+
+ void
+ flowgraph::disconnect(const msg_endpoint &src, const msg_endpoint &dst)
+ {
+ check_valid_port(src);
+ check_valid_port(dst);
+ for(msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
+ if(p->src() == src && p->dst() == dst){
+ d_msg_edges.erase(p);
+ return;
+ }
+ }
+ throw std::runtime_error("disconnect called on non-connected edge!");
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/frontend.ice b/gnuradio-runtime/lib/frontend.ice
deleted file mode 100644
index b7474f37bf..0000000000
--- a/gnuradio-runtime/lib/frontend.ice
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gnuradio.ice>
-
-[["python:package:gnuradio.ctrlport"]]
-module GNURadio {
- module Frontend {
-
- // primitive types
- dictionary<string, string> StrStrDict;
- dictionary<string, string> TunerArgs;
- struct F32Range
- {
- float min;
- float max;
- };
-
- // exception types
- exception NotSupported {};
- exception InvalidSetting { string msg; };
- exception ReceiverFailure { string msg; };
- exception NotExist {};
-
-
- // Status Types
- struct TunerStatus {
- float freq;
- float rate;
- int a2dbits;
- float gain;
- F32Range gainrange;
- bool isInverted;
- StrStrDict info;
- };
-
- struct StreamInfo {
- string uri;
- StrStrDict info;
- };
-
- struct ReceiverInfo {
- string uid;
- string name;
- StrStrDict info;
- };
-
- struct ChannelStatus {
- string uid;
- string name;
- bool active;
- float freq;
- float bandwidth;
- bool isComplex;
- StrStrDict info;
- };
-
- struct ChannelizerStatus {
- string uid;
- string name;
- StrStrDict info;
- };
-
- // Interfaces
- interface Component {
- void setName(string newName);
- };
-
- interface AbstractReceiver extends Component {
- idempotent ReceiverInfo getReceiverInfo();
- };
-
- interface Tuner extends Component {
- TunerStatus configureTuner(TunerArgs args) throws ReceiverFailure, InvalidSetting;
- idempotent TunerStatus status();
- idempotent float setGain(float gain) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent bool setInversion(bool inverted) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent float setCenterFreq(float freq) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent float setBandwidth(float bw) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
- };
-
- interface Channel {
- void start();
- void stop();
- void destroyChannel() throws NotSupported;
- idempotent bool active();
- idempotent ChannelStatus status();
- idempotent StreamInfo stream();
- idempotent bool setComplex(bool complex) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
- idempotent void setStreamInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
- };
-
- sequence<Tuner*> TunerSeq;
- sequence<Channel*> ChannelSeq;
-
- interface Channelizer extends AbstractReceiver {
- idempotent ChannelizerStatus status();
- idempotent Tuner* getTuner();
- idempotent ChannelSeq getChannels();
- idempotent ChannelSeq getActiveChannels();
- idempotent ChannelSeq getInactiveChannels();
- Channel* createChannel(float freq, float bw, StrStrDict args) throws NotSupported;
- };
-
- sequence<Channelizer*> ChannelizerSeq;
-
- interface Receiver extends AbstractReceiver {
- idempotent ChannelizerSeq getInputs();
- idempotent Channel* getChannelByID(string id) throws NotExist;
- idempotent Channelizer* getChannelizerByID(string id) throws NotExist;
- idempotent void setInfo(string k, string v) throws ReceiverFailure, NotSupported, InvalidSetting;
- };
-
- };
-
- module Booter {
- dictionary<string, string> WaveformArgs;
- exception WaveformRunningError {
- string waveformClass;
- float centerFrequencyHz;
- };
- exception SignalSourceError {string msg; };
- interface WaveformBooter extends Frontend::Receiver, ControlPort {
- string launchWaveform(string waveformClass, WaveformArgs args)
- throws WaveformRunningError, SignalSourceError;
- WaveformArgMap getDriverEnum();
- WaveformArgMap getSourceInfo();
- idempotent bool waveformRunning();
- idempotent string getWaveformClass();
- };
- };
-};
diff --git a/gnuradio-runtime/lib/gen_sine_table.py b/gnuradio-runtime/lib/gen_sine_table.py
deleted file mode 100755
index d7d11eff11..0000000000
--- a/gnuradio-runtime/lib/gen_sine_table.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-import math
-import sys
-
-def wrap (x):
- if x >= 2**31:
- return x - 2**32
- return x
-
-def gen_approx_table (f, nentries, min_x, max_x):
- """return a list of nentries containing tuples of the form:
- (m, c, abs_error). min_x and max_x specify the domain
- of the table.
- """
- r = []
- incx = float (max_x - min_x) / nentries
- for i in range (nentries):
- a = (i * incx) + min_x
- b = ((i + 1) * incx) + min_x
- m = (f(b)-f(a))/(b-a)
- c = (3*a+b)*(f(a)-f(b))/(4*(b-a)) + (f((a+b)/2) + f(a))/2
- abs_error = c+m*a-f(a)
- r.append ((m, c, abs_error))
- return r
-
-def scaled_sine (x):
- return math.sin (x * math.pi / 2**31)
-
-def gen_sine_table ():
- nbits = 10
- nentries = 2**nbits
-
- # min_x = -2**31
- # max_x = 2**31-1
- min_x = 0
- max_x = 2**32-1
- t = gen_approx_table (scaled_sine, nentries, min_x, max_x)
-
- max_error = 0
- for e in t:
- max_error = max (max_error, abs (e[2]))
-
- # sys.stdout.write ('static const int WORDBITS = 32;\n')
- # sys.stdout.write ('static const int NBITS = %d;\n' % (nbits,))
-
- sys.stdout.write (' // max_error = %22.15e\n' % (max_error,))
-
- # sys.stdout.write ('static const double sine_table[%d][2] = {\n'% (nentries,))
-
- for e in t:
- sys.stdout.write (' { %22.15e, %22.15e },\n' % (2 * e[0], e[1]))
-
- # sys.stdout.write ('};\n')
-
-if __name__ == '__main__':
- gen_sine_table ()
diff --git a/gnuradio-runtime/lib/gnuradio.ice b/gnuradio-runtime/lib/gnuradio.ice
deleted file mode 100644
index 731cbea956..0000000000
--- a/gnuradio-runtime/lib/gnuradio.ice
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-[["python:package:gnuradio.ctrlport"]]
-
-#ifndef GNURADIO_DEBUG
-#define GNURADIO_DEBUG
-
-module GNURadio {
-class Knob {};
-class KnobB extends Knob { bool value; };
-class KnobC extends Knob { byte value; };
-class KnobI extends Knob { int value; };
-class KnobF extends Knob { float value; };
-class KnobD extends Knob { double value; };
-class KnobL extends Knob { long value; };
-class KnobS extends Knob { string value; };
-
-sequence<bool> VectorB; sequence<byte> VectorC;
-sequence<int> VectorI; sequence<float> VectorF;
-sequence<double> VectorD; sequence<string> VectorS;
-sequence<long> VectorL;
-
-class KnobVecB extends Knob { VectorB value; };
-class KnobVecC extends Knob { VectorC value; };
-class KnobVecI extends Knob { VectorI value; };
-class KnobVecF extends Knob { VectorF value; };
-class KnobVecD extends Knob { VectorD value; };
-class KnobVecL extends Knob { VectorL value; };
-class KnobVecS extends Knob { VectorS value; };
-
-enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
- KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
- KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
- KNOBVECSTRING, KNOBVECLONG };
-
-const int DISPNULL = 0x0000;
-const int DISPTIME = 0x0001;
-const int DISPXY = 0x0002;
-const int DISPPSD = 0x0004;
-const int DISPSPEC = 0x0008;
-const int DISPRAST = 0x0010;
-const int DISPOPTCPLX = 0x0100;
-const int DISPOPTLOG = 0x0200;
-const int DISPOPTSTEM = 0x0400;
-const int DISPOPTSTRIP = 0x0800;
-const int DISPOPTSCATTER = 0x1000;
-
-struct KnobProp {
- KnobType type;
- string units;
- string description;
- int display;
- Knob min;
- Knob max;
- Knob defaultvalue;
-};
-
-sequence<string> KnobIDList;
-dictionary<string, Knob> KnobMap;
-dictionary<string, KnobProp> KnobPropMap;
-dictionary<string, string> WaveformArgMap;
-
-interface StreamReceiver {
- void push(VectorC data);
-};
-
-interface ControlPort {
- void set(KnobMap knobs);
- idempotent KnobMap get(KnobIDList knobs);
- idempotent KnobPropMap properties(KnobIDList knobs);
- void shutdown();
-};
-
-};
-
-#endif
diff --git a/gnuradio-runtime/lib/gr_basic_block.cc b/gnuradio-runtime/lib/gr_basic_block.cc
deleted file mode 100644
index 83f6c07c87..0000000000
--- a/gnuradio-runtime/lib/gr_basic_block.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_basic_block.h>
-#include <gr_block_registry.h>
-#include <stdexcept>
-#include <sstream>
-#include <iostream>
-
-static long s_next_id = 0;
-static long s_ncurrently_allocated = 0;
-
-long
-gr_basic_block_ncurrently_allocated()
-{
- return s_ncurrently_allocated;
-}
-
-gr_basic_block::gr_basic_block(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
- : d_name(name),
- d_input_signature(input_signature),
- d_output_signature(output_signature),
- d_unique_id(s_next_id++),
- d_symbolic_id(global_block_registry.block_register(this)),
- d_symbol_name(global_block_registry.register_symbolic_name(this)),
- d_color(WHITE),
- d_rpc_set(false),
- message_subscribers(pmt::make_dict())
-{
- s_ncurrently_allocated++;
-}
-
-gr_basic_block::~gr_basic_block()
-{
- s_ncurrently_allocated--;
- global_block_registry.block_unregister(this);
-}
-
-gr_basic_block_sptr
-gr_basic_block::to_basic_block()
-{
- return shared_from_this();
-}
-
-void
-gr_basic_block::set_block_alias(std::string name)
-{
- global_block_registry.register_symbolic_name(this, name);
-}
-
-// ** Message passing interface **
-
-// - register a new input message port
-void
-gr_basic_block::message_port_register_in(pmt::pmt_t port_id)
-{
- if(!pmt::is_symbol(port_id)) {
- throw std::runtime_error("message_port_register_in: bad port id");
- }
- msg_queue[port_id] = msg_queue_t();
- msg_queue_ready[port_id] = boost::shared_ptr<boost::condition_variable>(new boost::condition_variable());
-}
-
-pmt::pmt_t
-gr_basic_block::message_ports_in()
-{
- pmt::pmt_t port_names = pmt::make_vector(msg_queue.size(), pmt::PMT_NIL);
- msg_queue_map_itr itr = msg_queue.begin();
- for(size_t i = 0; i < msg_queue.size(); i++) {
- pmt::vector_set(port_names, i, (*itr).first);
- itr++;
- }
- return port_names;
-}
-
-// - register a new output message port
-void
-gr_basic_block::message_port_register_out(pmt::pmt_t port_id)
-{
- if(!pmt::is_symbol(port_id)) {
- throw std::runtime_error("message_port_register_out: bad port id");
- }
- if(pmt::dict_has_key(message_subscribers, port_id)) {
- throw std::runtime_error("message_port_register_out: port already in use");
- }
- message_subscribers = pmt::dict_add(message_subscribers, port_id, pmt::PMT_NIL);
-}
-
-pmt::pmt_t
-gr_basic_block::message_ports_out()
-{
- size_t len = pmt::length(message_subscribers);
- pmt::pmt_t port_names = pmt::make_vector(len, pmt::PMT_NIL);
- pmt::pmt_t keys = pmt::dict_keys(message_subscribers);
- for(size_t i = 0; i < len; i++) {
- pmt::vector_set(port_names, i, pmt::nth(i, keys));
- }
- return port_names;
-}
-
-// - publish a message on a message port
-void gr_basic_block::message_port_pub(pmt::pmt_t port_id, pmt::pmt_t msg)
-{
- if(!pmt::dict_has_key(message_subscribers, port_id)) {
- throw std::runtime_error("port does not exist");
- }
-
- pmt::pmt_t currlist = pmt::dict_ref(message_subscribers, port_id, pmt::PMT_NIL);
- // iterate through subscribers on port
- while(pmt::is_pair(currlist)) {
- pmt::pmt_t target = pmt::car(currlist);
-
- pmt::pmt_t block = pmt::car(target);
- pmt::pmt_t port = pmt::cdr(target);
-
- currlist = pmt::cdr(currlist);
- gr_basic_block_sptr blk = global_block_registry.block_lookup(block);
- //blk->post(msg);
- blk->post(port, msg);
- }
-}
-
-// - subscribe to a message port
-void
-gr_basic_block::message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target){
- if(!pmt::dict_has_key(message_subscribers, port_id)){
- std::stringstream ss;
- ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: " << pmt::write_string(target) << std::endl;
- throw std::runtime_error(ss.str());
- }
- pmt::pmt_t currlist = pmt::dict_ref(message_subscribers,port_id,pmt::PMT_NIL);
-
- // ignore re-adds of the same target
- if(!pmt::list_has(currlist, target))
- message_subscribers = pmt::dict_add(message_subscribers,port_id,pmt::list_add(currlist,target));
-}
-
-void
-gr_basic_block::message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target){
- if(!pmt::dict_has_key(message_subscribers, port_id)){
- std::stringstream ss;
- ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: " << pmt::write_string(target) << std::endl;
- throw std::runtime_error(ss.str());
- }
-
- // ignore unsubs of unknown targets
- pmt::pmt_t currlist = pmt::dict_ref(message_subscribers,port_id,pmt::PMT_NIL);
- message_subscribers = pmt::dict_add(message_subscribers,port_id,pmt::list_rm(currlist,target));
-}
-
-void
-gr_basic_block::_post(pmt::pmt_t which_port, pmt::pmt_t msg)
-{
- insert_tail(which_port, msg);
-}
-
-void
-gr_basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg)
-{
- gr::thread::scoped_lock guard(mutex);
-
- if( (msg_queue.find(which_port) == msg_queue.end()) || (msg_queue_ready.find(which_port) == msg_queue_ready.end())){
- std::cout << "target port = " << pmt::symbol_to_string(which_port) << std::endl;
- throw std::runtime_error("attempted to insert_tail on invalid queue!");
- }
-
- msg_queue[which_port].push_back(msg);
- msg_queue_ready[which_port]->notify_one();
-
- // wake up thread if BLKD_IN or BLKD_OUT
- global_block_registry.notify_blk(alias());
-}
-
-pmt::pmt_t
-gr_basic_block::delete_head_nowait(pmt::pmt_t which_port)
-{
- gr::thread::scoped_lock guard(mutex);
-
- if (empty_p(which_port)){
- return pmt::pmt_t();
- }
-
- pmt::pmt_t m(msg_queue[which_port].front());
- msg_queue[which_port].pop_front();
-
- return m;
-}
-
-pmt::pmt_t
-gr_basic_block::delete_head_blocking(pmt::pmt_t which_port)
-{
- gr::thread::scoped_lock guard(mutex);
-
- while (empty_p(which_port)){
- msg_queue_ready[which_port]->wait(guard);
- }
-
- pmt::pmt_t m(msg_queue[which_port].front());
- msg_queue[which_port].pop_front();
- return m;
-}
diff --git a/gnuradio-runtime/lib/gr_block.cc b/gnuradio-runtime/lib/gr_block.cc
deleted file mode 100644
index 2830a999ea..0000000000
--- a/gnuradio-runtime/lib/gr_block.cc
+++ /dev/null
@@ -1,687 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <stdexcept>
-#include <iostream>
-#include <gr_block_registry.h>
-#include <gr_prefs.h>
-
-gr_block::gr_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
- : gr_basic_block(name, input_signature, output_signature),
- d_output_multiple (1),
- d_output_multiple_set(false),
- d_unaligned(0),
- d_is_unaligned(false),
- d_relative_rate (1.0),
- d_history(1),
- d_fixed_rate(false),
- d_max_noutput_items_set(false),
- d_max_noutput_items(0),
- d_min_noutput_items(0),
- d_tag_propagation_policy(TPP_ALL_TO_ALL),
- d_pc_rpc_set(false),
- d_max_output_buffer(std::max(output_signature->max_streams(),1), -1),
- d_min_output_buffer(std::max(output_signature->max_streams(),1), -1)
-{
- global_block_registry.register_primitive(alias(), this);
-
-#ifdef ENABLE_GR_LOG
-#ifdef HAVE_LOG4CPP
- gr_prefs *p = gr_prefs::singleton();
- std::string config_file = p->get_string("LOG", "log_config", "");
- std::string log_level = p->get_string("LOG", "log_level", "off");
- std::string log_file = p->get_string("LOG", "log_file", "");
- std::string debug_level = p->get_string("LOG", "debug_level", "off");
- std::string debug_file = p->get_string("LOG", "debug_file", "");
-
- GR_CONFIG_LOGGER(config_file);
-
- GR_LOG_GETLOGGER(LOG, "gr_log." + alias());
- GR_LOG_SET_LEVEL(LOG, log_level);
- if(log_file.size() > 0) {
- if(log_file == "stdout") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
- }
- else if(log_file == "stderr") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
- }
- else {
- GR_LOG_ADD_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
- }
- }
- d_logger = LOG;
-
- GR_LOG_GETLOGGER(DLOG, "gr_log_debug." + alias());
- GR_LOG_SET_LEVEL(DLOG, debug_level);
- if(debug_file.size() > 0) {
- if(debug_file == "stdout") {
- GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cout","gr::debug :%p: %c{1} - %m%n");
- }
- else if(debug_file == "stderr") {
- GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cerr", "gr::debug :%p: %c{1} - %m%n");
- }
- else {
- GR_LOG_ADD_FILE_APPENDER(DLOG, debug_file, true, "%r :%p: %c{1} - %m%n");
- }
- }
- d_debug_logger = DLOG;
-#endif /* HAVE_LOG4CPP */
-#else /* ENABLE_GR_LOG */
- d_logger = NULL;
- d_debug_logger = NULL;
-#endif /* ENABLE_GR_LOG */
-}
-
-gr_block::~gr_block ()
-{
- global_block_registry.unregister_primitive(alias());
-}
-
-// stub implementation: 1:1
-
-void
-gr_block::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
- unsigned ninputs = ninput_items_required.size ();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = noutput_items + history() - 1;
-}
-
-// default implementation
-
-bool
-gr_block::start()
-{
- return true;
-}
-
-bool
-gr_block::stop()
-{
- return true;
-}
-
-void
-gr_block::set_output_multiple (int multiple)
-{
- if (multiple < 1)
- throw std::invalid_argument ("gr_block::set_output_multiple");
-
- d_output_multiple_set = true;
- d_output_multiple = multiple;
-}
-
-void
-gr_block::set_alignment (int multiple)
-{
- if (multiple < 1)
- throw std::invalid_argument ("gr_block::set_alignment_multiple");
-
- d_output_multiple = multiple;
-}
-
-void
-gr_block::set_unaligned (int na)
-{
- // unaligned value must be less than 0 and it doesn't make sense
- // that it's larger than the alignment value.
- if ((na < 0) || (na > d_output_multiple))
- throw std::invalid_argument ("gr_block::set_unaligned");
-
- d_unaligned = na;
-}
-
-void
-gr_block::set_is_unaligned (bool u)
-{
- d_is_unaligned = u;
-}
-
-void
-gr_block::set_relative_rate (double relative_rate)
-{
- if (relative_rate < 0.0)
- throw std::invalid_argument ("gr_block::set_relative_rate");
-
- d_relative_rate = relative_rate;
-}
-
-
-void
-gr_block::consume (int which_input, int how_many_items)
-{
- d_detail->consume (which_input, how_many_items);
-}
-
-void
-gr_block::consume_each (int how_many_items)
-{
- d_detail->consume_each (how_many_items);
-}
-
-void
-gr_block::produce (int which_output, int how_many_items)
-{
- d_detail->produce (which_output, how_many_items);
-}
-
-int
-gr_block::fixed_rate_ninput_to_noutput(int ninput)
-{
- throw std::runtime_error("Unimplemented");
-}
-
-int
-gr_block::fixed_rate_noutput_to_ninput(int noutput)
-{
- throw std::runtime_error("Unimplemented");
-}
-
-uint64_t
-gr_block::nitems_read(unsigned int which_input)
-{
- if(d_detail) {
- return d_detail->nitems_read(which_input);
- }
- else {
- //throw std::runtime_error("No block_detail associated with block yet");
- return 0;
- }
-}
-
-uint64_t
-gr_block::nitems_written(unsigned int which_output)
-{
- if(d_detail) {
- return d_detail->nitems_written(which_output);
- }
- else {
- //throw std::runtime_error("No block_detail associated with block yet");
- return 0;
- }
-}
-
-void
-gr_block::add_item_tag(unsigned int which_output,
- const gr_tag_t &tag)
-{
- d_detail->add_item_tag(which_output, tag);
-}
-
-void
-gr_block::remove_item_tag(unsigned int which_input,
- const gr_tag_t &tag)
-{
- d_detail->remove_item_tag(which_input, tag);
-}
-
-void
-gr_block::get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_output,
- uint64_t start, uint64_t end)
-{
- d_detail->get_tags_in_range(v, which_output, start, end);
-}
-
-void
-gr_block::get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_output,
- uint64_t start, uint64_t end,
- const pmt::pmt_t &key)
-{
- d_detail->get_tags_in_range(v, which_output, start, end, key);
-}
-
-gr_block::tag_propagation_policy_t
-gr_block::tag_propagation_policy()
-{
- return d_tag_propagation_policy;
-}
-
-void
-gr_block::set_tag_propagation_policy(tag_propagation_policy_t p)
-{
- d_tag_propagation_policy = p;
-}
-
-
-int
-gr_block::max_noutput_items()
-{
- return d_max_noutput_items;
-}
-
-void
-gr_block::set_max_noutput_items(int m)
-{
- if(m <= 0)
- throw std::runtime_error("gr_block::set_max_noutput_items: value for max_noutput_items must be greater than 0.\n");
-
- d_max_noutput_items = m;
- d_max_noutput_items_set = true;
-}
-
-void
-gr_block::unset_max_noutput_items()
-{
- d_max_noutput_items_set = false;
-}
-
-bool
-gr_block::is_set_max_noutput_items()
-{
- return d_max_noutput_items_set;
-}
-
-void
-gr_block::set_processor_affinity(const std::vector<int> &mask)
-{
- d_affinity = mask;
- if(d_detail) {
- d_detail->set_processor_affinity(d_affinity);
- }
-}
-
-void
-gr_block::unset_processor_affinity()
-{
- d_affinity.clear();
- if(d_detail) {
- d_detail->unset_processor_affinity();
- }
-}
-
-float
-gr_block::pc_noutput_items()
-{
- if(d_detail) {
- return d_detail->pc_noutput_items();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_noutput_items_avg()
-{
- if(d_detail) {
- return d_detail->pc_noutput_items_avg();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_noutput_items_var()
-{
- if(d_detail) {
- return d_detail->pc_noutput_items_var();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_nproduced()
-{
- if(d_detail) {
- return d_detail->pc_nproduced();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_nproduced_avg()
-{
- if(d_detail) {
- return d_detail->pc_nproduced_avg();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_nproduced_var()
-{
- if(d_detail) {
- return d_detail->pc_nproduced_var();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_input_buffers_full(int which)
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_input_buffers_full_avg(int which)
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full_avg(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_input_buffers_full_var(int which)
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full_var(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-std::vector<float>
-gr_block::pc_input_buffers_full()
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-std::vector<float>
-gr_block::pc_input_buffers_full_avg()
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full_avg();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-std::vector<float>
-gr_block::pc_input_buffers_full_var()
-{
- if(d_detail) {
- return d_detail->pc_input_buffers_full_var();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-float
-gr_block::pc_output_buffers_full(int which)
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_output_buffers_full_avg(int which)
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full_avg(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_output_buffers_full_var(int which)
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full_var(static_cast<size_t>(which));
- }
- else {
- return 0;
- }
-}
-
-std::vector<float>
-gr_block::pc_output_buffers_full()
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-std::vector<float>
-gr_block::pc_output_buffers_full_avg()
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full_avg();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-std::vector<float>
-gr_block::pc_output_buffers_full_var()
-{
- if(d_detail) {
- return d_detail->pc_output_buffers_full_var();
- }
- else {
- return std::vector<float>(1,0);
- }
-}
-
-float
-gr_block::pc_work_time()
-{
- if(d_detail) {
- return d_detail->pc_work_time();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_work_time_avg()
-{
- if(d_detail) {
- return d_detail->pc_work_time_avg();
- }
- else {
- return 0;
- }
-}
-
-float
-gr_block::pc_work_time_var()
-{
- if(d_detail) {
- return d_detail->pc_work_time_var();
- }
- else {
- return 0;
- }
-}
-
-void
-gr_block::reset_perf_counters()
-{
- if(d_detail) {
- d_detail->reset_perf_counters();
- }
-}
-
-void
-gr_block::setup_pc_rpc()
-{
- d_pc_rpc_set = true;
-#ifdef GR_CTRLPORT
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "noutput_items", &gr_block::pc_noutput_items,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "noutput items", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "avg noutput_items", &gr_block::pc_noutput_items_avg,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "Average noutput items", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "var noutput_items", &gr_block::pc_noutput_items_var,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "Var. noutput items", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "nproduced", &gr_block::pc_nproduced,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "items produced", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "avg nproduced", &gr_block::pc_nproduced_avg,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "Average items produced", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "var nproduced", &gr_block::pc_nproduced_var,
- pmt::mp(0), pmt::mp(32768), pmt::mp(0),
- "", "Var. items produced", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "work time", &gr_block::pc_work_time,
- pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
- "", "clock cycles in call to work", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "avg work time", &gr_block::pc_work_time_avg,
- pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
- "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, float>(
- alias(), "var work time", &gr_block::pc_work_time_var,
- pmt::mp(0), pmt::mp(1e9), pmt::mp(0),
- "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "input \% full", &gr_block::pc_input_buffers_full,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "how full input buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "avg input \% full", &gr_block::pc_input_buffers_full_avg,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "Average of how full input buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "var input \% full", &gr_block::pc_input_buffers_full_var,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "Var. of how full input buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "output \% full", &gr_block::pc_output_buffers_full,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "how full output buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "avg output \% full", &gr_block::pc_output_buffers_full_avg,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "Average of how full output buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<gr_block, std::vector<float> >(
- alias(), "var output \% full", &gr_block::pc_output_buffers_full_var,
- pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0),
- "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-#endif /* GR_CTRLPORT */
-}
-
-std::ostream&
-operator << (std::ostream& os, const gr_block *m)
-{
- os << "<gr_block " << m->name() << " (" << m->unique_id() << ")>";
- return os;
-}
-
-int
-gr_block::general_work(int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- throw std::runtime_error("gr_block::general_work() not implemented");
- return 0;
-}
diff --git a/gnuradio-runtime/lib/gr_block_detail.cc b/gnuradio-runtime/lib/gr_block_detail.cc
deleted file mode 100644
index 7098113301..0000000000
--- a/gnuradio-runtime/lib/gr_block_detail.cc
+++ /dev/null
@@ -1,473 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_block_detail.h>
-#include <gr_buffer.h>
-#include <iostream>
-
-static long s_ncurrently_allocated = 0;
-
-long
-gr_block_detail_ncurrently_allocated ()
-{
- return s_ncurrently_allocated;
-}
-
-gr_block_detail::gr_block_detail (unsigned int ninputs, unsigned int noutputs)
- : d_produce_or(0),
- d_ninputs (ninputs), d_noutputs (noutputs),
- d_input (ninputs), d_output (noutputs),
- d_done (false),
- d_ins_noutput_items(0),
- d_avg_noutput_items(0),
- d_var_noutput_items(0),
- d_ins_nproduced(0),
- d_avg_nproduced(0),
- d_var_nproduced(0),
- d_ins_input_buffers_full(ninputs, 0),
- d_avg_input_buffers_full(ninputs, 0),
- d_var_input_buffers_full(ninputs, 0),
- d_ins_output_buffers_full(noutputs, 0),
- d_avg_output_buffers_full(noutputs, 0),
- d_var_output_buffers_full(noutputs, 0),
- d_ins_work_time(0),
- d_avg_work_time(0),
- d_var_work_time(0),
- d_pc_counter(0)
-{
- s_ncurrently_allocated++;
-}
-
-gr_block_detail::~gr_block_detail ()
-{
- // should take care of itself
- s_ncurrently_allocated--;
-}
-
-void
-gr_block_detail::set_input (unsigned int which, gr_buffer_reader_sptr reader)
-{
- if (which >= d_ninputs)
- throw std::invalid_argument ("gr_block_detail::set_input");
-
- d_input[which] = reader;
-}
-
-void
-gr_block_detail::set_output (unsigned int which, gr_buffer_sptr buffer)
-{
- if (which >= d_noutputs)
- throw std::invalid_argument ("gr_block_detail::set_output");
-
- d_output[which] = buffer;
-}
-
-gr_block_detail_sptr
-gr_make_block_detail (unsigned int ninputs, unsigned int noutputs)
-{
- return gr_block_detail_sptr (new gr_block_detail (ninputs, noutputs));
-}
-
-void
-gr_block_detail::set_done (bool done)
-{
- d_done = done;
- for (unsigned int i = 0; i < d_noutputs; i++)
- d_output[i]->set_done (done);
-
- for (unsigned int i = 0; i < d_ninputs; i++)
- d_input[i]->set_done (done);
-}
-
-void
-gr_block_detail::consume (int which_input, int how_many_items)
-{
- if (how_many_items > 0) {
- input (which_input)->update_read_pointer (how_many_items);
- }
-}
-
-
-void
-gr_block_detail::consume_each (int how_many_items)
-{
- if (how_many_items > 0) {
- for (int i = 0; i < ninputs (); i++) {
- d_input[i]->update_read_pointer (how_many_items);
- }
- }
-}
-
-void
-gr_block_detail::produce (int which_output, int how_many_items)
-{
- if (how_many_items > 0){
- d_output[which_output]->update_write_pointer (how_many_items);
- d_produce_or |= how_many_items;
- }
-}
-
-void
-gr_block_detail::produce_each (int how_many_items)
-{
- if (how_many_items > 0) {
- for (int i = 0; i < noutputs (); i++) {
- d_output[i]->update_write_pointer (how_many_items);
- }
- d_produce_or |= how_many_items;
- }
-}
-
-
-uint64_t
-gr_block_detail::nitems_read(unsigned int which_input)
-{
- if(which_input >= d_ninputs)
- throw std::invalid_argument ("gr_block_detail::n_input_items");
- return d_input[which_input]->nitems_read();
-}
-
-uint64_t
-gr_block_detail::nitems_written(unsigned int which_output)
-{
- if(which_output >= d_noutputs)
- throw std::invalid_argument ("gr_block_detail::n_output_items");
- return d_output[which_output]->nitems_written();
-}
-
-void
-gr_block_detail::add_item_tag(unsigned int which_output, const gr_tag_t &tag)
-{
- if(!pmt::is_symbol(tag.key)) {
- throw pmt::wrong_type("gr_block_detail::add_item_tag key", tag.key);
- }
- else {
- // Add tag to gr_buffer's deque tags
- d_output[which_output]->add_item_tag(tag);
- }
-}
-
-void
-gr_block_detail::remove_item_tag(unsigned int which_input, const gr_tag_t &tag)
-{
- if(!pmt::is_symbol(tag.key)) {
- throw pmt::wrong_type("gr_block_detail::add_item_tag key", tag.key);
- }
- else {
- // Add tag to gr_buffer's deque tags
- d_input[which_input]->buffer()->remove_item_tag(tag);
- }
-}
-
-void
-gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end)
-{
- // get from gr_buffer_reader's deque of tags
- d_input[which_input]->get_tags_in_range(v, abs_start, abs_end);
-}
-
-void
-gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
- unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end,
- const pmt::pmt_t &key)
-{
- std::vector<gr_tag_t> found_items;
-
- v.resize(0);
-
- // get from gr_buffer_reader's deque of tags
- d_input[which_input]->get_tags_in_range(found_items, abs_start, abs_end);
-
- // Filter further by key name
- pmt::pmt_t itemkey;
- std::vector<gr_tag_t>::iterator itr;
- for(itr = found_items.begin(); itr != found_items.end(); itr++) {
- itemkey = (*itr).key;
- if(pmt::eqv(key, itemkey)) {
- v.push_back(*itr);
- }
- }
-}
-
-void
-gr_block_detail::set_processor_affinity(const std::vector<int> &mask)
-{
- if(threaded) {
- try {
- gr::thread::thread_bind_to_processor(thread, mask);
- }
- catch (std::runtime_error e) {
- std::cerr << "set_processor_affinity: invalid mask." << std::endl;;
- }
- }
-}
-
-void
-gr_block_detail::unset_processor_affinity()
-{
- if(threaded) {
- gr::thread::thread_unbind(thread);
- }
-}
-
-void
-gr_block_detail::start_perf_counters()
-{
- d_start_of_work = gr::high_res_timer_now();
-}
-
-void
-gr_block_detail::stop_perf_counters(int noutput_items, int nproduced)
-{
- d_end_of_work = gr::high_res_timer_now();
- gr::high_res_timer_type diff = d_end_of_work - d_start_of_work;
-
- if(d_pc_counter == 0) {
- d_ins_work_time = diff;
- d_avg_work_time = diff;
- d_var_work_time = 0;
- d_ins_nproduced = nproduced;
- d_avg_nproduced = nproduced;
- d_var_nproduced = 0;
- d_ins_noutput_items = noutput_items;
- d_avg_noutput_items = noutput_items;
- d_var_noutput_items = 0;
- for(size_t i=0; i < d_input.size(); i++) {
- float pfull = static_cast<float>(d_input[i]->items_available()) /
- static_cast<float>(d_input[i]->max_possible_items_available());
- d_ins_input_buffers_full[i] = pfull;
- d_avg_input_buffers_full[i] = pfull;
- d_var_input_buffers_full[i] = 0;
- }
- for(size_t i=0; i < d_output.size(); i++) {
- float pfull = 1.0f - static_cast<float>(d_output[i]->space_available()) /
- static_cast<float>(d_output[i]->bufsize());
- d_ins_output_buffers_full[i] = pfull;
- d_avg_output_buffers_full[i] = pfull;
- d_var_output_buffers_full[i] = 0;
- }
- }
- else {
- float d = diff - d_avg_work_time;
- d_ins_work_time = diff;
- d_avg_work_time = d_avg_work_time + d/d_pc_counter;
- d_var_work_time = d_var_work_time + d*d;
-
- d = nproduced - d_avg_nproduced;
- d_ins_nproduced = nproduced;
- d_avg_nproduced = d_avg_nproduced + d/d_pc_counter;
- d_var_nproduced = d_var_nproduced + d*d;
-
- d = noutput_items - d_avg_noutput_items;
- d_ins_noutput_items = noutput_items;
- d_avg_noutput_items = d_avg_noutput_items + d/d_pc_counter;
- d_var_noutput_items = d_var_noutput_items + d*d;
-
- for(size_t i=0; i < d_input.size(); i++) {
- float pfull = static_cast<float>(d_input[i]->items_available()) /
- static_cast<float>(d_input[i]->max_possible_items_available());
-
- d = pfull - d_avg_input_buffers_full[i];
- d_ins_input_buffers_full[i] = pfull;
- d_avg_input_buffers_full[i] = d_avg_input_buffers_full[i] + d/d_pc_counter;
- d_var_input_buffers_full[i] = d_var_input_buffers_full[i] + d*d;
- }
-
- for(size_t i=0; i < d_output.size(); i++) {
- float pfull = 1.0f - static_cast<float>(d_output[i]->space_available()) /
- static_cast<float>(d_output[i]->bufsize());
-
- d = pfull - d_avg_output_buffers_full[i];
- d_ins_output_buffers_full[i] = pfull;
- d_avg_output_buffers_full[i] = d_avg_output_buffers_full[i] + d/d_pc_counter;
- d_var_output_buffers_full[i] = d_var_output_buffers_full[i] + d*d;
- }
- }
-
- d_pc_counter++;
-}
-
-void
-gr_block_detail::reset_perf_counters()
-{
- d_pc_counter = 0;
-}
-
-float
-gr_block_detail::pc_noutput_items()
-{
- return d_ins_noutput_items;
-}
-
-float
-gr_block_detail::pc_nproduced()
-{
- return d_ins_nproduced;
-}
-
-float
-gr_block_detail::pc_input_buffers_full(size_t which)
-{
- if(which < d_ins_input_buffers_full.size())
- return d_ins_input_buffers_full[which];
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_input_buffers_full()
-{
- return d_ins_input_buffers_full;
-}
-
-float
-gr_block_detail::pc_output_buffers_full(size_t which)
-{
- if(which < d_ins_output_buffers_full.size())
- return d_ins_output_buffers_full[which];
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_output_buffers_full()
-{
- return d_ins_output_buffers_full;
-}
-
-float
-gr_block_detail::pc_work_time()
-{
- return d_ins_work_time;
-}
-
-float
-gr_block_detail::pc_noutput_items_avg()
-{
- return d_avg_noutput_items;
-}
-
-float
-gr_block_detail::pc_nproduced_avg()
-{
- return d_avg_nproduced;
-}
-
-float
-gr_block_detail::pc_input_buffers_full_avg(size_t which)
-{
- if(which < d_avg_input_buffers_full.size())
- return d_avg_input_buffers_full[which];
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_input_buffers_full_avg()
-{
- return d_avg_input_buffers_full;
-}
-
-float
-gr_block_detail::pc_output_buffers_full_avg(size_t which)
-{
- if(which < d_avg_output_buffers_full.size())
- return d_avg_output_buffers_full[which];
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_output_buffers_full_avg()
-{
- return d_avg_output_buffers_full;
-}
-
-float
-gr_block_detail::pc_work_time_avg()
-{
- return d_avg_work_time;
-}
-
-
-float
-gr_block_detail::pc_noutput_items_var()
-{
- return d_var_noutput_items/(d_pc_counter-1);
-}
-
-float
-gr_block_detail::pc_nproduced_var()
-{
- return d_var_nproduced/(d_pc_counter-1);
-}
-
-float
-gr_block_detail::pc_input_buffers_full_var(size_t which)
-{
- if(which < d_avg_input_buffers_full.size())
- return d_var_input_buffers_full[which]/(d_pc_counter-1);
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_input_buffers_full_var()
-{
- std::vector<float> var(d_avg_input_buffers_full.size(), 0);
- for(size_t i = 0; i < d_avg_input_buffers_full.size(); i++)
- var[i] = d_avg_input_buffers_full[i]/(d_pc_counter-1);
- return var;
-}
-
-float
-gr_block_detail::pc_output_buffers_full_var(size_t which)
-{
- if(which < d_avg_output_buffers_full.size())
- return d_var_output_buffers_full[which]/(d_pc_counter-1);
- else
- return 0;
-}
-
-std::vector<float>
-gr_block_detail::pc_output_buffers_full_var()
-{
- std::vector<float> var(d_avg_output_buffers_full.size(), 0);
- for(size_t i = 0; i < d_avg_output_buffers_full.size(); i++)
- var[i] = d_avg_output_buffers_full[i]/(d_pc_counter-1);
- return var;
-}
-
-float
-gr_block_detail::pc_work_time_var()
-{
- return d_var_work_time/(d_pc_counter-1);
-}
diff --git a/gnuradio-runtime/lib/gr_block_executor.cc b/gnuradio-runtime/lib/gr_block_executor.cc
deleted file mode 100644
index cfef406412..0000000000
--- a/gnuradio-runtime/lib/gr_block_executor.cc
+++ /dev/null
@@ -1,487 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_block_executor.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <gr_buffer.h>
-#include <gr_prefs.h>
-#include <boost/thread.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-#include <limits>
-#include <assert.h>
-#include <stdio.h>
-
-// must be defined to either 0 or 1
-#define ENABLE_LOGGING 0
-
-#if (ENABLE_LOGGING)
-#define LOG(x) do { x; } while(0)
-#else
-#define LOG(x) do {;} while(0)
-#endif
-
-static int which_scheduler = 0;
-
-inline static unsigned int
-round_up (unsigned int n, unsigned int multiple)
-{
- return ((n + multiple - 1) / multiple) * multiple;
-}
-
-inline static unsigned int
-round_down (unsigned int n, unsigned int multiple)
-{
- return (n / multiple) * multiple;
-}
-
-//
-// Return minimum available write space in all our downstream buffers
-// or -1 if we're output blocked and the output we're blocked
-// on is done.
-//
-static int
-min_available_space (gr_block_detail *d, int output_multiple, int min_noutput_items)
-{
- int min_space = std::numeric_limits<int>::max();
- if (min_noutput_items == 0)
- min_noutput_items = 1;
- for (int i = 0; i < d->noutputs (); i++){
- gr::thread::scoped_lock guard(*d->output(i)->mutex());
- int avail_n = round_down(d->output(i)->space_available(), output_multiple);
- int best_n = round_down(d->output(i)->bufsize()/2, output_multiple);
- if (best_n < min_noutput_items)
- throw std::runtime_error("Buffer too small for min_noutput_items");
- int n = std::min(avail_n, best_n);
- if (n < min_noutput_items){ // We're blocked on output.
- if (d->output(i)->done()){ // Downstream is done, therefore we're done.
- return -1;
- }
- return 0;
- }
- min_space = std::min (min_space, n);
- }
- return min_space;
-}
-
-static bool
-propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
- const std::vector<uint64_t> &start_nitems_read, double rrate,
- std::vector<gr_tag_t> &rtags)
-{
- // Move tags downstream
- // if a sink, we don't need to move downstream
- if(d->sink_p()) {
- return true;
- }
-
- switch(policy) {
- case gr_block::TPP_DONT:
- return true;
- break;
- case gr_block::TPP_ALL_TO_ALL:
- // every tag on every input propogates to everyone downstream
- for(int i = 0; i < d->ninputs(); i++) {
- d->get_tags_in_range(rtags, i, start_nitems_read[i],
- d->nitems_read(i));
-
- std::vector<gr_tag_t>::iterator t;
- if(rrate == 1.0) {
- for(t = rtags.begin(); t != rtags.end(); t++) {
- for(int o = 0; o < d->noutputs(); o++)
- d->output(o)->add_item_tag(*t);
- }
- }
- else {
- for(t = rtags.begin(); t != rtags.end(); t++) {
- gr_tag_t new_tag = *t;
- new_tag.offset *= rrate;
- for(int o = 0; o < d->noutputs(); o++)
- d->output(o)->add_item_tag(new_tag);
- }
- }
- }
- break;
- case gr_block::TPP_ONE_TO_ONE:
- // tags from input i only go to output i
- // this requires d->ninputs() == d->noutputs; this is checked when this
- // type of tag-propagation system is selected in gr_block_detail
- if(d->ninputs() == d->noutputs()) {
- for(int i = 0; i < d->ninputs(); i++) {
- d->get_tags_in_range(rtags, i, start_nitems_read[i],
- d->nitems_read(i));
-
- std::vector<gr_tag_t>::iterator t;
- for(t = rtags.begin(); t != rtags.end(); t++) {
- gr_tag_t new_tag = *t;
- new_tag.offset *= rrate;
- d->output(i)->add_item_tag(new_tag);
- }
- }
- }
- else {
- std::cerr << "Error: gr_block_executor: propagation_policy 'ONE-TO-ONE' requires ninputs == noutputs" << std::endl;
- return false;
- }
-
- break;
- default:
- return true;
- }
- return true;
-}
-
-gr_block_executor::gr_block_executor (gr_block_sptr block, int max_noutput_items)
- : d_block(block), d_log(0), d_max_noutput_items(max_noutput_items)
-{
- if (ENABLE_LOGGING){
- std::string name = str(boost::format("sst-%03d.log") % which_scheduler++);
- d_log = new std::ofstream(name.c_str());
- std::unitbuf(*d_log); // make it unbuffered...
- *d_log << "gr_block_executor: "
- << d_block << std::endl;
- }
-
-#ifdef GR_PERFORMANCE_COUNTERS
- gr_prefs *prefs = gr_prefs::singleton();
- d_use_pc = prefs->get_bool("PerfCounters", "on", false);
-#endif /* GR_PERFORMANCE_COUNTERS */
-
- d_block->start(); // enable any drivers, etc.
-}
-
-gr_block_executor::~gr_block_executor ()
-{
- if (ENABLE_LOGGING)
- delete d_log;
-
- d_block->stop(); // stop any drivers, etc.
-}
-
-gr_block_executor::state
-gr_block_executor::run_one_iteration()
-{
- int noutput_items;
- int max_items_avail;
- int max_noutput_items = d_max_noutput_items;
- int new_alignment=0;
- int alignment_state=-1;
-
- gr_block *m = d_block.get();
- gr_block_detail *d = m->detail().get();
-
- LOG(*d_log << std::endl << m);
-
- if (d->done()){
- assert(0);
- return DONE;
- }
-
- if (d->source_p ()){
- d_ninput_items_required.resize (0);
- d_ninput_items.resize (0);
- d_input_items.resize (0);
- d_input_done.resize(0);
- d_output_items.resize (d->noutputs ());
- d_start_nitems_read.resize(0);
-
- // determine the minimum available output space
- noutput_items = min_available_space (d, m->output_multiple (), m->min_noutput_items ());
- noutput_items = std::min(noutput_items, max_noutput_items);
- LOG(*d_log << " source\n noutput_items = " << noutput_items << std::endl);
- if (noutput_items == -1) // we're done
- goto were_done;
-
- if (noutput_items == 0){ // we're output blocked
- LOG(*d_log << " BLKD_OUT\n");
- return BLKD_OUT;
- }
-
- goto setup_call_to_work; // jump to common code
- }
-
- else if (d->sink_p ()){
- d_ninput_items_required.resize (d->ninputs ());
- d_ninput_items.resize (d->ninputs ());
- d_input_items.resize (d->ninputs ());
- d_input_done.resize(d->ninputs());
- d_output_items.resize (0);
- d_start_nitems_read.resize(d->ninputs());
- LOG(*d_log << " sink\n");
-
- max_items_avail = 0;
- for (int i = 0; i < d->ninputs (); i++){
- {
- /*
- * Acquire the mutex and grab local copies of items_available and done.
- */
- gr::thread::scoped_lock guard(*d->input(i)->mutex());
- d_ninput_items[i] = d->input(i)->items_available();
- d_input_done[i] = d->input(i)->done();
- }
-
- LOG(*d_log << " d_ninput_items[" << i << "] = " << d_ninput_items[i] << std::endl);
- LOG(*d_log << " d_input_done[" << i << "] = " << d_input_done[i] << std::endl);
-
- if (d_ninput_items[i] < m->output_multiple() && d_input_done[i])
- goto were_done;
-
- max_items_avail = std::max (max_items_avail, d_ninput_items[i]);
- }
-
- // take a swag at how much output we can sink
- noutput_items = (int) (max_items_avail * m->relative_rate ());
- noutput_items = round_down (noutput_items, m->output_multiple ());
- noutput_items = std::min(noutput_items, max_noutput_items);
- LOG(*d_log << " max_items_avail = " << max_items_avail << std::endl);
- LOG(*d_log << " noutput_items = " << noutput_items << std::endl);
-
- if (noutput_items == 0){ // we're blocked on input
- LOG(*d_log << " BLKD_IN\n");
- return BLKD_IN;
- }
-
- goto try_again; // Jump to code shared with regular case.
- }
-
- else {
- // do the regular thing
- d_ninput_items_required.resize (d->ninputs ());
- d_ninput_items.resize (d->ninputs ());
- d_input_items.resize (d->ninputs ());
- d_input_done.resize(d->ninputs());
- d_output_items.resize (d->noutputs ());
- d_start_nitems_read.resize(d->ninputs());
-
- max_items_avail = 0;
- for (int i = 0; i < d->ninputs (); i++){
- {
- /*
- * Acquire the mutex and grab local copies of items_available and done.
- */
- gr::thread::scoped_lock guard(*d->input(i)->mutex());
- d_ninput_items[i] = d->input(i)->items_available ();
- d_input_done[i] = d->input(i)->done();
- }
- max_items_avail = std::max (max_items_avail, d_ninput_items[i]);
- }
-
- // determine the minimum available output space
- noutput_items = min_available_space (d, m->output_multiple (), m->min_noutput_items ());
- if (ENABLE_LOGGING){
- *d_log << " regular ";
- if (m->relative_rate() >= 1.0)
- *d_log << "1:" << m->relative_rate() << std::endl;
- else
- *d_log << 1.0/m->relative_rate() << ":1\n";
- *d_log << " max_items_avail = " << max_items_avail << std::endl;
- *d_log << " noutput_items = " << noutput_items << std::endl;
- }
- if (noutput_items == -1) // we're done
- goto were_done;
-
- if (noutput_items == 0){ // we're output blocked
- LOG(*d_log << " BLKD_OUT\n");
- return BLKD_OUT;
- }
-
- try_again:
- if (m->fixed_rate()){
- // try to work it forward starting with max_items_avail.
- // We want to try to consume all the input we've got.
- int reqd_noutput_items = m->fixed_rate_ninput_to_noutput(max_items_avail);
-
- // only test this if we specifically set the output_multiple
- if(m->output_multiple_set())
- reqd_noutput_items = round_down(reqd_noutput_items, m->output_multiple());
-
- if (reqd_noutput_items > 0 && reqd_noutput_items <= noutput_items)
- noutput_items = reqd_noutput_items;
-
- // if we need this many outputs, overrule the max_noutput_items setting
- max_noutput_items = std::max(m->output_multiple(), max_noutput_items);
- }
- noutput_items = std::min(noutput_items, max_noutput_items);
-
- // Check if we're still unaligned; use up items until we're
- // aligned again. Otherwise, make sure we set the alignment
- // requirement.
- if(!m->output_multiple_set()) {
- if(m->is_unaligned()) {
- // When unaligned, don't just set noutput_items to the remaining
- // samples to meet alignment; this causes too much overhead in
- // requiring a premature call back here. Set the maximum amount
- // of samples to handle unalignment and get us back aligned.
- if(noutput_items >= m->unaligned()) {
- noutput_items = round_up(noutput_items, m->alignment()) \
- - (m->alignment() - m->unaligned());
- new_alignment = 0;
- }
- else {
- new_alignment = m->unaligned() - noutput_items;
- }
- alignment_state = 0;
- }
- else if(noutput_items < m->alignment()) {
- // if we don't have enough for an aligned call, keep track of
- // misalignment, set unaligned flag, and proceed.
- new_alignment = m->alignment() - noutput_items;
- m->set_unaligned(new_alignment);
- m->set_is_unaligned(true);
- alignment_state = 1;
- }
- else {
- // enough to round down to the nearest alignment and process.
- noutput_items = round_down(noutput_items, m->alignment());
- m->set_is_unaligned(false);
- alignment_state = 2;
- }
- }
-
- // ask the block how much input they need to produce noutput_items
- m->forecast (noutput_items, d_ninput_items_required);
-
- // See if we've got sufficient input available
-
- int i;
- for (i = 0; i < d->ninputs (); i++)
- if (d_ninput_items_required[i] > d_ninput_items[i]) // not enough
- break;
-
- if (i < d->ninputs ()){ // not enough input on input[i]
- // if we can, try reducing the size of our output request
- if (noutput_items > m->output_multiple ()){
- noutput_items /= 2;
- noutput_items = round_up (noutput_items, m->output_multiple ());
- goto try_again;
- }
-
- // We're blocked on input
- LOG(*d_log << " BLKD_IN\n");
- if (d_input_done[i]) // If the upstream block is done, we're done
- goto were_done;
-
- // Is it possible to ever fulfill this request?
- if (d_ninput_items_required[i] > d->input(i)->max_possible_items_available ()){
- // Nope, never going to happen...
- std::cerr << "\nsched: <gr_block " << m->name()
- << " (" << m->unique_id() << ")>"
- << " is requesting more input data\n"
- << " than we can provide.\n"
- << " ninput_items_required = "
- << d_ninput_items_required[i] << "\n"
- << " max_possible_items_available = "
- << d->input(i)->max_possible_items_available() << "\n"
- << " If this is a filter, consider reducing the number of taps.\n";
- goto were_done;
- }
-
- // If we were made unaligned in this round but return here without
- // processing; reset the unalignment claim before next entry.
- if(alignment_state == 1) {
- m->set_unaligned(0);
- m->set_is_unaligned(false);
- }
- return BLKD_IN;
- }
-
- // We've got enough data on each input to produce noutput_items.
- // Finish setting up the call to work.
-
- for (int i = 0; i < d->ninputs (); i++)
- d_input_items[i] = d->input(i)->read_pointer();
-
- setup_call_to_work:
-
- d->d_produce_or = 0;
- for (int i = 0; i < d->noutputs (); i++)
- d_output_items[i] = d->output(i)->write_pointer();
-
- // determine where to start looking for new tags
- for (int i = 0; i < d->ninputs(); i++)
- d_start_nitems_read[i] = d->nitems_read(i);
-
-#ifdef GR_PERFORMANCE_COUNTERS
- if(d_use_pc)
- d->start_perf_counters();
-#endif /* GR_PERFORMANCE_COUNTERS */
-
- // Do the actual work of the block
- int n = m->general_work (noutput_items, d_ninput_items,
- d_input_items, d_output_items);
-
-#ifdef GR_PERFORMANCE_COUNTERS
- if(d_use_pc)
- d->stop_perf_counters(noutput_items, n);
-#endif /* GR_PERFORMANCE_COUNTERS */
-
- LOG(*d_log << " general_work: noutput_items = " << noutput_items
- << " result = " << n << std::endl);
-
- // Adjust number of unaligned items left to process
- if(m->is_unaligned()) {
- m->set_unaligned(new_alignment);
- m->set_is_unaligned(m->unaligned() != 0);
- }
-
- if(!propagate_tags(m->tag_propagation_policy(), d,
- d_start_nitems_read, m->relative_rate(),
- d_returned_tags))
- goto were_done;
-
- if (n == gr_block::WORK_DONE)
- goto were_done;
-
- if (n != gr_block::WORK_CALLED_PRODUCE)
- d->produce_each (n); // advance write pointers
-
- if (d->d_produce_or > 0) // block produced something
- return READY;
-
- // We didn't produce any output even though we called general_work.
- // We have (most likely) consumed some input.
-
- /*
- // If this is a source, it's broken.
- if (d->source_p()){
- std::cerr << "gr_block_executor: source " << m
- << " produced no output. We're marking it DONE.\n";
- // FIXME maybe we ought to raise an exception...
- goto were_done;
- }
- */
-
- // Have the caller try again...
- return READY_NO_OUTPUT;
- }
- assert (0);
-
- were_done:
- LOG(*d_log << " were_done\n");
- d->set_done (true);
- return DONE;
-}
diff --git a/gnuradio-runtime/lib/gr_block_executor.h b/gnuradio-runtime/lib/gr_block_executor.h
deleted file mode 100644
index 7d5c4949a3..0000000000
--- a/gnuradio-runtime/lib/gr_block_executor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BLOCK_EXECUTOR_H
-#define INCLUDED_GR_BLOCK_EXECUTOR_H
-
-#include <gr_runtime_api.h>
-#include <gr_runtime_types.h>
-#include <fstream>
-#include <gr_tags.h>
-
-//class gr_block_executor;
-//typedef boost::shared_ptr<gr_block_executor> gr_block_executor_sptr;
-
-
-/*!
- * \brief Manage the execution of a single block.
- * \ingroup internal
- */
-
-class GR_RUNTIME_API gr_block_executor {
-protected:
- gr_block_sptr d_block; // The block we're trying to run
- std::ofstream *d_log;
-
- // These are allocated here so we don't have to on each iteration
-
- gr_vector_int d_ninput_items_required;
- gr_vector_int d_ninput_items;
- gr_vector_const_void_star d_input_items;
- std::vector<bool> d_input_done;
- gr_vector_void_star d_output_items;
- std::vector<uint64_t> d_start_nitems_read; //stores where tag counts are before work
- std::vector<gr_tag_t> d_returned_tags;
- int d_max_noutput_items;
-
-#ifdef GR_PERFORMANCE_COUNTERS
- bool d_use_pc;
-#endif /* GR_PERFORMANCE_COUNTERS */
-
- public:
- gr_block_executor(gr_block_sptr block, int max_noutput_items=100000);
- ~gr_block_executor ();
-
- enum state {
- READY, // We made progress; everything's cool.
- READY_NO_OUTPUT, // We consumed some input, but produced no output.
- BLKD_IN, // no progress; we're blocked waiting for input data.
- BLKD_OUT, // no progress; we're blocked waiting for output buffer space.
- DONE, // we're done; don't call me again.
- };
-
- /*
- * \brief Run one iteration.
- */
- state run_one_iteration();
-};
-
-#endif /* INCLUDED_GR_BLOCK_EXECUTOR_H */
diff --git a/gnuradio-runtime/lib/gr_block_registry.cc b/gnuradio-runtime/lib/gr_block_registry.cc
deleted file mode 100644
index a80673691a..0000000000
--- a/gnuradio-runtime/lib/gr_block_registry.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_basic_block.h>
-#include <gr_block_registry.h>
-#include <gr_tpb_detail.h>
-#include <gr_block_detail.h>
-#include <gr_block.h>
-#include <stdio.h>
-
-gr_block_registry global_block_registry;
-
-gr_block_registry::gr_block_registry(){
- d_ref_map = pmt::make_dict();
-}
-
-long gr_block_registry::block_register(gr_basic_block* block){
- if(d_map.find(block->name()) == d_map.end()){
- d_map[block->name()] = blocksubmap_t();
- d_map[block->name()][0] = block;
- return 0;
- } else {
- for(size_t i=0; i<=d_map[block->name()].size(); i++){
- if(d_map[block->name()].find(i) == d_map[block->name()].end()){
- d_map[block->name()][i] = block;
- return i;
- }
- }
- }
- throw std::runtime_error("should not reach this");
-}
-
-void gr_block_registry::block_unregister(gr_basic_block* block){
- d_map[block->name()].erase( d_map[block->name()].find(block->symbolic_id()));
- d_ref_map = pmt::dict_delete(d_ref_map, pmt::intern(block->symbol_name()));
- if(block->alias_set()){
- d_ref_map = pmt::dict_delete(d_ref_map, pmt::intern(block->alias()));
- }
-}
-
-std::string gr_block_registry::register_symbolic_name(gr_basic_block* block){
- std::stringstream ss;
- ss << block->name() << block->symbolic_id();
- //std::cout << "register_symbolic_name: " << ss.str() << std::endl;
- register_symbolic_name(block, ss.str());
- return ss.str();
-}
-
-void gr_block_registry::register_symbolic_name(gr_basic_block* block, std::string name){
- if(pmt::dict_has_key(d_ref_map, pmt::intern(name))){
- throw std::runtime_error("symbol already exists, can not re-use!");
- }
- d_ref_map = pmt::dict_add(d_ref_map, pmt::intern(name), pmt::make_any(block));
-}
-
-gr_basic_block_sptr gr_block_registry::block_lookup(pmt::pmt_t symbol){
- pmt::pmt_t ref = pmt::dict_ref(d_ref_map, symbol, pmt::PMT_NIL);
- if(pmt::eq(ref, pmt::PMT_NIL)){
- throw std::runtime_error("block lookup failed! block not found!");
- }
- gr_basic_block* blk = boost::any_cast<gr_basic_block*>( pmt::any_ref(ref) );
- return blk->shared_from_this();
-}
-
-
-void gr_block_registry::register_primitive(std::string blk, gr_block* ref){
- primitive_map[blk] = ref;
-}
-
-void gr_block_registry::unregister_primitive(std::string blk){
- primitive_map.erase(primitive_map.find(blk));
-}
-
-void gr_block_registry::notify_blk(std::string blk){
- if(primitive_map.find(blk) == primitive_map.end()){ return; }
- if(primitive_map[blk]->detail().get())
- primitive_map[blk]->detail()->d_tpb.notify_msg();
-}
-
diff --git a/gnuradio-runtime/lib/gr_buffer.cc b/gnuradio-runtime/lib/gr_buffer.cc
deleted file mode 100644
index bdce5b4036..0000000000
--- a/gnuradio-runtime/lib/gr_buffer.cc
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_buffer.h>
-#include <gr_vmcircbuf.h>
-#include <gr_math.h>
-#include <stdexcept>
-#include <iostream>
-#include <assert.h>
-#include <algorithm>
-#include <boost/math/common_factor_rt.hpp>
-
-static long s_buffer_count = 0; // counts for debugging storage mgmt
-static long s_buffer_reader_count = 0;
-
-// ----------------------------------------------------------------------------
-// Notes on storage management
-//
-// Pretty much all the fundamental classes are now using the
-// shared_ptr stuff for automatic reference counting. To ensure that
-// no mistakes are made, we make the constructors for classes private,
-// and then provide a free factory function that returns a smart
-// pointer to the desired class.
-//
-// gr_buffer and gr_buffer_reader are no exceptions. However, they
-// both want pointers to each other, and unless we do something, we'll
-// never delete any of them because of the circular structure.
-// They'll always have a reference count of at least one. We could
-// use boost::weak_ptr's from gr_buffer to gr_buffer_reader but that
-// introduces it's own problems. (gr_buffer_reader's destructor needs
-// to call gr_buffer::drop_reader, but has no easy way to get a
-// shared_ptr to itself.)
-//
-// Instead, we solve this problem by having gr_buffer hold a raw
-// pointer to gr_buffer_reader in its d_reader vector.
-// gr_buffer_reader's destructor calls gr_buffer::drop_reader, so
-// we're never left with an dangling pointer. gr_buffer_reader still
-// has a shared_ptr to the buffer ensuring that the buffer doesn't go
-// away under it. However, when the reference count of a
-// gr_buffer_reader goes to zero, we can successfully reclaim it.
-// ----------------------------------------------------------------------------
-
-
-/*
- * Compute the minimum number of buffer items that work (i.e.,
- * address space wrap-around works). To work is to satisfy this
- * contraint for integer buffer_size and k:
- *
- * type_size * nitems == k * page_size
- */
-static long
-minimum_buffer_items (long type_size, long page_size)
-{
- return page_size / boost::math::gcd (type_size, page_size);
-}
-
-
-gr_buffer::gr_buffer (int nitems, size_t sizeof_item, gr_block_sptr link)
- : d_base (0), d_bufsize (0), d_vmcircbuf (0),
- d_sizeof_item (sizeof_item), d_link(link),
- d_write_index (0), d_abs_write_offset(0), d_done (false),
- d_last_min_items_read(0)
-{
- if (!allocate_buffer (nitems, sizeof_item))
- throw std::bad_alloc ();
-
- s_buffer_count++;
-}
-
-gr_buffer_sptr
-gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link)
-{
- return gr_buffer_sptr (new gr_buffer (nitems, sizeof_item, link));
-}
-
-gr_buffer::~gr_buffer ()
-{
- delete d_vmcircbuf;
- assert (d_readers.size() == 0);
- s_buffer_count--;
-}
-
-/*!
- * sets d_vmcircbuf, d_base, d_bufsize.
- * returns true iff successful.
- */
-bool
-gr_buffer::allocate_buffer (int nitems, size_t sizeof_item)
-{
- int orig_nitems = nitems;
-
- // Any buffersize we come up with must be a multiple of min_nitems.
-
- int granularity = gr_vmcircbuf_sysconfig::granularity ();
- int min_nitems = minimum_buffer_items (sizeof_item, granularity);
-
- // Round-up nitems to a multiple of min_nitems.
-
- if (nitems % min_nitems != 0)
- nitems = ((nitems / min_nitems) + 1) * min_nitems;
-
- // If we rounded-up a whole bunch, give the user a heads up.
- // This only happens if sizeof_item is not a power of two.
-
- if (nitems > 2 * orig_nitems && nitems * (int) sizeof_item > granularity){
- std::cerr << "gr_buffer::allocate_buffer: warning: tried to allocate\n"
- << " " << orig_nitems << " items of size "
- << sizeof_item << ". Due to alignment requirements\n"
- << " " << nitems << " were allocated. If this isn't OK, consider padding\n"
- << " your structure to a power-of-two bytes.\n"
- << " On this platform, our allocation granularity is " << granularity << " bytes.\n";
- }
-
- d_bufsize = nitems;
- d_vmcircbuf = gr_vmcircbuf_sysconfig::make (d_bufsize * d_sizeof_item);
- if (d_vmcircbuf == 0){
- std::cerr << "gr_buffer::allocate_buffer: failed to allocate buffer of size "
- << d_bufsize * d_sizeof_item / 1024 << " KB\n";
- return false;
- }
-
- d_base = (char *) d_vmcircbuf->pointer_to_first_copy ();
- return true;
-}
-
-
-int
-gr_buffer::space_available ()
-{
- if (d_readers.empty ())
- return d_bufsize - 1; // See comment below
-
- else {
-
- // Find out the maximum amount of data available to our readers
-
- int most_data = d_readers[0]->items_available ();
- uint64_t min_items_read = d_readers[0]->nitems_read();
- for (size_t i = 1; i < d_readers.size (); i++) {
- most_data = std::max (most_data, d_readers[i]->items_available ());
- min_items_read = std::min(min_items_read, d_readers[i]->nitems_read());
- }
-
- if(min_items_read != d_last_min_items_read) {
- prune_tags(d_last_min_items_read);
- d_last_min_items_read = min_items_read;
- }
-
- // The -1 ensures that the case d_write_index == d_read_index is
- // unambiguous. It indicates that there is no data for the reader
-
- return d_bufsize - most_data - 1;
- }
-}
-
-void *
-gr_buffer::write_pointer ()
-{
- return &d_base[d_write_index * d_sizeof_item];
-}
-
-void
-gr_buffer::update_write_pointer (int nitems)
-{
- gr::thread::scoped_lock guard(*mutex());
- d_write_index = index_add (d_write_index, nitems);
- d_abs_write_offset += nitems;
-}
-
-void
-gr_buffer::set_done (bool done)
-{
- gr::thread::scoped_lock guard(*mutex());
- d_done = done;
-}
-
-gr_buffer_reader_sptr
-gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link)
-{
- if (nzero_preload < 0)
- throw std::invalid_argument("gr_buffer_add_reader: nzero_preload must be >= 0");
-
- gr_buffer_reader_sptr r (new gr_buffer_reader (buf,
- buf->index_sub(buf->d_write_index,
- nzero_preload),
- link));
- buf->d_readers.push_back (r.get ());
-
- return r;
-}
-
-void
-gr_buffer::drop_reader (gr_buffer_reader *reader)
-{
- // isn't C++ beautiful... GAG!
-
- std::vector<gr_buffer_reader *>::iterator result =
- std::find (d_readers.begin (), d_readers.end (), reader);
-
- if (result == d_readers.end ())
- throw std::invalid_argument ("gr_buffer::drop_reader"); // we didn't find it...
-
- d_readers.erase (result);
-}
-
-void
-gr_buffer::add_item_tag(const gr_tag_t &tag)
-{
- gr::thread::scoped_lock guard(*mutex());
- d_item_tags.push_back(tag);
-}
-
-void
-gr_buffer::remove_item_tag(const gr_tag_t &tag)
-{
- gr::thread::scoped_lock guard(*mutex());
- for (std::deque<gr_tag_t>::iterator it = d_item_tags.begin(); it != d_item_tags.end(); ++it) {
- if (*it == tag) {
- d_item_tags.erase(it);
- break;
- }
- }
-}
-
-void
-gr_buffer::prune_tags(uint64_t max_time)
-{
- /* NOTE: this function _should_ lock the mutex before editing
- d_item_tags. In practice, this function is only called at
- runtime by min_available_space in gr_block_executor.cc,
- which locks the mutex itself.
-
- If this function is used elsewhere, remember to lock the
- buffer's mutex al la the scoped_lock line below.
- */
- //gr::thread::scoped_lock guard(*mutex());
- std::deque<gr_tag_t>::iterator itr = d_item_tags.begin();
-
- uint64_t item_time;
-
- // Since tags are not guarenteed to be in any particular order,
- // we need to erase here instead of pop_front. An erase in the
- // middle invalidates all iterators; so this resets the iterator
- // to find more. Mostly, we wil be erasing from the front and
- // therefore lose little time this way.
- while(itr != d_item_tags.end()) {
- item_time = (*itr).offset;
- if(item_time < max_time) {
- d_item_tags.erase(itr);
- itr = d_item_tags.begin();
- }
- else
- itr++;
- }
-}
-
-long
-gr_buffer_ncurrently_allocated ()
-{
- return s_buffer_count;
-}
-
-// ----------------------------------------------------------------------------
-
-gr_buffer_reader::gr_buffer_reader(gr_buffer_sptr buffer, unsigned int read_index,
- gr_block_sptr link)
- : d_buffer(buffer), d_read_index(read_index), d_abs_read_offset(0), d_link(link)
-{
- s_buffer_reader_count++;
-}
-
-gr_buffer_reader::~gr_buffer_reader ()
-{
- d_buffer->drop_reader(this);
- s_buffer_reader_count--;
-}
-
-int
-gr_buffer_reader::items_available () const
-{
- return d_buffer->index_sub (d_buffer->d_write_index, d_read_index);
-}
-
-const void *
-gr_buffer_reader::read_pointer ()
-{
- return &d_buffer->d_base[d_read_index * d_buffer->d_sizeof_item];
-}
-
-void
-gr_buffer_reader::update_read_pointer (int nitems)
-{
- gr::thread::scoped_lock guard(*mutex());
- d_read_index = d_buffer->index_add (d_read_index, nitems);
- d_abs_read_offset += nitems;
-}
-
-void
-gr_buffer_reader::get_tags_in_range(std::vector<gr_tag_t> &v,
- uint64_t abs_start,
- uint64_t abs_end)
-{
- gr::thread::scoped_lock guard(*mutex());
-
- v.resize(0);
- std::deque<gr_tag_t>::iterator itr = d_buffer->get_tags_begin();
-
- uint64_t item_time;
- while(itr != d_buffer->get_tags_end()) {
- item_time = (*itr).offset;
-
- if((item_time >= abs_start) && (item_time < abs_end)) {
- v.push_back(*itr);
- }
-
- itr++;
- }
-}
-
-long
-gr_buffer_reader_ncurrently_allocated ()
-{
- return s_buffer_reader_count;
-}
diff --git a/gnuradio-runtime/lib/gr_circular_file.cc b/gnuradio-runtime/lib/gr_circular_file.cc
deleted file mode 100644
index 6f710c49b1..0000000000
--- a/gnuradio-runtime/lib/gr_circular_file.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_circular_file.h>
-
-#include <unistd.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#include <algorithm>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-static const int HEADER_SIZE = 4096;
-static const int HEADER_MAGIC = 0xEB021026;
-
-static const int HD_MAGIC = 0;
-static const int HD_HEADER_SIZE = 1; // integer offsets into header
-static const int HD_BUFFER_SIZE = 2;
-static const int HD_BUFFER_BASE = 3;
-static const int HD_BUFFER_CURRENT = 4;
-
-gr_circular_file::gr_circular_file (const char *filename,
- bool writable, int size)
- : d_fd (-1), d_header (0), d_buffer (0), d_mapped_size (0), d_bytes_read (0)
-{
- int mm_prot;
- if (writable){
-#ifdef HAVE_MMAP
- mm_prot = PROT_READ | PROT_WRITE;
-#endif
- d_fd = open (filename, O_CREAT | O_RDWR | O_TRUNC, 0664);
- if (d_fd < 0){
- perror (filename);
- exit (1);
- }
-#ifdef HAVE_MMAP /* FIXME */
- if(ftruncate (d_fd, size + HEADER_SIZE) != 0) {
- perror (filename);
- exit (1);
- }
-#endif
- }
- else {
-#ifdef HAVE_MMAP
- mm_prot = PROT_READ;
-#endif
- d_fd = open (filename, O_RDONLY);
- if (d_fd < 0){
- perror (filename);
- exit (1);
- }
- }
-
- struct stat statbuf;
- if (fstat (d_fd, &statbuf) < 0){
- perror (filename);
- exit (1);
- }
-
- if (statbuf.st_size < HEADER_SIZE){
- fprintf (stderr, "%s: file too small to be circular buffer\n", filename);
- exit (1);
- }
-
- d_mapped_size = statbuf.st_size;
-#ifdef HAVE_MMAP
- void *p = mmap (0, d_mapped_size, mm_prot, MAP_SHARED, d_fd, 0);
- if (p == MAP_FAILED){
- perror ("gr_circular_file: mmap failed");
- exit (1);
- }
-
- d_header = (int *) p;
-#else
- perror ("gr_circular_file: mmap unsupported by this system");
- exit (1);
-#endif
-
- if (writable){ // init header
-
- if (size < 0){
- fprintf (stderr, "gr_circular_buffer: size must be > 0 when writable\n");
- exit (1);
- }
-
- d_header[HD_MAGIC] = HEADER_MAGIC;
- d_header[HD_HEADER_SIZE] = HEADER_SIZE;
- d_header[HD_BUFFER_SIZE] = size;
- d_header[HD_BUFFER_BASE] = HEADER_SIZE; // right after header
- d_header[HD_BUFFER_CURRENT] = 0;
- }
-
- // sanity check (the asserts are a bit unforgiving...)
-
- assert (d_header[HD_MAGIC] == HEADER_MAGIC);
- assert (d_header[HD_HEADER_SIZE] == HEADER_SIZE);
- assert (d_header[HD_BUFFER_SIZE] > 0);
- assert (d_header[HD_BUFFER_BASE] >= d_header[HD_HEADER_SIZE]);
- assert (d_header[HD_BUFFER_BASE] + d_header[HD_BUFFER_SIZE] <= d_mapped_size);
- assert (d_header[HD_BUFFER_CURRENT] >= 0 &&
- d_header[HD_BUFFER_CURRENT] < d_header[HD_BUFFER_SIZE]);
-
- d_bytes_read = 0;
- d_buffer = (unsigned char *) d_header + d_header[HD_BUFFER_BASE];
-}
-
-gr_circular_file::~gr_circular_file ()
-{
-#ifdef HAVE_MMAP
- if (munmap ((char *) d_header, d_mapped_size) < 0){
- perror ("gr_circular_file: munmap");
- exit (1);
- }
-#endif
- close (d_fd);
-}
-
-bool
-gr_circular_file::write (void *vdata, int nbytes)
-{
- unsigned char *data = (unsigned char *) vdata;
- int buffer_size = d_header[HD_BUFFER_SIZE];
- int buffer_current = d_header[HD_BUFFER_CURRENT];
-
- while (nbytes > 0){
- int n = std::min (nbytes, buffer_size - buffer_current);
- memcpy (d_buffer + buffer_current, data, n);
-
- buffer_current += n;
- if (buffer_current >= buffer_size)
- buffer_current = 0;
-
- data += n;
- nbytes -= n;
- }
-
- d_header[HD_BUFFER_CURRENT] = buffer_current;
- return true;
-}
-
-int
-gr_circular_file::read (void *vdata, int nbytes)
-{
- unsigned char *data = (unsigned char *) vdata;
- int buffer_current = d_header[HD_BUFFER_CURRENT];
- int buffer_size = d_header[HD_BUFFER_SIZE];
- int total = 0;
-
- nbytes = std::min (nbytes, buffer_size - d_bytes_read);
-
- while (nbytes > 0){
- int offset = (buffer_current + d_bytes_read) % buffer_size;
- int n = std::min (nbytes, buffer_size - offset);
- memcpy (data, d_buffer + offset, n);
- data += n;
- d_bytes_read += n;
- total += n;
- nbytes -= n;
- }
- return total;
-}
-
-void
-gr_circular_file::reset_read_pointer ()
-{
- d_bytes_read = 0;
-}
diff --git a/gnuradio-runtime/lib/gr_circular_file.h b/gnuradio-runtime/lib/gr_circular_file.h
deleted file mode 100644
index 2b61bf2711..0000000000
--- a/gnuradio-runtime/lib/gr_circular_file.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_CIRCULAR_FILE_H_
-#define _GR_CIRCULAR_FILE_H_
-
-#include <gr_runtime_api.h>
-
-/*
- * writes input data into a circular buffer on disk.
- *
- * the file contains a fixed header:
- * 0x0000: int32 magic (0xEB021026)
- * 0x0004: int32 size in bytes of header (constant 4096)
- * 0x0008: int32 size in bytes of circular buffer (not including header)
- * 0x000C: int32 file offset to beginning of circular buffer
- * 0x0010: int32 byte offset from beginning of circular buffer to
- * current start of data
- *
- */
-class GR_RUNTIME_API gr_circular_file {
- int d_fd;
- int *d_header;
- unsigned char *d_buffer;
- int d_mapped_size;
- int d_bytes_read;
-
-public:
- gr_circular_file (const char *filename, bool writable = false, int size = 0);
- ~gr_circular_file ();
-
- bool write (void *data, int nbytes);
-
- // returns # of bytes actually read or 0 if end of buffer, or -1 on error.
- int read (void *data, int nbytes);
-
- // reset read pointer to beginning of buffer.
- void reset_read_pointer ();
-};
-
-#endif /* _GR_CIRCULAR_FILE_H_ */
\ No newline at end of file
diff --git a/gnuradio-runtime/lib/gr_constants.cc.in b/gnuradio-runtime/lib/gr_constants.cc.in
deleted file mode 100644
index b94f254d66..0000000000
--- a/gnuradio-runtime/lib/gr_constants.cc.in
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_constants.h>
-
-const std::string
-gr_prefix()
-{
- return "@prefix@";
-}
-
-const std::string
-gr_sysconfdir()
-{
- return "@SYSCONFDIR@";
-}
-
-const std::string
-gr_prefsdir()
-{
- return "@GR_PREFSDIR@";
-}
-
-const std::string
-gr_build_date()
-{
- return "@BUILD_DATE@";
-}
-
-const std::string
-gr_version()
-{
- return "@VERSION@";
-}
diff --git a/gnuradio-runtime/lib/gr_dispatcher.cc b/gnuradio-runtime/lib/gr_dispatcher.cc
deleted file mode 100644
index 96ebe9ad8b..0000000000
--- a/gnuradio-runtime/lib/gr_dispatcher.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_dispatcher.h>
-#include <math.h>
-#include <errno.h>
-#include <stdio.h>
-
-#ifdef HAVE_SELECT
-# ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-# else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# endif
-# ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
-# endif
-#endif
-
-
-static gr_dispatcher_sptr s_singleton;
-
-gr_dispatcher_sptr
-gr_make_dispatcher()
-{
- return gr_dispatcher_sptr(new gr_dispatcher());
-}
-
-gr_dispatcher_sptr
-gr_dispatcher_singleton()
-{
- if (s_singleton)
- return s_singleton;
-
- s_singleton = gr_make_dispatcher();
- return s_singleton;
-}
-
-#if !defined(HAVE_SELECT) // Stub it out
-
-gr_dispatcher::gr_dispatcher()
-{
-}
-
-gr_dispatcher::~gr_dispatcher()
-{
-}
-
-bool
-gr_dispatcher::add_handler(gr_select_handler_sptr handler)
-{
- return true;
-}
-
-bool
-gr_dispatcher::del_handler(gr_select_handler_sptr handler)
-{
- return true;
-}
-
-bool
-gr_dispatcher::del_handler(gr_select_handler *handler)
-{
- return true;
-}
-
-void
-gr_dispatcher::loop(double timeout)
-{
-}
-
-#else // defined(HAVE_SELECT)
-
-gr_dispatcher::gr_dispatcher()
- : d_handler(FD_SETSIZE), d_max_index(-1)
-{
-}
-
-gr_dispatcher::~gr_dispatcher()
-{
-}
-
-bool
-gr_dispatcher::add_handler(gr_select_handler_sptr handler)
-{
- int fd = handler->fd();
- if (fd < 0 || fd >= FD_SETSIZE)
- return false;
-
- d_max_index = std::max(d_max_index, fd);
- d_handler[fd] = handler;
- return true;
-}
-
-bool
-gr_dispatcher::del_handler(gr_select_handler_sptr handler)
-{
- return del_handler(handler.get());
-}
-
-bool
-gr_dispatcher::del_handler(gr_select_handler *handler)
-{
- int fd = handler->fd();
- if (fd < 0 || fd >= FD_SETSIZE)
- return false;
-
- d_handler[fd].reset();
-
- if (fd == d_max_index){
- int i;
- for (i = fd - 1; i >= 0 && !d_handler[i]; i--)
- ;
- d_max_index = i;
- }
- return true;
-}
-
-
-void
-gr_dispatcher::loop(double timeout)
-{
- struct timeval master;
- struct timeval tmp;
- fd_set rd_set;
- fd_set wr_set;
-
- double secs = floor (timeout);
- master.tv_sec = (long) secs;
- master.tv_usec = (long) ((timeout - secs) * 1e6);
-
- while (d_max_index >= 0){
- FD_ZERO(&rd_set);
- FD_ZERO(&wr_set);
-
- for (int i = 0; i <= d_max_index; i++){
- if (d_handler[i] && d_handler[i]->readable())
- FD_SET(i, &rd_set);
- if (d_handler[i] && d_handler[i]->writable())
- FD_SET(i, &wr_set);
- }
-
- tmp = master;
- int retval = select(d_max_index+1, &rd_set, &wr_set, 0, &tmp);
- if (retval == 0) // timed out with nothing ready
- continue;
- if (retval < 0){
- if (errno == EINTR)
- continue;
- perror ("gr_dispatcher/select");
- return;
- }
-
- for (int i = 0; i <= d_max_index; i++){
- if (FD_ISSET(i, &rd_set))
- if (d_handler[i])
- d_handler[i]->handle_read();
- if (FD_ISSET(i, &wr_set))
- if (d_handler[i])
- d_handler[i]->handle_write();
- }
- }
-}
-
-#endif
diff --git a/gnuradio-runtime/lib/gr_error_handler.cc b/gnuradio-runtime/lib/gr_error_handler.cc
deleted file mode 100644
index 448682966e..0000000000
--- a/gnuradio-runtime/lib/gr_error_handler.cc
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-/*
- * This code is based on error.cc from the "Click Modular Router".
- * Original copyright follows:
- */
-/*
- * error.{cc,hh} -- flexible classes for error reporting
- * Eddie Kohler
- *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, subject to the conditions
- * listed in the Click LICENSE file. These conditions include: you must
- * preserve this copyright notice, and you cannot mention the copyright
- * holders in advertising related to the Software without their permission.
- * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
- * notice is a summary of the Click LICENSE file; the license in that file is
- * legally binding.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_error_handler.h>
-#include <assert.h>
-#include <stdexcept>
-#include <unistd.h>
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-static gr_error_handler *s_default_handler = 0;
-static gr_error_handler *s_silent_handler = 0;
-
-bool
-gr_error_handler::has_default_handler()
-{
- return s_default_handler != 0;
-}
-
-void
-gr_error_handler::set_default_handler(gr_error_handler *errh)
-{
- s_default_handler = errh;
-}
-
-gr_error_handler *
-gr_error_handler::default_handler()
-{
- assert (s_default_handler != 0);
- return s_default_handler;
-}
-
-gr_error_handler *
-gr_error_handler::silent_handler()
-{
- assert (s_silent_handler != 0);
- return s_silent_handler;
-}
-
-// ----------------------------------------------------------------
-
-gr_error_handler::~gr_error_handler()
-{
- // nop
-}
-
-void
-gr_error_handler::debug(const char *format, ...)
-{
- va_list val;
- va_start(val, format);
- verror(ERR_DEBUG, format, val);
- va_end(val);
-}
-
-void
-gr_error_handler::message(const char *format, ...)
-{
- va_list val;
- va_start(val, format);
- verror(ERR_MESSAGE, format, val);
- va_end(val);
-}
-
-void
-gr_error_handler::warning(const char *format, ...)
-{
- va_list val;
- va_start(val, format);
- verror(ERR_WARNING, format, val);
- va_end(val);
-}
-
-void
-gr_error_handler::error(const char *format, ...)
-{
- va_list val;
- va_start(val, format);
- verror(ERR_ERROR, format, val);
- va_end(val);
-}
-
-void
-gr_error_handler::fatal(const char *format, ...)
-{
- va_list val;
- va_start(val, format);
- verror(ERR_FATAL, format, val);
- va_end(val);
-}
-
-void
-gr_error_handler::verror(seriousness s, const char *format, va_list val)
-{
- std::string text = make_text(s, format, val);
- handle_text(s, text);
- count_error(s);
-}
-
-void
-gr_error_handler::verror_text(seriousness s, const std::string &text)
-{
- // text is already made
- handle_text(s, text);
- count_error(s);
-}
-
-std::string
-gr_error_handler::make_text(seriousness s, const char *format, va_list val)
-{
- char text_buf[4096];
- vsnprintf(text_buf, sizeof(text_buf), format, val);
- text_buf[sizeof(text_buf)-1] = 0;
- return text_buf;
-}
-
-// ----------------------------------------------------------------
-
-void
-gr_base_error_handler::count_error(seriousness s)
-{
- if (s < ERR_WARNING)
- /* do nothing */;
- else if (s < ERR_ERROR)
- d_nwarnings++;
- else
- d_nerrors++;
-}
-
-// ----------------------------------------------------------------
-
-gr_file_error_handler::gr_file_error_handler(FILE *file)
- : d_file(file), d_fd(-1)
-{
-}
-
-gr_file_error_handler::gr_file_error_handler(int file_descriptor)
-{
- d_fd = dup(file_descriptor); // so we can fclose it
- if (d_fd == -1){
- perror("gr_file_error_handler:dup");
- throw std::invalid_argument("gr_file_error_handler:dup");
- }
- d_file = fdopen(d_fd, "w");
- if (d_file == 0){
- perror("gr_file_error_handler:fdopen");
- throw std::invalid_argument("gr_file_error_handler:fdopen");
- }
-}
-
-gr_file_error_handler::~gr_file_error_handler()
-{
- if (d_fd != -1){
- fclose(d_file);
- }
-}
-
-void
-gr_file_error_handler::handle_text(seriousness s, const std::string &text)
-{
- if (text.length() <= 0)
- return;
-
- fwrite(text.data(), 1, text.length(), d_file);
- if (text[text.length()-1] != '\n')
- fwrite("\n", 1, 1, d_file);
-
- if (d_fd != -1)
- fflush(d_file); // keep synced with any other users of fd
-}
-
-
-// ----------------------------------------------------------------
-// static error handlers
-//
-
-class gr_silent_error_handler : public gr_base_error_handler
-{
-public:
- gr_silent_error_handler() {}
- void handle_text(seriousness s, const std::string &str);
-};
-
-void
-gr_silent_error_handler::handle_text(seriousness s, const std::string &str)
-{
- // nop
-}
-
-class force_init {
-public:
- force_init()
- {
- s_default_handler = new gr_file_error_handler(stdout);
- s_silent_handler = new gr_silent_error_handler();
- }
-};
-
-static force_init kludge;
diff --git a/gnuradio-runtime/lib/gr_fast_atan2f.cc b/gnuradio-runtime/lib/gr_fast_atan2f.cc
deleted file mode 100644
index 8b7bfea12e..0000000000
--- a/gnuradio-runtime/lib/gr_fast_atan2f.cc
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_math.h> // declaration is in here
-#include <cmath>
-
-#define REAL float
-
-/***************************************************************************/
-/* Constant definitions */
-/***************************************************************************/
-
-#define TAN_MAP_RES 0.003921569 /* (smallest non-zero value in table) */
-#define RAD_PER_DEG 0.017453293
-#define TAN_MAP_SIZE 256
-
-/* arctangents from 0 to pi/4 radians */
-static REAL
-fast_atan_table[257] = {
- 0.000000e+00, 3.921549e-03, 7.842976e-03, 1.176416e-02,
- 1.568499e-02, 1.960533e-02, 2.352507e-02, 2.744409e-02,
- 3.136226e-02, 3.527947e-02, 3.919560e-02, 4.311053e-02,
- 4.702413e-02, 5.093629e-02, 5.484690e-02, 5.875582e-02,
- 6.266295e-02, 6.656816e-02, 7.047134e-02, 7.437238e-02,
- 7.827114e-02, 8.216752e-02, 8.606141e-02, 8.995267e-02,
- 9.384121e-02, 9.772691e-02, 1.016096e-01, 1.054893e-01,
- 1.093658e-01, 1.132390e-01, 1.171087e-01, 1.209750e-01,
- 1.248376e-01, 1.286965e-01, 1.325515e-01, 1.364026e-01,
- 1.402496e-01, 1.440924e-01, 1.479310e-01, 1.517652e-01,
- 1.555948e-01, 1.594199e-01, 1.632403e-01, 1.670559e-01,
- 1.708665e-01, 1.746722e-01, 1.784728e-01, 1.822681e-01,
- 1.860582e-01, 1.898428e-01, 1.936220e-01, 1.973956e-01,
- 2.011634e-01, 2.049255e-01, 2.086818e-01, 2.124320e-01,
- 2.161762e-01, 2.199143e-01, 2.236461e-01, 2.273716e-01,
- 2.310907e-01, 2.348033e-01, 2.385093e-01, 2.422086e-01,
- 2.459012e-01, 2.495869e-01, 2.532658e-01, 2.569376e-01,
- 2.606024e-01, 2.642600e-01, 2.679104e-01, 2.715535e-01,
- 2.751892e-01, 2.788175e-01, 2.824383e-01, 2.860514e-01,
- 2.896569e-01, 2.932547e-01, 2.968447e-01, 3.004268e-01,
- 3.040009e-01, 3.075671e-01, 3.111252e-01, 3.146752e-01,
- 3.182170e-01, 3.217506e-01, 3.252758e-01, 3.287927e-01,
- 3.323012e-01, 3.358012e-01, 3.392926e-01, 3.427755e-01,
- 3.462497e-01, 3.497153e-01, 3.531721e-01, 3.566201e-01,
- 3.600593e-01, 3.634896e-01, 3.669110e-01, 3.703234e-01,
- 3.737268e-01, 3.771211e-01, 3.805064e-01, 3.838825e-01,
- 3.872494e-01, 3.906070e-01, 3.939555e-01, 3.972946e-01,
- 4.006244e-01, 4.039448e-01, 4.072558e-01, 4.105574e-01,
- 4.138496e-01, 4.171322e-01, 4.204054e-01, 4.236689e-01,
- 4.269229e-01, 4.301673e-01, 4.334021e-01, 4.366272e-01,
- 4.398426e-01, 4.430483e-01, 4.462443e-01, 4.494306e-01,
- 4.526070e-01, 4.557738e-01, 4.589307e-01, 4.620778e-01,
- 4.652150e-01, 4.683424e-01, 4.714600e-01, 4.745676e-01,
- 4.776654e-01, 4.807532e-01, 4.838312e-01, 4.868992e-01,
- 4.899573e-01, 4.930055e-01, 4.960437e-01, 4.990719e-01,
- 5.020902e-01, 5.050985e-01, 5.080968e-01, 5.110852e-01,
- 5.140636e-01, 5.170320e-01, 5.199904e-01, 5.229388e-01,
- 5.258772e-01, 5.288056e-01, 5.317241e-01, 5.346325e-01,
- 5.375310e-01, 5.404195e-01, 5.432980e-01, 5.461666e-01,
- 5.490251e-01, 5.518738e-01, 5.547124e-01, 5.575411e-01,
- 5.603599e-01, 5.631687e-01, 5.659676e-01, 5.687566e-01,
- 5.715357e-01, 5.743048e-01, 5.770641e-01, 5.798135e-01,
- 5.825531e-01, 5.852828e-01, 5.880026e-01, 5.907126e-01,
- 5.934128e-01, 5.961032e-01, 5.987839e-01, 6.014547e-01,
- 6.041158e-01, 6.067672e-01, 6.094088e-01, 6.120407e-01,
- 6.146630e-01, 6.172755e-01, 6.198784e-01, 6.224717e-01,
- 6.250554e-01, 6.276294e-01, 6.301939e-01, 6.327488e-01,
- 6.352942e-01, 6.378301e-01, 6.403565e-01, 6.428734e-01,
- 6.453808e-01, 6.478788e-01, 6.503674e-01, 6.528466e-01,
- 6.553165e-01, 6.577770e-01, 6.602282e-01, 6.626701e-01,
- 6.651027e-01, 6.675261e-01, 6.699402e-01, 6.723452e-01,
- 6.747409e-01, 6.771276e-01, 6.795051e-01, 6.818735e-01,
- 6.842328e-01, 6.865831e-01, 6.889244e-01, 6.912567e-01,
- 6.935800e-01, 6.958943e-01, 6.981998e-01, 7.004964e-01,
- 7.027841e-01, 7.050630e-01, 7.073330e-01, 7.095943e-01,
- 7.118469e-01, 7.140907e-01, 7.163258e-01, 7.185523e-01,
- 7.207701e-01, 7.229794e-01, 7.251800e-01, 7.273721e-01,
- 7.295557e-01, 7.317307e-01, 7.338974e-01, 7.360555e-01,
- 7.382053e-01, 7.403467e-01, 7.424797e-01, 7.446045e-01,
- 7.467209e-01, 7.488291e-01, 7.509291e-01, 7.530208e-01,
- 7.551044e-01, 7.571798e-01, 7.592472e-01, 7.613064e-01,
- 7.633576e-01, 7.654008e-01, 7.674360e-01, 7.694633e-01,
- 7.714826e-01, 7.734940e-01, 7.754975e-01, 7.774932e-01,
- 7.794811e-01, 7.814612e-01, 7.834335e-01, 7.853983e-01,
- 7.853983e-01
- };
-
-
-/*****************************************************************************
-Function: Arc tangent
-
-Syntax: angle = fast_atan2(y, x);
-REAL y y component of input vector
-REAL x x component of input vector
-REAL angle angle of vector (x, y) in radians
-
-Description: This function calculates the angle of the vector (x,y) based
-on a table lookup and linear interpolation. The table uses
-a 256 point table covering -45 to +45 degrees and uses
-symetry to determine the final angle value in the range of
--180 to 180 degrees. Note that this function uses the small
-angle approximation for values close to zero. This routine
-calculates the arc tangent with an average error of
-+/- 0.045 degrees.
-*****************************************************************************/
-
-REAL
-gr_fast_atan2f(REAL y, REAL x)
-{
- REAL x_abs, y_abs, z;
- REAL alpha, angle, base_angle;
- int index;
-
- /* don't divide by zero! */ // FIXME could get hosed with -0.0
- if ((y == 0.0) && (x == 0.0))
- return 0.0;
-
- /* normalize to +/- 45 degree range */
- y_abs = fabs(y);
- x_abs = fabs(x);
- //z = (y_abs < x_abs ? y_abs / x_abs : x_abs / y_abs);
- if (y_abs < x_abs)
- z = y_abs / x_abs;
- else
- z = x_abs / y_abs;
-
- /* when ratio approaches the table resolution, the angle is */
- /* best approximated with the argument itself... */
- if (z < TAN_MAP_RES)
- base_angle = z;
- else {
- /* find index and interpolation value */
- alpha = z * (REAL) TAN_MAP_SIZE - .5;
- index = (int) alpha;
- alpha -= (REAL) index;
- /* determine base angle based on quadrant and */
- /* add or subtract table value from base angle based on quadrant */
- base_angle = fast_atan_table[index];
- base_angle +=
- (fast_atan_table[index + 1] - fast_atan_table[index]) * alpha;
- }
-
- if (x_abs > y_abs) { /* -45 -> 45 or 135 -> 225 */
- if (x >= 0.0) { /* -45 -> 45 */
- if (y >= 0.0)
- angle = base_angle; /* 0 -> 45, angle OK */
- else
- angle = -base_angle; /* -45 -> 0, angle = -angle */
- } else { /* 135 -> 180 or 180 -> -135 */
- angle = 3.14159265358979323846;
- if (y >= 0.0)
- angle -= base_angle; /* 135 -> 180, angle = 180 - angle */
- else
- angle = base_angle - angle; /* 180 -> -135, angle = angle - 180 */
- }
- } else { /* 45 -> 135 or -135 -> -45 */
- if (y >= 0.0) { /* 45 -> 135 */
- angle = 1.57079632679489661923;
- if (x >= 0.0)
- angle -= base_angle; /* 45 -> 90, angle = 90 - angle */
- else
- angle += base_angle; /* 90 -> 135, angle = 90 + angle */
- } else { /* -135 -> -45 */
- angle = -1.57079632679489661923;
- if (x >= 0.0)
- angle += base_angle; /* -90 -> -45, angle = -90 + angle */
- else
- angle -= base_angle; /* -135 -> -90, angle = -90 - angle */
- }
- }
-
-#ifdef ZERO_TO_TWOPI
- if (angle < 0)
- return (angle + TWOPI);
- else
- return (angle);
-#else
- return (angle);
-#endif
-}
-
diff --git a/gnuradio-runtime/lib/gr_feval.cc b/gnuradio-runtime/lib/gr_feval.cc
deleted file mode 100644
index 89f09984cf..0000000000
--- a/gnuradio-runtime/lib/gr_feval.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_feval.h>
-
-gr_feval_dd::~gr_feval_dd(){}
-
-double
-gr_feval_dd::eval(double x)
-{
- return 0;
-}
-
-double
-gr_feval_dd::calleval(double x)
-{
- return eval(x);
-}
-
-// ----------------------------------------------------------------
-
-gr_feval_cc::~gr_feval_cc(){}
-
-gr_complex
-gr_feval_cc::eval(gr_complex x)
-{
- return 0;
-}
-
-gr_complex
-gr_feval_cc::calleval(gr_complex x)
-{
- return eval(x);
-}
-
-// ----------------------------------------------------------------
-
-gr_feval_ll::~gr_feval_ll(){}
-
-long
-gr_feval_ll::eval(long x)
-{
- return 0;
-}
-
-long
-gr_feval_ll::calleval(long x)
-{
- return eval(x);
-}
-
-// ----------------------------------------------------------------
-
-gr_feval::~gr_feval(){}
-
-void
-gr_feval::eval(void)
-{
- // nop
-}
-
-void
-gr_feval::calleval(void)
-{
- eval();
-}
-
-// ----------------------------------------------------------------
-
-gr_feval_p::~gr_feval_p(){}
-
-void
-gr_feval_p::eval(pmt::pmt_t x)
-{
- // nop
-}
-
-void
-gr_feval_p::calleval(pmt::pmt_t x)
-{
- eval(x);
-}
-
-/*
- * Trivial examples showing C++ (transparently) calling Python
- */
-double
-gr_feval_dd_example(gr_feval_dd *f, double x)
-{
- return f->calleval(x);
-}
-
-gr_complex
-gr_feval_cc_example(gr_feval_cc *f, gr_complex x)
-{
- return f->calleval(x);
-}
-
-long
-gr_feval_ll_example(gr_feval_ll *f, long x)
-{
- return f->calleval(x);
-}
-
-void
-gr_feval_example(gr_feval *f)
-{
- f->calleval();
-}
diff --git a/gnuradio-runtime/lib/gr_flat_flowgraph.cc b/gnuradio-runtime/lib/gr_flat_flowgraph.cc
deleted file mode 100644
index de1e227ef0..0000000000
--- a/gnuradio-runtime/lib/gr_flat_flowgraph.cc
+++ /dev/null
@@ -1,427 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_flat_flowgraph.h>
-#include <gr_block_detail.h>
-#include <gr_io_signature.h>
-#include <gr_buffer.h>
-#include <gr_prefs.h>
-#include <volk/volk.h>
-#include <iostream>
-#include <map>
-#include <boost/format.hpp>
-
-#define GR_FLAT_FLOWGRAPH_DEBUG 0
-
-// 32Kbyte buffer size between blocks
-#define GR_FIXED_BUFFER_SIZE (32*(1L<<10))
-
-static const unsigned int s_fixed_buffer_size = GR_FIXED_BUFFER_SIZE;
-
-gr_flat_flowgraph_sptr
-gr_make_flat_flowgraph()
-{
- return gr_flat_flowgraph_sptr(new gr_flat_flowgraph());
-}
-
-gr_flat_flowgraph::gr_flat_flowgraph()
-{
-}
-
-gr_flat_flowgraph::~gr_flat_flowgraph()
-{
-}
-
-void
-gr_flat_flowgraph::setup_connections()
-{
- gr_basic_block_vector_t blocks = calc_used_blocks();
-
- // Assign block details to blocks
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
- cast_to_block_sptr(*p)->set_detail(allocate_block_detail(*p));
-
- // Connect inputs to outputs for each block
- for(gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- connect_block_inputs(*p);
-
- gr_block_sptr block = cast_to_block_sptr(*p);
- block->set_unaligned(0);
- block->set_is_unaligned(false);
- }
-
- // Connect message ports connetions
- for(gr_msg_edge_viter_t i = d_msg_edges.begin(); i != d_msg_edges.end(); i++){
- if(GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << boost::format("flat_fg connecting msg primitives: (%s, %s)->(%s, %s)\n") %
- i->src().block() % i->src().port() %
- i->dst().block() % i->dst().port();
- i->src().block()->message_port_sub( i->src().port(), pmt::cons(i->dst().block()->alias_pmt(), i->dst().port()) );
- }
-
-}
-
-gr_block_detail_sptr
-gr_flat_flowgraph::allocate_block_detail(gr_basic_block_sptr block)
-{
- int ninputs = calc_used_ports(block, true).size();
- int noutputs = calc_used_ports(block, false).size();
- gr_block_detail_sptr detail = gr_make_block_detail(ninputs, noutputs);
-
- gr_block_sptr grblock = cast_to_block_sptr(block);
- if(!grblock)
- throw std::runtime_error("allocate_block_detail found non-gr_block");
-
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "Creating block detail for " << block << std::endl;
-
- for (int i = 0; i < noutputs; i++) {
- grblock->expand_minmax_buffer(i);
-
- gr_buffer_sptr buffer = allocate_buffer(block, i);
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "Allocated buffer for output " << block << ":" << i << std::endl;
- detail->set_output(i, buffer);
-
- // Update the block's max_output_buffer based on what was actually allocated.
- grblock->set_max_output_buffer(i, buffer->bufsize());
- }
-
- return detail;
-}
-
-gr_buffer_sptr
-gr_flat_flowgraph::allocate_buffer(gr_basic_block_sptr block, int port)
-{
- gr_block_sptr grblock = cast_to_block_sptr(block);
- if (!grblock)
- throw std::runtime_error("allocate_buffer found non-gr_block");
- int item_size = block->output_signature()->sizeof_stream_item(port);
-
- // *2 because we're now only filling them 1/2 way in order to
- // increase the available parallelism when using the TPB scheduler.
- // (We're double buffering, where we used to single buffer)
- int nitems = s_fixed_buffer_size * 2 / item_size;
-
- // Make sure there are at least twice the output_multiple no. of items
- if (nitems < 2*grblock->output_multiple()) // Note: this means output_multiple()
- nitems = 2*grblock->output_multiple(); // can't be changed by block dynamically
-
- // If any downstream blocks are decimators and/or have a large output_multiple,
- // ensure we have a buffer at least twice their decimation factor*output_multiple
- gr_basic_block_vector_t blocks = calc_downstream_blocks(block, port);
-
- // limit buffer size if indicated
- if(grblock->max_output_buffer(port) > 0) {
-// std::cout << "constraining output items to " << block->max_output_buffer(port) << "\n";
- nitems = std::min((long)nitems, (long)grblock->max_output_buffer(port));
- nitems -= nitems%grblock->output_multiple();
- if( nitems < 1 )
- throw std::runtime_error("problems allocating a buffer with the given max output buffer constraint!");
- }
- else if(grblock->min_output_buffer(port) > 0) {
- nitems = std::max((long)nitems, (long)grblock->min_output_buffer(port));
- nitems -= nitems%grblock->output_multiple();
- if( nitems < 1 )
- throw std::runtime_error("problems allocating a buffer with the given min output buffer constraint!");
- }
-
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- gr_block_sptr dgrblock = cast_to_block_sptr(*p);
- if (!dgrblock)
- throw std::runtime_error("allocate_buffer found non-gr_block");
-
- double decimation = (1.0/dgrblock->relative_rate());
- int multiple = dgrblock->output_multiple();
- int history = dgrblock->history();
- nitems = std::max(nitems, static_cast<int>(2*(decimation*multiple+history)));
- }
-
-// std::cout << "gr_make_buffer(" << nitems << ", " << item_size << ", " << grblock << "\n";
- return gr_make_buffer(nitems, item_size, grblock);
-}
-
-void
-gr_flat_flowgraph::connect_block_inputs(gr_basic_block_sptr block)
-{
- gr_block_sptr grblock = cast_to_block_sptr(block);
- if (!grblock)
- throw std::runtime_error("connect_block_inputs found non-gr_block");
-
- // Get its detail and edges that feed into it
- gr_block_detail_sptr detail = grblock->detail();
- gr_edge_vector_t in_edges = calc_upstream_edges(block);
-
- // For each edge that feeds into it
- for (gr_edge_viter_t e = in_edges.begin(); e != in_edges.end(); e++) {
- // Set the buffer reader on the destination port to the output
- // buffer on the source port
- int dst_port = e->dst().port();
- int src_port = e->src().port();
- gr_basic_block_sptr src_block = e->src().block();
- gr_block_sptr src_grblock = cast_to_block_sptr(src_block);
- if (!src_grblock)
- throw std::runtime_error("connect_block_inputs found non-gr_block");
- gr_buffer_sptr src_buffer = src_grblock->detail()->output(src_port);
-
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "Setting input " << dst_port << " from edge " << (*e) << std::endl;
-
- detail->set_input(dst_port, gr_buffer_add_reader(src_buffer, grblock->history()-1, grblock));
- }
-}
-
-void
-gr_flat_flowgraph::merge_connections(gr_flat_flowgraph_sptr old_ffg)
-{
- // Allocate block details if needed. Only new blocks that aren't pruned out
- // by flattening will need one; existing blocks still in the new flowgraph will
- // already have one.
- for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- gr_block_sptr block = cast_to_block_sptr(*p);
-
- if (!block->detail()) {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "merge: allocating new detail for block " << (*p) << std::endl;
- block->set_detail(allocate_block_detail(block));
- }
- else
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "merge: reusing original detail for block " << (*p) << std::endl;
- }
-
- // Calculate the old edges that will be going away, and clear the buffer readers
- // on the RHS.
- for (gr_edge_viter_t old_edge = old_ffg->d_edges.begin(); old_edge != old_ffg->d_edges.end(); old_edge++) {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "merge: testing old edge " << (*old_edge) << "...";
-
- gr_edge_viter_t new_edge;
- for (new_edge = d_edges.begin(); new_edge != d_edges.end(); new_edge++)
- if (new_edge->src() == old_edge->src() &&
- new_edge->dst() == old_edge->dst())
- break;
-
- if (new_edge == d_edges.end()) { // not found in new edge list
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "not in new edge list" << std::endl;
- // zero the buffer reader on RHS of old edge
- gr_block_sptr block(cast_to_block_sptr(old_edge->dst().block()));
- int port = old_edge->dst().port();
- block->detail()->set_input(port, gr_buffer_reader_sptr());
- }
- else {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "found in new edge list" << std::endl;
- }
- }
-
- // Now connect inputs to outputs, reusing old buffer readers if they exist
- for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- gr_block_sptr block = cast_to_block_sptr(*p);
-
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "merge: merging " << (*p) << "...";
-
- if (old_ffg->has_block_p(*p)) {
- // Block exists in old flow graph
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "used in old flow graph" << std::endl;
- gr_block_detail_sptr detail = block->detail();
-
- // Iterate through the inputs and see what needs to be done
- int ninputs = calc_used_ports(block, true).size(); // Might be different now
- for (int i = 0; i < ninputs; i++) {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "Checking input " << block << ":" << i << "...";
- gr_edge edge = calc_upstream_edge(*p, i);
-
- // Fish out old buffer reader and see if it matches correct buffer from edge list
- gr_block_sptr src_block = cast_to_block_sptr(edge.src().block());
- gr_block_detail_sptr src_detail = src_block->detail();
- gr_buffer_sptr src_buffer = src_detail->output(edge.src().port());
- gr_buffer_reader_sptr old_reader;
- if (i < detail->ninputs()) // Don't exceed what the original detail has
- old_reader = detail->input(i);
-
- // If there's a match, use it
- if (old_reader && (src_buffer == old_reader->buffer())) {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "matched, reusing" << std::endl;
- }
- else {
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "needs a new reader" << std::endl;
-
- // Create new buffer reader and assign
- detail->set_input(i, gr_buffer_add_reader(src_buffer, block->history()-1, block));
- }
- }
- }
- else {
- // Block is new, it just needs buffer readers at this point
- if (GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << "new block" << std::endl;
- connect_block_inputs(block);
-
- // Make sure all buffers are aligned
- setup_buffer_alignment(block);
- }
-
- // Now deal with the fact that the block details might have changed numbers of
- // inputs and outputs vs. in the old flowgraph.
- }
-}
-
-void
-gr_flat_flowgraph::setup_buffer_alignment(gr_block_sptr block)
-{
- const int alignment = volk_get_alignment();
- for(int i = 0; i < block->detail()->ninputs(); i++) {
- void *r = (void*)block->detail()->input(i)->read_pointer();
- unsigned long int ri = (unsigned long int)r % alignment;
- //std::cerr << "reader: " << r << " alignment: " << ri << std::endl;
- if(ri != 0) {
- size_t itemsize = block->detail()->input(i)->get_sizeof_item();
- block->detail()->input(i)->update_read_pointer(alignment-ri/itemsize);
- }
- block->set_unaligned(0);
- block->set_is_unaligned(false);
- }
-
- for(int i = 0; i < block->detail()->noutputs(); i++) {
- void *w = (void*)block->detail()->output(i)->write_pointer();
- unsigned long int wi = (unsigned long int)w % alignment;
- //std::cerr << "writer: " << w << " alignment: " << wi << std::endl;
- if(wi != 0) {
- size_t itemsize = block->detail()->output(i)->get_sizeof_item();
- block->detail()->output(i)->update_write_pointer(alignment-wi/itemsize);
- }
- block->set_unaligned(0);
- block->set_is_unaligned(false);
- }
-}
-
-std::string
-gr_flat_flowgraph::edge_list()
-{
- std::stringstream s;
- for(gr_edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
- s << (*e) << std::endl;
- return s.str();
-}
-
-void gr_flat_flowgraph::dump()
-{
- for (gr_edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
- std::cout << " edge: " << (*e) << std::endl;
-
- for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- std::cout << " block: " << (*p) << std::endl;
- gr_block_detail_sptr detail = cast_to_block_sptr(*p)->detail();
- std::cout << " detail @" << detail << ":" << std::endl;
-
- int ni = detail->ninputs();
- int no = detail->noutputs();
- for (int i = 0; i < no; i++) {
- gr_buffer_sptr buffer = detail->output(i);
- std::cout << " output " << i << ": " << buffer << std::endl;
- }
-
- for (int i = 0; i < ni; i++) {
- gr_buffer_reader_sptr reader = detail->input(i);
- std::cout << " reader " << i << ": " << reader
- << " reading from buffer=" << reader->buffer() << std::endl;
- }
- }
-
-}
-
-gr_block_vector_t
-gr_flat_flowgraph::make_block_vector(gr_basic_block_vector_t &blocks)
-{
- gr_block_vector_t result;
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- result.push_back(cast_to_block_sptr(*p));
- }
-
- return result;
-}
-
-
-void gr_flat_flowgraph::clear_endpoint(const gr_msg_endpoint &e, bool is_src){
- for(size_t i=0; i<d_msg_edges.size(); i++){
- if(is_src){
- if(d_msg_edges[i].src() == e){
- d_msg_edges.erase(d_msg_edges.begin() + i);
- i--;
- }
- } else {
- if(d_msg_edges[i].dst() == e){
- d_msg_edges.erase(d_msg_edges.begin() + i);
- i--;
- }
- }
- }
-}
-
-void gr_flat_flowgraph::replace_endpoint(const gr_msg_endpoint &e, const gr_msg_endpoint &r, bool is_src){
- size_t n_replr(0);
- if(GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << boost::format("gr_flat_flowgraph::replace_endpoint( %s, %s, %d )\n") % e.block()% r.block()% is_src;
- for(size_t i=0; i<d_msg_edges.size(); i++){
- if(is_src){
- if(d_msg_edges[i].src() == e){
- if(GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << boost::format("gr_flat_flowgraph::replace_endpoint() flattening to ( %s, %s )\n") % r.block()% d_msg_edges[i].dst().block();
- d_msg_edges.push_back( gr_msg_edge(r, d_msg_edges[i].dst() ) );
- n_replr++;
- }
- } else {
- if(d_msg_edges[i].dst() == e){
- if(GR_FLAT_FLOWGRAPH_DEBUG)
- std::cout << boost::format("gr_flat_flowgraph::replace_endpoint() flattening to ( %s, %s )\n") % r.block()% d_msg_edges[i].dst().block();
- d_msg_edges.push_back( gr_msg_edge(d_msg_edges[i].src(), r ) );
- n_replr++;
- }
- }
- }
-}
-
-void
-gr_flat_flowgraph::enable_pc_rpc()
-{
-#ifdef GR_PERFORMANCE_COUNTERS
- if(gr_prefs::singleton()->get_bool("PerfCounters", "on", false)) {
- gr_basic_block_viter_t p;
- for(p = d_blocks.begin(); p != d_blocks.end(); p++) {
- gr_block_sptr block = cast_to_block_sptr(*p);
- if(!block->is_pc_rpc_set())
- block->setup_pc_rpc();
- }
- }
-#endif /* GR_PERFORMANCE_COUNTERS */
-}
diff --git a/gnuradio-runtime/lib/gr_flat_flowgraph.h b/gnuradio-runtime/lib/gr_flat_flowgraph.h
deleted file mode 100644
index 9c47a77e23..0000000000
--- a/gnuradio-runtime/lib/gr_flat_flowgraph.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FLAT_FLOWGRAPH_H
-#define INCLUDED_GR_FLAT_FLOWGRAPH_H
-
-#include <gr_runtime_api.h>
-#include <gr_flowgraph.h>
-#include <gr_block.h>
-
-// Create a shared pointer to a heap allocated gr_flat_flowgraph
-// (types defined in gr_runtime_types.h)
-GR_RUNTIME_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
-
-/*!
- *\brief Class specializing gr_flat_flowgraph that has all nodes
- * as gr_blocks, with no hierarchy
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_flat_flowgraph : public gr_flowgraph
-{
-public:
- friend GR_RUNTIME_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
-
- // Destruct an arbitrary gr_flat_flowgraph
- ~gr_flat_flowgraph();
-
- // Wire gr_blocks together in new flat_flowgraph
- void setup_connections();
-
- // Merge applicable connections from existing flat flowgraph
- void merge_connections(gr_flat_flowgraph_sptr sfg);
-
- // Return a string list of edges
- std::string edge_list();
-
- void dump();
-
- /*!
- * Make a vector of gr_block from a vector of gr_basic_block
- */
- static gr_block_vector_t make_block_vector(gr_basic_block_vector_t &blocks);
-
- void replace_endpoint(const gr_msg_endpoint &e, const gr_msg_endpoint &r, bool is_src);
- void clear_endpoint(const gr_msg_endpoint &e, bool is_src);
-
- /*!
- * Enables export of perf. counters to ControlPort on all blocks in
- * the flowgraph.
- */
- void enable_pc_rpc();
-
-private:
- gr_flat_flowgraph();
-
- gr_block_detail_sptr allocate_block_detail(gr_basic_block_sptr block);
- gr_buffer_sptr allocate_buffer(gr_basic_block_sptr block, int port);
- void connect_block_inputs(gr_basic_block_sptr block);
-
- /* When reusing a flowgraph's blocks, this call makes sure all of the
- * buffer's are aligned at the machine's alignment boundary and tells
- * the blocks that they are aligned.
- *
- * Called from both setup_connections and merge_connections for
- * start and restarts.
- */
- void setup_buffer_alignment(gr_block_sptr block);
-};
-
-#endif /* INCLUDED_GR_FLAT_FLOWGRAPH_H */
diff --git a/gnuradio-runtime/lib/gr_flowgraph.cc b/gnuradio-runtime/lib/gr_flowgraph.cc
deleted file mode 100644
index 28cd693171..0000000000
--- a/gnuradio-runtime/lib/gr_flowgraph.cc
+++ /dev/null
@@ -1,514 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_flowgraph.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <sstream>
-#include <iterator>
-
-#define GR_FLOWGRAPH_DEBUG 0
-
-gr_edge::~gr_edge()
-{
-}
-
-gr_flowgraph_sptr gr_make_flowgraph()
-{
- return gr_flowgraph_sptr(new gr_flowgraph());
-}
-
-gr_flowgraph::gr_flowgraph()
-{
-}
-
-gr_flowgraph::~gr_flowgraph()
-{
-}
-
-template<class T>
-static
-std::vector<T>
-unique_vector(std::vector<T> v)
-{
- std::vector<T> result;
- std::insert_iterator<std::vector<T> > inserter(result, result.begin());
-
- sort(v.begin(), v.end());
- unique_copy(v.begin(), v.end(), inserter);
- return result;
-}
-
-void
-gr_flowgraph::connect(const gr_endpoint &src, const gr_endpoint &dst)
-{
- check_valid_port(src.block()->output_signature(), src.port());
- check_valid_port(dst.block()->input_signature(), dst.port());
- check_dst_not_used(dst);
- check_type_match(src, dst);
-
- // All ist klar, Herr Kommisar
- d_edges.push_back(gr_edge(src,dst));
-}
-
-void
-gr_flowgraph::disconnect(const gr_endpoint &src, const gr_endpoint &dst)
-{
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (src == p->src() && dst == p->dst()) {
- d_edges.erase(p);
- return;
- }
- }
-
- std::stringstream msg;
- msg << "cannot disconnect edge " << gr_edge(src, dst) << ", not found";
- throw std::invalid_argument(msg.str());
-}
-
-void
-gr_flowgraph::validate()
-{
- d_blocks = calc_used_blocks();
-
- for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- std::vector<int> used_ports;
- int ninputs, noutputs;
-
- if (GR_FLOWGRAPH_DEBUG)
- std::cout << "Validating block: " << (*p) << std::endl;
-
- used_ports = calc_used_ports(*p, true); // inputs
- ninputs = used_ports.size();
- check_contiguity(*p, used_ports, true); // inputs
-
- used_ports = calc_used_ports(*p, false); // outputs
- noutputs = used_ports.size();
- check_contiguity(*p, used_ports, false); // outputs
-
- if (!((*p)->check_topology(ninputs, noutputs))) {
- std::stringstream msg;
- msg << "check topology failed on " << (*p)
- << " using ninputs=" << ninputs
- << ", noutputs=" << noutputs;
- throw std::runtime_error(msg.str());
- }
- }
-}
-
-void
-gr_flowgraph::clear()
-{
- // Boost shared pointers will deallocate as needed
- d_blocks.clear();
- d_edges.clear();
-}
-
-void
-gr_flowgraph::check_valid_port(gr_io_signature_sptr sig, int port)
-{
- std::stringstream msg;
-
- if (port < 0) {
- msg << "negative port number " << port << " is invalid";
- throw std::invalid_argument(msg.str());
- }
-
- int max = sig->max_streams();
- if (max != gr_io_signature::IO_INFINITE && port >= max) {
- msg << "port number " << port << " exceeds max of ";
- if (max == 0)
- msg << "(none)";
- else
- msg << max-1;
- throw std::invalid_argument(msg.str());
- }
-}
-
-void
-gr_flowgraph::check_valid_port(const gr_msg_endpoint &e)
-{
- if (GR_FLOWGRAPH_DEBUG)
- std::cout << "check_valid_port( " << e.block() << ", " << e.port() << ")\n";
-
- if(!e.block()->has_msg_port(e.port()))
- throw std::invalid_argument("invalid msg port in connect() or disconnect()");
-}
-
-void
-gr_flowgraph::check_dst_not_used(const gr_endpoint &dst)
-{
- // A destination is in use if it is already on the edge list
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if (p->dst() == dst) {
- std::stringstream msg;
- msg << "destination already in use by edge " << (*p);
- throw std::invalid_argument(msg.str());
- }
-}
-
-void
-gr_flowgraph::check_type_match(const gr_endpoint &src, const gr_endpoint &dst)
-{
- int src_size = src.block()->output_signature()->sizeof_stream_item(src.port());
- int dst_size = dst.block()->input_signature()->sizeof_stream_item(dst.port());
-
- if (src_size != dst_size) {
- std::stringstream msg;
- msg << "itemsize mismatch: " << src << " using " << src_size
- << ", " << dst << " using " << dst_size;
- throw std::invalid_argument(msg.str());
- }
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::calc_used_blocks()
-{
- gr_basic_block_vector_t tmp;
-
- // make sure free standing message blocks are included
- for (gr_msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
-// for now only blocks receiving messages get a thread context - uncomment to allow senders to also obtain one
-// tmp.push_back(p->src().block());
- tmp.push_back(p->dst().block());
- }
-
- // Collect all blocks in the edge list
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- tmp.push_back(p->src().block());
- tmp.push_back(p->dst().block());
- }
-
- return unique_vector<gr_basic_block_sptr>(tmp);
-}
-
-std::vector<int>
-gr_flowgraph::calc_used_ports(gr_basic_block_sptr block, bool check_inputs)
-{
- std::vector<int> tmp;
-
- // Collect all seen ports
- gr_edge_vector_t edges = calc_connections(block, check_inputs);
- for (gr_edge_viter_t p = edges.begin(); p != edges.end(); p++) {
- if (check_inputs == true)
- tmp.push_back(p->dst().port());
- else
- tmp.push_back(p->src().port());
- }
-
- return unique_vector<int>(tmp);
-}
-
-gr_edge_vector_t
-gr_flowgraph::calc_connections(gr_basic_block_sptr block, bool check_inputs)
-{
- gr_edge_vector_t result;
-
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (check_inputs) {
- if (p->dst().block() == block)
- result.push_back(*p);
- }
- else {
- if (p->src().block() == block)
- result.push_back(*p);
- }
- }
-
- return result; // assumes no duplicates
-}
-
-void
-gr_flowgraph::check_contiguity(gr_basic_block_sptr block,
- const std::vector<int> &used_ports,
- bool check_inputs)
-{
- std::stringstream msg;
-
- gr_io_signature_sptr sig =
- check_inputs ? block->input_signature() : block->output_signature();
-
- int nports = used_ports.size();
- int min_ports = sig->min_streams();
- int max_ports = sig->max_streams();
-
- if (nports == 0 && min_ports == 0)
- return;
-
- if (nports < min_ports) {
- msg << block << ": insufficient connected "
- << (check_inputs ? "input ports " : "output ports ")
- << "(" << min_ports << " needed, " << nports << " connected)";
- throw std::runtime_error(msg.str());
- }
-
- if (nports > max_ports && max_ports != gr_io_signature::IO_INFINITE) {
- msg << block << ": too many connected "
- << (check_inputs ? "input ports " : "output ports ")
- << "(" << max_ports << " allowed, " << nports << " connected)";
- throw std::runtime_error(msg.str());
- }
-
- if (used_ports[nports-1]+1 != nports) {
- for (int i = 0; i < nports; i++) {
- if (used_ports[i] != i) {
- msg << block << ": missing connection "
- << (check_inputs ? "to input port " : "from output port ")
- << i;
- throw std::runtime_error(msg.str());
- }
- }
- }
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::calc_downstream_blocks(gr_basic_block_sptr block, int port)
-{
- gr_basic_block_vector_t tmp;
-
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if (p->src() == gr_endpoint(block, port))
- tmp.push_back(p->dst().block());
-
- return unique_vector<gr_basic_block_sptr>(tmp);
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::calc_downstream_blocks(gr_basic_block_sptr block)
-{
- gr_basic_block_vector_t tmp;
-
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if (p->src().block() == block)
- tmp.push_back(p->dst().block());
-
- return unique_vector<gr_basic_block_sptr>(tmp);
-}
-
-gr_edge_vector_t
-gr_flowgraph::calc_upstream_edges(gr_basic_block_sptr block)
-{
- gr_edge_vector_t result;
-
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if (p->dst().block() == block)
- result.push_back(*p);
-
- return result; // Assume no duplicates
-}
-
-bool
-gr_flowgraph::has_block_p(gr_basic_block_sptr block)
-{
- gr_basic_block_viter_t result;
- result = std::find(d_blocks.begin(), d_blocks.end(), block);
- return (result != d_blocks.end());
-}
-
-gr_edge
-gr_flowgraph::calc_upstream_edge(gr_basic_block_sptr block, int port)
-{
- gr_edge result;
-
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (p->dst() == gr_endpoint(block, port)) {
- result = (*p);
- break;
- }
- }
-
- return result;
-}
-
-std::vector<gr_basic_block_vector_t>
-gr_flowgraph::partition()
-{
- std::vector<gr_basic_block_vector_t> result;
- gr_basic_block_vector_t blocks = calc_used_blocks();
- gr_basic_block_vector_t graph;
-
- while (blocks.size() > 0) {
- graph = calc_reachable_blocks(blocks[0], blocks);
- assert(graph.size());
- result.push_back(topological_sort(graph));
-
- for (gr_basic_block_viter_t p = graph.begin(); p != graph.end(); p++)
- blocks.erase(find(blocks.begin(), blocks.end(), *p));
- }
-
- return result;
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::calc_reachable_blocks(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks)
-{
- gr_basic_block_vector_t result;
-
- // Mark all blocks as unvisited
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
- (*p)->set_color(gr_basic_block::WHITE);
-
- // Recursively mark all reachable blocks
- reachable_dfs_visit(block, blocks);
-
- // Collect all the blocks that have been visited
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
- if ((*p)->color() == gr_basic_block::BLACK)
- result.push_back(*p);
-
- return result;
-}
-
-// Recursively mark all reachable blocks from given block and block list
-void
-gr_flowgraph::reachable_dfs_visit(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks)
-{
- // Mark the current one as visited
- block->set_color(gr_basic_block::BLACK);
-
- // Recurse into adjacent vertices
- gr_basic_block_vector_t adjacent = calc_adjacent_blocks(block, blocks);
-
- for (gr_basic_block_viter_t p = adjacent.begin(); p != adjacent.end(); p++)
- if ((*p)->color() == gr_basic_block::WHITE)
- reachable_dfs_visit(*p, blocks);
-}
-
-// Return a list of block adjacent to a given block along any edge
-gr_basic_block_vector_t
-gr_flowgraph::calc_adjacent_blocks(gr_basic_block_sptr block, gr_basic_block_vector_t &blocks)
-{
- gr_basic_block_vector_t tmp;
-
- // Find any blocks that are inputs or outputs
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (p->src().block() == block)
- tmp.push_back(p->dst().block());
- if (p->dst().block() == block)
- tmp.push_back(p->src().block());
- }
-
- return unique_vector<gr_basic_block_sptr>(tmp);
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::topological_sort(gr_basic_block_vector_t &blocks)
-{
- gr_basic_block_vector_t tmp;
- gr_basic_block_vector_t result;
- tmp = sort_sources_first(blocks);
-
- // Start 'em all white
- for (gr_basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++)
- (*p)->set_color(gr_basic_block::WHITE);
-
- for (gr_basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) {
- if ((*p)->color() == gr_basic_block::WHITE)
- topological_dfs_visit(*p, result);
- }
-
- reverse(result.begin(), result.end());
- return result;
-}
-
-gr_basic_block_vector_t
-gr_flowgraph::sort_sources_first(gr_basic_block_vector_t &blocks)
-{
- gr_basic_block_vector_t sources, nonsources, result;
-
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- if (source_p(*p))
- sources.push_back(*p);
- else
- nonsources.push_back(*p);
- }
-
- for (gr_basic_block_viter_t p = sources.begin(); p != sources.end(); p++)
- result.push_back(*p);
-
- for (gr_basic_block_viter_t p = nonsources.begin(); p != nonsources.end(); p++)
- result.push_back(*p);
-
- return result;
-}
-
-bool
-gr_flowgraph::source_p(gr_basic_block_sptr block)
-{
- return (calc_upstream_edges(block).size() == 0);
-}
-
-void
-gr_flowgraph::topological_dfs_visit(gr_basic_block_sptr block, gr_basic_block_vector_t &output)
-{
- block->set_color(gr_basic_block::GREY);
- gr_basic_block_vector_t blocks(calc_downstream_blocks(block));
-
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- switch ((*p)->color()) {
- case gr_basic_block::WHITE:
- topological_dfs_visit(*p, output);
- break;
-
- case gr_basic_block::GREY:
- throw std::runtime_error("flow graph has loops!");
-
- case gr_basic_block::BLACK:
- continue;
-
- default:
- throw std::runtime_error("invalid color on block!");
- }
- }
-
- block->set_color(gr_basic_block::BLACK);
- output.push_back(block);
-}
-
-void gr_flowgraph::connect(const gr_msg_endpoint &src, const gr_msg_endpoint &dst){
- check_valid_port(src);
- check_valid_port(dst);
- for (gr_msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
- if(p->src() == src && p->dst() == dst){
- throw std::runtime_error("connect called on already connected edge!");
- }
- }
- d_msg_edges.push_back(gr_msg_edge(src,dst));
-}
-
-void gr_flowgraph::disconnect(const gr_msg_endpoint &src, const gr_msg_endpoint &dst){
- check_valid_port(src);
- check_valid_port(dst);
- for (gr_msg_edge_viter_t p = d_msg_edges.begin(); p != d_msg_edges.end(); p++) {
- if(p->src() == src && p->dst() == dst){
- d_msg_edges.erase(p);
- return;
- }
- }
- throw std::runtime_error("disconnect called on non-connected edge!");
-}
-
-
diff --git a/gnuradio-runtime/lib/gr_fxpt.cc b/gnuradio-runtime/lib/gr_fxpt.cc
deleted file mode 100644
index 2ea8520e6b..0000000000
--- a/gnuradio-runtime/lib/gr_fxpt.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_fxpt.h>
-
-const float gr_fxpt::s_sine_table[1 << NBITS][2] = {
-#include "sine_table.h"
-};
-
-const float gr_fxpt::PI = 3.14159265358979323846;
-const float gr_fxpt::TWO_TO_THE_31 = 2147483648.0;
-
diff --git a/gnuradio-runtime/lib/gr_hier_block2.cc b/gnuradio-runtime/lib/gr_hier_block2.cc
deleted file mode 100644
index 9e924fdaf5..0000000000
--- a/gnuradio-runtime/lib/gr_hier_block2.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_hier_block2.h>
-#include <gr_io_signature.h>
-#include <gr_hier_block2_detail.h>
-#include <iostream>
-
-#define GR_HIER_BLOCK2_DEBUG 0
-
-
-gr_hier_block2_sptr
-gr_make_hier_block2(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
-{
- return gnuradio::get_initial_sptr(new gr_hier_block2(name, input_signature, output_signature));
-}
-
-gr_hier_block2::gr_hier_block2(const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
- : gr_basic_block(name, input_signature, output_signature),
- d_detail(new gr_hier_block2_detail(this)),
- hier_message_ports_in(pmt::PMT_NIL),
- hier_message_ports_out(pmt::PMT_NIL)
-{
- // This bit of magic ensures that self() works in the constructors of derived classes.
- gnuradio::detail::sptr_magic::create_and_stash_initial_sptr(this);
-}
-
-gr_hier_block2::~gr_hier_block2()
-{
- delete d_detail;
-}
-
-gr_hier_block2::opaque_self
-gr_hier_block2::self()
-{
- return shared_from_this();
-}
-
-gr_hier_block2_sptr
-gr_hier_block2::to_hier_block2()
-{
- return cast_to_hier_block2_sptr(shared_from_this());
-}
-
-void
-gr_hier_block2::connect(gr_basic_block_sptr block)
-{
- d_detail->connect(block);
-}
-
-void
-gr_hier_block2::connect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
-{
- d_detail->connect(src, src_port, dst, dst_port);
-}
-
-void
-gr_hier_block2::msg_connect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
-{
- if(!pmt::is_symbol(srcport)){throw std::runtime_error("bad port id"); }
- d_detail->msg_connect(src, srcport, dst, dstport);
-}
-
-void
-gr_hier_block2::msg_connect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport)
-{
- d_detail->msg_connect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
-}
-
-void
-gr_hier_block2::msg_disconnect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
-{
- if(!pmt::is_symbol(srcport)){throw std::runtime_error("bad port id"); }
- d_detail->msg_disconnect(src, srcport, dst, dstport);
-}
-
-void
-gr_hier_block2::msg_disconnect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport)
-{
- d_detail->msg_disconnect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
-}
-
-void
-gr_hier_block2::disconnect(gr_basic_block_sptr block)
-{
- d_detail->disconnect(block);
-}
-
-void
-gr_hier_block2::disconnect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
-{
- d_detail->disconnect(src, src_port, dst, dst_port);
-}
-
-void
-gr_hier_block2::disconnect_all()
-{
- d_detail->disconnect_all();
-}
-
-void
-gr_hier_block2::lock()
-{
- d_detail->lock();
-}
-
-void
-gr_hier_block2::unlock()
-{
- d_detail->unlock();
-}
-
-
-gr_flat_flowgraph_sptr
-gr_hier_block2::flatten() const
-{
- gr_flat_flowgraph_sptr new_ffg = gr_make_flat_flowgraph();
- d_detail->flatten_aux(new_ffg);
- return new_ffg;
-}
diff --git a/gnuradio-runtime/lib/gr_hier_block2_detail.cc b/gnuradio-runtime/lib/gr_hier_block2_detail.cc
deleted file mode 100644
index c8564f6698..0000000000
--- a/gnuradio-runtime/lib/gr_hier_block2_detail.cc
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * Copyright 2006,2007,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_hier_block2_detail.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <stdexcept>
-#include <sstream>
-#include <boost/format.hpp>
-
-#define GR_HIER_BLOCK2_DETAIL_DEBUG 0
-
-gr_hier_block2_detail::gr_hier_block2_detail(gr_hier_block2 *owner) :
- d_owner(owner),
- d_parent_detail(0),
- d_fg(gr_make_flowgraph())
-{
- int min_inputs = owner->input_signature()->min_streams();
- int max_inputs = owner->input_signature()->max_streams();
- int min_outputs = owner->output_signature()->min_streams();
- int max_outputs = owner->output_signature()->max_streams();
-
- if (max_inputs == gr_io_signature::IO_INFINITE ||
- max_outputs == gr_io_signature::IO_INFINITE ||
- (min_inputs != max_inputs) ||(min_outputs != max_outputs) ) {
- std::stringstream msg;
- msg << "Hierarchical blocks do not yet support arbitrary or"
- << " variable numbers of inputs or outputs (" << d_owner->name() << ")";
- throw std::runtime_error(msg.str());
- }
-
- d_inputs = std::vector<gr_endpoint_vector_t>(max_inputs);
- d_outputs = gr_endpoint_vector_t(max_outputs);
-}
-
-
-gr_hier_block2_detail::~gr_hier_block2_detail()
-{
- d_owner = 0; // Don't use delete, we didn't allocate
-}
-
-void
-gr_hier_block2_detail::connect(gr_basic_block_sptr block)
-{
- std::stringstream msg;
-
- // Check if duplicate
- if (std::find(d_blocks.begin(), d_blocks.end(), block) != d_blocks.end()) {
- msg << "Block " << block << " already connected.";
- throw std::invalid_argument(msg.str());
- }
-
- // Check if has inputs or outputs
- if (block->input_signature()->max_streams() != 0 ||
- block->output_signature()->max_streams() != 0) {
- msg << "Block " << block << " must not have any input or output ports";
- throw std::invalid_argument(msg.str());
- }
-
- gr_hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
-
- if (hblock && hblock.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: block is hierarchical, setting parent to " << this << std::endl;
- hblock->d_detail->d_parent_detail = this;
- }
-
- d_blocks.push_back(block);
-}
-
-void
-gr_hier_block2_detail::connect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
-{
- std::stringstream msg;
-
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connecting: " << gr_endpoint(src, src_port)
- << " -> " << gr_endpoint(dst, dst_port) << std::endl;
-
- if (src.get() == dst.get())
- throw std::invalid_argument("connect: src and destination blocks cannot be the same");
-
- gr_hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
- gr_hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
-
- if (src_block && src.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: src is hierarchical, setting parent to " << this << std::endl;
- src_block->d_detail->d_parent_detail = this;
- }
-
- if (dst_block && dst.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: dst is hierarchical, setting parent to " << this << std::endl;
- dst_block->d_detail->d_parent_detail = this;
- }
-
- // Connections to block inputs or outputs
- int max_port;
- if (src.get() == d_owner) {
- max_port = src->input_signature()->max_streams();
- if ((max_port != -1 && (src_port >= max_port)) || src_port < 0) {
- msg << "source port " << src_port << " out of range for " << src;
- throw std::invalid_argument(msg.str());
- }
-
- return connect_input(src_port, dst_port, dst);
- }
-
- if (dst.get() == d_owner) {
- max_port = dst->output_signature()->max_streams();
- if ((max_port != -1 && (dst_port >= max_port)) || dst_port < 0) {
- msg << "destination port " << dst_port << " out of range for " << dst;
- throw std::invalid_argument(msg.str());
- }
-
- return connect_output(dst_port, src_port, src);
- }
-
- // Internal connections
- d_fg->connect(src, src_port, dst, dst_port);
-
- // TODO: connects to NC
-}
-
-void
-gr_hier_block2_detail::msg_connect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connecting message port..." << std::endl;
-
- // register the subscription
-// this is done later...
-// src->message_port_sub(srcport, pmt::cons(dst->alias_pmt(), dstport));
-
- // add block uniquely to list to internal blocks
- if (std::find(d_blocks.begin(), d_blocks.end(), dst) == d_blocks.end()){
- d_blocks.push_back(src);
- d_blocks.push_back(dst);
- }
-
- bool hier_out = (d_owner == src.get()) && src->message_port_is_hier_out(srcport);;
- bool hier_in = (d_owner == dst.get()) && dst->message_port_is_hier_in(dstport);
-
- gr_hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
- gr_hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
-
- if (src_block && src.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: src is hierarchical, setting parent to " << this << std::endl;
- src_block->d_detail->d_parent_detail = this;
- }
-
- if (dst_block && dst.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: dst is hierarchical, setting parent to " << this << std::endl;
- dst_block->d_detail->d_parent_detail = this;
- }
-
- // add edge for this message connection
- if(GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format("connect( (%s, %s, %d), (%s, %s, %d) )\n") %
- src % srcport % hier_out %
- dst % dstport % hier_in;
- d_fg->connect( gr_msg_endpoint(src, srcport, hier_out), gr_msg_endpoint(dst, dstport, hier_in));
-}
-
-void
-gr_hier_block2_detail::msg_disconnect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnecting message port..." << std::endl;
-
- // unregister the subscription - if already subscribed
- src->message_port_unsub(srcport, pmt::cons(dst->alias_pmt(), dstport));
-
- // remove edge for this message connection
- bool hier_out = (d_owner == src.get()) && src->message_port_is_hier_out(srcport);;
- bool hier_in = (d_owner == dst.get()) && dst->message_port_is_hier_in(dstport);
- d_fg->disconnect( gr_msg_endpoint(src, srcport, hier_out), gr_msg_endpoint(dst, dstport, hier_in));
-}
-
-void
-gr_hier_block2_detail::disconnect(gr_basic_block_sptr block)
-{
- // Check on singleton list
- for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- if (*p == block) {
- d_blocks.erase(p);
-
- gr_hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
- if (block && block.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: block is hierarchical, clearing parent" << std::endl;
- hblock->d_detail->d_parent_detail = 0;
- }
-
- return;
- }
- }
-
- // Otherwise find all edges containing block
- gr_edge_vector_t edges, tmp = d_fg->edges();
- gr_edge_vector_t::iterator p;
- for (p = tmp.begin(); p != tmp.end(); p++) {
- if ((*p).src().block() == block || (*p).dst().block() == block) {
- edges.push_back(*p);
-
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: block found in edge " << (*p) << std::endl;
- }
- }
-
- if (edges.size() == 0) {
- std::stringstream msg;
- msg << "cannot disconnect block " << block << ", not found";
- throw std::invalid_argument(msg.str());
- }
-
- for (p = edges.begin(); p != edges.end(); p++) {
- disconnect((*p).src().block(), (*p).src().port(),
- (*p).dst().block(), (*p).dst().port());
- }
-}
-
-void
-gr_hier_block2_detail::disconnect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnecting: " << gr_endpoint(src, src_port)
- << " -> " << gr_endpoint(dst, dst_port) << std::endl;
-
- if (src.get() == dst.get())
- throw std::invalid_argument("disconnect: source and destination blocks cannot be the same");
-
- gr_hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
- gr_hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
-
- if (src_block && src.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: src is hierarchical, clearing parent" << std::endl;
- src_block->d_detail->d_parent_detail = 0;
- }
-
- if (dst_block && dst.get() != d_owner) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: dst is hierarchical, clearing parent" << std::endl;
- dst_block->d_detail->d_parent_detail = 0;
- }
-
- if (src.get() == d_owner)
- return disconnect_input(src_port, dst_port, dst);
-
- if (dst.get() == d_owner)
- return disconnect_output(dst_port, src_port, src);
-
- // Internal connections
- d_fg->disconnect(src, src_port, dst, dst_port);
-}
-
-void
-gr_hier_block2_detail::connect_input(int my_port, int port, gr_basic_block_sptr block)
-{
- std::stringstream msg;
-
- if (my_port < 0 || my_port >= (signed)d_inputs.size()) {
- msg << "input port " << my_port << " out of range for " << block;
- throw std::invalid_argument(msg.str());
- }
-
- gr_endpoint_vector_t &endps = d_inputs[my_port];
- gr_endpoint endp(block, port);
-
- gr_endpoint_viter_t p = std::find(endps.begin(), endps.end(), endp);
- if (p != endps.end()) {
- msg << "external input port " << my_port << " already wired to " << endp;
- throw std::invalid_argument(msg.str());
- }
-
- endps.push_back(endp);
-}
-
-void
-gr_hier_block2_detail::connect_output(int my_port, int port, gr_basic_block_sptr block)
-{
- std::stringstream msg;
-
- if (my_port < 0 || my_port >= (signed)d_outputs.size()) {
- msg << "output port " << my_port << " out of range for " << block;
- throw std::invalid_argument(msg.str());
- }
-
- if (d_outputs[my_port].block()) {
- msg << "external output port " << my_port << " already connected from "
- << d_outputs[my_port];
- throw std::invalid_argument(msg.str());
- }
-
- d_outputs[my_port] = gr_endpoint(block, port);
-}
-
-void
-gr_hier_block2_detail::disconnect_input(int my_port, int port, gr_basic_block_sptr block)
-{
- std::stringstream msg;
-
- if (my_port < 0 || my_port >= (signed)d_inputs.size()) {
- msg << "input port number " << my_port << " out of range for " << block;
- throw std::invalid_argument(msg.str());
- }
-
- gr_endpoint_vector_t &endps = d_inputs[my_port];
- gr_endpoint endp(block, port);
-
- gr_endpoint_viter_t p = std::find(endps.begin(), endps.end(), endp);
- if (p == endps.end()) {
- msg << "external input port " << my_port << " not connected to " << endp;
- throw std::invalid_argument(msg.str());
- }
-
- endps.erase(p);
-}
-
-void
-gr_hier_block2_detail::disconnect_output(int my_port, int port, gr_basic_block_sptr block)
-{
- std::stringstream msg;
-
- if (my_port < 0 || my_port >= (signed)d_outputs.size()) {
- msg << "output port number " << my_port << " out of range for " << block;
- throw std::invalid_argument(msg.str());
- }
-
- if (d_outputs[my_port].block() != block) {
- msg << "block " << block << " not assigned to output "
- << my_port << ", can't disconnect";
- throw std::invalid_argument(msg.str());
- }
-
- d_outputs[my_port] = gr_endpoint();
-}
-
-gr_endpoint_vector_t
-gr_hier_block2_detail::resolve_port(int port, bool is_input)
-{
- std::stringstream msg;
-
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Resolving port " << port << " as an "
- << (is_input ? "input" : "output")
- << " of " << d_owner->name() << std::endl;
-
- gr_endpoint_vector_t result;
-
- if (is_input) {
- if (port < 0 || port >= (signed)d_inputs.size()) {
- msg << "resolve_port: hierarchical block '" << d_owner->name()
- << "': input " << port << " is out of range";
- throw std::runtime_error(msg.str());
- }
-
- if (d_inputs[port].empty()) {
- msg << "resolve_port: hierarchical block '" << d_owner->name()
- << "': input " << port << " is not connected internally";
- throw std::runtime_error(msg.str());
- }
-
- gr_endpoint_vector_t &endps = d_inputs[port];
- gr_endpoint_viter_t p;
- for (p = endps.begin(); p != endps.end(); p++) {
- gr_endpoint_vector_t tmp = resolve_endpoint(*p, true);
- std::copy(tmp.begin(), tmp.end(), back_inserter(result));
- }
- }
- else {
- if (port < 0 || port >= (signed)d_outputs.size()) {
- msg << "resolve_port: hierarchical block '" << d_owner->name()
- << "': output " << port << " is out of range";
- throw std::runtime_error(msg.str());
- }
-
- if (d_outputs[port] == gr_endpoint()) {
- msg << "resolve_port: hierarchical block '" << d_owner->name()
- << "': output " << port << " is not connected internally";
- throw std::runtime_error(msg.str());
- }
-
- result = resolve_endpoint(d_outputs[port], false);
- }
-
- if (result.empty()) {
- msg << "resolve_port: hierarchical block '" << d_owner->name()
- << "': unable to resolve "
- << (is_input ? "input port " : "output port ")
- << port;
- throw std::runtime_error(msg.str());
- }
-
- return result;
-}
-
-void
-gr_hier_block2_detail::disconnect_all()
-{
- d_fg->clear();
- d_blocks.clear();
- d_inputs.clear();
- d_outputs.clear();
-}
-
-gr_endpoint_vector_t
-gr_hier_block2_detail::resolve_endpoint(const gr_endpoint &endp, bool is_input) const
-{
- std::stringstream msg;
- gr_endpoint_vector_t result;
-
- // Check if endpoint is a leaf node
- if (cast_to_block_sptr(endp.block())) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block " << endp.block() << " is a leaf node, returning." << std::endl;
- result.push_back(endp);
- return result;
- }
-
- // Check if endpoint is a hierarchical block
- gr_hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(endp.block()));
- if (hier_block2) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Resolving endpoint " << endp << " as an "
- << (is_input ? "input" : "output")
- << ", recursing" << std::endl;
- return hier_block2->d_detail->resolve_port(endp.port(), is_input);
- }
-
- msg << "unable to resolve" << (is_input ? " input " : " output ")
- << "endpoint " << endp;
- throw std::runtime_error(msg.str());
-}
-
-void
-gr_hier_block2_detail::flatten_aux(gr_flat_flowgraph_sptr sfg) const
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << " ** Flattening " << d_owner->name() << std::endl;
-
- // Add my edges to the flow graph, resolving references to actual endpoints
- gr_edge_vector_t edges = d_fg->edges();
- gr_msg_edge_vector_t msg_edges = d_fg->msg_edges();
- gr_edge_viter_t p;
- gr_msg_edge_viter_t q,u;
-
- // Only run setup_rpc if ControlPort config param is enabled.
- bool ctrlport_on = gr_prefs::singleton()->get_bool("ControlPort", "on", false);
-
- // For every block (gr_block and gr_hier_block2), set up the RPC
- // interface.
- for(p = edges.begin(); p != edges.end(); p++) {
- gr_basic_block_sptr b;
- b = p->src().block();
-
- if(ctrlport_on) {
- if(!b->is_rpc_set()) {
- b->setup_rpc();
- b->rpc_set();
- }
- }
-
- b = p->dst().block();
- if(ctrlport_on) {
- if(!b->is_rpc_set()) {
- b->setup_rpc();
- b->rpc_set();
- }
- }
- }
-
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening stream connections: " << std::endl;
-
- for (p = edges.begin(); p != edges.end(); p++) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening edge " << (*p) << std::endl;
-
- gr_endpoint_vector_t src_endps = resolve_endpoint(p->src(), false);
- gr_endpoint_vector_t dst_endps = resolve_endpoint(p->dst(), true);
-
- gr_endpoint_viter_t s, d;
- for (s = src_endps.begin(); s != src_endps.end(); s++) {
- for (d = dst_endps.begin(); d != dst_endps.end(); d++) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << (*s) << "->" << (*d) << std::endl;
- sfg->connect(*s, *d);
- }
- }
- }
-
- // loop through flattening hierarchical connections
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening msg connections: " << std::endl;
-
-
- std::vector<std::pair<gr_msg_endpoint, bool> > resolved_endpoints;
- for(q = msg_edges.begin(); q != msg_edges.end(); q++) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format(" flattening edge ( %s, %s, %d) -> ( %s, %s, %d)\n") % q->src().block() % q->src().port() % q->src().is_hier() % q->dst().block() % q->dst().port() % q->dst().is_hier();
-
- bool normal_connection = true;
-
- // resolve existing connections to hier ports
- if(q->dst().is_hier()){
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format(" resolve hier output (%s, %s)") % q->dst().block() % q->dst().port() << std::endl;
- sfg->replace_endpoint( q->dst(), q->src(), true );
- resolved_endpoints.push_back(std::pair<gr_msg_endpoint, bool>(q->dst(),true));
- normal_connection = false;
- }
-
- if(q->src().is_hier()){
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format(" resolve hier input (%s, %s)") % q->src().block() % q->src().port() << std::endl;
- sfg->replace_endpoint( q->src(), q->dst(), false );
- resolved_endpoints.push_back(std::pair<gr_msg_endpoint, bool>(q->src(),false));
- normal_connection = false;
- }
-
- // propogate non hier connections through
- if(normal_connection){
- sfg->connect( q->src(), q->dst() );
- }
- }
- for(std::vector<std::pair<gr_msg_endpoint, bool> >::iterator it = resolved_endpoints.begin(); it != resolved_endpoints.end(); it++){
- sfg->clear_endpoint( (*it).first, (*it).second );
- }
-
-/* // connect primitive edges in the new fg
- for(q = msg_edges.begin(); q != msg_edges.end(); q++) {
- if( (!q->src().is_hier()) && (!q->dst().is_hier()) ){
- sfg->connect( q->src(), q->dst() );
- } else {
- std::cout << "not connecting hier connection!" << std::endl;
- }
- }*/
-
- // Construct unique list of blocks used either in edges, inputs,
- // outputs, or by themselves. I still hate STL.
- gr_basic_block_vector_t blocks; // unique list of used blocks
- gr_basic_block_vector_t tmp = d_fg->calc_used_blocks();
-
- // First add the list of singleton blocks
- std::vector<gr_basic_block_sptr>::const_iterator b; // Because flatten_aux is const
- for (b = d_blocks.begin(); b != d_blocks.end(); b++)
- tmp.push_back(*b);
-
- // Now add the list of connected input blocks
- std::stringstream msg;
- for (unsigned int i = 0; i < d_inputs.size(); i++) {
- if (d_inputs[i].size() == 0) {
- msg << "In hierarchical block " << d_owner->name() << ", input " << i
- << " is not connected internally";
- throw std::runtime_error(msg.str());
- }
-
- for (unsigned int j = 0; j < d_inputs[i].size(); j++)
- tmp.push_back(d_inputs[i][j].block());
- }
-
- for (unsigned int i = 0; i < d_outputs.size(); i++) {
- gr_basic_block_sptr blk = d_outputs[i].block();
- if (!blk) {
- msg << "In hierarchical block " << d_owner->name() << ", output " << i
- << " is not connected internally";
- throw std::runtime_error(msg.str());
- }
- tmp.push_back(blk);
- }
- sort(tmp.begin(), tmp.end());
-
- std::insert_iterator<gr_basic_block_vector_t> inserter(blocks, blocks.begin());
- unique_copy(tmp.begin(), tmp.end(), inserter);
-
- // Recurse hierarchical children
- for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- gr_hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(*p));
- if (hier_block2 && (hier_block2.get() != d_owner)) {
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "flatten_aux: recursing into hierarchical block " << hier_block2 << std::endl;
- hier_block2->d_detail->flatten_aux(sfg);
- }
- }
-}
-
-void
-gr_hier_block2_detail::lock()
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "lock: entered in " << this << std::endl;
-
- if (d_parent_detail)
- d_parent_detail->lock();
- else
- d_owner->lock();
-}
-
-void
-gr_hier_block2_detail::unlock()
-{
- if (GR_HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "unlock: entered in " << this << std::endl;
-
- if (d_parent_detail)
- d_parent_detail->unlock();
- else
- d_owner->unlock();
-}
-
diff --git a/gnuradio-runtime/lib/gr_hier_block2_detail.h b/gnuradio-runtime/lib/gr_hier_block2_detail.h
deleted file mode 100644
index d08fe20ac0..0000000000
--- a/gnuradio-runtime/lib/gr_hier_block2_detail.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_HIER_BLOCK2_DETAIL_H
-#define INCLUDED_GR_HIER_BLOCK2_DETAIL_H
-
-#include <gr_runtime_api.h>
-#include <gr_hier_block2.h>
-#include <gr_flat_flowgraph.h>
-#include <boost/utility.hpp>
-
-/*!
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_hier_block2_detail : boost::noncopyable
-{
-public:
- gr_hier_block2_detail(gr_hier_block2 *owner);
- ~gr_hier_block2_detail();
-
- void connect(gr_basic_block_sptr block);
- void connect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port);
- void msg_connect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport);
- void msg_disconnect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport);
- void disconnect(gr_basic_block_sptr block);
- void disconnect(gr_basic_block_sptr, int src_port,
- gr_basic_block_sptr, int dst_port);
- void disconnect_all();
- void lock();
- void unlock();
- void flatten_aux(gr_flat_flowgraph_sptr sfg) const;
-
-private:
-
- // Private implementation data
- gr_hier_block2 *d_owner;
- gr_hier_block2_detail *d_parent_detail;
- gr_flowgraph_sptr d_fg;
- std::vector<gr_endpoint_vector_t> d_inputs; // Multiple internal endpoints per external input
- gr_endpoint_vector_t d_outputs; // Single internal endpoint per external output
- gr_basic_block_vector_t d_blocks;
-
-
- void connect_input(int my_port, int port, gr_basic_block_sptr block);
- void connect_output(int my_port, int port, gr_basic_block_sptr block);
- void disconnect_input(int my_port, int port, gr_basic_block_sptr block);
- void disconnect_output(int my_port, int port, gr_basic_block_sptr block);
-
- gr_endpoint_vector_t resolve_port(int port, bool is_input);
- gr_endpoint_vector_t resolve_endpoint(const gr_endpoint &endp, bool is_input) const;
-};
-
-#endif /* INCLUDED_GR_HIER_BLOCK2_DETAIL_H */
diff --git a/gnuradio-runtime/lib/gr_io_signature.cc b/gnuradio-runtime/lib/gr_io_signature.cc
deleted file mode 100644
index 6ac9acd17d..0000000000
--- a/gnuradio-runtime/lib/gr_io_signature.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <iostream>
-
-gr_io_signature_sptr
-gr_make_io_signaturev(int min_streams, int max_streams,
- const std::vector<int> &sizeof_stream_items)
-{
- return gr_io_signature_sptr (new gr_io_signature (min_streams, max_streams,
- sizeof_stream_items));
-}
-
-gr_io_signature_sptr
-gr_make_io_signature(int min_streams, int max_streams,
- int sizeof_stream_item)
-{
- std::vector<int> sizeof_items(1);
- sizeof_items[0] = sizeof_stream_item;
- return gr_make_io_signaturev(min_streams, max_streams, sizeof_items);
-}
-
-gr_io_signature_sptr
-gr_make_io_signature2(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2)
-{
- std::vector<int> sizeof_items(2);
- sizeof_items[0] = sizeof_stream_item1;
- sizeof_items[1] = sizeof_stream_item2;
- return gr_make_io_signaturev(min_streams, max_streams, sizeof_items);
-}
-
-gr_io_signature_sptr
-gr_make_io_signature3(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2,
- int sizeof_stream_item3)
-{
- std::vector<int> sizeof_items(3);
- sizeof_items[0] = sizeof_stream_item1;
- sizeof_items[1] = sizeof_stream_item2;
- sizeof_items[2] = sizeof_stream_item3;
- return gr_make_io_signaturev(min_streams, max_streams, sizeof_items);
-}
-
-// ------------------------------------------------------------------------
-
-
-gr_io_signature::gr_io_signature (int min_streams, int max_streams,
- const std::vector<int> &sizeof_stream_items)
-{
- if (min_streams < 0
- || (max_streams != IO_INFINITE && max_streams < min_streams))
- throw std::invalid_argument ("gr_io_signature(1)");
-
- if (sizeof_stream_items.size() < 1)
- throw std::invalid_argument("gr_io_signature(2)");
-
- for (size_t i = 0; i < sizeof_stream_items.size(); i++){
- if (max_streams != 0 && sizeof_stream_items[i] < 1)
- throw std::invalid_argument("gr_io_signature(3)");
- }
-
- d_min_streams = min_streams;
- d_max_streams = max_streams;
- d_sizeof_stream_item = sizeof_stream_items;
-}
-
-gr_io_signature::~gr_io_signature ()
-{
-}
-
-int
-gr_io_signature::sizeof_stream_item (int _index) const
-{
- if (_index < 0)
- throw std::invalid_argument ("gr_io_signature::sizeof_stream_item");
-
- size_t index = _index;
- return d_sizeof_stream_item[std::min(index, d_sizeof_stream_item.size() - 1)];
-}
-
-std::vector<int>
-gr_io_signature::sizeof_stream_items() const
-{
- return d_sizeof_stream_item;
-}
diff --git a/gnuradio-runtime/lib/gr_local_sighandler.cc b/gnuradio-runtime/lib/gr_local_sighandler.cc
deleted file mode 100644
index fb31742e13..0000000000
--- a/gnuradio-runtime/lib/gr_local_sighandler.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_local_sighandler.h>
-#include <stdexcept>
-#include <stdio.h>
-#include <string.h>
-
-
-gr_local_sighandler::gr_local_sighandler (int signum,
- void (*new_handler)(int))
- : d_signum (signum)
-{
-#ifdef HAVE_SIGACTION
- struct sigaction new_action;
- memset (&new_action, 0, sizeof (new_action));
-
- new_action.sa_handler = new_handler;
- sigemptyset (&new_action.sa_mask);
- new_action.sa_flags = 0;
-
- if (sigaction (d_signum, &new_action, &d_old_action) < 0){
- perror ("sigaction (install new)");
- throw std::runtime_error ("sigaction");
- }
-#endif
-}
-
-gr_local_sighandler::~gr_local_sighandler ()
-{
-#ifdef HAVE_SIGACTION
- if (sigaction (d_signum, &d_old_action, 0) < 0){
- perror ("sigaction (restore old)");
- throw std::runtime_error ("sigaction");
- }
-#endif
-}
-
-void
-gr_local_sighandler::throw_signal (int signum)
-{
- throw gr_signal (signum);
-}
-
-/*
- * Semi-hideous way to may a signal number into a signal name
- */
-
-#define SIGNAME(x) case x: return #x
-
-std::string
-gr_signal::name () const
-{
- char tmp[128];
-
- switch (signal ()){
-#ifdef SIGHUP
- SIGNAME (SIGHUP);
-#endif
-#ifdef SIGINT
- SIGNAME (SIGINT);
-#endif
-#ifdef SIGQUIT
- SIGNAME (SIGQUIT);
-#endif
-#ifdef SIGILL
- SIGNAME (SIGILL);
-#endif
-#ifdef SIGTRAP
- SIGNAME (SIGTRAP);
-#endif
-#ifdef SIGABRT
- SIGNAME (SIGABRT);
-#endif
-#ifdef SIGBUS
- SIGNAME (SIGBUS);
-#endif
-#ifdef SIGFPE
- SIGNAME (SIGFPE);
-#endif
-#ifdef SIGKILL
- SIGNAME (SIGKILL);
-#endif
-#ifdef SIGUSR1
- SIGNAME (SIGUSR1);
-#endif
-#ifdef SIGSEGV
- SIGNAME (SIGSEGV);
-#endif
-#ifdef SIGUSR2
- SIGNAME (SIGUSR2);
-#endif
-#ifdef SIGPIPE
- SIGNAME (SIGPIPE);
-#endif
-#ifdef SIGALRM
- SIGNAME (SIGALRM);
-#endif
-#ifdef SIGTERM
- SIGNAME (SIGTERM);
-#endif
-#ifdef SIGSTKFLT
- SIGNAME (SIGSTKFLT);
-#endif
-#ifdef SIGCHLD
- SIGNAME (SIGCHLD);
-#endif
-#ifdef SIGCONT
- SIGNAME (SIGCONT);
-#endif
-#ifdef SIGSTOP
- SIGNAME (SIGSTOP);
-#endif
-#ifdef SIGTSTP
- SIGNAME (SIGTSTP);
-#endif
-#ifdef SIGTTIN
- SIGNAME (SIGTTIN);
-#endif
-#ifdef SIGTTOU
- SIGNAME (SIGTTOU);
-#endif
-#ifdef SIGURG
- SIGNAME (SIGURG);
-#endif
-#ifdef SIGXCPU
- SIGNAME (SIGXCPU);
-#endif
-#ifdef SIGXFSZ
- SIGNAME (SIGXFSZ);
-#endif
-#ifdef SIGVTALRM
- SIGNAME (SIGVTALRM);
-#endif
-#ifdef SIGPROF
- SIGNAME (SIGPROF);
-#endif
-#ifdef SIGWINCH
- SIGNAME (SIGWINCH);
-#endif
-#ifdef SIGIO
- SIGNAME (SIGIO);
-#endif
-#ifdef SIGPWR
- SIGNAME (SIGPWR);
-#endif
-#ifdef SIGSYS
- SIGNAME (SIGSYS);
-#endif
- default:
-#if defined (HAVE_SNPRINTF)
-#if defined (SIGRTMIN) && defined (SIGRTMAX)
- if (signal () >= SIGRTMIN && signal () <= SIGRTMAX){
- snprintf (tmp, sizeof (tmp), "SIGRTMIN + %d", signal ());
- return tmp;
- }
-#endif
- snprintf (tmp, sizeof (tmp), "SIGNAL %d", signal ());
- return tmp;
-#else
- return "Unknown signal";
-#endif
- }
-}
diff --git a/gnuradio-runtime/lib/gr_local_sighandler.h b/gnuradio-runtime/lib/gr_local_sighandler.h
deleted file mode 100644
index a49ee031ca..0000000000
--- a/gnuradio-runtime/lib/gr_local_sighandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_LOCAL_SIGHANDLER_H
-#define INCLUDED_GR_LOCAL_SIGHANDLER_H
-
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#include <gr_runtime_api.h>
-#include <string>
-
-/*!
- * \brief Get and set signal handler.
- *
- * \ingroup internal
- * Constructor installs new handler, destructor reinstalls
- * original value.
- */
-class GR_RUNTIME_API gr_local_sighandler {
- int d_signum;
-#ifdef HAVE_SIGACTION
- struct sigaction d_old_action;
-#endif
-public:
- gr_local_sighandler (int signum, void (*new_handler)(int));
- ~gr_local_sighandler ();
-
- /* throw gr_signal (signum) */
- static void throw_signal (int signum);
-};
-
-/*!
- * \brief Representation of signal.
- */
-class GR_RUNTIME_API gr_signal
-{
- int d_signum;
-public:
- gr_signal (int signum) : d_signum (signum) {}
- int signal () const { return d_signum; }
- std::string name () const;
-};
-
-#endif /* INCLUDED_GR_LOCAL_SIGHANDLER_H */
diff --git a/gnuradio-runtime/lib/gr_logger.cc b/gnuradio-runtime/lib/gr_logger.cc
deleted file mode 100644
index 6da4a6d914..0000000000
--- a/gnuradio-runtime/lib/gr_logger.cc
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*******************************************************************************
-* Author: Mark Plett
-* Description:
-* The gr_log module wraps the log4cpp library for logging in gnuradio.
-*******************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_logger.h>
-#include <stdexcept>
-#include <algorithm>
-
-#ifdef ENABLE_GR_LOG
-#ifdef HAVE_LOG4CPP
-
-/**************************** BEGIN LOG4CPP HELPERS ***************************/
-/* Logger config class. This is a singleton that controls how log4cpp is configured
- * If watch_period>0 a thread is started to watch teh config file for changes.
- */
-
-// Getters of logger_config
-logger_config&
-logger_config::get_instance(void){
- static logger_config instance;
- return instance;
-};
-
-std::string
-logger_config::get_filename(){
- logger_config& in=get_instance();
- return in.filename;
-};
-
-unsigned int
-logger_config::get_watch_period(){
- logger_config& in=get_instance();
- return in.watch_period;
-};
-
-// Method to watch config file for changes
-void logger_config::watch_file(std::string filename,unsigned int watch_period){
- std::time_t last_write(boost::filesystem::last_write_time(filename));
- std::time_t current_time(0);
- while(true){
- try{
- current_time = boost::filesystem::last_write_time(filename);
- if(current_time>last_write){
- std::cout<<"GNURadio Reloading logger configuration:"<<filename<<std::endl;
- last_write = current_time;
-// Should we wipe out all old configuration or just add the new? Just adding...
-// logger_reset_config();
- logger_load_config(filename);
- };
- boost::this_thread::sleep(boost::posix_time::time_duration(0,0,watch_period,0));
- }
- catch(const boost::thread_interrupted&){
- std::cout<<"GNURadio leaving logger config file watch."<<std::endl;
- break;
- };
- };
-};
-
-// Method to load the confifuration. It only loads if the filename or watch has changed
-void logger_config::load_config(std::string filename,unsigned int watch_period){
- logger_config& instance = get_instance();
-// Only reconfigure if filename or watch has changed
- if(instance.filename!=filename || watch_period!=instance.watch_period){
- instance.filename = filename;
- instance.watch_period = watch_period;
-// Stop any file watching thread
- if(instance.watch_thread!=NULL) stop_watch();
-// Load configuration
- std::cout<<"GNURadio Loading logger configuration:"<<instance.filename<<std::endl;
- logger_load_config(instance.filename);
-// Start watch if required
- if(instance.watch_period>0){
- instance.watch_thread = new boost::thread(watch_file,instance.filename,instance.watch_period);
- }
- };
-};
-
-// Method to stop the watcher thread
-void logger_config::stop_watch(){
- logger_config& instance = get_instance();
- if(instance.watch_thread){
- instance.watch_thread->interrupt();
- instance.watch_thread->join();
- delete(instance.watch_thread);
- instance.watch_thread=NULL;
- };
-};
-
-// Method to reset logger configuration
-void
-logger_config::reset_config(void){
- logger_config& instance = get_instance();
- stop_watch();
- std::vector<log4cpp::Category*> *loggers = log4cpp::Category::getCurrentCategories();
- std::vector<log4cpp::Category*>::iterator logger = loggers->begin();
-// We can't destroy categories but we can neuter them by removing all appenders.
- for (;logger!=loggers->end();logger++){
- (*logger)->removeAllAppenders();
- };
- instance.filename=std::string("");
- instance.watch_period=0;
-}
-
-/***************** Functions to call log4cpp methods *************************/
-
-gr_logger_ptr
-logger_get_logger(std::string name)
-{
- if(log4cpp::Category::exists(name)){
- gr_logger_ptr logger = &log4cpp::Category::getInstance(name);
- return logger;
- }
- else
- {
- gr_logger_ptr logger = &log4cpp::Category::getInstance(name);
- logger->setPriority(log4cpp::Priority::NOTSET);
- return logger;
- };
-};
-
-void
-logger_load_config(const std::string &config_filename)
-{
- if(config_filename.size() != 0) {
- try
- {
- log4cpp::PropertyConfigurator::configure(config_filename);
- }
- catch( log4cpp::ConfigureFailure &e )
- {
- std::cout << "Logger config failed :" << e.what() << std::endl;
- }
- };
-}
-
-void
-logger_set_level(gr_logger_ptr logger, const std::string &level)
-{
- std::string nocase = level;
- std::transform(level.begin(), level.end(), nocase.begin(), ::tolower);
-
- if(nocase == "off" || nocase == "notset")
- logger_set_level(logger, log4cpp::Priority::NOTSET);
- else if(nocase == "all" || nocase == "debug")
- logger_set_level(logger, log4cpp::Priority::DEBUG);
- else if(nocase == "info")
- logger_set_level(logger, log4cpp::Priority::INFO);
- else if(nocase == "notice")
- logger_set_level(logger, log4cpp::Priority::NOTICE);
- else if(nocase == "warn")
- logger_set_level(logger, log4cpp::Priority::WARN);
- else if(nocase == "error")
- logger_set_level(logger, log4cpp::Priority::ERROR);
- else if(nocase == "crit")
- logger_set_level(logger, log4cpp::Priority::CRIT);
- else if(nocase == "alert")
- logger_set_level(logger, log4cpp::Priority::ALERT);
- else if(nocase=="fatal")
- logger_set_level(logger, log4cpp::Priority::FATAL);
- else if(nocase == "emerg")
- logger_set_level(logger, log4cpp::Priority::EMERG);
- else
- throw std::runtime_error("logger_set_level: Bad level type.\n");
-}
-
-void
-logger_set_level(gr_logger_ptr logger, log4cpp::Priority::Value level)
-{
- logger->setPriority(level);
-}
-
-void
-logger_get_level(gr_logger_ptr logger, std::string &level)
-{
- log4cpp::Priority::Value levelPtr = logger->getPriority();
- if(levelPtr == log4cpp::Priority::NOTSET) level = "noset";
- if(levelPtr == log4cpp::Priority::DEBUG) level = "debug";
- if(levelPtr == log4cpp::Priority::INFO) level = "info";
- if(levelPtr == log4cpp::Priority::NOTICE) level = "notice";
- if(levelPtr == log4cpp::Priority::WARN) level = "warn";
- if(levelPtr == log4cpp::Priority::ERROR) level = "error";
- if(levelPtr == log4cpp::Priority::CRIT) level = "crit";
- if(levelPtr == log4cpp::Priority::ALERT) level = "alert";
- if(levelPtr == log4cpp::Priority::FATAL) level = "fatal";
- if(levelPtr == log4cpp::Priority::EMERG) level = "emerg";
-};
-
-void
-logger_get_level(gr_logger_ptr logger,log4cpp::Priority::Value level)
-{
- level = logger->getPriority();
-}
-
-void
-logger_add_console_appender(gr_logger_ptr logger,std::string target,std::string pattern)
-{
-
- log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
- log4cpp::Appender* app;
- if(target=="stdout")
- app = new log4cpp::OstreamAppender("ConsoleAppender::",&std::cout);
- else
- app = new log4cpp::OstreamAppender("ConsoleAppender::",&std::cerr);
-
- layout->setConversionPattern(pattern);
- app->setLayout(layout);
- logger->setAppender(app);
-
-}
-
-void
-logger_add_file_appender(gr_logger_ptr logger,std::string filename,bool append,std::string pattern)
-{
-
- log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
- log4cpp::Appender* app = new
- log4cpp::FileAppender("FileAppender::"+filename,
- filename);
- layout->setConversionPattern(pattern);
- app->setLayout(layout);
- logger->setAppender(app);
-
-}
-
-void
-logger_add_rollingfile_appender(gr_logger_ptr logger,std::string filename,
- size_t filesize,int bkup_index,bool append,mode_t mode,std::string pattern)
-{
- log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
- log4cpp::Appender* app = new
- log4cpp::RollingFileAppender("RollFileAppender::"+filename,filename,filesize,bkup_index,append,mode);
- layout->setConversionPattern(pattern);
- app->setLayout(layout);
- logger->setAppender(app);
-}
-
-std::vector<std::string>
-logger_get_logger_names(void){
- std::vector<std::string> names;
- std::vector<log4cpp::Category*> *loggers = log4cpp::Category::getCurrentCategories();
- std::vector<log4cpp::Category*>::iterator logger = loggers->begin();
-
- for (;logger!=loggers->end();logger++){
- names.push_back((*logger)->getName());
- };
- return names;
-
-}
-
-#endif /* HAVE_LOG4CPP */
-
-/****** Start Methods to provide Python the capabilities of the macros ********/
-void gr_logger_config(const std::string config_filename, unsigned int watch_period){
- GR_CONFIG_AND_WATCH_LOGGER(config_filename,watch_period);
-};
-std::vector<std::string> gr_logger_get_logger_names(void){
- std::vector<std::string> names;
- GR_GET_LOGGER_NAMES(names);
- return names;
-};
-void gr_logger_reset_config(void){
- GR_RESET_CONFIGURATION();
-};
-
-// Remaining capability provided by gr_logger class in gr_logger.h
-
-#endif /* ENABLE_GR_LOGGER */
diff --git a/gnuradio-runtime/lib/gr_message.cc b/gnuradio-runtime/lib/gr_message.cc
deleted file mode 100644
index a99dcd7653..0000000000
--- a/gnuradio-runtime/lib/gr_message.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_message.h>
-#include <assert.h>
-#include <string.h>
-
-static long s_ncurrently_allocated = 0;
-
-gr_message_sptr
-gr_make_message (long type, double arg1, double arg2, size_t length)
-{
- return gr_message_sptr (new gr_message (type, arg1, arg2, length));
-}
-
-gr_message_sptr
-gr_make_message_from_string(const std::string s, long type, double arg1, double arg2)
-{
- gr_message_sptr m = gr_make_message(type, arg1, arg2, s.size());
- memcpy(m->msg(), s.data(), s.size());
- return m;
-}
-
-
-gr_message::gr_message (long type, double arg1, double arg2, size_t length)
- : d_type(type), d_arg1(arg1), d_arg2(arg2)
-{
- if (length == 0)
- d_buf_start = d_msg_start = d_msg_end = d_buf_end = 0;
- else {
- d_buf_start = new unsigned char [length];
- d_msg_start = d_buf_start;
- d_msg_end = d_buf_end = d_buf_start + length;
- }
- s_ncurrently_allocated++;
-}
-
-gr_message::~gr_message ()
-{
- assert (d_next == 0);
- delete [] d_buf_start;
- d_msg_start = d_msg_end = d_buf_end = 0;
- s_ncurrently_allocated--;
-}
-
-std::string
-gr_message::to_string() const
-{
- return std::string((char *)d_msg_start, length());
-}
-
-long
-gr_message_ncurrently_allocated ()
-{
- return s_ncurrently_allocated;
-}
diff --git a/gnuradio-runtime/lib/gr_misc.cc b/gnuradio-runtime/lib/gr_misc.cc
deleted file mode 100644
index 1ed2a03d7f..0000000000
--- a/gnuradio-runtime/lib/gr_misc.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_misc.h>
-
-unsigned int
-gr_rounduppow2(unsigned int n)
-{
- int i;
- for (i=0;((n-1)>>i) != 0;i++)
- ;
- return 1<<i;
-}
-
-// ----------------------------------------------------------------
-
-void
-gr_zero_vector(std::vector<float> &v)
-{
- for(unsigned int i=0; i < v.size(); i++)
- v[i] = 0;
-}
-
-void
-gr_zero_vector(std::vector<double> &v)
-{
- for(unsigned int i=0; i < v.size(); i++)
- v[i] = 0;
-}
-
-void
-gr_zero_vector(std::vector<int> &v)
-{
- for(unsigned int i=0; i < v.size(); i++)
- v[i] = 0;
-}
-
-void
-gr_zero_vector(std::vector<gr_complex> &v)
-{
- for(unsigned int i=0; i < v.size(); i++)
- v[i] = 0;
-}
diff --git a/gnuradio-runtime/lib/gr_misc.h b/gnuradio-runtime/lib/gr_misc.h
deleted file mode 100644
index 182ae87de6..0000000000
--- a/gnuradio-runtime/lib/gr_misc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MISC_H
-#define INCLUDED_GR_MISC_H
-
-#include <gr_runtime_api.h>
-#include <gr_types.h>
-
-GR_RUNTIME_API unsigned int
-gr_rounduppow2(unsigned int n);
-
-// FIXME should be template
-GR_RUNTIME_API void gr_zero_vector(std::vector<float> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<double> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<int> &v);
-GR_RUNTIME_API void gr_zero_vector(std::vector<gr_complex> &v);
-
-
-#endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-runtime/lib/gr_msg_accepter.cc b/gnuradio-runtime/lib/gr_msg_accepter.cc
deleted file mode 100644
index 93d5fb20e8..0000000000
--- a/gnuradio-runtime/lib/gr_msg_accepter.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_msg_accepter.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <gr_hier_block2.h>
-#include <stdexcept>
-
-using namespace pmt;
-
-gr_msg_accepter::gr_msg_accepter()
-{
-}
-
-gr_msg_accepter::~gr_msg_accepter()
-{
- // NOP, required as virtual destructor
-}
-
-void
-gr_msg_accepter::post(pmt_t which_port, pmt_t msg)
-{
- // Notify derived class, handled case by case
- gr_block *p = dynamic_cast<gr_block *>(this);
- if (p) {
- p->_post(which_port,msg);
- return;
- }
- gr_hier_block2 *p2 = dynamic_cast<gr_hier_block2 *>(this);
- if (p2){
- // FIXME do the right thing
- return;
- }
-
- throw std::runtime_error("unknown derived class");
-}
diff --git a/gnuradio-runtime/lib/gr_msg_handler.cc b/gnuradio-runtime/lib/gr_msg_handler.cc
deleted file mode 100644
index 0f93497088..0000000000
--- a/gnuradio-runtime/lib/gr_msg_handler.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_msg_handler.h>
-
-gr_msg_handler::~gr_msg_handler ()
-{
-}
diff --git a/gnuradio-runtime/lib/gr_msg_queue.cc b/gnuradio-runtime/lib/gr_msg_queue.cc
deleted file mode 100644
index 03bbe046a4..0000000000
--- a/gnuradio-runtime/lib/gr_msg_queue.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_msg_queue.h>
-#include <stdexcept>
-
-gr_msg_queue_sptr
-gr_make_msg_queue(unsigned int limit)
-{
- return gr_msg_queue_sptr (new gr_msg_queue(limit));
-}
-
-gr_msg_queue::gr_msg_queue(unsigned int limit)
- : d_not_empty(), d_not_full(),
- /*d_head(0), d_tail(0),*/ d_count(0), d_limit(limit)
-{
-}
-
-gr_msg_queue::~gr_msg_queue()
-{
- flush ();
-}
-
-void
-gr_msg_queue::insert_tail(gr_message_sptr msg)
-{
- if (msg->d_next)
- throw std::invalid_argument("gr_msg_queue::insert_tail: msg already in queue");
-
- gr::thread::scoped_lock guard(d_mutex);
-
- while (full_p())
- d_not_full.wait(guard);
-
- if (d_tail == 0){
- d_tail = d_head = msg;
- //msg->d_next = 0;
- msg->d_next.reset();
- }
- else {
- d_tail->d_next = msg;
- d_tail = msg;
- //msg->d_next = 0;
- msg->d_next.reset();
- }
- d_count++;
- d_not_empty.notify_one();
-}
-
-gr_message_sptr
-gr_msg_queue::delete_head()
-{
- gr::thread::scoped_lock guard(d_mutex);
- gr_message_sptr m;
-
- while ((m = d_head) == 0)
- d_not_empty.wait(guard);
-
- d_head = m->d_next;
- if (d_head == 0){
- //d_tail = 0;
- d_tail.reset();
- }
-
- d_count--;
- // m->d_next = 0;
- m->d_next.reset();
- d_not_full.notify_one();
- return m;
-}
-
-gr_message_sptr
-gr_msg_queue::delete_head_nowait()
-{
- gr::thread::scoped_lock guard(d_mutex);
- gr_message_sptr m;
-
- if ((m = d_head) == 0){
- //return 0;
- return gr_message_sptr();
- }
-
- d_head = m->d_next;
- if (d_head == 0){
- //d_tail = 0;
- d_tail.reset();
- }
-
- d_count--;
- //m->d_next = 0;
- m->d_next.reset();
- d_not_full.notify_one();
- return m;
-}
-
-void
-gr_msg_queue::flush()
-{
- gr_message_sptr m;
-
- while ((m = delete_head_nowait ()) != 0)
- ;
-}
diff --git a/gnuradio-runtime/lib/gr_pagesize.cc b/gnuradio-runtime/lib/gr_pagesize.cc
deleted file mode 100644
index e31e05ca70..0000000000
--- a/gnuradio-runtime/lib/gr_pagesize.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_pagesize.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#if defined(_WIN32) && defined(HAVE_GETPAGESIZE)
-extern "C" size_t getpagesize(void);
-#endif
-
-int
-gr_pagesize ()
-{
- static int s_pagesize = -1;
-
- if (s_pagesize == -1){
-#if defined(HAVE_GETPAGESIZE)
- s_pagesize = getpagesize ();
-#elif defined (HAVE_SYSCONF)
- s_pagesize = sysconf (_SC_PAGESIZE);
- if (s_pagesize == -1){
- perror ("_SC_PAGESIZE");
- s_pagesize = 4096;
- }
-#else
- fprintf (stderr, "gr_pagesize: no info; setting pagesize = 4096\n");
- s_pagesize = 4096;
-#endif
- }
- return s_pagesize;
-}
-
diff --git a/gnuradio-runtime/lib/gr_pagesize.h b/gnuradio-runtime/lib/gr_pagesize.h
deleted file mode 100644
index d14cb22b1b..0000000000
--- a/gnuradio-runtime/lib/gr_pagesize.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _GR_PAGESIZE_H_
-#define _GR_PAGESIZE_H_
-
-#include <gr_runtime_api.h>
-
-/*!
- * \brief return the page size in bytes
- */
-
-GR_RUNTIME_API int gr_pagesize ();
-
-
-#endif /* _GR_PAGESIZE_H_ */
\ No newline at end of file
diff --git a/gnuradio-runtime/lib/gr_preferences.cc b/gnuradio-runtime/lib/gr_preferences.cc
deleted file mode 100644
index a0f5616603..0000000000
--- a/gnuradio-runtime/lib/gr_preferences.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2010,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_preferences.h>
-#include <gr_sys_paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-namespace fs = boost::filesystem;
-
-/*
- * The simplest thing that could possibly work:
- * the key is the filename; the value is the file contents.
- */
-
-static const char *
-pathname (const char *key)
-{
- static fs::path path;
- path = fs::path(gr_appdata_path()) / ".gnuradio" / "prefs" / key;
- return path.string().c_str();
-}
-
-static void
-ensure_dir_path ()
-{
- fs::path path = fs::path(gr_appdata_path()) / ".gnuradio";
- if (!fs::is_directory(path)) fs::create_directory(path);
-
- path = path / "prefs";
- if (!fs::is_directory(path)) fs::create_directory(path);
-}
-
-const char *
-gr_preferences::get (const char *key)
-{
- static char buf[1024];
-
- FILE *fp = fopen (pathname (key), "r");
- if (fp == 0) {
- perror (pathname (key));
- return 0;
- }
-
- memset (buf, 0, sizeof (buf));
- size_t ret = fread (buf, 1, sizeof (buf) - 1, fp);
- if(ret == 0) {
- if(ferror(fp) != 0) {
- perror (pathname (key));
- fclose (fp);
- return 0;
- }
- }
- fclose (fp);
- return buf;
-}
-
-void
-gr_preferences::set (const char *key, const char *value)
-{
- ensure_dir_path ();
-
- FILE *fp = fopen (pathname (key), "w");
- if (fp == 0){
- perror (pathname (key));
- return;
- }
-
- size_t ret = fwrite (value, 1, strlen (value), fp);
- if(ret == 0) {
- if(ferror(fp) != 0) {
- perror (pathname (key));
- fclose (fp);
- return;
- }
- }
- fclose (fp);
-};
diff --git a/gnuradio-runtime/lib/gr_prefs.cc b/gnuradio-runtime/lib/gr_prefs.cc
deleted file mode 100644
index 8a79c3335f..0000000000
--- a/gnuradio-runtime/lib/gr_prefs.cc
+++ /dev/null
@@ -1,391 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_prefs.h>
-#include <gr_sys_paths.h>
-#include <gr_constants.h>
-#include <algorithm>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
-namespace fs = boost::filesystem;
-
-/*
- * Stub implementations
- */
-
-static gr_prefs s_default_singleton;
-static gr_prefs *s_singleton = &s_default_singleton;
-
-gr_prefs *
-gr_prefs::singleton()
-{
- return s_singleton;
-}
-
-void
-gr_prefs::set_singleton(gr_prefs *p)
-{
- s_singleton = p;
-}
-
-gr_prefs::gr_prefs()
-{
- _read_files();
-}
-
-gr_prefs::~gr_prefs()
-{
- // nop
-}
-
-std::vector<std::string>
-gr_prefs::_sys_prefs_filenames()
-{
- std::vector<std::string> fnames;
-
- fs::path dir = gr_prefsdir();
- if(!fs::is_directory(dir))
- return fnames;
-
- fs::directory_iterator diritr(dir);
- while(diritr != fs::directory_iterator()) {
- fs::path p = *diritr++;
- if(p.extension() != ".swp")
- fnames.push_back(p.string());
- }
- std::sort(fnames.begin(), fnames.end());
-
- // Find if there is a ~/.gnuradio/config.conf file and add this to
- // the end of the file list to override any preferences in the
- // installed path config files.
- fs::path homedir = fs::path(gr_appdata_path());
- homedir = homedir/".gnuradio/config.conf";
- if(fs::exists(homedir)) {
- fnames.push_back(homedir.string());
- }
-
- return fnames;
-}
-
-void
-gr_prefs::_read_files()
-{
- std::string config;
-
- std::vector<std::string> filenames = _sys_prefs_filenames();
- std::vector<std::string>::iterator sitr;
- char tmp[1024];
- for(sitr = filenames.begin(); sitr != filenames.end(); sitr++) {
- fs::ifstream fin(*sitr);
- while(!fin.eof()) {
- fin.getline(tmp, 1024);
- std::string t(tmp);
- // ignore empty lines or lines of just comments
- if((t.size() > 0) && (t[0] != '#')) {
- // remove any comments in the line
- size_t hash = t.find("#");
-
- // Use hash marks at the end of each segment as a delimiter
- config += t.substr(0, hash) + '#';
- }
- }
- fin.close();
- }
-
- // Remove all whitespace.
- config.erase(std::remove_if(config.begin(), config.end(), ::isspace), config.end());
-
- // Convert the string into a map
- _convert_to_map(config);
-}
-
-void
-gr_prefs::_convert_to_map(const std::string &conf)
-{
- // Convert the string into an map of maps
- // Map is structured as {section name: map of options}
- // And options map is simply: {option name: option value}
- std::string sub = conf;
- size_t sec_start = sub.find("[");
- while(sec_start != std::string::npos) {
- sub = sub.substr(sec_start);
-
- size_t sec_end = sub.find("]");
- if(sec_end == std::string::npos)
- throw std::runtime_error("Config file error: Mismatched section label.\n");
-
- std::string sec = sub.substr(1, sec_end-1);
- size_t next_sec_start = sub.find("[", sec_end);
- std::string subsec = sub.substr(sec_end+1, next_sec_start-sec_end-2);
-
- std::transform(sec.begin(), sec.end(), sec.begin(), ::tolower);
-
- std::map<std::string, std::string> options_map = d_config_map[sec];
- size_t next_opt = 0;
- size_t next_val = 0;
- next_opt = subsec.find("#");
- while(next_opt < subsec.size()-1) {
- next_val = subsec.find("=", next_opt);
- std::string option = subsec.substr(next_opt+1, next_val-next_opt-1);
-
- next_opt = subsec.find("#", next_val);
- std::string value = subsec.substr(next_val+1, next_opt-next_val-1);
-
- std::transform(option.begin(), option.end(), option.begin(), ::tolower);
- options_map[option] = value;
- }
-
- d_config_map[sec] = options_map;
-
- sec_start = sub.find("[", sec_end);
- }
-}
-
-std::string
-gr_prefs::to_string()
-{
- gr_config_map_itr sections;
- gr_config_map_elem_itr options;
- std::stringstream s;
-
- for(sections = d_config_map.begin(); sections != d_config_map.end(); sections++) {
- s << "[" << sections->first << "]" << std::endl;
- for(options = sections->second.begin(); options != sections->second.end(); options++) {
- s << options->first << " = " << options->second << std::endl;
- }
- s << std::endl;
- }
-
- return s.str();
-}
-
-void
-gr_prefs::save()
-{
- std::string conf = to_string();
-
- fs::path homedir = fs::path(gr_appdata_path());
- homedir = homedir/".gnuradio/config.conf";
- fs::ofstream fout(homedir);
- fout << conf;
- fout.close();
-}
-
-char *
-gr_prefs::option_to_env(std::string section, std::string option)
-{
- std::stringstream envname;
- std::string secname=section, optname=option;
-
- std::transform(section.begin(), section.end(), secname.begin(), ::toupper);
- std::transform(option.begin(), option.end(), optname.begin(), ::toupper);
- envname << "GR_CONF_" << secname << "_" << optname;
-
- return getenv(envname.str().c_str());
-}
-
-bool
-gr_prefs::has_section(const std::string §ion)
-{
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
- return d_config_map.count(s) > 0;
-}
-
-bool
-gr_prefs::has_option(const std::string §ion, const std::string &option)
-{
- if(option_to_env(section, option))
- return true;
-
- if(has_section(section)) {
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- gr_config_map_itr sec = d_config_map.find(s);
- return sec->second.count(o) > 0;
- }
- else {
- return false;
- }
-}
-
-const std::string
-gr_prefs::get_string(const std::string §ion, const std::string &option,
- const std::string &default_val)
-{
- char *env = option_to_env(section, option);
- if(env)
- return std::string(env);
-
- if(has_option(section, option)) {
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- gr_config_map_itr sec = d_config_map.find(s);
- gr_config_map_elem_itr opt = sec->second.find(o);
- return opt->second;
- }
- else {
- return default_val;
- }
-}
-
-void
-gr_prefs::set_string(const std::string §ion, const std::string &option,
- const std::string &val)
-{
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- std::map<std::string, std::string> opt_map = d_config_map[s];
-
- opt_map[o] = val;
-
- d_config_map[s] = opt_map;
-}
-
-bool
-gr_prefs::get_bool(const std::string §ion, const std::string &option, bool default_val)
-{
- if(has_option(section, option)) {
- std::string str = get_string(section, option, "");
- if(str == "") {
- return default_val;
- }
- std::transform(str.begin(), str.end(), str.begin(), ::tolower);
- if((str == "true") || (str == "on") || (str == "1"))
- return true;
- else if((str == "false") || (str == "off") || (str == "0"))
- return false;
- else
- return default_val;
- }
- else {
- return default_val;
- }
-}
-
-void
-gr_prefs::set_bool(const std::string §ion, const std::string &option, bool val)
-{
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- std::map<std::string, std::string> opt_map = d_config_map[s];
-
- std::stringstream sstr;
- sstr << (val == true);
- opt_map[o] = sstr.str();
-
- d_config_map[s] = opt_map;
-}
-
-long
-gr_prefs::get_long(const std::string §ion, const std::string &option, long default_val)
-{
- if(has_option(section, option)) {
- std::string str = get_string(section, option, "");
- if(str == "") {
- return default_val;
- }
- std::stringstream sstr(str);
- long n;
- sstr >> n;
- return n;
- }
- else {
- return default_val;
- }
-}
-
-void
-gr_prefs::set_long(const std::string §ion, const std::string &option, long val)
-{
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- std::map<std::string, std::string> opt_map = d_config_map[s];
-
- std::stringstream sstr;
- sstr << val;
- opt_map[o] = sstr.str();
-
- d_config_map[s] = opt_map;
-}
-
-double
-gr_prefs::get_double(const std::string §ion, const std::string &option, double default_val)
-{
- if(has_option(section, option)) {
- std::string str = get_string(section, option, "");
- if(str == "") {
- return default_val;
- }
- std::stringstream sstr(str);
- double n;
- sstr >> n;
- return n;
- }
- else {
- return default_val;
- }
-}
-
-void
-gr_prefs::set_double(const std::string §ion, const std::string &option, double val)
-{
- std::string s = section;
- std::transform(section.begin(), section.end(), s.begin(), ::tolower);
-
- std::string o = option;
- std::transform(option.begin(), option.end(), o.begin(), ::tolower);
-
- std::map<std::string, std::string> opt_map = d_config_map[s];
-
- std::stringstream sstr;
- sstr << val;
- opt_map[o] = sstr.str();
-
- d_config_map[s] = opt_map;
-}
diff --git a/gnuradio-runtime/lib/gr_random.cc b/gnuradio-runtime/lib/gr_random.cc
deleted file mode 100644
index 323839acc7..0000000000
--- a/gnuradio-runtime/lib/gr_random.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * Copyright 1997 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. M.I.T. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <math.h>
-#include <gr_random.h>
-
-#define IA 16807
-#define IM 2147483647
-#define AM (1.0/IM)
-#define IQ 127773
-#define IR 2836
-#define NDIV (1+(IM-1)/NTAB)
-#define EPS 1.2e-7
-#define RNMX (1.0-EPS)
-
-
-gr_random::gr_random (long seed)
-{
- reseed (seed);
-}
-
-void
-gr_random::reseed (long seed)
-{
- d_seed = seed;
- d_iy = 0;
- for (int i = 0; i < NTAB; i++)
- d_iv[i] = 0;
- d_iset = 0;
- d_gset = 0;
-}
-
-/*
- * This looks like it returns a uniform random deviate between 0.0 and 1.0
- * It looks similar to code from "Numerical Recipes in C".
- */
-float gr_random::ran1()
-{
- int j;
- long k;
- float temp;
-
- if (d_seed <= 0 || !d_iy) {
- if (-d_seed < 1)
- d_seed=1;
- else
- d_seed = -d_seed;
- for (j=NTAB+7;j>=0;j--) {
- k=d_seed/IQ;
- d_seed=IA*(d_seed-k*IQ)-IR*k;
- if (d_seed < 0)
- d_seed += IM;
- if (j < NTAB)
- d_iv[j] = d_seed;
- }
- d_iy=d_iv[0];
- }
- k=(d_seed)/IQ;
- d_seed=IA*(d_seed-k*IQ)-IR*k;
- if (d_seed < 0)
- d_seed += IM;
- j=d_iy/NDIV;
- d_iy=d_iv[j];
- d_iv[j] = d_seed;
- temp=AM * d_iy;
- if (temp > RNMX)
- temp = RNMX;
- return temp;
-}
-
-/*
- * Returns a normally distributed deviate with zero mean and variance 1.
- * Also looks like it's from "Numerical Recipes in C".
- */
-float gr_random::gasdev()
-{
- float fac,rsq,v1,v2;
- d_iset = 1 - d_iset;
- if (d_iset) {
- do {
- v1=2.0*ran1()-1.0;
- v2=2.0*ran1()-1.0;
- rsq=v1*v1+v2*v2;
- } while (rsq >= 1.0 || rsq == 0.0);
- fac= sqrt(-2.0*log(rsq)/rsq);
- d_gset=v1*fac;
- return v2*fac;
- }
- return d_gset;
-}
-
-/*
- * Copied from The KC7WW / OH2BNS Channel Simulator
- * FIXME Need to check how good this is at some point
- */
-
-float gr_random::laplacian()
-{
- float z = ran1();
- if (z < 0.5)
- return log(2.0 * z) / M_SQRT2;
- else
- return -log(2.0 * (1.0 - z)) / M_SQRT2;
-}
-
-/*
- * Copied from The KC7WW / OH2BNS Channel Simulator
- * FIXME Need to check how good this is at some point
- */
-
- // 5 => scratchy, 8 => Geiger
-
-float gr_random::impulse(float factor = 5)
-{
- float z = -M_SQRT2 * log(ran1());
- if (fabsf(z) <= factor)
- return 0.0;
- else
- return z;
-}
-
-/*
- * Complex rayleigh is really gaussian I and gaussian Q
- * It can also be generated by real rayleigh magnitude and
- * uniform random angle
- * Adapted from The KC7WW / OH2BNS Channel Simulator
- * FIXME Need to check how good this is at some point
- */
-
-gr_complex gr_random::rayleigh_complex()
-{
- return gr_complex(gasdev(),gasdev());
-}
-
-/* Other option
- mag = rayleigh();
- ang = 2.0 * M_PI * RNG();
- *Rx = rxx * cos(z);
- *Iy = rxx * sin(z);
-*/
-
-
-float gr_random::rayleigh()
-{
- return sqrt(-2.0 * log(ran1()));
-}
diff --git a/gnuradio-runtime/lib/gr_random.h b/gnuradio-runtime/lib/gr_random.h
deleted file mode 100644
index 783c05f920..0000000000
--- a/gnuradio-runtime/lib/gr_random.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_RANDOM_H
-#define INCLUDED_GR_RANDOM_H
-
-#include <gr_runtime_api.h>
-#include <gr_complex.h>
-
-/*!
- * \brief pseudo random number generator
- * \ingroup math_blk
- */
-class GR_RUNTIME_API gr_random {
-protected:
- static const int NTAB = 32;
- long d_seed;
- long d_iy;
- long d_iv[NTAB];
- int d_iset;
- float d_gset;
-
-
-public:
- gr_random (long seed=3021);
-
- void reseed (long seed);
-
- /*!
- * \brief uniform random deviate in the range [0.0, 1.0)
- */
- float ran1 ();
-
- /*!
- * \brief normally distributed deviate with zero mean and variance 1
- */
- float gasdev ();
-
- float laplacian ();
- float impulse (float factor);
- float rayleigh ();
- gr_complex rayleigh_complex ();
-};
-
-#endif /* INCLUDED_GR_RANDOM_H */
-
diff --git a/gnuradio-runtime/lib/gr_realtime.cc b/gnuradio-runtime/lib/gr_realtime.cc
deleted file mode 100644
index d7a7eab5ba..0000000000
--- a/gnuradio-runtime/lib/gr_realtime.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gr_realtime.h>
-
-gr_rt_status_t
-gr_enable_realtime_scheduling()
-{
- return gr_enable_realtime_scheduling();
-}
diff --git a/gnuradio-runtime/lib/gr_reverse.cc b/gnuradio-runtime/lib/gr_reverse.cc
deleted file mode 100644
index 08c588cb55..0000000000
--- a/gnuradio-runtime/lib/gr_reverse.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_reverse.h>
-
-
-std::vector<float>
-gr_reverse (const std::vector<float> &taps)
-{
- int size = taps.size ();
- std::vector<float> new_taps(size);
-
- if (size == 0)
- return new_taps;
-
- for (int i = 0; i < size; i++)
- new_taps[i] = taps[size - i - 1];
-
- return new_taps;
-}
-
-
-std::vector<gr_complex>
-gr_reverse (const std::vector<gr_complex> &taps)
-{
- int size = taps.size ();
- std::vector<gr_complex> new_taps(size);
-
- if (size == 0)
- return new_taps;
-
- for (int i = 0; i < size; i++)
- new_taps[i] = taps[size - i - 1];
-
- return new_taps;
-}
-
diff --git a/gnuradio-runtime/lib/gr_reverse.h b/gnuradio-runtime/lib/gr_reverse.h
deleted file mode 100644
index aa8619619f..0000000000
--- a/gnuradio-runtime/lib/gr_reverse.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_REVERSE_H
-#define INCLUDED_GR_REVERSE_H
-
-#include <gr_runtime_api.h>
-#include <vector>
-#include <gr_complex.h>
-
-// reverse the order of taps
-std::vector<float> gr_reverse (const std::vector<float> &taps);
-std::vector<gr_complex> gr_reverse (const std::vector<gr_complex> &taps);
-
-
-#endif /* INCLUDED_GR_REVERSE_H */
diff --git a/gnuradio-runtime/lib/gr_scheduler.cc b/gnuradio-runtime/lib/gr_scheduler.cc
deleted file mode 100644
index c691f5d99f..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_scheduler.h>
-
-gr_scheduler::gr_scheduler(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
-{
-}
-
-gr_scheduler::~gr_scheduler()
-{
-}
diff --git a/gnuradio-runtime/lib/gr_scheduler.h b/gnuradio-runtime/lib/gr_scheduler.h
deleted file mode 100644
index 097f575c21..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GR_SCHEDULER_H
-#define INCLUDED_GR_SCHEDULER_H
-
-#include <gr_runtime_api.h>
-#include <boost/utility.hpp>
-#include <gr_block.h>
-#include <gr_flat_flowgraph.h>
-
-
-class gr_scheduler;
-typedef boost::shared_ptr<gr_scheduler> gr_scheduler_sptr;
-
-
-/*!
- * \brief Abstract scheduler that takes a flattened flow graph and runs it.
- *
- * Preconditions: details, buffers and buffer readers have been assigned.
- */
-class GR_RUNTIME_API gr_scheduler : boost::noncopyable
-{
-
-public:
- /*!
- * \brief Construct a scheduler and begin evaluating the graph.
- *
- * The scheduler will continue running until all blocks until they
- * report that they are done or the stop method is called.
- */
- gr_scheduler(gr_flat_flowgraph_sptr ffg, int max_noutput_items);
-
- virtual ~gr_scheduler();
-
- /*!
- * \brief Tell the scheduler to stop executing.
- */
- virtual void stop() = 0;
-
- /*!
- * \brief Block until the graph is done.
- */
- virtual void wait() = 0;
-};
-
-#endif /* INCLUDED_GR_SCHEDULER_H */
diff --git a/gnuradio-runtime/lib/gr_scheduler_sts.cc b/gnuradio-runtime/lib/gr_scheduler_sts.cc
deleted file mode 100644
index 10f01edaf6..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler_sts.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_scheduler_sts.h>
-#include <gr_single_threaded_scheduler.h>
-#include <thread/thread_body_wrapper.h>
-
-class sts_container
-{
- gr_block_vector_t d_blocks;
-
-public:
-
- sts_container(gr_block_vector_t blocks)
- : d_blocks(blocks) {}
-
- void operator()()
- {
- gr_make_single_threaded_scheduler(d_blocks)->run();
- }
-};
-
-
-gr_scheduler_sptr
-gr_scheduler_sts::make(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
-{
- return gr_scheduler_sptr(new gr_scheduler_sts(ffg, max_noutput_items));
-}
-
-gr_scheduler_sts::gr_scheduler_sts(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
- : gr_scheduler(ffg, max_noutput_items)
-{
- // Split the flattened flow graph into discrete partitions, each
- // of which is topologically sorted.
-
- std::vector<gr_basic_block_vector_t> graphs = ffg->partition();
-
- // For each partition, create a thread to evaluate it using
- // an instance of the gr_single_threaded_scheduler
-
- for (std::vector<gr_basic_block_vector_t>::iterator p = graphs.begin();
- p != graphs.end(); p++) {
-
- gr_block_vector_t blocks = gr_flat_flowgraph::make_block_vector(*p);
- d_threads.create_thread(
- gr::thread::thread_body_wrapper<sts_container>(sts_container(blocks),
- "single-threaded-scheduler"));
- }
-}
-
-gr_scheduler_sts::~gr_scheduler_sts()
-{
- stop();
-}
-
-void
-gr_scheduler_sts::stop()
-{
- d_threads.interrupt_all();
-}
-
-void
-gr_scheduler_sts::wait()
-{
- d_threads.join_all();
-}
diff --git a/gnuradio-runtime/lib/gr_scheduler_sts.h b/gnuradio-runtime/lib/gr_scheduler_sts.h
deleted file mode 100644
index af98c6d8ba..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler_sts.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_SCHEDULER_STS_H
-#define INCLUDED_GR_SCHEDULER_STS_H
-
-#include <gr_runtime_api.h>
-#include <gr_scheduler.h>
-#include <thread/thread_group.h>
-
-/*!
- * \brief Concrete scheduler that uses the single_threaded_scheduler
- */
-class GR_RUNTIME_API gr_scheduler_sts : public gr_scheduler
-{
- gr::thread::thread_group d_threads;
-
-protected:
- /*!
- * \brief Construct a scheduler and begin evaluating the graph.
- *
- * The scheduler will continue running until all blocks until they
- * report that they are done or the stop method is called.
- */
- gr_scheduler_sts(gr_flat_flowgraph_sptr ffg, int max_noutput_items);
-
-public:
- static gr_scheduler_sptr make(gr_flat_flowgraph_sptr ffg, int max_noutput_items);
-
- ~gr_scheduler_sts();
-
- /*!
- * \brief Tell the scheduler to stop executing.
- */
- void stop();
-
- /*!
- * \brief Block until the graph is done.
- */
- void wait();
-};
-
-
-
-
-#endif /* INCLUDED_GR_SCHEDULER_STS_H */
diff --git a/gnuradio-runtime/lib/gr_scheduler_tpb.cc b/gnuradio-runtime/lib/gr_scheduler_tpb.cc
deleted file mode 100644
index e67078632f..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler_tpb.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_scheduler_tpb.h>
-#include <gr_tpb_thread_body.h>
-#include <thread/thread_body_wrapper.h>
-#include <sstream>
-
-/*
- * You know, a lambda expression would be sooo much easier...
- */
-class tpb_container
-{
- gr_block_sptr d_block;
- int d_max_noutput_items;
-
-public:
- tpb_container(gr_block_sptr block, int max_noutput_items)
- : d_block(block), d_max_noutput_items(max_noutput_items) {}
-
- void operator()()
- {
- gr_tpb_thread_body body(d_block, d_max_noutput_items);
- }
-};
-
-
-gr_scheduler_sptr
-gr_scheduler_tpb::make(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
-{
- return gr_scheduler_sptr(new gr_scheduler_tpb(ffg, max_noutput_items));
-}
-
-gr_scheduler_tpb::gr_scheduler_tpb(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
- : gr_scheduler(ffg, max_noutput_items)
-{
- // Get a topologically sorted vector of all the blocks in use.
- // Being topologically sorted probably isn't going to matter, but
- // there's a non-zero chance it might help...
-
- gr_basic_block_vector_t used_blocks = ffg->calc_used_blocks();
- used_blocks = ffg->topological_sort(used_blocks);
- gr_block_vector_t blocks = gr_flat_flowgraph::make_block_vector(used_blocks);
-
- // Ensure that the done flag is clear on all blocks
-
- for (size_t i = 0; i < blocks.size(); i++){
- blocks[i]->detail()->set_done(false);
- }
-
- // Fire off a thead for each block
-
- for (size_t i = 0; i < blocks.size(); i++){
- std::stringstream name;
- name << "thread-per-block[" << i << "]: " << blocks[i];
-
- // If set, use internal value instead of global value
- if(blocks[i]->is_set_max_noutput_items())
- max_noutput_items = blocks[i]->max_noutput_items();
-
- d_threads.create_thread(
- gr::thread::thread_body_wrapper<tpb_container>(tpb_container(blocks[i], max_noutput_items),
- name.str()));
- }
-}
-
-gr_scheduler_tpb::~gr_scheduler_tpb()
-{
- stop();
-}
-
-void
-gr_scheduler_tpb::stop()
-{
- d_threads.interrupt_all();
-}
-
-void
-gr_scheduler_tpb::wait()
-{
- d_threads.join_all();
-}
diff --git a/gnuradio-runtime/lib/gr_scheduler_tpb.h b/gnuradio-runtime/lib/gr_scheduler_tpb.h
deleted file mode 100644
index 4ab7bb16d2..0000000000
--- a/gnuradio-runtime/lib/gr_scheduler_tpb.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_SCHEDULER_TPB_H
-#define INCLUDED_GR_SCHEDULER_TPB_H
-
-#include <gr_runtime_api.h>
-#include <gr_scheduler.h>
-#include <thread/thread_group.h>
-
-/*!
- * \brief Concrete scheduler that uses a kernel thread-per-block
- */
-class GR_RUNTIME_API gr_scheduler_tpb : public gr_scheduler
-{
- gr::thread::thread_group d_threads;
-
-protected:
- /*!
- * \brief Construct a scheduler and begin evaluating the graph.
- *
- * The scheduler will continue running until all blocks until they
- * report that they are done or the stop method is called.
- */
- gr_scheduler_tpb(gr_flat_flowgraph_sptr ffg, int max_noutput_items);
-
-public:
- static gr_scheduler_sptr make(gr_flat_flowgraph_sptr ffg, int max_noutput_items=100000);
-
- ~gr_scheduler_tpb();
-
- /*!
- * \brief Tell the scheduler to stop executing.
- */
- void stop();
-
- /*!
- * \brief Block until the graph is done.
- */
- void wait();
-};
-
-
-#endif /* INCLUDED_GR_SCHEDULER_TPB_H */
diff --git a/gnuradio-runtime/lib/gr_select_handler.cc b/gnuradio-runtime/lib/gr_select_handler.cc
deleted file mode 100644
index 0fc86354a6..0000000000
--- a/gnuradio-runtime/lib/gr_select_handler.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_select_handler.h>
-
-gr_select_handler::gr_select_handler(int fd)
- : d_fd(fd)
-{
-}
-
-gr_select_handler::~gr_select_handler()
-{
-}
diff --git a/gnuradio-runtime/lib/gr_sincos.c b/gnuradio-runtime/lib/gr_sincos.c
deleted file mode 100644
index a8d01b0da4..0000000000
--- a/gnuradio-runtime/lib/gr_sincos.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE // ask for GNU extensions if available
-#endif
-
-#include <gr_sincos.h>
-#include <math.h>
-
-// ----------------------------------------------------------------
-
-#if defined (HAVE_SINCOS)
-
-void
-gr_sincos (double x, double *sinx, double *cosx)
-{
- sincos (x, sinx, cosx);
-}
-
-#else
-
-void
-gr_sincos (double x, double *sinx, double *cosx)
-{
- *sinx = sin (x);
- *cosx = cos (x);
-}
-
-#endif
-
-// ----------------------------------------------------------------
-
-#if defined (HAVE_SINCOSF)
-
-void
-gr_sincosf (float x, float *sinx, float *cosx)
-{
- sincosf (x, sinx, cosx);
-}
-
-#elif defined (HAVE_SINF) && defined (HAVE_COSF)
-
-void
-gr_sincosf (float x, float *sinx, float *cosx)
-{
- *sinx = sinf (x);
- *cosx = cosf (x);
-}
-
-#else
-
-void
-gr_sincosf (float x, float *sinx, float *cosx)
-{
- *sinx = sin (x);
- *cosx = cos (x);
-}
-
-#endif
diff --git a/gnuradio-runtime/lib/gr_single_threaded_scheduler.cc b/gnuradio-runtime/lib/gr_single_threaded_scheduler.cc
deleted file mode 100644
index 1bb9e9b0a8..0000000000
--- a/gnuradio-runtime/lib/gr_single_threaded_scheduler.cc
+++ /dev/null
@@ -1,364 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_single_threaded_scheduler.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <gr_buffer.h>
-#include <boost/thread.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-#include <limits>
-#include <assert.h>
-#include <stdio.h>
-
-// must be defined to either 0 or 1
-#define ENABLE_LOGGING 0
-
-#if (ENABLE_LOGGING)
-#define LOG(x) do { x; } while(0)
-#else
-#define LOG(x) do {;} while(0)
-#endif
-
-static int which_scheduler = 0;
-
-gr_single_threaded_scheduler_sptr
-gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks)
-{
- return
- gr_single_threaded_scheduler_sptr (new gr_single_threaded_scheduler (blocks));
-}
-
-gr_single_threaded_scheduler::gr_single_threaded_scheduler (
- const std::vector<gr_block_sptr> &blocks)
- : d_blocks (blocks), d_enabled (true), d_log(0)
-{
- if (ENABLE_LOGGING){
- std::string name = str(boost::format("sst-%d.log") % which_scheduler++);
- d_log = new std::ofstream(name.c_str());
- *d_log << "gr_single_threaded_scheduler: "
- << d_blocks.size ()
- << " blocks\n";
- }
-}
-
-gr_single_threaded_scheduler::~gr_single_threaded_scheduler ()
-{
- if (ENABLE_LOGGING)
- delete d_log;
-}
-
-void
-gr_single_threaded_scheduler::run ()
-{
- // d_enabled = true; // KLUDGE
- main_loop ();
-}
-
-void
-gr_single_threaded_scheduler::stop ()
-{
- if (0)
- std::cout << "gr_singled_threaded_scheduler::stop() "
- << this << std::endl;
- d_enabled = false;
-}
-
-inline static unsigned int
-round_up (unsigned int n, unsigned int multiple)
-{
- return ((n + multiple - 1) / multiple) * multiple;
-}
-
-inline static unsigned int
-round_down (unsigned int n, unsigned int multiple)
-{
- return (n / multiple) * multiple;
-}
-
-//
-// Return minimum available write space in all our downstream buffers
-// or -1 if we're output blocked and the output we're blocked
-// on is done.
-//
-static int
-min_available_space (gr_block_detail *d, int output_multiple)
-{
- int min_space = std::numeric_limits<int>::max();
-
- for (int i = 0; i < d->noutputs (); i++){
- int n = round_down (d->output(i)->space_available (), output_multiple);
- if (n == 0){ // We're blocked on output.
- if (d->output(i)->done()){ // Downstream is done, therefore we're done.
- return -1;
- }
- return 0;
- }
- min_space = std::min (min_space, n);
- }
- return min_space;
-}
-
-void
-gr_single_threaded_scheduler::main_loop ()
-{
- static const int DEFAULT_CAPACITY = 16;
-
- int noutput_items;
- gr_vector_int ninput_items_required (DEFAULT_CAPACITY);
- gr_vector_int ninput_items (DEFAULT_CAPACITY);
- gr_vector_const_void_star input_items (DEFAULT_CAPACITY);
- gr_vector_void_star output_items (DEFAULT_CAPACITY);
- unsigned int bi;
- unsigned int nalive;
- int max_items_avail;
- bool made_progress_last_pass;
- bool making_progress;
-
- for (unsigned i = 0; i < d_blocks.size (); i++)
- d_blocks[i]->detail()->set_done (false); // reset any done flags
-
- for (unsigned i = 0; i < d_blocks.size (); i++) // enable any drivers, etc.
- d_blocks[i]->start();
-
-
- bi = 0;
- made_progress_last_pass = true;
- making_progress = false;
-
- // Loop while there are still blocks alive
-
- nalive = d_blocks.size ();
- while (d_enabled && nalive > 0){
-
- if (boost::this_thread::interruption_requested())
- break;
-
- gr_block *m = d_blocks[bi].get ();
- gr_block_detail *d = m->detail().get ();
-
- LOG(*d_log << std::endl << m);
-
- if (d->done ())
- goto next_block;
-
- if (d->source_p ()){
- // Invoke sources as a last resort. As long as the previous pass
- // made progress, don't call a source.
- if (made_progress_last_pass){
- LOG(*d_log << " Skipping source\n");
- goto next_block;
- }
-
- ninput_items_required.resize (0);
- ninput_items.resize (0);
- input_items.resize (0);
- output_items.resize (d->noutputs ());
-
- // determine the minimum available output space
- noutput_items = min_available_space (d, m->output_multiple ());
- LOG(*d_log << " source\n noutput_items = " << noutput_items << std::endl);
- if (noutput_items == -1) // we're done
- goto were_done;
-
- if (noutput_items == 0){ // we're output blocked
- LOG(*d_log << " BLKD_OUT\n");
- goto next_block;
- }
-
- goto setup_call_to_work; // jump to common code
- }
-
- else if (d->sink_p ()){
- ninput_items_required.resize (d->ninputs ());
- ninput_items.resize (d->ninputs ());
- input_items.resize (d->ninputs ());
- output_items.resize (0);
- LOG(*d_log << " sink\n");
-
- max_items_avail = 0;
- for (int i = 0; i < d->ninputs (); i++){
- ninput_items[i] = d->input(i)->items_available();
- //if (ninput_items[i] == 0 && d->input(i)->done())
- if (ninput_items[i] < m->output_multiple() && d->input(i)->done())
- goto were_done;
-
- max_items_avail = std::max (max_items_avail, ninput_items[i]);
- }
-
- // take a swag at how much output we can sink
- noutput_items = (int) (max_items_avail * m->relative_rate ());
- noutput_items = round_down (noutput_items, m->output_multiple ());
- LOG(*d_log << " max_items_avail = " << max_items_avail << std::endl);
- LOG(*d_log << " noutput_items = " << noutput_items << std::endl);
-
- if (noutput_items == 0){ // we're blocked on input
- LOG(*d_log << " BLKD_IN\n");
- goto next_block;
- }
-
- goto try_again; // Jump to code shared with regular case.
- }
-
- else {
- // do the regular thing
- ninput_items_required.resize (d->ninputs ());
- ninput_items.resize (d->ninputs ());
- input_items.resize (d->ninputs ());
- output_items.resize (d->noutputs ());
-
- max_items_avail = 0;
- for (int i = 0; i < d->ninputs (); i++){
- ninput_items[i] = d->input(i)->items_available ();
- max_items_avail = std::max (max_items_avail, ninput_items[i]);
- }
-
- // determine the minimum available output space
- noutput_items = min_available_space (d, m->output_multiple ());
- if (ENABLE_LOGGING){
- *d_log << " regular ";
- if (m->relative_rate() >= 1.0)
- *d_log << "1:" << m->relative_rate() << std::endl;
- else
- *d_log << 1.0/m->relative_rate() << ":1\n";
- *d_log << " max_items_avail = " << max_items_avail << std::endl;
- *d_log << " noutput_items = " << noutput_items << std::endl;
- }
- if (noutput_items == -1) // we're done
- goto were_done;
-
- if (noutput_items == 0){ // we're output blocked
- LOG(*d_log << " BLKD_OUT\n");
- goto next_block;
- }
-
-#if 0
- // Compute best estimate of noutput_items that we can really use.
- noutput_items =
- std::min ((unsigned) noutput_items,
- std::max ((unsigned) m->output_multiple(),
- round_up ((unsigned) (max_items_avail * m->relative_rate()),
- m->output_multiple ())));
-
- LOG(*d_log << " revised noutput_items = " << noutput_items << std::endl);
-#endif
-
- try_again:
- if (m->fixed_rate()){
- // try to work it forward starting with max_items_avail.
- // We want to try to consume all the input we've got.
- int reqd_noutput_items = m->fixed_rate_ninput_to_noutput(max_items_avail);
- reqd_noutput_items = round_up(reqd_noutput_items, m->output_multiple());
- if (reqd_noutput_items > 0 && reqd_noutput_items <= noutput_items)
- noutput_items = reqd_noutput_items;
- }
-
- // ask the block how much input they need to produce noutput_items
- m->forecast (noutput_items, ninput_items_required);
-
- // See if we've got sufficient input available
-
- int i;
- for (i = 0; i < d->ninputs (); i++)
- if (ninput_items_required[i] > ninput_items[i]) // not enough
- break;
-
- if (i < d->ninputs ()){ // not enough input on input[i]
- // if we can, try reducing the size of our output request
- if (noutput_items > m->output_multiple ()){
- noutput_items /= 2;
- noutput_items = round_up (noutput_items, m->output_multiple ());
- goto try_again;
- }
-
- // We're blocked on input
- LOG(*d_log << " BLKD_IN\n");
- if (d->input(i)->done()) // If the upstream block is done, we're done
- goto were_done;
-
- // Is it possible to ever fulfill this request?
- if (ninput_items_required[i] > d->input(i)->max_possible_items_available ()){
- // Nope, never going to happen...
- std::cerr << "\nsched: <gr_block " << m->name()
- << " (" << m->unique_id() << ")>"
- << " is requesting more input data\n"
- << " than we can provide.\n"
- << " ninput_items_required = "
- << ninput_items_required[i] << "\n"
- << " max_possible_items_available = "
- << d->input(i)->max_possible_items_available() << "\n"
- << " If this is a filter, consider reducing the number of taps.\n";
- goto were_done;
- }
-
- goto next_block;
- }
-
- // We've got enough data on each input to produce noutput_items.
- // Finish setting up the call to work.
-
- for (int i = 0; i < d->ninputs (); i++)
- input_items[i] = d->input(i)->read_pointer();
-
- setup_call_to_work:
-
- for (int i = 0; i < d->noutputs (); i++)
- output_items[i] = d->output(i)->write_pointer();
-
- // Do the actual work of the block
- int n = m->general_work (noutput_items, ninput_items,
- input_items, output_items);
- LOG(*d_log << " general_work: noutput_items = " << noutput_items
- << " result = " << n << std::endl);
-
- if (n == -1) // block is done
- goto were_done;
-
- d->produce_each (n); // advance write pointers
- if (n > 0)
- making_progress = true;
-
- goto next_block;
- }
- assert (0);
-
- were_done:
- LOG(*d_log << " were_done\n");
- d->set_done (true);
- nalive--;
-
- next_block:
- if (++bi >= d_blocks.size ()){
- bi = 0;
- made_progress_last_pass = making_progress;
- making_progress = false;
- }
- }
-
- for (unsigned i = 0; i < d_blocks.size (); i++) // disable any drivers, etc.
- d_blocks[i]->stop();
-}
diff --git a/gnuradio-runtime/lib/gr_sptr_magic.cc b/gnuradio-runtime/lib/gr_sptr_magic.cc
deleted file mode 100644
index 2073701422..0000000000
--- a/gnuradio-runtime/lib/gr_sptr_magic.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_sptr_magic.h>
-#include <gr_hier_block2.h>
-#include <map>
-#include <stdexcept>
-
-
-#include <thread/thread.h>
-
-namespace gnuradio {
-
- static gr::thread::mutex s_mutex;
- typedef std::map<gr_basic_block*, gr_basic_block_sptr> sptr_map;
- static sptr_map s_map;
-
- void
- detail::sptr_magic::create_and_stash_initial_sptr(gr_hier_block2 *p)
- {
- gr_basic_block_sptr sptr(p);
- gr::thread::scoped_lock guard(s_mutex);
- s_map.insert(sptr_map::value_type(static_cast<gr_basic_block *>(p), sptr));
- }
-
-
- gr_basic_block_sptr
- detail::sptr_magic::fetch_initial_sptr(gr_basic_block *p)
- {
- /*
- * If p isn't a subclass of gr_hier_block2, just create the
- * shared ptr and return it.
- */
- gr_hier_block2 *hb2 = dynamic_cast<gr_hier_block2 *>(p);
- if (!hb2){
- return gr_basic_block_sptr(p);
- }
-
- /*
- * p is a subclass of gr_hier_block2, thus we've already created the shared pointer
- * and stashed it away. Fish it out and return it.
- */
- gr::thread::scoped_lock guard(s_mutex);
- sptr_map::iterator pos = s_map.find(static_cast<gr_basic_block *>(p));
- if (pos == s_map.end())
- throw std::invalid_argument("gr_sptr_magic: invalid pointer!");
-
- gr_basic_block_sptr sptr = pos->second;
- s_map.erase(pos);
- return sptr;
- }
-};
diff --git a/gnuradio-runtime/lib/gr_sync_block.cc b/gnuradio-runtime/lib/gr_sync_block.cc
deleted file mode 100644
index 94efcdc8ee..0000000000
--- a/gnuradio-runtime/lib/gr_sync_block.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_sync_block.h>
-
-gr_sync_block::gr_sync_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
- : gr_block(name, input_signature, output_signature)
-{
- set_fixed_rate(true);
-}
-
-
-void
-gr_sync_block::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
- unsigned ninputs = ninput_items_required.size();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items);
-}
-
-int
-gr_sync_block::fixed_rate_noutput_to_ninput(int noutput_items)
-{
- return noutput_items + history() - 1;
-}
-
-int
-gr_sync_block::fixed_rate_ninput_to_noutput(int ninput_items)
-{
- return std::max(0, ninput_items - (int)history() + 1);
-}
-
-int
-gr_sync_block::general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- int r = work (noutput_items, input_items, output_items);
- if (r > 0)
- consume_each (r);
- return r;
-}
diff --git a/gnuradio-runtime/lib/gr_sync_decimator.cc b/gnuradio-runtime/lib/gr_sync_decimator.cc
deleted file mode 100644
index a0f907db53..0000000000
--- a/gnuradio-runtime/lib/gr_sync_decimator.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_sync_decimator.h>
-
-gr_sync_decimator::gr_sync_decimator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned decimation)
- : gr_sync_block (name, input_signature, output_signature)
-{
- set_decimation (decimation);
-}
-
-void
-gr_sync_decimator::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
- unsigned ninputs = ninput_items_required.size ();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
-}
-
-int
-gr_sync_decimator::fixed_rate_noutput_to_ninput(int noutput_items)
-{
- return noutput_items * decimation() + history() - 1;
-}
-
-int
-gr_sync_decimator::fixed_rate_ninput_to_noutput(int ninput_items)
-{
- return std::max(0, ninput_items - (int)history() + 1) / decimation();
-}
-
-int
-gr_sync_decimator::general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- int r = work (noutput_items, input_items, output_items);
- if (r > 0)
- consume_each (r * decimation ());
- return r;
-}
-
diff --git a/gnuradio-runtime/lib/gr_sync_interpolator.cc b/gnuradio-runtime/lib/gr_sync_interpolator.cc
deleted file mode 100644
index ece873c14a..0000000000
--- a/gnuradio-runtime/lib/gr_sync_interpolator.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_sync_interpolator.h>
-
-gr_sync_interpolator::gr_sync_interpolator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned interpolation)
- : gr_sync_block (name, input_signature, output_signature)
-{
- set_interpolation (interpolation);
-}
-
-void
-gr_sync_interpolator::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
- unsigned ninputs = ninput_items_required.size ();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
-}
-
-int
-gr_sync_interpolator::fixed_rate_noutput_to_ninput(int noutput_items)
-{
- return noutput_items / interpolation() + history() - 1;
-}
-
-int
-gr_sync_interpolator::fixed_rate_ninput_to_noutput(int ninput_items)
-{
- return std::max(0, ninput_items - (int)history() + 1) * interpolation();
-}
-
-int
-gr_sync_interpolator::general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- int r = work (noutput_items, input_items, output_items);
- if (r > 0)
- consume_each (r / interpolation ());
- return r;
-}
-
-
diff --git a/gnuradio-runtime/lib/gr_sys_paths.cc b/gnuradio-runtime/lib/gr_sys_paths.cc
deleted file mode 100644
index b4918af33d..0000000000
--- a/gnuradio-runtime/lib/gr_sys_paths.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_sys_paths.h>
-#include <cstdlib> //getenv
-#include <cstdio> //P_tmpdir (maybe)
-
-const char *gr_tmp_path(){
- const char *path;
-
- //first case, try TMP environment variable
- path = getenv("TMP");
- if (path) return path;
-
- //second case, try P_tmpdir when its defined
- #ifdef P_tmpdir
- if (P_tmpdir) return P_tmpdir;
- #endif /*P_tmpdir*/
-
- //fall-through case, nothing worked
- return "/tmp";
-}
-
-const char *gr_appdata_path(){
- const char *path;
-
- //first case, try HOME environment variable (unix)
- path = getenv("HOME");
- if (path) return path;
-
- //second case, try APPDATA environment variable (windows)
- path = getenv("APPDATA");
- if (path) return path;
-
- //fall-through case, nothing worked
- return gr_tmp_path();
-}
diff --git a/gnuradio-runtime/lib/gr_tagged_stream_block.cc b/gnuradio-runtime/lib/gr_tagged_stream_block.cc
deleted file mode 100644
index a60515f481..0000000000
--- a/gnuradio-runtime/lib/gr_tagged_stream_block.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <boost/format.hpp>
-#include <gr_tagged_stream_block.h>
-
-gr_tagged_stream_block::gr_tagged_stream_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- const std::string &length_tag_key)
- : gr_block(name, input_signature, output_signature),
- d_length_tag_key(pmt::string_to_symbol(length_tag_key)),
- d_n_input_items_reqd(input_signature->min_streams(), 0),
- d_length_tag_key_str(length_tag_key)
-{
-}
-
-
-// This is evil hackery: We trick the scheduler into creating the right number of input items
-void
-gr_tagged_stream_block::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
- unsigned ninputs = ninput_items_required.size();
- for (unsigned i = 0; i < ninputs; i++) {
- if (i < d_n_input_items_reqd.size() && d_n_input_items_reqd[i] != 0) {
- ninput_items_required[i] = d_n_input_items_reqd[i];
- } else {
- // If there's no item, there's no tag--so there must at least be one!
- ninput_items_required[i] = std::max(1, (int) std::floor((double) noutput_items / relative_rate() + 0.5));
- }
- }
-}
-
-
-void
-gr_tagged_stream_block::parse_length_tags(
- const std::vector<std::vector<gr_tag_t> > &tags,
- gr_vector_int &n_input_items_reqd
-){
- for (unsigned i = 0; i < tags.size(); i++) {
- for (unsigned k = 0; k < tags[i].size(); k++) {
- if (tags[i][k].key == d_length_tag_key) {
- n_input_items_reqd[i] = pmt::to_long(tags[i][k].value);
- remove_item_tag(i, tags[i][k]);
- }
- }
- }
-}
-
-
-int
-gr_tagged_stream_block::calculate_output_stream_length(const gr_vector_int &ninput_items)
-{
- int noutput_items = *std::max_element(ninput_items.begin(), ninput_items.end());
- return (int) std::floor(relative_rate() * noutput_items + 0.5);
-}
-
-
-void
-gr_tagged_stream_block::update_length_tags(int n_produced, int n_ports)
-{
- for (int i = 0; i < n_ports; i++) {
- add_item_tag(i, nitems_written(i),
- d_length_tag_key,
- pmt::from_long(n_produced)
- );
- }
- return;
-}
-
-
-int
-gr_tagged_stream_block::general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- if (d_length_tag_key_str.empty()) {
- return work(noutput_items, ninput_items, input_items, output_items);
- }
-
- if (d_n_input_items_reqd[0] == 0) { // Otherwise, it's already set from a previous call
- std::vector<std::vector<gr_tag_t> > tags(input_items.size(), std::vector<gr_tag_t>());
- for (unsigned i = 0; i < input_items.size(); i++) {
- get_tags_in_range(tags[i], i, nitems_read(i), nitems_read(i)+1);
- }
- d_n_input_items_reqd.assign(input_items.size(), -1);
- parse_length_tags(tags, d_n_input_items_reqd);
- }
- for (unsigned i = 0; i < input_items.size(); i++) {
- if (d_n_input_items_reqd[i] == -1) {
- GR_LOG_FATAL(d_logger, boost::format("Missing a required length tag on port %1% at item #%2%") % i % nitems_read(i));
- throw std::runtime_error("Missing length tag.");
- }
- if (d_n_input_items_reqd[i] > ninput_items[i]) {
- return 0;
- }
- }
-
- int min_output_size = calculate_output_stream_length(d_n_input_items_reqd);
- if (noutput_items < min_output_size) {
- set_min_noutput_items(min_output_size);
- return 0;
- }
- set_min_noutput_items(1);
-
- // WORK CALLED HERE //
- int n_produced = work(noutput_items, d_n_input_items_reqd, input_items, output_items);
- //////////////////////
-
- if (n_produced == WORK_DONE) {
- return n_produced;
- }
- for (int i = 0; i < (int) d_n_input_items_reqd.size(); i++) {
- consume(i, d_n_input_items_reqd[i]);
- }
- update_length_tags(n_produced, output_items.size());
-
- d_n_input_items_reqd.assign(input_items.size(), 0);
-
- return n_produced;
-}
-
diff --git a/gnuradio-runtime/lib/gr_test.cc b/gnuradio-runtime/lib/gr_test.cc
deleted file mode 100644
index cd5ef83611..0000000000
--- a/gnuradio-runtime/lib/gr_test.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2008,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_test.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <iostream>
-#include <string.h>
-
-gr_test_sptr gr_make_test (const std::string &name,
- int min_inputs, int max_inputs, unsigned int sizeof_input_item,
- int min_outputs, int max_outputs, unsigned int sizeof_output_item,
- unsigned int history,unsigned int output_multiple,double relative_rate,
- bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type)
-{
- return gnuradio::get_initial_sptr(new gr_test (name, min_inputs,max_inputs,sizeof_input_item,
- min_outputs,max_outputs,sizeof_output_item,
- history,output_multiple,relative_rate,fixed_rate,cons_type, prod_type));
-}
-
- gr_test::gr_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
- int min_outputs, int max_outputs, unsigned int sizeof_output_item,
- unsigned int history,unsigned int output_multiple,double relative_rate,
- bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type): gr_block (name,
- gr_make_io_signature (min_inputs, max_inputs, sizeof_input_item),
- gr_make_io_signature (min_outputs, max_outputs, sizeof_output_item)),
- d_sizeof_input_item(sizeof_input_item),
- d_sizeof_output_item(sizeof_output_item),
- d_check_topology(true),
- d_consume_type(cons_type),
- d_min_consume(0),
- d_max_consume(0),
- d_produce_type(prod_type),
- d_min_produce(0),
- d_max_produce(0)
- {
- set_history(history);
- set_output_multiple(output_multiple);
- set_relative_rate(relative_rate);
- set_fixed_rate(fixed_rate);
- }
-
-int
-gr_test::general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
- {
- //touch all inputs and outputs to detect segfaults
- unsigned ninputs = input_items.size ();
- unsigned noutputs= output_items.size();
- for (unsigned i = 0; i < ninputs; i++)
- {
- char * in=(char *)input_items[i];
- if (ninput_items[i]< (int)(noutput_items+history()))
- {
- std::cerr << "ERROR: ninput_items[" << i << "] < noutput_items+history()" << std::endl;
- std::cerr << "ninput_items[" << i << "] = " << ninput_items[i] << std::endl;
- std::cerr << "noutput_items+history() = " << noutput_items+history() << std::endl;
- std::cerr << "noutput_items = " << noutput_items << std::endl;
- std::cerr << "history() = " << history() << std::endl;
- throw std::runtime_error ("gr_test");
- } else
- {
- for (int j=0;j<ninput_items[i];j++)
- {
- //Touch every available input_item
- //We use a class variable to avoid the compiler to optimize this away
- for(unsigned int k=0;k<d_sizeof_input_item;k++)
- d_temp= in[j*d_sizeof_input_item+k];
- }
- switch (d_consume_type)
- {
- case CONSUME_NOUTPUT_ITEMS:
- consume(i,noutput_items);
- break;
- case CONSUME_NOUTPUT_ITEMS_LIMIT_MAX:
- consume(i,std::min(noutput_items,d_max_consume));
- break;
- case CONSUME_NOUTPUT_ITEMS_LIMIT_MIN:
- consume(i,std::min(std::max(noutput_items,d_min_consume),ninput_items[i]));
- break;
- case CONSUME_ALL_AVAILABLE:
- consume(i,ninput_items[i]);
- break;
- case CONSUME_ALL_AVAILABLE_LIMIT_MAX:
- consume(i,std::min(ninput_items[i],d_max_consume));
- break;
-/* //This could result in segfault, uncomment if you want to test this
- case CONSUME_ALL_AVAILABLE_LIMIT_MIN:
- consume(i,std::max(ninput_items[i],d_max_consume));
- break;*/
- case CONSUME_ZERO:
- consume(i,0);
- break;
- case CONSUME_ONE:
- consume(i,1);
- break;
- case CONSUME_MINUS_ONE:
- consume(i,-1);
- break;
- default:
- consume(i,noutput_items);
- }
- }
- }
- for (unsigned i = 0; i < noutputs; i++)
- {
- char * out=(char *)output_items[i];
- {
- for (int j=0;j<noutput_items;j++)
- {
- //Touch every available output_item
- for(unsigned int k=0;k<d_sizeof_output_item;k++)
- out[j*d_sizeof_input_item+k]=0;
- }
- }
- }
- //Now copy input to output until max ninputs or max noutputs is reached
- int common_nports=std::min(ninputs,noutputs);
- if(d_sizeof_output_item==d_sizeof_input_item)
- for (int i = 0; i < common_nports; i++)
- {
- memcpy(output_items[i],input_items[i],noutput_items*d_sizeof_input_item);
- }
- int noutput_items_produced=0;
- switch (d_produce_type){
- case PRODUCE_NOUTPUT_ITEMS:
- noutput_items_produced=noutput_items;
- break;
- case PRODUCE_NOUTPUT_ITEMS_LIMIT_MAX:
- noutput_items_produced=std::min(noutput_items,d_max_produce);
- break;
-/* //This could result in segfault, uncomment if you want to test this
- case PRODUCE_NOUTPUT_ITEMS_LIMIT_MIN:
- noutput_items_produced=std::max(noutput_items,d_min_produce);
- break;*/
- case PRODUCE_ZERO:
- noutput_items_produced=0;
- break;
- case PRODUCE_ONE:
- noutput_items_produced=1;
- break;
- case PRODUCE_MINUS_ONE:
- noutput_items_produced=-1;
- break;
- default:
- noutput_items_produced=noutput_items;
- }
- return noutput_items_produced;
- }
-
-
-
diff --git a/gnuradio-runtime/lib/gr_test.h b/gnuradio-runtime/lib/gr_test.h
deleted file mode 100644
index 2276ab1967..0000000000
--- a/gnuradio-runtime/lib/gr_test.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TEST_H
-#define INCLUDED_GR_TEST_H
-
-#include <gr_runtime_api.h>
-#include <gr_block.h>
-#include <string>
-#include "gr_test_types.h"
-
-class gr_test;
-typedef boost::shared_ptr<gr_test> gr_test_sptr;
-
-// public constructor
-GR_RUNTIME_API gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
- int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
- int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
- unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
- bool fixed_rate=true,gr_consume_type_t cons_type=CONSUME_NOUTPUT_ITEMS, gr_produce_type_t prod_type=PRODUCE_NOUTPUT_ITEMS);
-
-/*!
- * \brief Test class for testing runtime system (setting up buffers and such.)
- * \ingroup misc
- *
- * This block does not do any usefull actual data processing.
- * It just exposes setting all standard block parameters using the contructor or public methods.
- *
- * This block can be usefull when testing the runtime system.
- * You can force this block to have a large history, decimation
- * factor and/or large output_multiple.
- * The runtime system should detect this and create large enough buffers
- * all through the signal chain.
- */
-class GR_RUNTIME_API gr_test : public gr_block {
-
- public:
-
- ~gr_test (){}
-
-int general_work (int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
- // ----------------------------------------------------------------
- // override these to define your behavior
- // ----------------------------------------------------------------
-
- /*!
- * \brief Estimate input requirements given output request
- *
- * \param noutput_items number of output items to produce
- * \param ninput_items_required number of input items required on each input stream
- *
- * Given a request to product \p noutput_items, estimate the number of
- * data items required on each input stream. The estimate doesn't have
- * to be exact, but should be close.
- */
- void forecast (int noutput_items,
- gr_vector_int &ninput_items_required)
- {
- unsigned ninputs = ninput_items_required.size ();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = (int)((double)noutput_items / relative_rate()) + (int)history();
- }
-
-
- /*!
- * \brief Force check topology to return true or false.
- *
- * \param check_topology value to return when check_topology is called (true or false)
- * default check_topology returns true
- *
- */
- void set_check_topology (bool check_topology){ d_check_topology=check_topology;}
-
- /*!
- * \brief Confirm that ninputs and noutputs is an acceptable combination.
- *
- * \param ninputs number of input streams connected
- * \param noutputs number of output streams connected
- *
- * \returns true if this is a valid configuration for this block.
- *
- * This function is called by the runtime system whenever the
- * topology changes. Most classes do not need to override this.
- * This check is in addition to the constraints specified by the input
- * and output gr_io_signatures.
- */
- bool check_topology (int ninputs, int noutputs) { return d_check_topology;}
-
- // ----------------------------------------------------------------
- /*
- * The following two methods provide special case info to the
- * scheduler in the event that a block has a fixed input to output
- * ratio. gr_sync_block, gr_sync_decimator and gr_sync_interpolator
- * override these. If you're fixed rate, subclass one of those.
- */
- /*!
- * \brief Given ninput samples, return number of output samples that will be produced.
- * N.B. this is only defined if fixed_rate returns true.
- * Generally speaking, you don't need to override this.
- */
- int fixed_rate_ninput_to_noutput(int ninput) { return (int)((double)ninput/relative_rate()); }
-
- /*!
- * \brief Given noutput samples, return number of input samples required to produce noutput.
- * N.B. this is only defined if fixed_rate returns true.
- */
- int fixed_rate_noutput_to_ninput(int noutput) { return (int)((double)noutput*relative_rate()); }
-
- /*!
- * \brief Set if fixed rate should return true.
- * N.B. This is normally a private method but we make it available here as public.
- */
- void set_fixed_rate_public(bool fixed_rate){ set_fixed_rate(fixed_rate);}
-
- /*!
- * \brief Set the consume pattern.
- *
- * \param cons_type which consume pattern to use
- */
- void set_consume_type (gr_consume_type_t cons_type) { d_consume_type=cons_type;}
-
- /*!
- * \brief Set the consume limit.
- *
- * \param limit min or maximum items to consume (depending on consume_type)
- */
- void set_consume_limit (unsigned int limit) { d_min_consume=limit; d_max_consume=limit;}
-
- /*!
- * \brief Set the produce pattern.
- *
- * \param prod_type which produce pattern to use
- */
- void set_produce_type (gr_produce_type_t prod_type) { d_produce_type=prod_type;}
-
- /*!
- * \brief Set the produce limit.
- *
- * \param limit min or maximum items to produce (depending on produce_type)
- */
- void set_produce_limit (unsigned int limit) { d_min_produce=limit; d_max_produce=limit;}
-
- // ----------------------------------------------------------------------------
-
-
-
- protected:
- unsigned int d_sizeof_input_item;
- unsigned int d_sizeof_output_item;
- bool d_check_topology;
- char d_temp;
- gr_consume_type_t d_consume_type;
- int d_min_consume;
- int d_max_consume;
- gr_produce_type_t d_produce_type;
- int d_min_produce;
- int d_max_produce;
- gr_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
- int min_outputs, int max_outputs, unsigned int sizeof_output_item,
- unsigned int history,unsigned int output_multiple,double relative_rate,
- bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type);
-
-
-
- friend GR_RUNTIME_API gr_test_sptr gr_make_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
- int min_outputs, int max_outputs, unsigned int sizeof_output_item,
- unsigned int history,unsigned int output_multiple,double relative_rate,
- bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type);
-};
-
-
-
-#endif /* INCLUDED_GR_TEST_H */
diff --git a/gnuradio-runtime/lib/gr_test_types.h b/gnuradio-runtime/lib/gr_test_types.h
deleted file mode 100644
index 04f38f7b26..0000000000
--- a/gnuradio-runtime/lib/gr_test_types.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_TEST_TYPES_H
-#define INCLUDED_GR_TEST_TYPES_H
-
-typedef enum {
- CONSUME_NOUTPUT_ITEMS=0,
- CONSUME_NOUTPUT_ITEMS_LIMIT_MAX=1,
- CONSUME_NOUTPUT_ITEMS_LIMIT_MIN=2,
- CONSUME_ALL_AVAILABLE=3,
- CONSUME_ALL_AVAILABLE_LIMIT_MAX=4,
- /*CONSUME_ALL_AVAILABLE_LIMIT_MIN=5,*/
- CONSUME_ZERO=6,
- CONSUME_ONE=7,
- CONSUME_MINUS_ONE=8
- } gr_consume_type_t;
-
-typedef enum {
- PRODUCE_NOUTPUT_ITEMS=0,
- PRODUCE_NOUTPUT_ITEMS_LIMIT_MAX=1,
- /*PRODUCE_NOUTPUT_ITEMS_LIMIT_MIN=2,*/
- PRODUCE_ZERO=6,
- PRODUCE_ONE=7,
- PRODUCE_MINUS_ONE=8
- } gr_produce_type_t;
-
-#endif /* INCLUDED_GR_TEST_TYPES_H */
diff --git a/gnuradio-runtime/lib/gr_top_block.cc b/gnuradio-runtime/lib/gr_top_block.cc
deleted file mode 100644
index 362057aadb..0000000000
--- a/gnuradio-runtime/lib/gr_top_block.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <unistd.h>
-#include <gr_top_block.h>
-#include <gr_top_block_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <iostream>
-
-gr_top_block_sptr
-gr_make_top_block(const std::string &name)
-{
- return gnuradio::get_initial_sptr(new gr_top_block(name));
-}
-
-gr_top_block::gr_top_block(const std::string &name)
- : gr_hier_block2(name,
- gr_make_io_signature(0,0,0),
- gr_make_io_signature(0,0,0))
-
-{
- d_impl = new gr_top_block_impl(this);
-}
-
-gr_top_block::~gr_top_block()
-{
- stop();
- wait();
-
- delete d_impl;
-}
-
-void
-gr_top_block::start(int max_noutput_items)
-{
- d_impl->start(max_noutput_items);
-
- if(gr_prefs::singleton()->get_bool("ControlPort", "on", false)) {
- setup_rpc();
- }
-}
-
-void
-gr_top_block::stop()
-{
- d_impl->stop();
-}
-
-void
-gr_top_block::wait()
-{
- d_impl->wait();
-}
-
-void
-gr_top_block::run(int max_noutput_items)
-{
- start(max_noutput_items);
- wait();
-}
-
-void
-gr_top_block::lock()
-{
- d_impl->lock();
-}
-
-void
-gr_top_block::unlock()
-{
- d_impl->unlock();
-}
-
-std::string
-gr_top_block::edge_list()
-{
- return d_impl->edge_list();
-}
-
-void
-gr_top_block::dump()
-{
- d_impl->dump();
-}
-
-int
-gr_top_block::max_noutput_items()
-{
- return d_impl->max_noutput_items();
-}
-
-void
-gr_top_block::set_max_noutput_items(int nmax)
-{
- d_impl->set_max_noutput_items(nmax);
-}
-
-gr_top_block_sptr
-gr_top_block::to_top_block()
-{
- return cast_to_top_block_sptr(shared_from_this());
-}
-
-void
-gr_top_block::setup_rpc()
-{
-#ifdef GR_CTRLPORT
- if(is_rpc_set()) return;
- // Getters
- add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_get<gr_top_block, int>(
- alias(), "max noutput_items",
- &gr_top_block::max_noutput_items,
- pmt::mp(0), pmt::mp(8192), pmt::mp(8192),
- "items", "Max number of output items",
- RPC_PRIVLVL_MIN, DISPNULL)));
-
- if(gr_prefs::singleton()->get_bool("ControlPort", "edges_list", false)) {
- add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_get<gr_top_block, std::string>(
- alias(), "edge list",
- &gr_top_block::edge_list,
- pmt::mp(""), pmt::mp(""), pmt::mp(""),
- "edges", "List of edges in the graph",
- RPC_PRIVLVL_MIN, DISPNULL)));
- }
-
- // Setters
- add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_set<gr_top_block, int>(
- alias(), "max noutput_items",
- &gr_top_block::set_max_noutput_items,
- pmt::mp(0), pmt::mp(8192), pmt::mp(8192),
- "items", "Max number of output items",
- RPC_PRIVLVL_MIN, DISPNULL)));
- rpc_set();
-#endif /* GR_CTRLPORT */
-}
diff --git a/gnuradio-runtime/lib/gr_top_block_impl.cc b/gnuradio-runtime/lib/gr_top_block_impl.cc
deleted file mode 100644
index ef645ea57d..0000000000
--- a/gnuradio-runtime/lib/gr_top_block_impl.cc
+++ /dev/null
@@ -1,211 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_top_block.h>
-#include <gr_top_block_impl.h>
-#include <gr_flat_flowgraph.h>
-#include <gr_scheduler_sts.h>
-#include <gr_scheduler_tpb.h>
-#include <gr_prefs.h>
-
-#include <stdexcept>
-#include <iostream>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#define GR_TOP_BLOCK_IMPL_DEBUG 0
-
-
-typedef gr_scheduler_sptr (*scheduler_maker)(gr_flat_flowgraph_sptr ffg,
- int max_noutput_items);
-
-static struct scheduler_table {
- const char *name;
- scheduler_maker f;
-} scheduler_table[] = {
- { "TPB", gr_scheduler_tpb::make }, // first entry is default
- { "STS", gr_scheduler_sts::make }
-};
-
-static gr_scheduler_sptr
-make_scheduler(gr_flat_flowgraph_sptr ffg, int max_noutput_items)
-{
- static scheduler_maker factory = 0;
-
- if (factory == 0){
- char *v = getenv("GR_SCHEDULER");
- if (!v)
- factory = scheduler_table[0].f; // use default
- else {
- for (size_t i = 0; i < sizeof(scheduler_table)/sizeof(scheduler_table[0]); i++){
- if (strcmp(v, scheduler_table[i].name) == 0){
- factory = scheduler_table[i].f;
- break;
- }
- }
- if (factory == 0){
- std::cerr << "warning: Invalid GR_SCHEDULER environment variable value \""
- << v << "\". Using \"" << scheduler_table[0].name << "\"\n";
- factory = scheduler_table[0].f;
- }
- }
- }
- return factory(ffg, max_noutput_items);
-}
-
-
-gr_top_block_impl::gr_top_block_impl(gr_top_block *owner)
- : d_owner(owner), d_ffg(),
- d_state(IDLE), d_lock_count(0)
-{
-}
-
-gr_top_block_impl::~gr_top_block_impl()
-{
- d_owner = 0;
-}
-
-void
-gr_top_block_impl::start(int max_noutput_items)
-{
- gr::thread::scoped_lock l(d_mutex);
-
- d_max_noutput_items = max_noutput_items;
-
- if (d_state != IDLE)
- throw std::runtime_error("top_block::start: top block already running or wait() not called after previous stop()");
-
- if (d_lock_count > 0)
- throw std::runtime_error("top_block::start: can't start with flow graph locked");
-
- // Create new flat flow graph by flattening hierarchy
- d_ffg = d_owner->flatten();
-
- // Validate new simple flow graph and wire it up
- d_ffg->validate();
- d_ffg->setup_connections();
-
- // Only export perf. counters if ControlPort config param is enabled
- // and if the PerfCounter option 'export' is turned on.
- gr_prefs *p = gr_prefs::singleton();
- if(p->get_bool("ControlPort", "on", false) && p->get_bool("PerfCounters", "export", false))
- d_ffg->enable_pc_rpc();
-
- d_scheduler = make_scheduler(d_ffg, d_max_noutput_items);
- d_state = RUNNING;
-}
-
-void
-gr_top_block_impl::stop()
-{
- if (d_scheduler)
- d_scheduler->stop();
-}
-
-
-void
-gr_top_block_impl::wait()
-{
- if (d_scheduler)
- d_scheduler->wait();
-
- d_state = IDLE;
-}
-
-// N.B. lock() and unlock() cannot be called from a flow graph thread or
-// deadlock will occur when reconfiguration happens
-void
-gr_top_block_impl::lock()
-{
- gr::thread::scoped_lock lock(d_mutex);
- d_lock_count++;
-}
-
-void
-gr_top_block_impl::unlock()
-{
- gr::thread::scoped_lock lock(d_mutex);
-
- if (d_lock_count <= 0){
- d_lock_count = 0; // fix it, then complain
- throw std::runtime_error("unpaired unlock() call");
- }
-
- d_lock_count--;
- if (d_lock_count > 0 || d_state == IDLE) // nothing to do
- return;
-
- restart();
-}
-
-/*
- * restart is called with d_mutex held
- */
-void
-gr_top_block_impl::restart()
-{
- stop(); // Stop scheduler and wait for completion
- wait();
-
- // Create new simple flow graph
- gr_flat_flowgraph_sptr new_ffg = d_owner->flatten();
- new_ffg->validate(); // check consistency, sanity, etc
- new_ffg->merge_connections(d_ffg); // reuse buffers, etc
- d_ffg = new_ffg;
-
- // Create a new scheduler to execute it
- d_scheduler = make_scheduler(d_ffg, d_max_noutput_items);
- d_state = RUNNING;
-}
-
-std::string
-gr_top_block_impl::edge_list()
-{
- if(d_ffg)
- return d_ffg->edge_list();
- else
- return "";
-}
-
-void
-gr_top_block_impl::dump()
-{
- if (d_ffg)
- d_ffg->dump();
-}
-
-int
-gr_top_block_impl::max_noutput_items()
-{
- return d_max_noutput_items;
-}
-
-void
-gr_top_block_impl::set_max_noutput_items(int nmax)
-{
- d_max_noutput_items = nmax;
-}
diff --git a/gnuradio-runtime/lib/gr_top_block_impl.h b/gnuradio-runtime/lib/gr_top_block_impl.h
deleted file mode 100644
index 345a33152f..0000000000
--- a/gnuradio-runtime/lib/gr_top_block_impl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
-#define INCLUDED_GR_TOP_BLOCK_IMPL_H
-
-#include <gr_runtime_api.h>
-#include <gr_scheduler.h>
-#include <thread/thread.h>
-
-/*!
- *\brief Abstract implementation details of gr_top_block
- * \ingroup internal
- *
- * The actual implementation of gr_top_block. Separate class allows
- * decoupling of changes from dependent classes.
- *
- */
-class GR_RUNTIME_API gr_top_block_impl
-{
-public:
- gr_top_block_impl(gr_top_block *owner);
- ~gr_top_block_impl();
-
- // Create and start scheduler threads
- void start(int max_noutput_items=100000000);
-
- // Signal scheduler threads to stop
- void stop();
-
- // Wait for scheduler threads to exit
- void wait();
-
- // Lock the top block to allow reconfiguration
- void lock();
-
- // Unlock the top block at end of reconfiguration
- void unlock();
-
- // Return a string list of edges
- std::string edge_list();
-
- // Dump the flowgraph to stdout
- void dump();
-
- // Get the number of max noutput_items in the flowgraph
- int max_noutput_items();
-
- // Set the maximum number of noutput_items in the flowgraph
- void set_max_noutput_items(int nmax);
-
-protected:
-
- enum tb_state { IDLE, RUNNING };
-
- gr_top_block *d_owner;
- gr_flat_flowgraph_sptr d_ffg;
- gr_scheduler_sptr d_scheduler;
-
- gr::thread::mutex d_mutex; // protects d_state and d_lock_count
- tb_state d_state;
- int d_lock_count;
- int d_max_noutput_items;
-
-private:
- void restart();
-};
-
-#endif /* INCLUDED_GR_TOP_BLOCK_IMPL_H */
diff --git a/gnuradio-runtime/lib/gr_tpb_detail.cc b/gnuradio-runtime/lib/gr_tpb_detail.cc
deleted file mode 100644
index 46eb6bbe0d..0000000000
--- a/gnuradio-runtime/lib/gr_tpb_detail.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_tpb_detail.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <gr_buffer.h>
-
-using namespace pmt;
-
-/*
- * We assume that no worker threads are ever running when the
- * graph structure is being manipulated, thus it's safe for us to poke
- * around in our neighbors w/o holding any locks.
- */
-
-void
-gr_tpb_detail::notify_upstream(gr_block_detail *d)
-{
- // For each of our inputs, tell the guy upstream that we've consumed
- // some input, and that he most likely has more output buffer space
- // available.
-
- for (size_t i = 0; i < d->d_input.size(); i++){
- // Can you say, "pointer chasing?"
- d->d_input[i]->buffer()->link()->detail()->d_tpb.set_output_changed();
- }
-}
-
-void
-gr_tpb_detail::notify_downstream(gr_block_detail *d)
-{
- // For each of our outputs, tell the guys downstream that they have
- // new input available.
-
- for (size_t i = 0; i < d->d_output.size(); i++){
- gr_buffer_sptr buf = d->d_output[i];
- for (size_t j = 0, k = buf->nreaders(); j < k; j++)
- buf->reader(j)->link()->detail()->d_tpb.set_input_changed();
- }
-}
-
-void
-gr_tpb_detail::notify_neighbors(gr_block_detail *d)
-{
- notify_downstream(d);
- notify_upstream(d);
-}
-
diff --git a/gnuradio-runtime/lib/gr_tpb_thread_body.cc b/gnuradio-runtime/lib/gr_tpb_thread_body.cc
deleted file mode 100644
index 11934dbf09..0000000000
--- a/gnuradio-runtime/lib/gr_tpb_thread_body.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_tpb_thread_body.h>
-#include <gr_prefs.h>
-#include <iostream>
-#include <boost/thread.hpp>
-#include <pmt/pmt.h>
-#include <boost/foreach.hpp>
-
-using namespace pmt;
-
-gr_tpb_thread_body::gr_tpb_thread_body(gr_block_sptr block, int max_noutput_items)
- : d_exec(block, max_noutput_items)
-{
- //std::cerr << "gr_tpb_thread_body: " << block << std::endl;
-
- gr_block_detail *d = block->detail().get();
- gr_block_executor::state s;
- pmt_t msg;
-
- d->threaded = true;
- d->thread = gr::thread::get_current_thread_id();
-
- gr_prefs *p = gr_prefs::singleton();
- size_t max_nmsgs = static_cast<size_t>(p->get_long("DEFAULT", "max_messages", 100));
-
- // Set thread affinity if it was set before fg was started.
- if(block->processor_affinity().size() > 0) {
- gr::thread::thread_bind_to_processor(d->thread, block->processor_affinity());
- }
-
- while (1){
- boost::this_thread::interruption_point();
-
- // handle any queued up messages
- //BOOST_FOREACH( pmt::pmt_t port, block->msg_queue.keys() )
-
- BOOST_FOREACH( gr_basic_block::msg_queue_map_t::value_type &i, block->msg_queue )
- {
- // Check if we have a message handler attached before getting
- // any messages. This is mostly a protection for the unknown
- // startup sequence of the threads.
- if(block->has_msg_handler(i.first)) {
- while ((msg = block->delete_head_nowait(i.first))){
- block->dispatch_msg(i.first,msg);
- }
- }
- else {
- // If we don't have a handler but are building up messages,
- // prune the queue from the front to keep memory in check.
- if(block->nmsgs(i.first) > max_nmsgs)
- msg = block->delete_head_nowait(i.first);
- }
- }
-
- d->d_tpb.clear_changed();
- // run one iteration if we are a connected stream block
- if(d->noutputs() >0 || d->ninputs()>0){
- s = d_exec.run_one_iteration();
- } else {
- s = gr_block_executor::BLKD_IN;
- }
-
- switch(s){
- case gr_block_executor::READY: // Tell neighbors we made progress.
- d->d_tpb.notify_neighbors(d);
- break;
-
- case gr_block_executor::READY_NO_OUTPUT: // Notify upstream only
- d->d_tpb.notify_upstream(d);
- break;
-
- case gr_block_executor::DONE: // Game over.
- d->d_tpb.notify_neighbors(d);
- return;
-
- case gr_block_executor::BLKD_IN: // Wait for input.
- {
- gr::thread::scoped_lock guard(d->d_tpb.mutex);
- while (!d->d_tpb.input_changed){
-
- // wait for input or message
- while(!d->d_tpb.input_changed && block->empty_p())
- d->d_tpb.input_cond.wait(guard);
-
- // handle all pending messages
- BOOST_FOREACH( gr_basic_block::msg_queue_map_t::value_type &i, block->msg_queue )
- {
- while ((msg = block->delete_head_nowait(i.first))){
- guard.unlock(); // release lock while processing msg
- block->dispatch_msg(i.first, msg);
- guard.lock();
- }
- }
- }
- }
- break;
-
-
- case gr_block_executor::BLKD_OUT: // Wait for output buffer space.
- {
- gr::thread::scoped_lock guard(d->d_tpb.mutex);
- while (!d->d_tpb.output_changed){
-
- // wait for output room or message
- while(!d->d_tpb.output_changed && block->empty_p())
- d->d_tpb.output_cond.wait(guard);
-
- // handle all pending messages
- BOOST_FOREACH( gr_basic_block::msg_queue_map_t::value_type &i, block->msg_queue )
- {
- while ((msg = block->delete_head_nowait(i.first))){
- guard.unlock(); // release lock while processing msg
- block->dispatch_msg(i.first,msg);
- guard.lock();
- }
- }
- }
- }
- break;
-
- default:
- assert(0);
- }
- }
-}
-
-gr_tpb_thread_body::~gr_tpb_thread_body()
-{
-}
diff --git a/gnuradio-runtime/lib/gr_tpb_thread_body.h b/gnuradio-runtime/lib/gr_tpb_thread_body.h
deleted file mode 100644
index 6ecb022f69..0000000000
--- a/gnuradio-runtime/lib/gr_tpb_thread_body.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_TPB_THREAD_BODY_H
-#define INCLUDED_GR_TPB_THREAD_BODY_H
-
-#include <gr_runtime_api.h>
-#include <gr_block_executor.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-
-/*!
- * \brief The body of each thread-per-block thread.
- *
- * One of these is instantiated in its own thread for each block. The
- * constructor turns into the main loop which returns when the block is
- * done or is interrupted.
- */
-
-class GR_RUNTIME_API gr_tpb_thread_body {
- gr_block_executor d_exec;
-
-public:
- gr_tpb_thread_body(gr_block_sptr block, int max_noutput_items=100000);
- ~gr_tpb_thread_body();
-};
-
-
-#endif /* INCLUDED_GR_TPB_THREAD_BODY_H */
diff --git a/gnuradio-runtime/lib/gr_vco.h b/gnuradio-runtime/lib/gr_vco.h
deleted file mode 100644
index 3ceaf15dd4..0000000000
--- a/gnuradio-runtime/lib/gr_vco.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _GR_VCO_H_
-#define _GR_VCO_H_
-
-
-#include <vector>
-#include <gr_sincos.h>
-#include <cmath>
-#include <gr_complex.h>
-
-/*!
- * \brief base class template for Voltage Controlled Oscillator (VCO)
- * \ingroup misc
- */
-
-//FIXME Eventually generalize this to fixed point
-
-template<class o_type, class i_type>
-class gr_vco {
-public:
- gr_vco () : d_phase (0) {}
-
- virtual ~gr_vco () {}
-
- // radians
- void set_phase (double angle) {
- d_phase = angle;
- }
-
- void adjust_phase (double delta_phase) {
- d_phase += delta_phase;
- if (fabs (d_phase) > M_PI){
-
- while (d_phase > M_PI)
- d_phase -= 2*M_PI;
-
- while (d_phase < -M_PI)
- d_phase += 2*M_PI;
- }
- }
-
- double get_phase () const { return d_phase; }
-
- // compute sin and cos for current phase angle
- void sincos (float *sinx, float *cosx) const;
-
- // compute cos or sin for current phase angle
- float cos () const { return std::cos (d_phase); }
- float sin () const { return std::sin (d_phase); }
-
- // compute a block at a time
- void cos (float *output, const float *input, int noutput_items, double k, double ampl = 1.0);
-
-protected:
- double d_phase;
-};
-
-template<class o_type, class i_type>
-void
-gr_vco<o_type,i_type>::sincos (float *sinx, float *cosx) const
-{
- gr_sincosf (d_phase, sinx, cosx);
-}
-
-template<class o_type, class i_type>
-void
-gr_vco<o_type,i_type>::cos (float *output, const float *input, int noutput_items, double k, double ampl)
-{
- for (int i = 0; i < noutput_items; i++){
- output[i] = cos() * ampl;
- adjust_phase(input[i] * k);
- }
-}
-#endif /* _GR_VCO_H_ */
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf.cc b/gnuradio-runtime/lib/gr_vmcircbuf.cc
deleted file mode 100644
index 522d9515d0..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf.cc
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_vmcircbuf.h>
-#include <assert.h>
-#include <stdexcept>
-#include <gr_preferences.h>
-#include <stdio.h>
-#include <string.h>
-#include <gr_local_sighandler.h>
-#include <vector>
-#include <boost/format.hpp>
-
-// all the factories we know about
-#include <gr_vmcircbuf_createfilemapping.h>
-#include <gr_vmcircbuf_sysv_shm.h>
-#include <gr_vmcircbuf_mmap_shm_open.h>
-#include <gr_vmcircbuf_mmap_tmpfile.h>
-
-static const char *FACTORY_PREF_KEY = "gr_vmcircbuf_default_factory";
-
-gr_vmcircbuf::~gr_vmcircbuf ()
-{
-}
-
-gr_vmcircbuf_factory::~gr_vmcircbuf_factory ()
-{
-}
-
-// ----------------------------------------------------------------
-
-static gr_vmcircbuf_factory *s_default_factory = 0;
-
-gr_vmcircbuf_factory *
-gr_vmcircbuf_sysconfig::get_default_factory ()
-{
- if (s_default_factory)
- return s_default_factory;
-
- bool verbose = false;
-
- std::vector<gr_vmcircbuf_factory *> all = all_factories ();
-
- const char *name = gr_preferences::get (FACTORY_PREF_KEY);
-
- if (name){
- for (unsigned int i = 0; i < all.size (); i++){
- if (strcmp (name, all[i]->name ()) == 0){
- s_default_factory = all[i];
- if (verbose)
- fprintf (stderr, "gr_vmcircbuf_sysconfig: using %s\n",
- s_default_factory->name ());
- return s_default_factory;
- }
- }
- }
-
- // either we don't have a default, or the default named is not in our
- // list of factories. Find the first factory that works.
-
- if (verbose)
- fprintf (stderr, "gr_vmcircbuf_sysconfig: finding a working factory...\n");
-
- for (unsigned int i = 0; i < all.size (); i++){
- if (test_factory (all[i], verbose)){
- set_default_factory (all[i]);
- return s_default_factory;
- }
- }
-
- // We're screwed!
-
- fprintf (stderr, "gr_vmcircbuf_sysconfig: unable to find a working factory!\n");
- throw std::runtime_error ("gr_vmcircbuf_sysconfig");
-}
-
-std::vector<gr_vmcircbuf_factory *>
-gr_vmcircbuf_sysconfig::all_factories ()
-{
- std::vector<gr_vmcircbuf_factory *> result;
-
- result.push_back (gr_vmcircbuf_createfilemapping_factory::singleton ());
-#ifdef TRY_SHM_VMCIRCBUF
- result.push_back (gr_vmcircbuf_sysv_shm_factory::singleton ());
- result.push_back (gr_vmcircbuf_mmap_shm_open_factory::singleton ());
-#endif
- result.push_back (gr_vmcircbuf_mmap_tmpfile_factory::singleton ());
-
- return result;
-}
-
-void
-gr_vmcircbuf_sysconfig::set_default_factory (gr_vmcircbuf_factory *f)
-{
- gr_preferences::set (FACTORY_PREF_KEY, f->name ());
- s_default_factory = f;
-}
-
-
-// ------------------------------------------------------------------------
-// test code for vmcircbuf factories
-// ------------------------------------------------------------------------
-
-static void
-init_buffer (gr_vmcircbuf *c, int counter, int size)
-{
- unsigned int *p = (unsigned int *) c->pointer_to_first_copy ();
- for (unsigned int i = 0; i < size / sizeof (int); i++)
- p[i] = counter + i;
-}
-
-static bool
-check_mapping (gr_vmcircbuf *c, int counter, int size, const char *msg, bool verbose)
-{
- bool ok = true;
-
- if (verbose)
- fprintf (stderr, "... %s", msg);
-
- unsigned int *p1 = (unsigned int *) c->pointer_to_first_copy ();
- unsigned int *p2 = (unsigned int *) c->pointer_to_second_copy ();
-
- // fprintf (stderr, "p1 = %p, p2 = %p\n", p1, p2);
-
- for (unsigned int i = 0; i < size / sizeof (int); i++){
- if (p1[i] != counter + i){
- ok = false;
- if (verbose)
- fprintf (stderr, " p1[%d] == %u, expected %u\n", i, p1[i], counter + i);
- break;
- }
- if (p2[i] != counter + i){
- if (verbose)
- fprintf (stderr, " p2[%d] == %u, expected %u\n", i, p2[i], counter + i);
- ok = false;
- break;
- }
- }
-
- if (ok && verbose){
- fprintf (stderr, " OK\n");
- }
- return ok;
-}
-
-static const char *
-memsize (int size)
-{
- static std::string buf;
- if (size >= (1 << 20)){
- buf = str(boost::format("%dMB") % (size / (1 << 20)));
- }
- else if (size >= (1 << 10)){
- buf = str(boost::format("%dKB") % (size / (1 << 10)));
- }
- else {
- buf = str(boost::format("%d") % size);
- }
- return buf.c_str();
-}
-
-static bool
-test_a_bunch (gr_vmcircbuf_factory *factory, int n, int size, int *start_ptr, bool verbose)
-{
- bool ok = true;
- std::vector<int> counter(n);
- std::vector<gr_vmcircbuf *> c(n);
- int cum_size = 0;
-
- for (int i = 0; i < n; i++){
- counter[i] = *start_ptr;
- *start_ptr += size;
- if ((c[i] = factory->make (size)) == 0){
- if (verbose)
- fprintf (stderr,
- "Failed to allocate gr_vmcircbuf number %d of size %d (cum = %s)\n",
- i + 1, size, memsize (cum_size));
- return false;
- }
- init_buffer (c[i], counter[i], size);
- cum_size += size;
- }
-
- for (int i = 0; i < n; i++){
- std::string msg = str(boost::format("test_a_bunch_%dx%s[%d]") % n % memsize (size) % i);
- ok &= check_mapping (c[i], counter[i], size, msg.c_str(), verbose);
- }
-
- for (int i = 0; i < n; i++){
- delete c[i];
- c[i] = 0;
- }
-
- return ok;
-}
-
-static bool
-standard_tests (gr_vmcircbuf_factory *f, int verbose)
-{
- if (verbose >= 1)
- fprintf (stderr, "Testing %s...\n", f->name ());
-
- bool v = verbose >= 2;
- int granularity = f->granularity ();
- int start = 0;
- bool ok = true;
-
- ok &= test_a_bunch (f, 1, 1 * granularity, &start, v); // 1 x 4KB = 4KB
-
- if (ok){
- ok &= test_a_bunch (f, 64, 4 * granularity, &start, v); // 64 x 16KB = 1MB
- ok &= test_a_bunch (f, 4, 4 * (1L << 20), &start, v); // 4 x 4MB = 16MB
-// ok &= test_a_bunch (f, 256, 256 * (1L << 10), &start, v); // 256 x 256KB = 64MB
- }
-
- if (verbose >= 1)
- fprintf (stderr, "....... %s: %s", f->name (), ok ? "OK\n" : "Doesn't work\n");
-
- return ok;
-}
-
-bool
-gr_vmcircbuf_sysconfig::test_factory (gr_vmcircbuf_factory *f, int verbose)
-{
- // Install local signal handlers for SIGSEGV and SIGBUS.
- // If something goes wrong, these signals may be invoked.
-
-#ifdef SIGSEGV
- gr_local_sighandler sigsegv (SIGSEGV, gr_local_sighandler::throw_signal);
-#endif
-#ifdef SIGBUS
- gr_local_sighandler sigbus (SIGBUS, gr_local_sighandler::throw_signal);
-#endif
-#ifdef SIGSYS
- gr_local_sighandler sigsys (SIGSYS, gr_local_sighandler::throw_signal);
-#endif
-
- try {
- return standard_tests (f, verbose);
- }
- catch (gr_signal &sig){
- if (verbose){
- fprintf (stderr, "....... %s: %s", f->name (), "Doesn't work\n");
- fprintf (stderr,
- "gr_vmcircbuf_factory::test_factory (%s): caught %s\n",
- f->name (), sig.name().c_str());
- return false;
- }
- }
- catch (...){
- if (verbose){
- fprintf (stderr, "....... %s: %s", f->name (), "Doesn't work\n");
- fprintf (stderr,
- "gr_vmcircbuf_factory::test_factory (%s): some kind of uncaught exception\n",
- f->name ());
- }
- return false;
- }
- return false; // never gets here. shut compiler up.
-}
-
-bool
-gr_vmcircbuf_sysconfig::test_all_factories (int verbose)
-{
- bool ok = false;
-
- std::vector<gr_vmcircbuf_factory *> all = all_factories ();
-
- for (unsigned int i = 0; i < all.size (); i++)
- ok |= test_factory (all[i], verbose);
-
- return ok;
-}
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf.h b/gnuradio-runtime/lib/gr_vmcircbuf.h
deleted file mode 100644
index e7f492a8bd..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_VMCIRCBUF_H_
-#define _GR_VMCIRCBUF_H_
-
-#include <gr_runtime_api.h>
-#include <vector>
-
-/*!
- * \brief abstract class to implement doubly mapped virtual memory circular buffers
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_vmcircbuf {
- protected:
- int d_size;
- char *d_base;
-
- // CREATORS
- gr_vmcircbuf (int size) : d_size (size), d_base (0) {};
-
- public:
- virtual ~gr_vmcircbuf ();
-
- // ACCESSORS
- void *pointer_to_first_copy () const { return d_base; }
- void *pointer_to_second_copy () const { return d_base + d_size; }
-};
-
-/*!
- * \brief abstract factory for creating circular buffers
- */
-class GR_RUNTIME_API gr_vmcircbuf_factory {
- protected:
- gr_vmcircbuf_factory () {};
- virtual ~gr_vmcircbuf_factory ();
-
- public:
-
- /*!
- * \brief return name of this factory
- */
- virtual const char *name () const = 0;
-
- /*!
- * \brief return granularity of mapping, typically equal to page size
- */
- virtual int granularity () = 0;
-
- /*!
- * \brief return a gr_vmcircbuf, or 0 if unable.
- *
- * Call this to create a doubly mapped circular buffer.
- */
- virtual gr_vmcircbuf *make (int size) = 0;
-};
-
-/*
- * \brief pulls together all implementations of gr_vmcircbuf
- */
-class GR_RUNTIME_API gr_vmcircbuf_sysconfig {
- public:
-
- /*
- * \brief return the single instance of the default factory.
- *
- * returns the default factory to use if it's already defined,
- * else find the first working factory and use it.
- */
- static gr_vmcircbuf_factory *get_default_factory ();
-
-
- static int granularity () { return get_default_factory()->granularity(); }
- static gr_vmcircbuf *make (int size) { return get_default_factory()->make(size); }
-
-
- // N.B. not all factories are guaranteed to work.
- // It's too hard to check everything at config time, so we check at runtime
- static std::vector<gr_vmcircbuf_factory *> all_factories ();
-
- // make this factory the default
- static void set_default_factory (gr_vmcircbuf_factory *f);
-
- /*!
- * \brief Does this factory really work?
- *
- * verbose = 0: silent
- * verbose = 1: names of factories tested and results
- * verbose = 2: all intermediate results
- */
- static bool test_factory (gr_vmcircbuf_factory *f, int verbose);
-
- /*!
- * \brief Test all factories, return true if at least one of them works
- * verbose = 0: silent
- * verbose = 1: names of factories tested and results
- * verbose = 2: all intermediate results
- */
- static bool test_all_factories (int verbose);
-};
-
-
-#endif /* _GR_VMCIRCBUF_H_ */
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc
deleted file mode 100644
index 1b4d9700a5..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2005,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdexcept>
-#include <assert.h>
-#include <unistd.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#include <errno.h>
-#include <stdio.h>
-#include <gr_pagesize.h>
-#include <gr_vmcircbuf_createfilemapping.h>
-#include <boost/format.hpp>
-
-#ifdef HAVE_CREATEFILEMAPPING
-// Print Windows error (could/should be global?)
-static void
-werror( char *where, DWORD last_error )
-{
- char buf[1024];
-
- FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- last_error,
- 0, // default language
- buf,
- sizeof(buf)/sizeof(TCHAR), // buffer size
- NULL );
- fprintf( stderr, "%s: Error %d: %s", where, last_error, buf );
- return;
-}
-#endif
-
-
-gr_vmcircbuf_createfilemapping::gr_vmcircbuf_createfilemapping (int size)
- : gr_vmcircbuf (size)
-{
-#if !defined(HAVE_CREATEFILEMAPPING)
- fprintf (stderr, "%s: createfilemapping is not available\n",__FUNCTION__);
- throw std::runtime_error ("gr_vmcircbuf_createfilemapping");
-#else
- static int s_seg_counter = 0;
-
- if (size <= 0 || (size % gr_pagesize ()) != 0){
- fprintf (stderr, "gr_vmcircbuf_createfilemapping: invalid size = %d\n", size);
- throw std::runtime_error ("gr_vmcircbuf_createfilemapping");
- }
-
- std::string seg_name = str(boost::format("/gnuradio-%d-%d") % getpid () % s_seg_counter);
-
- d_handle = CreateFileMapping(INVALID_HANDLE_VALUE, // use paging file
- NULL, // default security
- PAGE_READWRITE, // read/write access
- 0, // max. object size
- size, // buffer size
- seg_name.c_str()); // name of mapping object
-
- s_seg_counter++;
- if (d_handle == NULL || d_handle == INVALID_HANDLE_VALUE){
- std::string msg = str(boost::format(
- "gr_vmcircbuf_mmap_createfilemapping: CreateFileMapping [%s]") %
- seg_name );
- werror((char *) msg.c_str(), GetLastError() );
- throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
- }
-
- // Allocate virtual memory of the needed size, then free it so we can use it
- LPVOID first_tmp;
- first_tmp = VirtualAlloc( NULL, 2*size, MEM_RESERVE, PAGE_NOACCESS );
- if (first_tmp == NULL){
- werror( "gr_vmcircbuf_mmap_createfilemapping: VirtualAlloc", GetLastError());
- CloseHandle(d_handle); // cleanup
- throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
- }
-
- if (VirtualFree(first_tmp, 0, MEM_RELEASE) == 0){
- werror( "gr_vmcircbuf_mmap_createfilemapping: VirtualFree", GetLastError());
- CloseHandle(d_handle); // cleanup
- throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
- }
-
- d_first_copy = MapViewOfFileEx((HANDLE)d_handle, // handle to map object
- FILE_MAP_WRITE, // read/write permission
- 0,
- 0,
- size,
- first_tmp);
- if (d_first_copy != first_tmp){
- werror( "gr_vmcircbuf_mmap_createfilemapping: MapViewOfFileEx(1)", GetLastError());
- CloseHandle(d_handle); // cleanup
- throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
- }
-
- d_second_copy = MapViewOfFileEx((HANDLE)d_handle, // handle to map object
- FILE_MAP_WRITE, // read/write permission
- 0,
- 0,
- size,
- (char *)first_tmp + size);//(LPVOID) ((char *)d_first_copy + size));
-
- if (d_second_copy != (char *)first_tmp + size){
- werror( "gr_vmcircbuf_mmap_createfilemapping: MapViewOfFileEx(2)", GetLastError());
- UnmapViewOfFile(d_first_copy);
- CloseHandle(d_handle); // cleanup
- throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
- }
-
-#ifdef DEBUG
- fprintf (stderr,"gr_vmcircbuf_mmap_createfilemapping: contiguous? mmap %p %p %p %p\n",
- (char *)d_first_copy, (char *)d_second_copy, size, (char *)d_first_copy + size);
-#endif
-
- // Now remember the important stuff
- d_base = (char *) d_first_copy;
- d_size = size;
-#endif /*HAVE_CREATEFILEMAPPING*/
-}
-
-gr_vmcircbuf_createfilemapping::~gr_vmcircbuf_createfilemapping ()
-{
-#ifdef HAVE_CREATEFILEMAPPING
- if (UnmapViewOfFile(d_first_copy) == 0)
- {
- werror("gr_vmcircbuf_createfilemapping: UnmapViewOfFile(d_first_copy)", GetLastError());
- }
- d_base=NULL;
- if (UnmapViewOfFile(d_second_copy) == 0)
- {
- werror("gr_vmcircbuf_createfilemapping: UnmapViewOfFile(d_second_copy)", GetLastError());
- }
- //d_second=NULL;
- CloseHandle(d_handle);
-#endif
-}
-
-// ----------------------------------------------------------------
-// The factory interface
-// ----------------------------------------------------------------
-
-
-gr_vmcircbuf_factory *gr_vmcircbuf_createfilemapping_factory::s_the_factory = 0;
-
-gr_vmcircbuf_factory *
-gr_vmcircbuf_createfilemapping_factory::singleton ()
-{
- if (s_the_factory)
- return s_the_factory;
- s_the_factory = new gr_vmcircbuf_createfilemapping_factory ();
- return s_the_factory;
-}
-
-int
-gr_vmcircbuf_createfilemapping_factory::granularity ()
-{
-#ifdef HAVE_CREATEFILEMAPPING
- // return 65536;//TODO, check, is this needed or can we just use gr_pagesize()
- SYSTEM_INFO system_info;
- GetSystemInfo(&system_info);
- //fprintf(stderr,"win32 AllocationGranularity %p\n",(int)system_info.dwAllocationGranularity);
- return (int)system_info.dwAllocationGranularity;
-#else
- return gr_pagesize ();
-#endif
-}
-
-gr_vmcircbuf *
-gr_vmcircbuf_createfilemapping_factory::make (int size)
-{
- try
- {
- return new gr_vmcircbuf_createfilemapping (size);
- }
- catch (...)
- {
- return 0;
- }
-}
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h
deleted file mode 100644
index a4bb5cbe92..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
-#define _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
-
-#include <gr_runtime_api.h>
-#include <gr_vmcircbuf.h>
-
-#ifdef HAVE_CREATEFILEMAPPING
-#include <windows.h>
-#endif
-/*!
- * \brief concrete class to implement circular buffers with mmap and shm_open
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
-{
- public:
- // CREATORS
- gr_vmcircbuf_createfilemapping (int size);
- virtual ~gr_vmcircbuf_createfilemapping ();
-#ifdef HAVE_CREATEFILEMAPPING
- private:
- HANDLE d_handle;
- LPVOID d_first_copy;
- LPVOID d_second_copy;
-#endif
-};
-
-/*!
- * \brief concrete factory for circular buffers built using mmap and shm_open
- */
-class GR_RUNTIME_API gr_vmcircbuf_createfilemapping_factory : public gr_vmcircbuf_factory
-{
- private:
- static gr_vmcircbuf_factory *s_the_factory;
-
- public:
- static gr_vmcircbuf_factory *singleton ();
-
- virtual const char *name () const { return "gr_vmcircbuf_createfilemapping_factory"; }
-
- /*!
- * \brief return granularity of mapping, typically equal to page size
- */
- virtual int granularity ();
-
- /*!
- * \brief return a gr_vmcircbuf, or 0 if unable.
- *
- * Call this to create a doubly mapped circular buffer.
- */
- virtual gr_vmcircbuf *make (int size);
-};
-
-#endif /* _GR_VMCIRCBUF_CREATEFILEMAPPING_H_ */
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc
deleted file mode 100644
index 3d170081d0..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_vmcircbuf_mmap_shm_open.h>
-#include <stdexcept>
-#include <assert.h>
-#include <unistd.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#include <errno.h>
-#include <stdio.h>
-#include <gr_pagesize.h>
-#include <gr_sys_paths.h>
-
-
-gr_vmcircbuf_mmap_shm_open::gr_vmcircbuf_mmap_shm_open (int size)
- : gr_vmcircbuf (size)
-{
-#if !defined(HAVE_MMAP) || !defined(HAVE_SHM_OPEN)
- fprintf (stderr, "gr_vmcircbuf_mmap_shm_open: mmap or shm_open is not available\n");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
-#else
- static int s_seg_counter = 0;
-
- if (size <= 0 || (size % gr_pagesize ()) != 0){
- fprintf (stderr, "gr_vmcircbuf_mmap_shm_open: invalid size = %d\n", size);
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
- int shm_fd = -1;
- char seg_name[1024];
- static bool portable_format = true;
-
- // open a new named shared memory segment
-
- while (1){
- if (portable_format){
-
- // This is the POSIX recommended "portable format".
- // Of course the "portable format" doesn't work on some systems...
-
- snprintf (seg_name, sizeof (seg_name),
- "/gnuradio-%d-%d", getpid (), s_seg_counter);
- }
- else {
-
- // Where the "portable format" doesn't work, we try building
- // a full filesystem pathname pointing into a suitable temporary directory.
-
- snprintf (seg_name, sizeof (seg_name),
- "%s/gnuradio-%d-%d", gr_tmp_path (), getpid (), s_seg_counter);
- }
-
- shm_fd = shm_open (seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
- if (shm_fd == -1 && errno == EACCES && portable_format){
- portable_format = false;
- continue; // try again using "non-portable format"
- }
-
- s_seg_counter++;
-
- if (shm_fd == -1){
- if (errno == EEXIST) // Named segment already exists (shouldn't happen). Try again
- continue;
-
- char msg[1024];
- snprintf (msg, sizeof (msg), "gr_vmcircbuf_mmap_shm_open: shm_open [%s]", seg_name);
- perror (msg);
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
- break;
- }
-
- // We've got a new shared memory segment fd open.
- // Now set it's length to 2x what we really want and mmap it in.
-
- if (ftruncate (shm_fd, (off_t) 2 * size) == -1){
- close (shm_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_shm_open: ftruncate (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
- void *first_copy = mmap (0, 2 * size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- shm_fd, (off_t) 0);
-
- if (first_copy == MAP_FAILED){
- close (shm_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_shm_open: mmap (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
- // unmap the 2nd half
- if (munmap ((char *) first_copy + size, size) == -1){
- close (shm_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_shm_open: munmap (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
- // map the first half into the now available hole where the
- // second half used to be.
-
- void *second_copy = mmap ((char *) first_copy + size, size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- shm_fd, (off_t) 0);
-
- if (second_copy == MAP_FAILED){
- close (shm_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_shm_open: mmap (2)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
-#if 0 // OS/X doesn't allow you to resize the segment
-
- // cut the shared memory segment down to size
- if (ftruncate (shm_fd, (off_t) size) == -1){
- close (shm_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_shm_open: ftruncate (2)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-#endif
-
- close (shm_fd); // fd no longer needed. The mapping is retained.
-
- if (shm_unlink (seg_name) == -1){ // unlink the seg_name.
- perror ("gr_vmcircbuf_mmap_shm_open: shm_unlink");
- throw std::runtime_error ("gr_vmcircbuf_mmap_shm_open");
- }
-
- // Now remember the important stuff
-
- d_base = (char *) first_copy;
- d_size = size;
-#endif
-}
-
-gr_vmcircbuf_mmap_shm_open::~gr_vmcircbuf_mmap_shm_open ()
-{
-#if defined(HAVE_MMAP)
- if (munmap (d_base, 2 * d_size) == -1){
- perror ("gr_vmcircbuf_mmap_shm_open: munmap (2)");
- }
-#endif
-}
-
-// ----------------------------------------------------------------
-// The factory interface
-// ----------------------------------------------------------------
-
-
-gr_vmcircbuf_factory *gr_vmcircbuf_mmap_shm_open_factory::s_the_factory = 0;
-
-gr_vmcircbuf_factory *
-gr_vmcircbuf_mmap_shm_open_factory::singleton ()
-{
- if (s_the_factory)
- return s_the_factory;
-
- s_the_factory = new gr_vmcircbuf_mmap_shm_open_factory ();
- return s_the_factory;
-}
-
-int
-gr_vmcircbuf_mmap_shm_open_factory::granularity ()
-{
- return gr_pagesize ();
-}
-
-gr_vmcircbuf *
-gr_vmcircbuf_mmap_shm_open_factory::make (int size)
-{
- try {
- return new gr_vmcircbuf_mmap_shm_open (size);
- }
- catch (...){
- return 0;
- }
-}
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h
deleted file mode 100644
index d35df80839..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
-#define _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
-
-#include <gr_runtime_api.h>
-#include <gr_vmcircbuf.h>
-
-/*!
- * \brief concrete class to implement circular buffers with mmap and shm_open
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
- public:
-
- // CREATORS
-
- gr_vmcircbuf_mmap_shm_open (int size);
- virtual ~gr_vmcircbuf_mmap_shm_open ();
-};
-
-/*!
- * \brief concrete factory for circular buffers built using mmap and shm_open
- */
-class GR_RUNTIME_API gr_vmcircbuf_mmap_shm_open_factory : public gr_vmcircbuf_factory {
- private:
- static gr_vmcircbuf_factory *s_the_factory;
-
- public:
- static gr_vmcircbuf_factory *singleton ();
-
- virtual const char *name () const { return "gr_vmcircbuf_mmap_shm_open_factory"; }
-
- /*!
- * \brief return granularity of mapping, typically equal to page size
- */
- virtual int granularity ();
-
- /*!
- * \brief return a gr_vmcircbuf, or 0 if unable.
- *
- * Call this to create a doubly mapped circular buffer.
- */
- virtual gr_vmcircbuf *make (int size);
-};
-
-#endif /* _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_ */
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc
deleted file mode 100644
index 35de64699e..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_vmcircbuf_mmap_tmpfile.h>
-#include <stdexcept>
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <gr_pagesize.h>
-#include <gr_sys_paths.h>
-
-gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size)
- : gr_vmcircbuf (size)
-{
-#if !defined(HAVE_MMAP)
- fprintf (stderr, "gr_vmcircbuf_mmap_tmpfile: mmap or mkstemp is not available\n");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
-#else
-
- if (size <= 0 || (size % gr_pagesize ()) != 0){
- fprintf (stderr, "gr_vmcircbuf_mmap_tmpfile: invalid size = %d\n", size);
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- int seg_fd = -1;
- char seg_name[1024];
-
- static int s_seg_counter = 0;
-
-
- // open a temporary file that we'll map in a bit later
-
- while (1){
- snprintf (seg_name, sizeof (seg_name),
- "%s/gnuradio-%d-%d-XXXXXX", gr_tmp_path (), getpid (), s_seg_counter);
- s_seg_counter++;
-
- seg_fd = open (seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
- if (seg_fd == -1){
- if (errno == EEXIST) // File already exists (shouldn't happen). Try again
- continue;
-
- char msg[1024];
- snprintf (msg, sizeof (msg),
- "gr_vmcircbuf_mmap_tmpfile: open [%s]", seg_name);
- perror (msg);
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
- break;
- }
-
- if (unlink (seg_name) == -1){
- perror ("gr_vmcircbuf_mmap_tmpfile: unlink");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- // We've got a valid file descriptor to a tmp file.
- // Now set it's length to 2x what we really want and mmap it in.
-
- if (ftruncate (seg_fd, (off_t) 2 * size) == -1){
- close (seg_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_tmpfile: ftruncate (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- void *first_copy = mmap (0, 2 * size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- seg_fd, (off_t) 0);
-
- if (first_copy == MAP_FAILED){
- close (seg_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_tmpfile: mmap (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- // unmap the 2nd half
- if (munmap ((char *) first_copy + size, size) == -1){
- close (seg_fd); // cleanup
- perror ("gr_vmcircbuf_mmap_tmpfile: munmap (1)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- // map the first half into the now available hole where the
- // second half used to be.
-
- void *second_copy = mmap ((char *) first_copy + size, size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- seg_fd, (off_t) 0);
-
- if (second_copy == MAP_FAILED){
- munmap(first_copy, size); // cleanup
- close (seg_fd);
- perror ("gr_vmcircbuf_mmap_tmpfile: mmap (2)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- // check for contiguity
- if ((char *) second_copy != (char *) first_copy + size){
- munmap(first_copy, size); // cleanup
- munmap(second_copy, size);
- close (seg_fd);
- perror ("gr_vmcircbuf_mmap_tmpfile: non-contiguous second copy");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- // cut the tmp file down to size
- if (ftruncate (seg_fd, (off_t) size) == -1){
- munmap(first_copy, size); // cleanup
- munmap(second_copy, size);
- close (seg_fd);
- perror ("gr_vmcircbuf_mmap_tmpfile: ftruncate (2)");
- throw std::runtime_error ("gr_vmcircbuf_mmap_tmpfile");
- }
-
- close (seg_fd); // fd no longer needed. The mapping is retained.
-
- // Now remember the important stuff
-
- d_base = (char *) first_copy;
- d_size = size;
-#endif
-}
-
-gr_vmcircbuf_mmap_tmpfile::~gr_vmcircbuf_mmap_tmpfile ()
-{
-#if defined(HAVE_MMAP)
- if (munmap (d_base, 2 * d_size) == -1){
- perror ("gr_vmcircbuf_mmap_tmpfile: munmap (2)");
- }
-#endif
-}
-
-// ----------------------------------------------------------------
-// The factory interface
-// ----------------------------------------------------------------
-
-
-gr_vmcircbuf_factory *gr_vmcircbuf_mmap_tmpfile_factory::s_the_factory = 0;
-
-gr_vmcircbuf_factory *
-gr_vmcircbuf_mmap_tmpfile_factory::singleton ()
-{
- if (s_the_factory)
- return s_the_factory;
-
- s_the_factory = new gr_vmcircbuf_mmap_tmpfile_factory ();
- return s_the_factory;
-}
-
-int
-gr_vmcircbuf_mmap_tmpfile_factory::granularity ()
-{
- return gr_pagesize ();
-}
-
-gr_vmcircbuf *
-gr_vmcircbuf_mmap_tmpfile_factory::make (int size)
-{
- try {
- return new gr_vmcircbuf_mmap_tmpfile (size);
- }
- catch (...){
- return 0;
- }
-}
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h
deleted file mode 100644
index cd865734f2..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_VMCIRCBUF_MMAP_TMPFILE_H_
-#define _GR_VMCIRCBUF_MMAP_TMPFILE_H_
-
-#include <gr_runtime_api.h>
-#include <gr_vmcircbuf.h>
-
-/*!
- * \brief concrete class to implement circular buffers with mmap and shm_open
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
- public:
-
- // CREATORS
-
- gr_vmcircbuf_mmap_tmpfile (int size);
- virtual ~gr_vmcircbuf_mmap_tmpfile ();
-};
-
-/*!
- * \brief concrete factory for circular buffers built using mmap and shm_open
- */
-class GR_RUNTIME_API gr_vmcircbuf_mmap_tmpfile_factory : public gr_vmcircbuf_factory {
- private:
- static gr_vmcircbuf_factory *s_the_factory;
-
- public:
- static gr_vmcircbuf_factory *singleton ();
-
- virtual const char *name () const { return "gr_vmcircbuf_mmap_tmpfile_factory"; }
-
- /*!
- * \brief return granularity of mapping, typically equal to page size
- */
- virtual int granularity ();
-
- /*!
- * \brief return a gr_vmcircbuf, or 0 if unable.
- *
- * Call this to create a doubly mapped circular buffer.
- */
- virtual gr_vmcircbuf *make (int size);
-};
-
-#endif /* _GR_VMCIRCBUF_MMAP_TMPFILE_H_ */
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc
deleted file mode 100644
index d9cf75e70f..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <gr_vmcircbuf_sysv_shm.h>
-#include <stdexcept>
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_IPC_H
-#include <sys/ipc.h>
-#endif
-#ifdef HAVE_SYS_SHM_H
-#include <sys/shm.h>
-#endif
-#include <errno.h>
-#include <stdio.h>
-#include <gr_pagesize.h>
-
-
-gr_vmcircbuf_sysv_shm::gr_vmcircbuf_sysv_shm (int size)
- : gr_vmcircbuf (size)
-{
-#if !defined(HAVE_SYS_SHM_H)
- fprintf (stderr, "gr_vmcircbuf_sysv_shm: sysv shared memory is not available\n");
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
-#else
-
- int pagesize = gr_pagesize();
-
- if (size <= 0 || (size % pagesize) != 0){
- fprintf (stderr, "gr_vmcircbuf_sysv_shm: invalid size = %d\n", size);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- int shmid_guard = -1;
- int shmid1 = -1;
- int shmid2 = -1;
-
- // We use this as a guard page. We'll map it read-only on both ends of the buffer.
- // Ideally we'd map it no access, but I don't think that's possible with SysV
- if ((shmid_guard = shmget (IPC_PRIVATE, pagesize, IPC_CREAT | 0400)) == -1){
- perror ("gr_vmcircbuf_sysv_shm: shmget (0)");
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- if ((shmid2 = shmget (IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1){
- perror ("gr_vmcircbuf_sysv_shm: shmget (1)");
- shmctl (shmid_guard, IPC_RMID, 0);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- if ((shmid1 = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1){
- perror ("gr_vmcircbuf_sysv_shm: shmget (2)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid2, IPC_RMID, 0);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- void *first_copy = shmat (shmid2, 0, 0);
- if (first_copy == (void *) -1){
- perror ("gr_vmcircbuf_sysv_shm: shmat (1)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid2, IPC_RMID, 0);
- shmctl (shmid1, IPC_RMID, 0);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- shmctl (shmid2, IPC_RMID, 0);
-
- // There may be a race between our detach and attach.
- //
- // If the system allocates all shared memory segments at the same
- // virtual addresses in all processes and if the system allocates
- // some other segment to first_copy or first_copoy + size between
- // our detach and attach, the attaches below could fail [I've never
- // seen it fail for this reason].
-
- shmdt (first_copy);
-
- // first read-only guard page
- if (shmat (shmid_guard, first_copy, SHM_RDONLY) == (void *) -1){
- perror ("gr_vmcircbuf_sysv_shm: shmat (2)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid1, IPC_RMID, 0);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- // first copy
- if (shmat (shmid1, (char *) first_copy + pagesize, 0) == (void *) -1){
- perror ("gr_vmcircbuf_sysv_shm: shmat (3)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid1, IPC_RMID, 0);
- shmdt (first_copy);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- // second copy
- if (shmat (shmid1, (char *) first_copy + pagesize + size, 0) == (void *) -1){
- perror ("gr_vmcircbuf_sysv_shm: shmat (4)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid1, IPC_RMID, 0);
- shmdt ((char *)first_copy + pagesize);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- // second read-only guard page
- if (shmat (shmid_guard, (char *) first_copy + pagesize + 2 * size, SHM_RDONLY) == (void *) -1){
- perror ("gr_vmcircbuf_sysv_shm: shmat (5)");
- shmctl (shmid_guard, IPC_RMID, 0);
- shmctl (shmid1, IPC_RMID, 0);
- shmdt (first_copy);
- shmdt ((char *)first_copy + pagesize);
- shmdt ((char *)first_copy + pagesize + size);
- throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
- }
-
- shmctl (shmid1, IPC_RMID, 0);
- shmctl (shmid_guard, IPC_RMID, 0);
-
- // Now remember the important stuff
-
- d_base = (char *) first_copy + pagesize;
- d_size = size;
-#endif
-}
-
-gr_vmcircbuf_sysv_shm::~gr_vmcircbuf_sysv_shm ()
-{
-#if defined(HAVE_SYS_SHM_H)
- if (shmdt (d_base - gr_pagesize()) == -1
- || shmdt (d_base) == -1
- || shmdt (d_base + d_size) == -1
- || shmdt (d_base + 2 * d_size) == -1){
- perror ("gr_vmcircbuf_sysv_shm: shmdt (2)");
- }
-#endif
-}
-
-// ----------------------------------------------------------------
-// The factory interface
-// ----------------------------------------------------------------
-
-
-gr_vmcircbuf_factory *gr_vmcircbuf_sysv_shm_factory::s_the_factory = 0;
-
-gr_vmcircbuf_factory *
-gr_vmcircbuf_sysv_shm_factory::singleton ()
-{
- if (s_the_factory)
- return s_the_factory;
-
- s_the_factory = new gr_vmcircbuf_sysv_shm_factory ();
- return s_the_factory;
-}
-
-int
-gr_vmcircbuf_sysv_shm_factory::granularity ()
-{
- return gr_pagesize ();
-}
-
-gr_vmcircbuf *
-gr_vmcircbuf_sysv_shm_factory::make (int size)
-{
- try {
- return new gr_vmcircbuf_sysv_shm (size);
- }
- catch (...){
- return 0;
- }
-}
diff --git a/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h
deleted file mode 100644
index abebd93f1c..0000000000
--- a/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_VMCIRCBUF_SYSV_SHM_H_
-#define _GR_VMCIRCBUF_SYSV_SHM_H_
-
-#include <gr_runtime_api.h>
-#include <gr_vmcircbuf.h>
-
-/*!
- * \brief concrete class to implement circular buffers with mmap and shm_open
- * \ingroup internal
- */
-class GR_RUNTIME_API gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
- public:
-
- // CREATORS
-
- gr_vmcircbuf_sysv_shm (int size);
- virtual ~gr_vmcircbuf_sysv_shm ();
-};
-
-/*!
- * \brief concrete factory for circular buffers built using mmap and shm_open
- */
-class GR_RUNTIME_API gr_vmcircbuf_sysv_shm_factory : public gr_vmcircbuf_factory {
- private:
- static gr_vmcircbuf_factory *s_the_factory;
-
- public:
- static gr_vmcircbuf_factory *singleton ();
-
- virtual const char *name () const { return "gr_vmcircbuf_sysv_shm_factory"; }
-
- /*!
- * \brief return granularity of mapping, typically equal to page size
- */
- virtual int granularity ();
-
- /*!
- * \brief return a gr_vmcircbuf, or 0 if unable.
- *
- * Call this to create a doubly mapped circular buffer.
- */
- virtual gr_vmcircbuf *make (int size);
-};
-
-#endif /* _GR_VMCIRCBUF_SYSV_SHM_H_ */
diff --git a/gnuradio-runtime/lib/gri_debugger_hook.cc b/gnuradio-runtime/lib/gri_debugger_hook.cc
deleted file mode 100644
index d9270c435f..0000000000
--- a/gnuradio-runtime/lib/gri_debugger_hook.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gri_debugger_hook.h>
-
-void
-gri_debugger_hook ()
-{
- // nop. set a breakpoint here
-}
diff --git a/gnuradio-runtime/lib/gri_debugger_hook.h b/gnuradio-runtime/lib/gri_debugger_hook.h
deleted file mode 100644
index 6d31ed1b2c..0000000000
--- a/gnuradio-runtime/lib/gri_debugger_hook.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GRI_DEBUGGER_HOOK_H
-#define INCLUDED_GRI_DEBUGGER_HOOK_H
-
-#include <gr_runtime_api.h>
-
-GR_RUNTIME_API void gri_debugger_hook ();
-
-#endif /* INCLUDED_GRI_DEBUGGER_HOOK_H */
\ No newline at end of file
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
new file mode 100644
index 0000000000..f26da18e54
--- /dev/null
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -0,0 +1,160 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006-2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/io_signature.h>
+#include "hier_block2_detail.h"
+#include <iostream>
+
+namespace gr {
+
+#define GR_HIER_BLOCK2_DEBUG 0
+
+ hier_block2_sptr
+ make_hier_block2(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature)
+ {
+ return gnuradio::get_initial_sptr
+ (new hier_block2(name, input_signature, output_signature));
+ }
+
+ hier_block2::hier_block2(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature)
+ : basic_block(name, input_signature, output_signature),
+ d_detail(new hier_block2_detail(this)),
+ hier_message_ports_in(pmt::PMT_NIL),
+ hier_message_ports_out(pmt::PMT_NIL)
+ {
+ // This bit of magic ensures that self() works in the constructors of derived classes.
+ gnuradio::detail::sptr_magic::create_and_stash_initial_sptr(this);
+ }
+
+ hier_block2::~hier_block2()
+ {
+ delete d_detail;
+ }
+
+ hier_block2::opaque_self
+ hier_block2::self()
+ {
+ return shared_from_this();
+ }
+
+ hier_block2_sptr
+ hier_block2::to_hier_block2()
+ {
+ return cast_to_hier_block2_sptr(shared_from_this());
+ }
+
+ void
+ hier_block2::connect(basic_block_sptr block)
+ {
+ d_detail->connect(block);
+ }
+
+ void
+ hier_block2::connect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port)
+ {
+ d_detail->connect(src, src_port, dst, dst_port);
+ }
+
+ void
+ hier_block2::msg_connect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport)
+ {
+ if(!pmt::is_symbol(srcport)) {
+ throw std::runtime_error("bad port id");
+ }
+ d_detail->msg_connect(src, srcport, dst, dstport);
+ }
+
+ void
+ hier_block2::msg_connect(basic_block_sptr src, std::string srcport,
+ basic_block_sptr dst, std::string dstport)
+ {
+ d_detail->msg_connect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
+ }
+
+ void
+ hier_block2::msg_disconnect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport)
+ {
+ if(!pmt::is_symbol(srcport)) {
+ throw std::runtime_error("bad port id");
+ }
+ d_detail->msg_disconnect(src, srcport, dst, dstport);
+ }
+
+ void
+ hier_block2::msg_disconnect(basic_block_sptr src, std::string srcport,
+ basic_block_sptr dst, std::string dstport)
+ {
+ d_detail->msg_disconnect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
+ }
+
+ void
+ hier_block2::disconnect(basic_block_sptr block)
+ {
+ d_detail->disconnect(block);
+ }
+
+ void
+ hier_block2::disconnect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port)
+ {
+ d_detail->disconnect(src, src_port, dst, dst_port);
+ }
+
+ void
+ hier_block2::disconnect_all()
+ {
+ d_detail->disconnect_all();
+ }
+
+ void
+ hier_block2::lock()
+ {
+ d_detail->lock();
+ }
+
+ void
+ hier_block2::unlock()
+ {
+ d_detail->unlock();
+ }
+
+ flat_flowgraph_sptr
+ hier_block2::flatten() const
+ {
+ flat_flowgraph_sptr new_ffg = make_flat_flowgraph();
+ d_detail->flatten_aux(new_ffg);
+ return new_ffg;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
new file mode 100644
index 0000000000..83207d978c
--- /dev/null
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -0,0 +1,657 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "hier_block2_detail.h"
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
+#include <stdexcept>
+#include <sstream>
+#include <boost/format.hpp>
+
+namespace gr {
+
+#define HIER_BLOCK2_DETAIL_DEBUG 0
+
+ hier_block2_detail::hier_block2_detail(hier_block2 *owner)
+ : d_owner(owner),
+ d_parent_detail(0),
+ d_fg(make_flowgraph())
+ {
+ int min_inputs = owner->input_signature()->min_streams();
+ int max_inputs = owner->input_signature()->max_streams();
+ int min_outputs = owner->output_signature()->min_streams();
+ int max_outputs = owner->output_signature()->max_streams();
+
+ if(max_inputs == io_signature::IO_INFINITE ||
+ max_outputs == io_signature::IO_INFINITE ||
+ (min_inputs != max_inputs) ||(min_outputs != max_outputs) ) {
+ std::stringstream msg;
+ msg << "Hierarchical blocks do not yet support arbitrary or"
+ << " variable numbers of inputs or outputs (" << d_owner->name() << ")";
+ throw std::runtime_error(msg.str());
+ }
+
+ d_inputs = std::vector<endpoint_vector_t>(max_inputs);
+ d_outputs = endpoint_vector_t(max_outputs);
+ }
+
+ hier_block2_detail::~hier_block2_detail()
+ {
+ d_owner = 0; // Don't use delete, we didn't allocate
+ }
+
+ void
+ hier_block2_detail::connect(basic_block_sptr block)
+ {
+ std::stringstream msg;
+
+ // Check if duplicate
+ if(std::find(d_blocks.begin(), d_blocks.end(), block) != d_blocks.end()) {
+ msg << "Block " << block << " already connected.";
+ throw std::invalid_argument(msg.str());
+ }
+
+ // Check if has inputs or outputs
+ if(block->input_signature()->max_streams() != 0 ||
+ block->output_signature()->max_streams() != 0) {
+ msg << "Block " << block << " must not have any input or output ports";
+ throw std::invalid_argument(msg.str());
+ }
+
+ hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
+
+ if(hblock && hblock.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connect: block is hierarchical, setting parent to " << this << std::endl;
+ hblock->d_detail->d_parent_detail = this;
+ }
+
+ d_blocks.push_back(block);
+ }
+
+ void
+ hier_block2_detail::connect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port)
+ {
+ std::stringstream msg;
+
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connecting: " << endpoint(src, src_port)
+ << " -> " << endpoint(dst, dst_port) << std::endl;
+
+ if(src.get() == dst.get())
+ throw std::invalid_argument("connect: src and destination blocks cannot be the same");
+
+ hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
+ hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
+
+ if(src_block && src.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connect: src is hierarchical, setting parent to " << this << std::endl;
+ src_block->d_detail->d_parent_detail = this;
+ }
+
+ if(dst_block && dst.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connect: dst is hierarchical, setting parent to " << this << std::endl;
+ dst_block->d_detail->d_parent_detail = this;
+ }
+
+ // Connections to block inputs or outputs
+ int max_port;
+ if(src.get() == d_owner) {
+ max_port = src->input_signature()->max_streams();
+ if((max_port != -1 && (src_port >= max_port)) || src_port < 0) {
+ msg << "source port " << src_port << " out of range for " << src;
+ throw std::invalid_argument(msg.str());
+ }
+
+ return connect_input(src_port, dst_port, dst);
+ }
+
+ if(dst.get() == d_owner) {
+ max_port = dst->output_signature()->max_streams();
+ if((max_port != -1 && (dst_port >= max_port)) || dst_port < 0) {
+ msg << "destination port " << dst_port << " out of range for " << dst;
+ throw std::invalid_argument(msg.str());
+ }
+
+ return connect_output(dst_port, src_port, src);
+ }
+
+ // Internal connections
+ d_fg->connect(src, src_port, dst, dst_port);
+
+ // TODO: connects to NC
+ }
+
+ void
+ hier_block2_detail::msg_connect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport)
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connecting message port..." << std::endl;
+
+ // register the subscription
+ // this is done later...
+ // src->message_port_sub(srcport, pmt::cons(dst->alias_pmt(), dstport));
+
+ // add block uniquely to list to internal blocks
+ if(std::find(d_blocks.begin(), d_blocks.end(), dst) == d_blocks.end()){
+ d_blocks.push_back(src);
+ d_blocks.push_back(dst);
+ }
+
+ bool hier_out = (d_owner == src.get()) && src->message_port_is_hier_out(srcport);;
+ bool hier_in = (d_owner == dst.get()) && dst->message_port_is_hier_in(dstport);
+
+ hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
+ hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
+
+ if(src_block && src.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connect: src is hierarchical, setting parent to " << this << std::endl;
+ src_block->d_detail->d_parent_detail = this;
+ }
+
+ if(dst_block && dst.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "connect: dst is hierarchical, setting parent to " << this << std::endl;
+ dst_block->d_detail->d_parent_detail = this;
+ }
+
+ // add edge for this message connection
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << boost::format("connect( (%s, %s, %d), (%s, %s, %d) )\n") % \
+ src % srcport % hier_out %
+ dst % dstport % hier_in;
+ d_fg->connect(msg_endpoint(src, srcport, hier_out), msg_endpoint(dst, dstport, hier_in));
+ }
+
+ void
+ hier_block2_detail::msg_disconnect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport)
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnecting message port..." << std::endl;
+
+ // unregister the subscription - if already subscribed
+ src->message_port_unsub(srcport, pmt::cons(dst->alias_pmt(), dstport));
+
+ // remove edge for this message connection
+ bool hier_out = (d_owner == src.get()) && src->message_port_is_hier_out(srcport);;
+ bool hier_in = (d_owner == dst.get()) && dst->message_port_is_hier_in(dstport);
+ d_fg->disconnect(msg_endpoint(src, srcport, hier_out), msg_endpoint(dst, dstport, hier_in));
+ }
+
+ void
+ hier_block2_detail::disconnect(basic_block_sptr block)
+ {
+ // Check on singleton list
+ for(basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ if(*p == block) {
+ d_blocks.erase(p);
+
+ hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
+ if(block && block.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnect: block is hierarchical, clearing parent" << std::endl;
+ hblock->d_detail->d_parent_detail = 0;
+ }
+
+ return;
+ }
+ }
+
+ // Otherwise find all edges containing block
+ edge_vector_t edges, tmp = d_fg->edges();
+ edge_vector_t::iterator p;
+ for(p = tmp.begin(); p != tmp.end(); p++) {
+ if((*p).src().block() == block || (*p).dst().block() == block) {
+ edges.push_back(*p);
+
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnect: block found in edge " << (*p) << std::endl;
+ }
+ }
+
+ if(edges.size() == 0) {
+ std::stringstream msg;
+ msg << "cannot disconnect block " << block << ", not found";
+ throw std::invalid_argument(msg.str());
+ }
+
+ for(p = edges.begin(); p != edges.end(); p++) {
+ disconnect((*p).src().block(), (*p).src().port(),
+ (*p).dst().block(), (*p).dst().port());
+ }
+ }
+
+ void
+ hier_block2_detail::disconnect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port)
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnecting: " << endpoint(src, src_port)
+ << " -> " << endpoint(dst, dst_port) << std::endl;
+
+ if(src.get() == dst.get())
+ throw std::invalid_argument("disconnect: source and destination blocks cannot be the same");
+
+ hier_block2_sptr src_block(cast_to_hier_block2_sptr(src));
+ hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
+
+ if(src_block && src.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnect: src is hierarchical, clearing parent" << std::endl;
+ src_block->d_detail->d_parent_detail = 0;
+ }
+
+ if(dst_block && dst.get() != d_owner) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "disconnect: dst is hierarchical, clearing parent" << std::endl;
+ dst_block->d_detail->d_parent_detail = 0;
+ }
+
+ if(src.get() == d_owner)
+ return disconnect_input(src_port, dst_port, dst);
+
+ if(dst.get() == d_owner)
+ return disconnect_output(dst_port, src_port, src);
+
+ // Internal connections
+ d_fg->disconnect(src, src_port, dst, dst_port);
+ }
+
+ void
+ hier_block2_detail::connect_input(int my_port, int port,
+ basic_block_sptr block)
+ {
+ std::stringstream msg;
+
+ if(my_port < 0 || my_port >= (signed)d_inputs.size()) {
+ msg << "input port " << my_port << " out of range for " << block;
+ throw std::invalid_argument(msg.str());
+ }
+
+ endpoint_vector_t &endps = d_inputs[my_port];
+ endpoint endp(block, port);
+
+ endpoint_viter_t p = std::find(endps.begin(), endps.end(), endp);
+ if(p != endps.end()) {
+ msg << "external input port " << my_port << " already wired to " << endp;
+ throw std::invalid_argument(msg.str());
+ }
+
+ endps.push_back(endp);
+ }
+
+ void
+ hier_block2_detail::connect_output(int my_port, int port,
+ basic_block_sptr block)
+ {
+ std::stringstream msg;
+
+ if(my_port < 0 || my_port >= (signed)d_outputs.size()) {
+ msg << "output port " << my_port << " out of range for " << block;
+ throw std::invalid_argument(msg.str());
+ }
+
+ if(d_outputs[my_port].block()) {
+ msg << "external output port " << my_port << " already connected from "
+ << d_outputs[my_port];
+ throw std::invalid_argument(msg.str());
+ }
+
+ d_outputs[my_port] = endpoint(block, port);
+ }
+
+ void
+ hier_block2_detail::disconnect_input(int my_port, int port,
+ basic_block_sptr block)
+ {
+ std::stringstream msg;
+
+ if(my_port < 0 || my_port >= (signed)d_inputs.size()) {
+ msg << "input port number " << my_port << " out of range for " << block;
+ throw std::invalid_argument(msg.str());
+ }
+
+ endpoint_vector_t &endps = d_inputs[my_port];
+ endpoint endp(block, port);
+
+ endpoint_viter_t p = std::find(endps.begin(), endps.end(), endp);
+ if(p == endps.end()) {
+ msg << "external input port " << my_port << " not connected to " << endp;
+ throw std::invalid_argument(msg.str());
+ }
+
+ endps.erase(p);
+ }
+
+ void
+ hier_block2_detail::disconnect_output(int my_port, int port,
+ basic_block_sptr block)
+ {
+ std::stringstream msg;
+
+ if(my_port < 0 || my_port >= (signed)d_outputs.size()) {
+ msg << "output port number " << my_port << " out of range for " << block;
+ throw std::invalid_argument(msg.str());
+ }
+
+ if(d_outputs[my_port].block() != block) {
+ msg << "block " << block << " not assigned to output "
+ << my_port << ", can't disconnect";
+ throw std::invalid_argument(msg.str());
+ }
+
+ d_outputs[my_port] = endpoint();
+ }
+
+ endpoint_vector_t
+ hier_block2_detail::resolve_port(int port, bool is_input)
+ {
+ std::stringstream msg;
+
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Resolving port " << port << " as an "
+ << (is_input ? "input" : "output")
+ << " of " << d_owner->name() << std::endl;
+
+ endpoint_vector_t result;
+
+ if(is_input) {
+ if(port < 0 || port >= (signed)d_inputs.size()) {
+ msg << "resolve_port: hierarchical block '" << d_owner->name()
+ << "': input " << port << " is out of range";
+ throw std::runtime_error(msg.str());
+ }
+
+ if(d_inputs[port].empty()) {
+ msg << "resolve_port: hierarchical block '" << d_owner->name()
+ << "': input " << port << " is not connected internally";
+ throw std::runtime_error(msg.str());
+ }
+
+ endpoint_vector_t &endps = d_inputs[port];
+ endpoint_viter_t p;
+ for(p = endps.begin(); p != endps.end(); p++) {
+ endpoint_vector_t tmp = resolve_endpoint(*p, true);
+ std::copy(tmp.begin(), tmp.end(), back_inserter(result));
+ }
+ }
+ else {
+ if(port < 0 || port >= (signed)d_outputs.size()) {
+ msg << "resolve_port: hierarchical block '" << d_owner->name()
+ << "': output " << port << " is out of range";
+ throw std::runtime_error(msg.str());
+ }
+
+ if(d_outputs[port] == endpoint()) {
+ msg << "resolve_port: hierarchical block '" << d_owner->name()
+ << "': output " << port << " is not connected internally";
+ throw std::runtime_error(msg.str());
+ }
+
+ result = resolve_endpoint(d_outputs[port], false);
+ }
+
+ if(result.empty()) {
+ msg << "resolve_port: hierarchical block '" << d_owner->name()
+ << "': unable to resolve "
+ << (is_input ? "input port " : "output port ")
+ << port;
+ throw std::runtime_error(msg.str());
+ }
+
+ return result;
+ }
+
+ void
+ hier_block2_detail::disconnect_all()
+ {
+ d_fg->clear();
+ d_blocks.clear();
+ d_inputs.clear();
+ d_outputs.clear();
+ }
+
+ endpoint_vector_t
+ hier_block2_detail::resolve_endpoint(const endpoint &endp, bool is_input) const
+ {
+ std::stringstream msg;
+ endpoint_vector_t result;
+
+ // Check if endpoint is a leaf node
+ if(cast_to_block_sptr(endp.block())) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Block " << endp.block() << " is a leaf node, returning." << std::endl;
+ result.push_back(endp);
+ return result;
+ }
+
+ // Check if endpoint is a hierarchical block
+ hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(endp.block()));
+ if(hier_block2) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Resolving endpoint " << endp << " as an "
+ << (is_input ? "input" : "output")
+ << ", recursing" << std::endl;
+ return hier_block2->d_detail->resolve_port(endp.port(), is_input);
+ }
+
+ msg << "unable to resolve" << (is_input ? " input " : " output ")
+ << "endpoint " << endp;
+ throw std::runtime_error(msg.str());
+ }
+
+ void
+ hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << " ** Flattening " << d_owner->name() << std::endl;
+
+ // Add my edges to the flow graph, resolving references to actual endpoints
+ edge_vector_t edges = d_fg->edges();
+ msg_edge_vector_t msg_edges = d_fg->msg_edges();
+ edge_viter_t p;
+ msg_edge_viter_t q,u;
+
+ // Only run setup_rpc if ControlPort config param is enabled.
+ bool ctrlport_on = prefs::singleton()->get_bool("ControlPort", "on", false);
+
+ // For every block (gr::block and gr::hier_block2), set up the RPC
+ // interface.
+ for(p = edges.begin(); p != edges.end(); p++) {
+ basic_block_sptr b;
+ b = p->src().block();
+
+ if(ctrlport_on) {
+ if(!b->is_rpc_set()) {
+ b->setup_rpc();
+ b->rpc_set();
+ }
+ }
+
+ b = p->dst().block();
+ if(ctrlport_on) {
+ if(!b->is_rpc_set()) {
+ b->setup_rpc();
+ b->rpc_set();
+ }
+ }
+ }
+
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Flattening stream connections: " << std::endl;
+
+ for(p = edges.begin(); p != edges.end(); p++) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Flattening edge " << (*p) << std::endl;
+
+ endpoint_vector_t src_endps = resolve_endpoint(p->src(), false);
+ endpoint_vector_t dst_endps = resolve_endpoint(p->dst(), true);
+
+ endpoint_viter_t s, d;
+ for(s = src_endps.begin(); s != src_endps.end(); s++) {
+ for(d = dst_endps.begin(); d != dst_endps.end(); d++) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << (*s) << "->" << (*d) << std::endl;
+ sfg->connect(*s, *d);
+ }
+ }
+ }
+
+ // loop through flattening hierarchical connections
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "Flattening msg connections: " << std::endl;
+
+ std::vector<std::pair<msg_endpoint, bool> > resolved_endpoints;
+ for(q = msg_edges.begin(); q != msg_edges.end(); q++) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << boost::format(" flattening edge ( %s, %s, %d) -> ( %s, %s, %d)\n") % \
+ q->src().block() % q->src().port() % q->src().is_hier() % q->dst().block() % \
+ q->dst().port() % q->dst().is_hier();
+
+ bool normal_connection = true;
+
+ // resolve existing connections to hier ports
+ if(q->dst().is_hier()) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << boost::format(" resolve hier output (%s, %s)") % \
+ q->dst().block() % q->dst().port() << std::endl;
+ sfg->replace_endpoint( q->dst(), q->src(), true );
+ resolved_endpoints.push_back(std::pair<msg_endpoint, bool>(q->dst(),true));
+ normal_connection = false;
+ }
+
+ if(q->src().is_hier()) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << boost::format(" resolve hier input (%s, %s)") % \
+ q->src().block() % q->src().port() << std::endl;
+ sfg->replace_endpoint( q->src(), q->dst(), false );
+ resolved_endpoints.push_back(std::pair<msg_endpoint, bool>(q->src(),false));
+ normal_connection = false;
+ }
+
+ // propogate non hier connections through
+ if(normal_connection){
+ sfg->connect( q->src(), q->dst() );
+ }
+ }
+
+ for(std::vector<std::pair<msg_endpoint, bool> >::iterator it = resolved_endpoints.begin();
+ it != resolved_endpoints.end(); it++) {
+ sfg->clear_endpoint((*it).first, (*it).second);
+ }
+
+ /*
+ // connect primitive edges in the new fg
+ for(q = msg_edges.begin(); q != msg_edges.end(); q++) {
+ if((!q->src().is_hier()) && (!q->dst().is_hier())) {
+ sfg->connect(q->src(), q->dst());
+ }
+ else {
+ std::cout << "not connecting hier connection!" << std::endl;
+ }
+ }
+ */
+
+ // Construct unique list of blocks used either in edges, inputs,
+ // outputs, or by themselves. I still hate STL.
+ basic_block_vector_t blocks; // unique list of used blocks
+ basic_block_vector_t tmp = d_fg->calc_used_blocks();
+
+ // First add the list of singleton blocks
+ std::vector<basic_block_sptr>::const_iterator b; // Because flatten_aux is const
+ for(b = d_blocks.begin(); b != d_blocks.end(); b++)
+ tmp.push_back(*b);
+
+ // Now add the list of connected input blocks
+ std::stringstream msg;
+ for(unsigned int i = 0; i < d_inputs.size(); i++) {
+ if(d_inputs[i].size() == 0) {
+ msg << "In hierarchical block " << d_owner->name() << ", input " << i
+ << " is not connected internally";
+ throw std::runtime_error(msg.str());
+ }
+
+ for(unsigned int j = 0; j < d_inputs[i].size(); j++)
+ tmp.push_back(d_inputs[i][j].block());
+ }
+
+ for(unsigned int i = 0; i < d_outputs.size(); i++) {
+ basic_block_sptr blk = d_outputs[i].block();
+ if(!blk) {
+ msg << "In hierarchical block " << d_owner->name() << ", output " << i
+ << " is not connected internally";
+ throw std::runtime_error(msg.str());
+ }
+ tmp.push_back(blk);
+ }
+ sort(tmp.begin(), tmp.end());
+
+ std::insert_iterator<basic_block_vector_t> inserter(blocks, blocks.begin());
+ unique_copy(tmp.begin(), tmp.end(), inserter);
+
+ // Recurse hierarchical children
+ for(basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(*p));
+ if(hier_block2 && (hier_block2.get() != d_owner)) {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "flatten_aux: recursing into hierarchical block "
+ << hier_block2 << std::endl;
+ hier_block2->d_detail->flatten_aux(sfg);
+ }
+ }
+ }
+
+ void
+ hier_block2_detail::lock()
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "lock: entered in " << this << std::endl;
+
+ if(d_parent_detail)
+ d_parent_detail->lock();
+ else
+ d_owner->lock();
+ }
+
+ void
+ hier_block2_detail::unlock()
+ {
+ if(HIER_BLOCK2_DETAIL_DEBUG)
+ std::cout << "unlock: entered in " << this << std::endl;
+
+ if(d_parent_detail)
+ d_parent_detail->unlock();
+ else
+ d_owner->unlock();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h
new file mode 100644
index 0000000000..99bf6e8ef1
--- /dev/null
+++ b/gnuradio-runtime/lib/hier_block2_detail.h
@@ -0,0 +1,77 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_HIER_BLOCK2_DETAIL_H
+#define INCLUDED_GR_RUNTIME_HIER_BLOCK2_DETAIL_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/hier_block2.h>
+#include <flat_flowgraph.h>
+#include <boost/utility.hpp>
+
+namespace gr {
+
+ /*!
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API hier_block2_detail : boost::noncopyable
+ {
+ public:
+ hier_block2_detail(hier_block2 *owner);
+ ~hier_block2_detail();
+
+ void connect(basic_block_sptr block);
+ void connect(basic_block_sptr src, int src_port,
+ basic_block_sptr dst, int dst_port);
+ void msg_connect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport);
+ void msg_disconnect(basic_block_sptr src, pmt::pmt_t srcport,
+ basic_block_sptr dst, pmt::pmt_t dstport);
+ void disconnect(basic_block_sptr block);
+ void disconnect(basic_block_sptr, int src_port,
+ basic_block_sptr, int dst_port);
+ void disconnect_all();
+ void lock();
+ void unlock();
+ void flatten_aux(flat_flowgraph_sptr sfg) const;
+
+ private:
+ // Private implementation data
+ hier_block2 *d_owner;
+ hier_block2_detail *d_parent_detail;
+ flowgraph_sptr d_fg;
+ std::vector<endpoint_vector_t> d_inputs; // Multiple internal endpoints per external input
+ endpoint_vector_t d_outputs; // Single internal endpoint per external output
+ basic_block_vector_t d_blocks;
+
+ void connect_input(int my_port, int port, basic_block_sptr block);
+ void connect_output(int my_port, int port, basic_block_sptr block);
+ void disconnect_input(int my_port, int port, basic_block_sptr block);
+ void disconnect_output(int my_port, int port, basic_block_sptr block);
+
+ endpoint_vector_t resolve_port(int port, bool is_input);
+ endpoint_vector_t resolve_endpoint(const endpoint &endp, bool is_input) const;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_RUNTIME_HIER_BLOCK2_DETAIL_H */
diff --git a/gnuradio-runtime/lib/ice_application_base.cc b/gnuradio-runtime/lib/ice_application_base.cc
deleted file mode 100644
index 88db6056c1..0000000000
--- a/gnuradio-runtime/lib/ice_application_base.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <ice_application_base.h>
-
-int ice_application_common::d_reacquire_attributes(0);
-bool ice_application_common::d_main_called(false);
-bool ice_application_common::d_have_ice_config(false);
-boost::shared_ptr<boost::thread> ice_application_common::d_thread;
-std::string ice_application_common::d_endpointStr("");
-
-boost::shared_ptr<ice_application_common>
-ice_application_common::Instance()
-{
- static boost::shared_ptr<ice_application_common>
- instance(new ice_application_common());
- return instance;
-}
-
-int ice_application_common::run(int, char**)
-{
- communicator()->waitForShutdown();
- return EXIT_SUCCESS;
-}
diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
new file mode 100644
index 0000000000..ccfdf3c06b
--- /dev/null
+++ b/gnuradio-runtime/lib/io_signature.cc
@@ -0,0 +1,117 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/io_signature.h>
+#include <stdexcept>
+#include <iostream>
+
+namespace gr {
+
+ gr::io_signature::sptr
+ io_signature::makev(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items)
+ {
+ return gr::io_signature::sptr
+ (new io_signature(min_streams, max_streams,
+ sizeof_stream_items));
+ }
+
+ gr::io_signature::sptr
+ io_signature::make(int min_streams, int max_streams,
+ int sizeof_stream_item)
+ {
+ std::vector<int> sizeof_items(1);
+ sizeof_items[0] = sizeof_stream_item;
+ return io_signature::makev(min_streams, max_streams, sizeof_items);
+ }
+
+ gr::io_signature::sptr
+ io_signature::make2(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2)
+ {
+ std::vector<int> sizeof_items(2);
+ sizeof_items[0] = sizeof_stream_item1;
+ sizeof_items[1] = sizeof_stream_item2;
+ return io_signature::makev(min_streams, max_streams, sizeof_items);
+ }
+
+ gr::io_signature::sptr
+ io_signature::make3(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2,
+ int sizeof_stream_item3)
+ {
+ std::vector<int> sizeof_items(3);
+ sizeof_items[0] = sizeof_stream_item1;
+ sizeof_items[1] = sizeof_stream_item2;
+ sizeof_items[2] = sizeof_stream_item3;
+ return io_signature::makev(min_streams, max_streams, sizeof_items);
+ }
+
+ // ------------------------------------------------------------------------
+
+ io_signature::io_signature(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items)
+ {
+ if(min_streams < 0
+ || (max_streams != IO_INFINITE && max_streams < min_streams))
+ throw std::invalid_argument ("gr::io_signature(1)");
+
+ if(sizeof_stream_items.size() < 1)
+ throw std::invalid_argument("gr::io_signature(2)");
+
+ for(size_t i = 0; i < sizeof_stream_items.size(); i++) {
+ if(max_streams != 0 && sizeof_stream_items[i] < 1)
+ throw std::invalid_argument("gr::io_signature(3)");
+ }
+
+ d_min_streams = min_streams;
+ d_max_streams = max_streams;
+ d_sizeof_stream_item = sizeof_stream_items;
+ }
+
+ io_signature::~io_signature()
+ {
+ }
+
+ int
+ io_signature::sizeof_stream_item(int _index) const
+ {
+ if(_index < 0)
+ throw std::invalid_argument("gr::io_signature::sizeof_stream_item");
+
+ size_t index = _index;
+ return d_sizeof_stream_item[std::min(index, d_sizeof_stream_item.size() - 1)];
+ }
+
+ std::vector<int>
+ io_signature::sizeof_stream_items() const
+ {
+ return d_sizeof_stream_item;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/local_sighandler.cc b/gnuradio-runtime/lib/local_sighandler.cc
new file mode 100644
index 0000000000..ebd9bb1362
--- /dev/null
+++ b/gnuradio-runtime/lib/local_sighandler.cc
@@ -0,0 +1,189 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "local_sighandler.h"
+#include <stdexcept>
+#include <stdio.h>
+#include <string.h>
+
+namespace gr {
+
+ local_sighandler::local_sighandler(int signum,
+ void (*new_handler)(int))
+ : d_signum(signum)
+ {
+#ifdef HAVE_SIGACTION
+ struct sigaction new_action;
+ memset(&new_action, 0, sizeof(new_action));
+
+ new_action.sa_handler = new_handler;
+ sigemptyset(&new_action.sa_mask);
+ new_action.sa_flags = 0;
+
+ if(sigaction (d_signum, &new_action, &d_old_action) < 0) {
+ perror("sigaction (install new)");
+ throw std::runtime_error("sigaction");
+ }
+#endif
+ }
+
+ local_sighandler::~local_sighandler()
+ {
+#ifdef HAVE_SIGACTION
+ if(sigaction (d_signum, &d_old_action, 0) < 0) {
+ perror("sigaction (restore old)");
+ throw std::runtime_error("sigaction");
+ }
+#endif
+ }
+
+ void
+ local_sighandler::throw_signal(int signum)
+ {
+ throw signal(signum);
+ }
+
+ /*
+ * Semi-hideous way to may a signal number into a signal name
+ */
+ #define SIGNAME(x) case x: return #x
+
+ std::string
+ signal::name() const
+ {
+ char tmp[128];
+
+ switch(signum()) {
+#ifdef SIGHUP
+ SIGNAME(SIGHUP);
+#endif
+#ifdef SIGINT
+ SIGNAME(SIGINT);
+#endif
+#ifdef SIGQUIT
+ SIGNAME(SIGQUIT);
+#endif
+#ifdef SIGILL
+ SIGNAME(SIGILL);
+#endif
+#ifdef SIGTRAP
+ SIGNAME(SIGTRAP);
+#endif
+#ifdef SIGABRT
+ SIGNAME(SIGABRT);
+#endif
+#ifdef SIGBUS
+ SIGNAME(SIGBUS);
+#endif
+#ifdef SIGFPE
+ SIGNAME(SIGFPE);
+#endif
+#ifdef SIGKILL
+ SIGNAME(SIGKILL);
+#endif
+#ifdef SIGUSR1
+ SIGNAME(SIGUSR1);
+#endif
+#ifdef SIGSEGV
+ SIGNAME(SIGSEGV);
+#endif
+#ifdef SIGUSR2
+ SIGNAME(SIGUSR2);
+#endif
+#ifdef SIGPIPE
+ SIGNAME(SIGPIPE);
+#endif
+#ifdef SIGALRM
+ SIGNAME(SIGALRM);
+#endif
+#ifdef SIGTERM
+ SIGNAME(SIGTERM);
+#endif
+#ifdef SIGSTKFLT
+ SIGNAME(SIGSTKFLT);
+#endif
+#ifdef SIGCHLD
+ SIGNAME(SIGCHLD);
+#endif
+#ifdef SIGCONT
+ SIGNAME(SIGCONT);
+#endif
+#ifdef SIGSTOP
+ SIGNAME(SIGSTOP);
+#endif
+#ifdef SIGTSTP
+ SIGNAME(SIGTSTP);
+#endif
+#ifdef SIGTTIN
+ SIGNAME(SIGTTIN);
+#endif
+#ifdef SIGTTOU
+ SIGNAME(SIGTTOU);
+#endif
+#ifdef SIGURG
+ SIGNAME(SIGURG);
+#endif
+#ifdef SIGXCPU
+ SIGNAME(SIGXCPU);
+#endif
+#ifdef SIGXFSZ
+ SIGNAME(SIGXFSZ);
+#endif
+#ifdef SIGVTALRM
+ SIGNAME(SIGVTALRM);
+#endif
+#ifdef SIGPROF
+ SIGNAME(SIGPROF);
+#endif
+#ifdef SIGWINCH
+ SIGNAME(SIGWINCH);
+#endif
+#ifdef SIGIO
+ SIGNAME(SIGIO);
+#endif
+#ifdef SIGPWR
+ SIGNAME(SIGPWR);
+#endif
+#ifdef SIGSYS
+ SIGNAME(SIGSYS);
+#endif
+ default:
+#if defined (HAVE_SNPRINTF)
+#if defined (SIGRTMIN) && defined (SIGRTMAX)
+ if(signum() >= SIGRTMIN && signum() <= SIGRTMAX) {
+ snprintf(tmp, sizeof(tmp), "SIGRTMIN + %d", signum());
+ return tmp;
+ }
+#endif
+ snprintf(tmp, sizeof(tmp), "SIGNAL %d", signum());
+ return tmp;
+#else
+ return "Unknown signal";
+#endif
+ }
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/local_sighandler.h b/gnuradio-runtime/lib/local_sighandler.h
new file mode 100644
index 0000000000..bd322e5b00
--- /dev/null
+++ b/gnuradio-runtime/lib/local_sighandler.h
@@ -0,0 +1,74 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_LOCAL_SIGHANDLER_H
+#define INCLUDED_GR_LOCAL_SIGHANDLER_H
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#include <gnuradio/api.h>
+#include <string>
+
+namespace gr {
+
+ /*!
+ * \brief Get and set signal handler.
+ *
+ * \ingroup internal
+ * Constructor installs new handler, destructor reinstalls
+ * original value.
+ */
+ class GR_RUNTIME_API local_sighandler
+ {
+ private:
+ int d_signum;
+#ifdef HAVE_SIGACTION
+ struct sigaction d_old_action;
+#endif
+
+ public:
+ local_sighandler(int signum, void (*new_handler)(int));
+ ~local_sighandler();
+
+ /* throw gr_signal (signum) */
+ static void throw_signal(int signum);
+ };
+
+ /*!
+ * \brief Representation of signal.
+ */
+ class GR_RUNTIME_API signal
+ {
+ private:
+ int d_signum;
+
+ public:
+ signal(int signum) : d_signum(signum) {}
+ int signum() const { return d_signum; }
+ std::string name() const;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_LOCAL_SIGHANDLER_H */
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
new file mode 100644
index 0000000000..dceb18471f
--- /dev/null
+++ b/gnuradio-runtime/lib/logger.cc
@@ -0,0 +1,323 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*******************************************************************************
+* Author: Mark Plett
+* Description:
+* The gr_log module wraps the log4cpp library for logging in gnuradio.
+*******************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/logger.h>
+#include <stdexcept>
+#include <algorithm>
+
+
+#ifdef ENABLE_GR_LOG
+#ifdef HAVE_LOG4CPP
+
+namespace gr {
+
+ bool logger_config::logger_configured(false);
+
+ /************************ BEGIN LOG4CPP HELPERS ***********************/
+ /* Logger config class. This is a singleton that controls how
+ * log4cpp is configured If watch_period>0 a thread is started to
+ * watch teh config file for changes.
+ */
+
+ // Getters of logger_config
+ logger_config&
+ logger_config::get_instance(void)
+ {
+ static logger_config instance;
+ return instance;
+ }
+
+ std::string
+ logger_config::get_filename()
+ {
+ logger_config& in=get_instance();
+ return in.filename;
+ }
+
+ unsigned int
+ logger_config::get_watch_period()
+ {
+ logger_config& in=get_instance();
+ return in.watch_period;
+ }
+
+ // Method to watch config file for changes
+ void
+ logger_config::watch_file(std::string filename, unsigned int watch_period)
+ {
+ std::time_t last_write(boost::filesystem::last_write_time(filename));
+ std::time_t current_time(0);
+ while(true) {
+ try {
+ current_time = boost::filesystem::last_write_time(filename);
+ if(current_time>last_write) {
+ std::cout<<"GNURadio Reloading logger configuration:"<<filename<<std::endl;
+ last_write = current_time;
+ // Should we wipe out all old configuration or just add the
+ // new? Just adding... logger_reset_config();
+ logger_configured = logger_load_config(filename);
+ }
+ boost::this_thread::sleep(boost::posix_time::time_duration(0,0,watch_period,0));
+ }
+ catch(const boost::thread_interrupted&) {
+ std::cout<<"GNURadio leaving logger config file watch."<<std::endl;
+ break;
+ }
+ }
+ }
+
+ // Method to load the confifuration. It only loads if the filename
+ // or watch has changed
+ void
+ logger_config::load_config(std::string filename,unsigned int watch_period)
+ {
+ logger_config& instance = get_instance();
+ // Only reconfigure if filename or watch has changed
+ if(!logger_configured) {
+ instance.filename = filename;
+ instance.watch_period = watch_period;
+ // Stop any file watching thread
+ if(instance.watch_thread!=NULL)
+ stop_watch();
+ // Load configuration
+ std::cout<<"GNURadio Loading logger configuration:"<<instance.filename<<std::endl;
+ logger_configured = logger_load_config(instance.filename);
+ // Start watch if required
+ if(instance.watch_period>0) {
+ instance.watch_thread = new boost::thread(watch_file, instance.filename,
+ instance.watch_period);
+ }
+ }
+ }
+
+ // Method to stop the watcher thread
+ void
+ logger_config::stop_watch()
+ {
+ logger_config& instance = get_instance();
+ if(instance.watch_thread) {
+ instance.watch_thread->interrupt();
+ instance.watch_thread->join();
+ delete(instance.watch_thread);
+ instance.watch_thread=NULL;
+ }
+ }
+
+ // Method to reset logger configuration
+ void
+ logger_config::reset_config(void)
+ {
+ logger_config& instance = get_instance();
+ stop_watch();
+ std::vector<log4cpp::Category*> *loggers = log4cpp::Category::getCurrentCategories();
+ std::vector<log4cpp::Category*>::iterator logger = loggers->begin();
+ // We can't destroy categories but we can neuter them by removing all appenders.
+ for(;logger!=loggers->end();logger++) {
+ (*logger)->removeAllAppenders();
+ }
+ instance.filename = std::string("");
+ instance.watch_period = 0;
+ logger_configured = false;
+ }
+
+ /***************** Functions to call log4cpp methods *************************/
+
+ logger_ptr
+ logger_get_logger(std::string name)
+ {
+ if(log4cpp::Category::exists(name)) {
+ logger_ptr logger = &log4cpp::Category::getInstance(name);
+ return logger;
+ }
+ else {
+ logger_ptr logger = &log4cpp::Category::getInstance(name);
+ logger->setPriority(log4cpp::Priority::NOTSET);
+ return logger;
+ }
+ }
+
+ bool
+ logger_load_config(const std::string &config_filename)
+ {
+ if(config_filename.size() != 0) {
+ try {
+ log4cpp::PropertyConfigurator::configure(config_filename);
+ return true;
+ }
+ catch(log4cpp::ConfigureFailure &e) {
+ std::cout << "Logger config failed :" << e.what() << std::endl;
+ }
+ }
+ return false;
+ }
+
+ void
+ logger_set_level(logger_ptr logger, const std::string &level)
+ {
+ std::string nocase = level;
+ std::transform(level.begin(), level.end(), nocase.begin(), ::tolower);
+
+ if(nocase == "off" || nocase == "notset")
+ logger_set_level(logger, log4cpp::Priority::NOTSET);
+ else if(nocase == "all" || nocase == "debug")
+ logger_set_level(logger, log4cpp::Priority::DEBUG);
+ else if(nocase == "info")
+ logger_set_level(logger, log4cpp::Priority::INFO);
+ else if(nocase == "notice")
+ logger_set_level(logger, log4cpp::Priority::NOTICE);
+ else if(nocase == "warn")
+ logger_set_level(logger, log4cpp::Priority::WARN);
+ else if(nocase == "error")
+ logger_set_level(logger, log4cpp::Priority::ERROR);
+ else if(nocase == "crit")
+ logger_set_level(logger, log4cpp::Priority::CRIT);
+ else if(nocase == "alert")
+ logger_set_level(logger, log4cpp::Priority::ALERT);
+ else if(nocase=="fatal")
+ logger_set_level(logger, log4cpp::Priority::FATAL);
+ else if(nocase == "emerg")
+ logger_set_level(logger, log4cpp::Priority::EMERG);
+ else
+ throw std::runtime_error("logger_set_level: Bad level type.\n");
+ }
+
+ void
+ logger_set_level(logger_ptr logger, log4cpp::Priority::Value level)
+ {
+ logger->setPriority(level);
+ }
+
+ void
+ logger_get_level(logger_ptr logger, std::string &level)
+ {
+ log4cpp::Priority::Value levelPtr = logger->getPriority();
+ if(levelPtr == log4cpp::Priority::NOTSET) level = "noset";
+ if(levelPtr == log4cpp::Priority::DEBUG) level = "debug";
+ if(levelPtr == log4cpp::Priority::INFO) level = "info";
+ if(levelPtr == log4cpp::Priority::NOTICE) level = "notice";
+ if(levelPtr == log4cpp::Priority::WARN) level = "warn";
+ if(levelPtr == log4cpp::Priority::ERROR) level = "error";
+ if(levelPtr == log4cpp::Priority::CRIT) level = "crit";
+ if(levelPtr == log4cpp::Priority::ALERT) level = "alert";
+ if(levelPtr == log4cpp::Priority::FATAL) level = "fatal";
+ if(levelPtr == log4cpp::Priority::EMERG) level = "emerg";
+ }
+
+ void
+ logger_get_level(logger_ptr logger,log4cpp::Priority::Value level)
+ {
+ level = logger->getPriority();
+ }
+
+ void
+ logger_add_console_appender(logger_ptr logger, std::string target, std::string pattern)
+ {
+ log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
+ log4cpp::Appender* app;
+ if(target=="stdout")
+ app = new log4cpp::OstreamAppender("ConsoleAppender::",&std::cout);
+ else
+ app = new log4cpp::OstreamAppender("ConsoleAppender::",&std::cerr);
+
+ layout->setConversionPattern(pattern);
+ app->setLayout(layout);
+ logger->setAppender(*app);
+ }
+
+ void
+ logger_add_file_appender(logger_ptr logger, std::string filename,
+ bool append, std::string pattern)
+ {
+ log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
+ log4cpp::Appender* app = new
+ log4cpp::FileAppender("FileAppender::"+filename,
+ filename);
+ layout->setConversionPattern(pattern);
+ app->setLayout(layout);
+ logger->setAppender(app);
+ }
+
+ void
+ logger_add_rollingfile_appender(logger_ptr logger, std::string filename,
+ size_t filesize, int bkup_index, bool append,
+ mode_t mode, std::string pattern)
+ {
+ log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
+ log4cpp::Appender* app = new
+ log4cpp::RollingFileAppender("RollFileAppender::" + filename, filename,
+ filesize, bkup_index, append, mode);
+ layout->setConversionPattern(pattern);
+ app->setLayout(layout);
+ logger->setAppender(app);
+ }
+
+ std::vector<std::string>
+ logger_get_logger_names(void)
+ {
+ std::vector<std::string> names;
+ std::vector<log4cpp::Category*> *loggers = log4cpp::Category::getCurrentCategories();
+ std::vector<log4cpp::Category*>::iterator logger = loggers->begin();
+
+ for(;logger!=loggers->end();logger++) {
+ names.push_back((*logger)->getName());
+ }
+ return names;
+ }
+
+} /* namespace gr */
+
+#endif /* HAVE_LOG4CPP */
+
+/****** Start Methods to provide Python the capabilities of the macros ********/
+void
+gr_logger_config(const std::string config_filename, unsigned int watch_period)
+{
+ GR_CONFIG_AND_WATCH_LOGGER(config_filename, watch_period);
+}
+
+std::vector<std::string>
+gr_logger_get_logger_names(void)
+{
+ std::vector<std::string> names;
+ GR_GET_LOGGER_NAMES(names);
+ return names;
+}
+
+void
+gr_logger_reset_config(void)
+{
+ GR_RESET_CONFIGURATION();
+}
+
+// Remaining capability provided by gr::logger class in gnuradio/logger.h
+
+#endif /* ENABLE_GR_LOGGER */
diff --git a/gnuradio-runtime/lib/malloc16.h b/gnuradio-runtime/lib/malloc16.h
index 90d1eca77a..05f80cbf4f 100644
--- a/gnuradio-runtime/lib/malloc16.h
+++ b/gnuradio-runtime/lib/malloc16.h
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gr_runtime_api.h>
+#include <gnuradio/api.h>
#ifdef __cplusplus
extern "C" {
diff --git a/gnuradio-runtime/lib/math/CMakeLists.txt b/gnuradio-runtime/lib/math/CMakeLists.txt
new file mode 100644
index 0000000000..c95c84cecb
--- /dev/null
+++ b/gnuradio-runtime/lib/math/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Copyright 2010,2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+list(APPEND gnuradio_runtime_sources
+ ${CMAKE_CURRENT_SOURCE_DIR}/fast_atan2f.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/fxpt.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/random.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/sincos.cc
+)
diff --git a/gnuradio-runtime/lib/math/fast_atan2f.cc b/gnuradio-runtime/lib/math/fast_atan2f.cc
new file mode 100644
index 0000000000..3555cf50ec
--- /dev/null
+++ b/gnuradio-runtime/lib/math/fast_atan2f.cc
@@ -0,0 +1,202 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/math.h> // declaration is in here
+#include <cmath>
+
+namespace gr {
+
+ /***************************************************************************/
+ /* Constant definitions */
+ /***************************************************************************/
+
+ #define TAN_MAP_RES 0.003921569 /* (smallest non-zero value in table) */
+ #define RAD_PER_DEG 0.017453293
+ #define TAN_MAP_SIZE 256
+
+ /* arctangents from 0 to pi/4 radians */
+ static float
+ fast_atan_table[257] = {
+ 0.000000e+00, 3.921549e-03, 7.842976e-03, 1.176416e-02,
+ 1.568499e-02, 1.960533e-02, 2.352507e-02, 2.744409e-02,
+ 3.136226e-02, 3.527947e-02, 3.919560e-02, 4.311053e-02,
+ 4.702413e-02, 5.093629e-02, 5.484690e-02, 5.875582e-02,
+ 6.266295e-02, 6.656816e-02, 7.047134e-02, 7.437238e-02,
+ 7.827114e-02, 8.216752e-02, 8.606141e-02, 8.995267e-02,
+ 9.384121e-02, 9.772691e-02, 1.016096e-01, 1.054893e-01,
+ 1.093658e-01, 1.132390e-01, 1.171087e-01, 1.209750e-01,
+ 1.248376e-01, 1.286965e-01, 1.325515e-01, 1.364026e-01,
+ 1.402496e-01, 1.440924e-01, 1.479310e-01, 1.517652e-01,
+ 1.555948e-01, 1.594199e-01, 1.632403e-01, 1.670559e-01,
+ 1.708665e-01, 1.746722e-01, 1.784728e-01, 1.822681e-01,
+ 1.860582e-01, 1.898428e-01, 1.936220e-01, 1.973956e-01,
+ 2.011634e-01, 2.049255e-01, 2.086818e-01, 2.124320e-01,
+ 2.161762e-01, 2.199143e-01, 2.236461e-01, 2.273716e-01,
+ 2.310907e-01, 2.348033e-01, 2.385093e-01, 2.422086e-01,
+ 2.459012e-01, 2.495869e-01, 2.532658e-01, 2.569376e-01,
+ 2.606024e-01, 2.642600e-01, 2.679104e-01, 2.715535e-01,
+ 2.751892e-01, 2.788175e-01, 2.824383e-01, 2.860514e-01,
+ 2.896569e-01, 2.932547e-01, 2.968447e-01, 3.004268e-01,
+ 3.040009e-01, 3.075671e-01, 3.111252e-01, 3.146752e-01,
+ 3.182170e-01, 3.217506e-01, 3.252758e-01, 3.287927e-01,
+ 3.323012e-01, 3.358012e-01, 3.392926e-01, 3.427755e-01,
+ 3.462497e-01, 3.497153e-01, 3.531721e-01, 3.566201e-01,
+ 3.600593e-01, 3.634896e-01, 3.669110e-01, 3.703234e-01,
+ 3.737268e-01, 3.771211e-01, 3.805064e-01, 3.838825e-01,
+ 3.872494e-01, 3.906070e-01, 3.939555e-01, 3.972946e-01,
+ 4.006244e-01, 4.039448e-01, 4.072558e-01, 4.105574e-01,
+ 4.138496e-01, 4.171322e-01, 4.204054e-01, 4.236689e-01,
+ 4.269229e-01, 4.301673e-01, 4.334021e-01, 4.366272e-01,
+ 4.398426e-01, 4.430483e-01, 4.462443e-01, 4.494306e-01,
+ 4.526070e-01, 4.557738e-01, 4.589307e-01, 4.620778e-01,
+ 4.652150e-01, 4.683424e-01, 4.714600e-01, 4.745676e-01,
+ 4.776654e-01, 4.807532e-01, 4.838312e-01, 4.868992e-01,
+ 4.899573e-01, 4.930055e-01, 4.960437e-01, 4.990719e-01,
+ 5.020902e-01, 5.050985e-01, 5.080968e-01, 5.110852e-01,
+ 5.140636e-01, 5.170320e-01, 5.199904e-01, 5.229388e-01,
+ 5.258772e-01, 5.288056e-01, 5.317241e-01, 5.346325e-01,
+ 5.375310e-01, 5.404195e-01, 5.432980e-01, 5.461666e-01,
+ 5.490251e-01, 5.518738e-01, 5.547124e-01, 5.575411e-01,
+ 5.603599e-01, 5.631687e-01, 5.659676e-01, 5.687566e-01,
+ 5.715357e-01, 5.743048e-01, 5.770641e-01, 5.798135e-01,
+ 5.825531e-01, 5.852828e-01, 5.880026e-01, 5.907126e-01,
+ 5.934128e-01, 5.961032e-01, 5.987839e-01, 6.014547e-01,
+ 6.041158e-01, 6.067672e-01, 6.094088e-01, 6.120407e-01,
+ 6.146630e-01, 6.172755e-01, 6.198784e-01, 6.224717e-01,
+ 6.250554e-01, 6.276294e-01, 6.301939e-01, 6.327488e-01,
+ 6.352942e-01, 6.378301e-01, 6.403565e-01, 6.428734e-01,
+ 6.453808e-01, 6.478788e-01, 6.503674e-01, 6.528466e-01,
+ 6.553165e-01, 6.577770e-01, 6.602282e-01, 6.626701e-01,
+ 6.651027e-01, 6.675261e-01, 6.699402e-01, 6.723452e-01,
+ 6.747409e-01, 6.771276e-01, 6.795051e-01, 6.818735e-01,
+ 6.842328e-01, 6.865831e-01, 6.889244e-01, 6.912567e-01,
+ 6.935800e-01, 6.958943e-01, 6.981998e-01, 7.004964e-01,
+ 7.027841e-01, 7.050630e-01, 7.073330e-01, 7.095943e-01,
+ 7.118469e-01, 7.140907e-01, 7.163258e-01, 7.185523e-01,
+ 7.207701e-01, 7.229794e-01, 7.251800e-01, 7.273721e-01,
+ 7.295557e-01, 7.317307e-01, 7.338974e-01, 7.360555e-01,
+ 7.382053e-01, 7.403467e-01, 7.424797e-01, 7.446045e-01,
+ 7.467209e-01, 7.488291e-01, 7.509291e-01, 7.530208e-01,
+ 7.551044e-01, 7.571798e-01, 7.592472e-01, 7.613064e-01,
+ 7.633576e-01, 7.654008e-01, 7.674360e-01, 7.694633e-01,
+ 7.714826e-01, 7.734940e-01, 7.754975e-01, 7.774932e-01,
+ 7.794811e-01, 7.814612e-01, 7.834335e-01, 7.853983e-01,
+ 7.853983e-01
+ };
+
+
+ /*****************************************************************************
+ Function: Arc tangent
+
+ Syntax: angle = fast_atan2(y, x);
+ float y y component of input vector
+ float x x component of input vector
+ float angle angle of vector (x, y) in radians
+
+ Description: This function calculates the angle of the vector (x,y)
+ based on a table lookup and linear interpolation. The table uses a
+ 256 point table covering -45 to +45 degrees and uses symetry to
+ determine the final angle value in the range of -180 to 180
+ degrees. Note that this function uses the small angle approximation
+ for values close to zero. This routine calculates the arc tangent
+ with an average error of +/- 0.045 degrees.
+ *****************************************************************************/
+
+ float
+ fast_atan2f(float y, float x)
+ {
+ float x_abs, y_abs, z;
+ float alpha, angle, base_angle;
+ int index;
+
+ /* don't divide by zero! */ // FIXME could get hosed with -0.0
+ if((y == 0.0) && (x == 0.0))
+ return 0.0;
+
+ /* normalize to +/- 45 degree range */
+ y_abs = fabsf(y);
+ x_abs = fabsf(x);
+ //z = (y_abs < x_abs ? y_abs / x_abs : x_abs / y_abs);
+ if(y_abs < x_abs)
+ z = y_abs / x_abs;
+ else
+ z = x_abs / y_abs;
+
+ /* when ratio approaches the table resolution, the angle is */
+ /* best approximated with the argument itself... */
+ if(z < TAN_MAP_RES)
+ base_angle = z;
+ else {
+ /* find index and interpolation value */
+ alpha = z * (float)TAN_MAP_SIZE - .5;
+ index = (int)alpha;
+ alpha -= (float)index;
+ /* determine base angle based on quadrant and */
+ /* add or subtract table value from base angle based on quadrant */
+ base_angle = fast_atan_table[index];
+ base_angle +=
+ (fast_atan_table[index + 1] - fast_atan_table[index]) * alpha;
+ }
+
+ if(x_abs > y_abs) { /* -45 -> 45 or 135 -> 225 */
+ if(x >= 0.0) { /* -45 -> 45 */
+ if(y >= 0.0)
+ angle = base_angle; /* 0 -> 45, angle OK */
+ else
+ angle = -base_angle; /* -45 -> 0, angle = -angle */
+ }
+ else { /* 135 -> 180 or 180 -> -135 */
+ angle = 3.14159265358979323846;
+ if(y >= 0.0)
+ angle -= base_angle; /* 135 -> 180, angle = 180 - angle */
+ else
+ angle = base_angle - angle; /* 180 -> -135, angle = angle - 180 */
+ }
+ }
+ else { /* 45 -> 135 or -135 -> -45 */
+ if(y >= 0.0) { /* 45 -> 135 */
+ angle = 1.57079632679489661923;
+ if(x >= 0.0)
+ angle -= base_angle; /* 45 -> 90, angle = 90 - angle */
+ else
+ angle += base_angle; /* 90 -> 135, angle = 90 + angle */
+ }
+ else { /* -135 -> -45 */
+ angle = -1.57079632679489661923;
+ if(x >= 0.0)
+ angle += base_angle; /* -90 -> -45, angle = -90 + angle */
+ else
+ angle -= base_angle; /* -135 -> -90, angle = -90 - angle */
+ }
+ }
+
+ #ifdef ZERO_TO_TWOPI
+ if (angle < 0)
+ return (angle + TWOPI);
+ else
+ return (angle);
+ #else
+ return (angle);
+ #endif
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/math/fxpt.cc b/gnuradio-runtime/lib/math/fxpt.cc
new file mode 100644
index 0000000000..23fdda1241
--- /dev/null
+++ b/gnuradio-runtime/lib/math/fxpt.cc
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/fxpt.h>
+
+namespace gr {
+
+ const float fxpt::s_sine_table[1 << NBITS][2] = {
+ #include "sine_table.h"
+ };
+
+ const float fxpt::PI = 3.14159265358979323846;
+ const float fxpt::TWO_TO_THE_31 = 2147483648.0;
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/math/gen_sine_table.py b/gnuradio-runtime/lib/math/gen_sine_table.py
new file mode 100755
index 0000000000..d7d11eff11
--- /dev/null
+++ b/gnuradio-runtime/lib/math/gen_sine_table.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+#
+# Copyright 2004 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+import math
+import sys
+
+def wrap (x):
+ if x >= 2**31:
+ return x - 2**32
+ return x
+
+def gen_approx_table (f, nentries, min_x, max_x):
+ """return a list of nentries containing tuples of the form:
+ (m, c, abs_error). min_x and max_x specify the domain
+ of the table.
+ """
+ r = []
+ incx = float (max_x - min_x) / nentries
+ for i in range (nentries):
+ a = (i * incx) + min_x
+ b = ((i + 1) * incx) + min_x
+ m = (f(b)-f(a))/(b-a)
+ c = (3*a+b)*(f(a)-f(b))/(4*(b-a)) + (f((a+b)/2) + f(a))/2
+ abs_error = c+m*a-f(a)
+ r.append ((m, c, abs_error))
+ return r
+
+def scaled_sine (x):
+ return math.sin (x * math.pi / 2**31)
+
+def gen_sine_table ():
+ nbits = 10
+ nentries = 2**nbits
+
+ # min_x = -2**31
+ # max_x = 2**31-1
+ min_x = 0
+ max_x = 2**32-1
+ t = gen_approx_table (scaled_sine, nentries, min_x, max_x)
+
+ max_error = 0
+ for e in t:
+ max_error = max (max_error, abs (e[2]))
+
+ # sys.stdout.write ('static const int WORDBITS = 32;\n')
+ # sys.stdout.write ('static const int NBITS = %d;\n' % (nbits,))
+
+ sys.stdout.write (' // max_error = %22.15e\n' % (max_error,))
+
+ # sys.stdout.write ('static const double sine_table[%d][2] = {\n'% (nentries,))
+
+ for e in t:
+ sys.stdout.write (' { %22.15e, %22.15e },\n' % (2 * e[0], e[1]))
+
+ # sys.stdout.write ('};\n')
+
+if __name__ == '__main__':
+ gen_sine_table ()
diff --git a/gnuradio-runtime/lib/math/qa_fxpt.cc b/gnuradio-runtime/lib/math/qa_fxpt.cc
new file mode 100644
index 0000000000..d368e7de82
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt.cc
@@ -0,0 +1,102 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_fxpt.h>
+#include <gnuradio/fxpt.h>
+#include <cppunit/TestAssert.h>
+#include <iostream>
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+
+static const float SIN_COS_TOLERANCE = 1e-5;
+
+void
+qa_fxpt::t0()
+{
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(M_PI/2, gr::fxpt::fixed_to_float(0x40000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, gr::fxpt::fixed_to_float(0x00000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(-M_PI, gr::fxpt::fixed_to_float(0x80000000), SIN_COS_TOLERANCE);
+
+ if(0) {
+ /*
+ * These are disabled because of some precision issues.
+ *
+ * Different compilers seem to have different opinions on whether
+ * the calulations are done single or double (or extended)
+ * precision. Any of the answers are fine for our real purpose, but
+ * sometimes the answer is off by a few bits at the bottom.
+ * Hence, the disabled check.
+ */
+ CPPUNIT_ASSERT_EQUAL((gr_int32)0x40000000, gr::fxpt::float_to_fixed(M_PI/2));
+ CPPUNIT_ASSERT_EQUAL((gr_int32)0, gr::fxpt::float_to_fixed(0));
+ CPPUNIT_ASSERT_EQUAL((gr_int32)0x80000000, gr::fxpt::float_to_fixed(-M_PI));
+ }
+}
+
+void
+qa_fxpt::t1()
+{
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, gr::fxpt::sin(0x00000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.707106781, gr::fxpt::sin(0x20000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 1, gr::fxpt::sin(0x40000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.707106781, gr::fxpt::sin(0x60000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, gr::fxpt::sin(0x7fffffff), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, gr::fxpt::sin(0x80000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, gr::fxpt::sin(0x80000001), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(-1, gr::fxpt::sin(-0x40000000), SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.707106781, gr::fxpt::sin(-0x20000000), SIN_COS_TOLERANCE);
+
+ for(float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600) {
+ float expected = sin(p);
+ float actual = gr::fxpt::sin(gr::fxpt::float_to_fixed (p));
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, SIN_COS_TOLERANCE);
+ }
+}
+
+void
+qa_fxpt::t2()
+{
+ for(float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600) {
+ float expected = cos(p);
+ float actual = gr::fxpt::cos(gr::fxpt::float_to_fixed(p));
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, SIN_COS_TOLERANCE);
+ }
+}
+
+void
+qa_fxpt::t3()
+{
+ for(float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600) {
+ float expected_sin = sin(p);
+ float expected_cos = cos(p);
+ float actual_sin;
+ float actual_cos;
+ gr::fxpt::sincos(gr::fxpt::float_to_fixed (p), &actual_sin, &actual_cos);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(expected_sin, actual_sin, SIN_COS_TOLERANCE);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(expected_cos, actual_cos, SIN_COS_TOLERANCE);
+ }
+}
diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h
new file mode 100644
index 0000000000..58a6f02d1b
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_FXPT_H
+#define INCLUDED_QA_GR_FXPT_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_fxpt : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_fxpt);
+ CPPUNIT_TEST(t0);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST(t3);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+ void t0();
+ void t1();
+ void t2();
+ void t3();
+};
+
+#endif /* INCLUDED_QA_GR_FXPT_H */
+
+
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.cc b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc
new file mode 100644
index 0000000000..cf229d68be
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc
@@ -0,0 +1,120 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_fxpt_nco.h>
+#include <gnuradio/fxpt_nco.h>
+#include <gnuradio/nco.h>
+#include <cppunit/TestAssert.h>
+#include <iostream>
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+
+static const float SIN_COS_TOLERANCE = 1e-5;
+
+//static const float SIN_COS_FREQ = 5003;
+static const float SIN_COS_FREQ = 4096;
+
+static const int SIN_COS_BLOCK_SIZE = 100000;
+
+static double max_d(double a, double b)
+{
+ return fabs(a) > fabs(b) ? a : b;
+}
+
+void
+qa_fxpt_nco::t0()
+{
+ gr::nco<float,float> ref_nco;
+ gr::fxpt_nco new_nco;
+ double max_error = 0, max_phase_error = 0;
+
+ ref_nco.set_freq((float)(2 * M_PI / SIN_COS_FREQ));
+ new_nco.set_freq((float)(2 * M_PI / SIN_COS_FREQ));
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_nco.get_freq(), new_nco.get_freq(), SIN_COS_TOLERANCE);
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ float ref_sin = ref_nco.sin();
+ float new_sin = new_nco.sin();
+ //printf ("i = %6d\n", i);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_sin, new_sin, SIN_COS_TOLERANCE);
+
+ max_error = max_d(max_error, ref_sin-new_sin);
+
+ float ref_cos = ref_nco.cos();
+ float new_cos = new_nco.cos();
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_cos, new_cos, SIN_COS_TOLERANCE);
+
+ max_error = max_d(max_error, ref_cos-new_cos);
+
+ ref_nco.step();
+ new_nco.step();
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_nco.get_phase(), new_nco.get_phase(), SIN_COS_TOLERANCE);
+
+ max_phase_error = max_d(max_phase_error, ref_nco.get_phase()-new_nco.get_phase());
+ }
+ // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
+}
+
+void
+qa_fxpt_nco::t1()
+{
+ gr::nco<float,float> ref_nco;
+ gr::fxpt_nco new_nco;
+ gr_complex ref_block[SIN_COS_BLOCK_SIZE];
+ gr_complex new_block[SIN_COS_BLOCK_SIZE];
+ double max_error = 0;
+
+ ref_nco.set_freq((float)(2 * M_PI / SIN_COS_FREQ));
+ new_nco.set_freq((float)(2 * M_PI / SIN_COS_FREQ));
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_nco.get_freq(), new_nco.get_freq(), SIN_COS_TOLERANCE);
+
+ ref_nco.sincos((gr_complex*)ref_block, SIN_COS_BLOCK_SIZE);
+ new_nco.sincos((gr_complex*)new_block, SIN_COS_BLOCK_SIZE);
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_block[i].real(), new_block[i].real(), SIN_COS_TOLERANCE);
+ max_error = max_d (max_error, ref_block[i].real()-new_block[i].real());
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_block[i].imag(), new_block[i].imag(), SIN_COS_TOLERANCE);
+ max_error = max_d (max_error, ref_block[i].imag()-new_block[i].imag());
+ }
+ CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_nco.get_phase(), new_nco.get_phase(), SIN_COS_TOLERANCE);
+ // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
+}
+
+void
+qa_fxpt_nco::t2()
+{
+}
+
+void
+qa_fxpt_nco::t3()
+{
+}
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
new file mode 100644
index 0000000000..1b2cdaede6
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_FXPT_NCO_H
+#define INCLUDED_QA_GR_FXPT_NCO_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_fxpt_nco : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_fxpt_nco);
+ CPPUNIT_TEST(t0);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST(t3);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void t0();
+ void t1();
+ void t2();
+ void t3();
+};
+
+#endif /* INCLUDED_QA_GR_FXPT_NCO_H */
+
+
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc
new file mode 100644
index 0000000000..ee9865e926
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc
@@ -0,0 +1,110 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_fxpt_vco.h>
+#include <gnuradio/fxpt_vco.h>
+#include <vco.h>
+#include <cppunit/TestAssert.h>
+#include <iostream>
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+
+static const float SIN_COS_TOLERANCE = 1e-5;
+
+static const float SIN_COS_K = 0.42;
+static const float SIN_COS_AMPL = 0.8;
+
+static const int SIN_COS_BLOCK_SIZE = 100000;
+
+static double max_d(double a, double b)
+{
+ return fabs(a) > fabs(b) ? a : b;
+}
+
+void
+qa_fxpt_vco::t0()
+{
+ gr::vco<float,float> ref_vco;
+ gr::fxpt_vco new_vco;
+ double max_error = 0, max_phase_error = 0;
+ float input[SIN_COS_BLOCK_SIZE];
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ input[i] = sin(double(i));
+ }
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ float ref_cos = ref_vco.cos();
+ float new_cos = new_vco.cos();
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_cos, new_cos, SIN_COS_TOLERANCE);
+
+ max_error = max_d(max_error, ref_cos-new_cos);
+
+ ref_vco.adjust_phase(input[i]);
+ new_vco.adjust_phase(input[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_vco.get_phase(), new_vco.get_phase(), SIN_COS_TOLERANCE);
+
+ max_phase_error = max_d(max_phase_error, ref_vco.get_phase()-new_vco.get_phase());
+ }
+ // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
+}
+
+void
+qa_fxpt_vco::t1()
+{
+ gr::vco<float,float> ref_vco;
+ gr::fxpt_vco new_vco;
+ float ref_block[SIN_COS_BLOCK_SIZE];
+ float new_block[SIN_COS_BLOCK_SIZE];
+ float input[SIN_COS_BLOCK_SIZE];
+ double max_error = 0;
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ input[i] = sin(double(i));
+ }
+
+ ref_vco.cos(ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL);
+ new_vco.cos(new_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL);
+
+ for(int i = 0; i < SIN_COS_BLOCK_SIZE; i++) {
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_block[i], new_block[i], SIN_COS_TOLERANCE);
+ max_error = max_d(max_error, ref_block[i]-new_block[i]);
+ }
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(ref_vco.get_phase(), new_vco.get_phase(), SIN_COS_TOLERANCE);
+ // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, ref_vco.get_phase()-new_vco.get_phase());
+}
+
+void
+qa_fxpt_vco::t2()
+{
+}
+
+void
+qa_fxpt_vco::t3()
+{
+}
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
new file mode 100644
index 0000000000..72693f32e2
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_FXPT_VCO_H
+#define INCLUDED_QA_GR_FXPT_VCO_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_fxpt_vco : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_fxpt_vco);
+ CPPUNIT_TEST(t0);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST(t3);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void t0();
+ void t1();
+ void t2();
+ void t3();
+};
+
+#endif /* INCLUDED_QA_GR_FXPT_VCO_H */
+
+
diff --git a/gnuradio-runtime/lib/math/qa_math.cc b/gnuradio-runtime/lib/math/qa_math.cc
new file mode 100644
index 0000000000..1fb43cc67f
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_math.cc
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/math.h>
+#include <qa_math.h>
+#include <cppunit/TestAssert.h>
+#include <stdio.h>
+
+void
+qa_math::test_binary_slicer1()
+{
+ float x[5] = {-1, -0.5, 0, 0.5, 1.0};
+ unsigned int z[5] = {0, 0, 1, 1, 1};
+ unsigned int y;
+
+ //printf("\nBinary\n");
+ for(unsigned int i = 0; i < 5; i++) {
+ y = gr::binary_slicer(x[i]);
+ //printf("in: %f out: %d desired: %d\n", x[i], y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+
+ //printf("\nBranchless Binary\n");
+ for (unsigned int i = 0; i < 5; i++) {
+ y = gr::branchless_binary_slicer(x[i]);
+ //printf("in: %f out: %d desired: %d\n", x[i], y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+}
+
+void
+qa_math::test_quad_0deg_slicer1()
+{
+ gr_complex x[4] = {gr_complex(1, 0),
+ gr_complex(0, 1),
+ gr_complex(-1, 0),
+ gr_complex(0, -1)};
+
+ unsigned int z[4] = {0, 1, 2, 3};
+ unsigned int y;
+
+ //printf("\nQuad0\n");
+ for (unsigned int i = 0; i < 4; i++) {
+ y = gr::quad_0deg_slicer(x[i]);
+ //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+
+ //printf("\nBranchless Quad0\n");
+ for (unsigned int i = 0; i < 4; i++) {
+ y = gr::branchless_quad_0deg_slicer(x[i]);
+ //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+}
+
+void
+qa_math::test_quad_45deg_slicer1()
+{
+ gr_complex x[4] = {gr_complex(0.707, 0.707),
+ gr_complex(-0.707, 0.707),
+ gr_complex(-0.707, -0.707),
+ gr_complex(0.707, -0.707)};
+
+ unsigned int z[4] = {0, 1, 2, 3};
+ unsigned int y;
+
+ //printf("\nQuad45\n");
+ for (unsigned int i = 0; i < 4; i++) {
+ y = gr::quad_45deg_slicer(x[i]);
+ //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+
+ //printf("\nBranchless Quad45\n");
+ for (unsigned int i = 0; i < 4; i++) {
+ y = gr::branchless_quad_45deg_slicer(x[i]);
+ //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
+ }
+}
diff --git a/gnuradio-runtime/lib/math/qa_math.h b/gnuradio-runtime/lib/math/qa_math.h
new file mode 100644
index 0000000000..3621283b37
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_math.h
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef _QA_GR_MATH_H_
+#define _QA_GR_MATH_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_math : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_math);
+ CPPUNIT_TEST(test_binary_slicer1);
+ CPPUNIT_TEST(test_quad_0deg_slicer1);
+ CPPUNIT_TEST(test_quad_45deg_slicer1);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+ void test_binary_slicer1();
+ void test_quad_0deg_slicer1();
+ void test_quad_45deg_slicer1();
+};
+
+#endif /* _QA_GR_MATH_H_ */
diff --git a/gnuradio-runtime/lib/math/qa_sincos.cc b/gnuradio-runtime/lib/math/qa_sincos.cc
new file mode 100644
index 0000000000..7def8a9bb8
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_sincos.cc
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_sincos.h>
+#include <gnuradio/sincos.h>
+#include <cppunit/TestAssert.h>
+#include <cmath>
+
+void
+qa_sincos::t1()
+{
+ static const unsigned int N = 1000;
+ double c_sin, c_cos;
+ double gr_sin, gr_cos;
+
+ for(unsigned i = 0; i < N; i++) {
+ double x = i/100.0;
+ c_sin = sin(x);
+ c_cos = cos(x);
+
+ gr::sincos(x, &gr_sin, &gr_cos);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
+ }
+}
+
+void
+qa_sincos::t2()
+{
+ static const unsigned int N = 1000;
+ float c_sin, c_cos;
+ float gr_sin, gr_cos;
+
+ for(unsigned i = 0; i < N; i++) {
+ float x = i/100.0;
+ c_sin = sinf(x);
+ c_cos = cosf(x);
+
+ gr::sincosf(x, &gr_sin, &gr_cos);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
+ }
+}
diff --git a/gnuradio-runtime/lib/math/qa_sincos.h b/gnuradio-runtime/lib/math/qa_sincos.h
new file mode 100644
index 0000000000..c54b75f97f
--- /dev/null
+++ b/gnuradio-runtime/lib/math/qa_sincos.h
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _QA_SINCOS_H_
+#define _QA_SINCOS_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_sincos : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_sincos);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void t1();
+ void t2();
+};
+
+#endif /* _QA_SINCOS_H_ */
diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc
new file mode 100644
index 0000000000..7170f27edf
--- /dev/null
+++ b/gnuradio-runtime/lib/math/random.cc
@@ -0,0 +1,188 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * Copyright 1997 Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without express or implied warranty.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <math.h>
+#include <gnuradio/random.h>
+
+namespace gr {
+
+#define IA 16807
+#define IM 2147483647
+#define AM (1.0/IM)
+#define IQ 127773
+#define IR 2836
+#define NDIV (1+(IM-1)/NTAB)
+#define EPS 1.2e-7
+#define RNMX (1.0-EPS)
+
+ random::random(long seed)
+ {
+ reseed(seed);
+ }
+
+ void
+ random::reseed(long seed)
+ {
+ d_seed = seed;
+ d_iy = 0;
+ for(int i = 0; i < NTAB; i++)
+ d_iv[i] = 0;
+ d_iset = 0;
+ d_gset = 0;
+ }
+
+ /*
+ * This looks like it returns a uniform random deviate between 0.0 and 1.0
+ * It looks similar to code from "Numerical Recipes in C".
+ */
+ float
+ random::ran1()
+ {
+ int j;
+ long k;
+ float temp;
+
+ if(d_seed <= 0 || !d_iy) {
+ if(-d_seed < 1)
+ d_seed=1;
+ else
+ d_seed = -d_seed;
+ for(j=NTAB+7;j>=0;j--) {
+ k=d_seed/IQ;
+ d_seed=IA*(d_seed-k*IQ)-IR*k;
+ if(d_seed < 0)
+ d_seed += IM;
+ if(j < NTAB)
+ d_iv[j] = d_seed;
+ }
+ d_iy=d_iv[0];
+ }
+ k=(d_seed)/IQ;
+ d_seed=IA*(d_seed-k*IQ)-IR*k;
+ if(d_seed < 0)
+ d_seed += IM;
+ j=d_iy/NDIV;
+ d_iy=d_iv[j];
+ d_iv[j] = d_seed;
+ temp=AM * d_iy;
+ if(temp > RNMX)
+ temp = RNMX;
+ return temp;
+ }
+
+ /*
+ * Returns a normally distributed deviate with zero mean and variance 1.
+ * Also looks like it's from "Numerical Recipes in C".
+ */
+ float
+ random::gasdev()
+ {
+ float fac,rsq,v1,v2;
+ d_iset = 1 - d_iset;
+ if(d_iset) {
+ do {
+ v1=2.0*ran1()-1.0;
+ v2=2.0*ran1()-1.0;
+ rsq=v1*v1+v2*v2;
+ } while(rsq >= 1.0 || rsq == 0.0);
+ fac= sqrt(-2.0*log(rsq)/rsq);
+ d_gset=v1*fac;
+ return v2*fac;
+ }
+ return d_gset;
+ }
+
+ /*
+ * Copied from The KC7WW / OH2BNS Channel Simulator
+ * FIXME Need to check how good this is at some point
+ */
+ float
+ random::laplacian()
+ {
+ float z = ran1();
+ if(z < 0.5)
+ return log(2.0 * z) / M_SQRT2;
+ else
+ return -log(2.0 * (1.0 - z)) / M_SQRT2;
+ }
+
+ /*
+ * Copied from The KC7WW / OH2BNS Channel Simulator
+ * FIXME Need to check how good this is at some point
+ */
+ // 5 => scratchy, 8 => Geiger
+ float
+ random::impulse(float factor = 5)
+ {
+ float z = -M_SQRT2 * log(ran1());
+ if(fabsf(z) <= factor)
+ return 0.0;
+ else
+ return z;
+ }
+
+ /*
+ * Complex rayleigh is really gaussian I and gaussian Q
+ * It can also be generated by real rayleigh magnitude and
+ * uniform random angle
+ * Adapted from The KC7WW / OH2BNS Channel Simulator
+ * FIXME Need to check how good this is at some point
+ */
+ gr_complex
+ random::rayleigh_complex()
+ {
+ return gr_complex(gasdev(),gasdev());
+ }
+
+ /* Other option
+ mag = rayleigh();
+ ang = 2.0 * M_PI * RNG();
+ *Rx = rxx * cos(z);
+ *Iy = rxx * sin(z);
+ */
+
+ float
+ random::rayleigh()
+ {
+ return sqrt(-2.0 * log(ran1()));
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/math/sincos.cc b/gnuradio-runtime/lib/math/sincos.cc
new file mode 100644
index 0000000000..49a90d2128
--- /dev/null
+++ b/gnuradio-runtime/lib/math/sincos.cc
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE // ask for GNU extensions if available
+#endif
+
+#include <gnuradio/sincos.h>
+#include <math.h>
+
+namespace gr {
+
+#if defined (HAVE_SINCOS)
+
+ void
+ sincos(double x, double *sinx, double *cosx)
+ {
+ ::sincos(x, sinx, cosx);
+ }
+
+#else
+
+ void
+ sincos(double x, double *sinx, double *cosx)
+ {
+ *sinx = ::sin(x);
+ *cosx = ::cos(x);
+ }
+
+#endif
+
+ // ----------------------------------------------------------------
+
+#if defined (HAVE_SINCOSF)
+
+ void
+ sincosf(float x, float *sinx, float *cosx)
+ {
+ ::sincosf(x, sinx, cosx);
+ }
+
+#elif defined (HAVE_SINF) && defined (HAVE_COSF)
+
+ void
+ sincosf(float x, float *sinx, float *cosx)
+ {
+ *sinx = ::sinf(x);
+ *cosx = ::cosf(x);
+ }
+
+#else
+
+ void
+ sincosf(float x, float *sinx, float *cosx)
+ {
+ *sinx = ::sin(x);
+ *cosx = ::cos(x);
+ }
+
+#endif
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/math/sine_table.h b/gnuradio-runtime/lib/math/sine_table.h
new file mode 100644
index 0000000000..69834943bc
--- /dev/null
+++ b/gnuradio-runtime/lib/math/sine_table.h
@@ -0,0 +1,1025 @@
+ // max_error = 2.353084136763606e-06
+ { 2.925817799165007e-09, 7.219194364267018e-09 },
+ { 2.925707643778599e-09, 2.526699001579799e-07 },
+ { 2.925487337153070e-09, 1.191140162167675e-06 },
+ { 2.925156887582842e-09, 3.284585035595589e-06 },
+ { 2.924716307509151e-09, 6.994872605695784e-06 },
+ { 2.924165613519592e-09, 1.278374920658798e-05 },
+ { 2.923504826347475e-09, 2.111280464718590e-05 },
+ { 2.922733970871080e-09, 3.244343744537165e-05 },
+ { 2.921853076112655e-09, 4.723682007436170e-05 },
+ { 2.920862175237416e-09, 6.595386421935634e-05 },
+ { 2.919761305552202e-09, 8.905518605213658e-05 },
+ { 2.918550508504146e-09, 1.170010715193098e-04 },
+ { 2.917229829679050e-09, 1.502514416517192e-04 },
+ { 2.915799318799769e-09, 1.892658178912071e-04 },
+ { 2.914259029724184e-09, 2.345032874456615e-04 },
+ { 2.912609020443340e-09, 2.864224686607020e-04 },
+ { 2.910849353079123e-09, 3.454814764261432e-04 },
+ { 2.908980093882049e-09, 4.121378876027343e-04 },
+ { 2.907001313228646e-09, 4.868487064877691e-04 },
+ { 2.904913085618902e-09, 5.700703303049837e-04 },
+ { 2.902715489673383e-09, 6.622585147355725e-04 },
+ { 2.900408608130373e-09, 7.638683394782519e-04 },
+ { 2.897992527842612e-09, 8.753541738578119e-04 },
+ { 2.895467339774186e-09, 9.971696424604937e-04 },
+ { 2.892833138996999e-09, 1.129767590823255e-03 },
+ { 2.890090024687216e-09, 1.273600051161478e-03 },
+ { 2.887238100121550e-09, 1.429118208142094e-03 },
+ { 2.884277472673313e-09, 1.596772364709564e-03 },
+ { 2.881208253808507e-09, 1.777011907950626e-03 },
+ { 2.878030559081432e-09, 1.970285275029487e-03 },
+ { 2.874744508130554e-09, 2.177039919152579e-03 },
+ { 2.871350224673798e-09, 2.397722275614272e-03 },
+ { 2.867847836504030e-09, 2.632777727878843e-03 },
+ { 2.864237475484149e-09, 2.882650573737405e-03 },
+ { 2.860519277542297e-09, 3.147783991507308e-03 },
+ { 2.856693382666432e-09, 3.428620006328931e-03 },
+ { 2.852759934899389e-09, 3.725599456482154e-03 },
+ { 2.848719082333207e-09, 4.039161959812243e-03 },
+ { 2.844570977103752e-09, 4.369745880190706e-03 },
+ { 2.840315775384800e-09, 4.717788294077374e-03 },
+ { 2.835953637382310e-09, 5.083724957128360e-03 },
+ { 2.831484727328322e-09, 5.467990270896617e-03 },
+ { 2.826909213474759e-09, 5.871017249604038e-03 },
+ { 2.822227268087134e-09, 6.293237486988512e-03 },
+ { 2.817439067438018e-09, 6.735081123237729e-03 },
+ { 2.812544791800534e-09, 7.196976811989608e-03 },
+ { 2.807544625441273e-09, 7.679351687456759e-03 },
+ { 2.802438756613836e-09, 8.182631331563162e-03 },
+ { 2.797227377551135e-09, 8.707239741274575e-03 },
+ { 2.791910684458716e-09, 9.253599295902304e-03 },
+ { 2.786488877507140e-09, 9.822130724578715e-03 },
+ { 2.780962160824228e-09, 1.041325307382490e-02 },
+ { 2.775330742487884e-09, 1.102738367513773e-02 },
+ { 2.769594834517682e-09, 1.166493811278924e-02 },
+ { 2.763754652867477e-09, 1.232633019159818e-02 },
+ { 2.757810417416620e-09, 1.301197190494069e-02 },
+ { 2.751762351962413e-09, 1.372227340270610e-02 },
+ { 2.745610684210923e-09, 1.445764295952962e-02 },
+ { 2.739355645769094e-09, 1.521848694296229e-02 },
+ { 2.732997472135539e-09, 1.600520978188769e-02 },
+ { 2.726536402691907e-09, 1.681821393496225e-02 },
+ { 2.719972680693777e-09, 1.765789985920713e-02 },
+ { 2.713306553261610e-09, 1.852466597868779e-02 },
+ { 2.706538271371373e-09, 1.941890865333146e-02 },
+ { 2.699668089844909e-09, 2.034102214787814e-02 },
+ { 2.692696267340880e-09, 2.129139860085272e-02 },
+ { 2.685623066344263e-09, 2.227042799383416e-02 },
+ { 2.678448753157212e-09, 2.327849812064098e-02 },
+ { 2.671173597888530e-09, 2.431599455681316e-02 },
+ { 2.663797874443630e-09, 2.538330062913108e-02 },
+ { 2.656321860514457e-09, 2.648079738524795e-02 },
+ { 2.648745837568575e-09, 2.760886356354952e-02 },
+ { 2.641070090839117e-09, 2.876787556300114e-02 },
+ { 2.633294909313421e-09, 2.995820741329835e-02 },
+ { 2.625420585722845e-09, 3.118023074495535e-02 },
+ { 2.617447416531143e-09, 3.243431475972608e-02 },
+ { 2.609375701923643e-09, 3.372082620101990e-02 },
+ { 2.601205745795833e-09, 3.504012932452527e-02 },
+ { 2.592937855741933e-09, 3.639258586895711e-02 },
+ { 2.584572343043400e-09, 3.777855502693250e-02 },
+ { 2.576109522656942e-09, 3.919839341605197e-02 },
+ { 2.567549713203028e-09, 4.065245505002102e-02 },
+ { 2.558893236953688e-09, 4.214109131001403e-02 },
+ { 2.550140419820252e-09, 4.366465091617666e-02 },
+ { 2.541291591341445e-09, 4.522347989919473e-02 },
+ { 2.532347084670572e-09, 4.681792157215026e-02 },
+ { 2.523307236563343e-09, 4.844831650239501e-02 },
+ { 2.514172387364900e-09, 5.011500248369893e-02 },
+ { 2.504942880997064e-09, 5.181831450849345e-02 },
+ { 2.495619064945627e-09, 5.355858474024022e-02 },
+ { 2.486201290246928e-09, 5.533614248606705e-02 },
+ { 2.476689911475047e-09, 5.715131416942842e-02 },
+ { 2.467085286727668e-09, 5.900442330315692e-02 },
+ { 2.457387777613798e-09, 6.089579046229943e-02 },
+ { 2.447597749239101e-09, 6.282573325755320e-02 },
+ { 2.437715570192557e-09, 6.479456630859221e-02 },
+ { 2.427741612532542e-09, 6.680260121764925e-02 },
+ { 2.417676251773166e-09, 6.885014654319160e-02 },
+ { 2.407519866869294e-09, 7.093750777401114e-02 },
+ { 2.397272840203310e-09, 7.306498730310884e-02 },
+ { 2.386935557569868e-09, 7.523288440214027e-02 },
+ { 2.376508408161815e-09, 7.744149519577415e-02 },
+ { 2.365991784555363e-09, 7.969111263635709e-02 },
+ { 2.355386082695641e-09, 8.198202647865405e-02 },
+ { 2.344691701881232e-09, 8.431452325495814e-02 },
+ { 2.333909044749407e-09, 8.668888625021409e-02 },
+ { 2.323038517261246e-09, 8.910539547731611e-02 },
+ { 2.312080528685971e-09, 9.156432765274414e-02 },
+ { 2.301035491585642e-09, 9.406595617227698e-02 },
+ { 2.289903821799651e-09, 9.661055108691619e-02 },
+ { 2.278685938428940e-09, 9.919837907903295e-02 },
+ { 2.267382263820762e-09, 1.018297034385580e-01 },
+ { 2.255993223551837e-09, 1.045047840397028e-01 },
+ { 2.244519246413220e-09, 1.072238773174577e-01 },
+ { 2.232960764393620e-09, 1.099872362446146e-01 },
+ { 2.221318212663309e-09, 1.127951103088245e-01 },
+ { 2.209592029557811e-09, 1.156477454898748e-01 },
+ { 2.197782656561395e-09, 1.185453842371912e-01 },
+ { 2.185890538290176e-09, 1.214882654476019e-01 },
+ { 2.173916122475606e-09, 1.244766244431883e-01 },
+ { 2.161859859947797e-09, 1.275106929493488e-01 },
+ { 2.149722204618256e-09, 1.305906990731841e-01 },
+ { 2.137503613462743e-09, 1.337168672820376e-01 },
+ { 2.125204546504321e-09, 1.368894183821595e-01 },
+ { 2.112825466795944e-09, 1.401085694976751e-01 },
+ { 2.100366840402933e-09, 1.433745340497602e-01 },
+ { 2.087829136385612e-09, 1.466875217359607e-01 },
+ { 2.075212826781308e-09, 1.500477385098620e-01 },
+ { 2.062518386587093e-09, 1.534553865607503e-01 },
+ { 2.049746293741359e-09, 1.569106642937665e-01 },
+ { 2.036897029106193e-09, 1.604137663100403e-01 },
+ { 2.023971076449323e-09, 1.639648833871233e-01 },
+ { 2.010968922425217e-09, 1.675642024598467e-01 },
+ { 1.997891056557933e-09, 1.712119066008896e-01 },
+ { 1.984737971221581e-09, 1.749081750021970e-01 },
+ { 1.971510161622434e-09, 1.786531829561379e-01 },
+ { 1.958208125780130e-09, 1.824471018371070e-01 },
+ { 1.944832364508511e-09, 1.862900990834311e-01 },
+ { 1.931383381397782e-09, 1.901823381790926e-01 },
+ { 1.917861682794392e-09, 1.941239786363039e-01 },
+ { 1.904267777782611e-09, 1.981151759777950e-01 },
+ { 1.890602178165317e-09, 2.021560817195309e-01 },
+ { 1.876865398444616e-09, 2.062468433536743e-01 },
+ { 1.863057955802572e-09, 2.103876043317229e-01 },
+ { 1.849180370081465e-09, 2.145785040479915e-01 },
+ { 1.835233163764673e-09, 2.188196778231083e-01 },
+ { 1.821216861956509e-09, 2.231112568880342e-01 },
+ { 1.807131992362945e-09, 2.274533683680190e-01 },
+ { 1.792979085271234e-09, 2.318461352671018e-01 },
+ { 1.778758673530482e-09, 2.362896764525300e-01 },
+ { 1.764471292530943e-09, 2.407841066397789e-01 },
+ { 1.750117480184598e-09, 2.453295363773890e-01 },
+ { 1.735697776904342e-09, 2.499260720324433e-01 },
+ { 1.721212725583874e-09, 2.545738157760434e-01 },
+ { 1.706662871577097e-09, 2.592728655691494e-01 },
+ { 1.692048762677849e-09, 2.640233151485341e-01 },
+ { 1.677370949099090e-09, 2.688252540131204e-01 },
+ { 1.662629983452104e-09, 2.736787674105404e-01 },
+ { 1.647826420726167e-09, 2.785839363237506e-01 },
+ { 1.632960818266680e-09, 2.835408374583758e-01 },
+ { 1.618033735755429e-09, 2.885495432295704e-01 },
+ { 1.603045735188609e-09, 2.936101217498361e-01 },
+ { 1.587997380855918e-09, 2.987226368167127e-01 },
+ { 1.572889239319430e-09, 3.038871479007593e-01 },
+ { 1.557721879392051e-09, 3.091037101339017e-01 },
+ { 1.542495872116447e-09, 3.143723742978435e-01 },
+ { 1.527211790743024e-09, 3.196931868130269e-01 },
+ { 1.511870210708909e-09, 3.250661897274744e-01 },
+ { 1.496471709615926e-09, 3.304914207062036e-01 },
+ { 1.481016867208896e-09, 3.359689130207621e-01 },
+ { 1.465506265353924e-09, 3.414986955389885e-01 },
+ { 1.449940488016384e-09, 3.470807927151147e-01 },
+ { 1.434320121238994e-09, 3.527152245800635e-01 },
+ { 1.418645753119802e-09, 3.584020067320109e-01 },
+ { 1.402917973789838e-09, 3.641411503272979e-01 },
+ { 1.387137375391042e-09, 3.699326620714776e-01 },
+ { 1.371304552054134e-09, 3.757765442106153e-01 },
+ { 1.355420099875958e-09, 3.816727945230153e-01 },
+ { 1.339484616897137e-09, 3.876214063110671e-01 },
+ { 1.323498703079580e-09, 3.936223683933865e-01 },
+ { 1.307462960283922e-09, 3.996756650972121e-01 },
+ { 1.291377992246768e-09, 4.057812762511174e-01 },
+ { 1.275244404558188e-09, 4.119391771778626e-01 },
+ { 1.259062804638585e-09, 4.181493386877248e-01 },
+ { 1.242833801715929e-09, 4.244117270719281e-01 },
+ { 1.226558006803155e-09, 4.307263040962509e-01 },
+ { 1.210236032674760e-09, 4.370930269951803e-01 },
+ { 1.193868493843725e-09, 4.435118484661861e-01 },
+ { 1.177456006538695e-09, 4.499827166641340e-01 },
+ { 1.160999188680582e-09, 4.565055751961679e-01 },
+ { 1.144498659859216e-09, 4.630803631168164e-01 },
+ { 1.127955041310214e-09, 4.697070149232604e-01 },
+ { 1.111368955891417e-09, 4.763854605510119e-01 },
+ { 1.094741028059551e-09, 4.831156253697562e-01 },
+ { 1.078071883846871e-09, 4.898974301794375e-01 },
+ { 1.061362150836978e-09, 4.967307912069362e-01 },
+ { 1.044612458142151e-09, 5.036156201023686e-01 },
+ { 1.027823436378632e-09, 5.105518239364775e-01 },
+ { 1.010995717643647e-09, 5.175393051975563e-01 },
+ { 9.941299354913699e-10, 5.245779617890562e-01 },
+ { 9.772267249089968e-10, 5.316676870274011e-01 },
+ { 9.602867222926046e-10, 5.388083696401416e-01 },
+ { 9.433105654240147e-10, 5.459998937639375e-01 },
+ { 9.262988934458084e-10, 5.532421389435711e-01 },
+ { 9.092523468378193e-10, 5.605349801305876e-01 },
+ { 8.921715673928355e-10, 5.678782876825250e-01 },
+ { 8.750571981926701e-10, 5.752719273622372e-01 },
+ { 8.579098835836508e-10, 5.827157603377209e-01 },
+ { 8.407302691522673e-10, 5.902096431821322e-01 },
+ { 8.235190017016133e-10, 5.977534278737073e-01 },
+ { 8.062767292259225e-10, 6.053469617967722e-01 },
+ { 7.890041008871165e-10, 6.129900877421282e-01 },
+ { 7.717017669898175e-10, 6.206826439083659e-01 },
+ { 7.543703789572603e-10, 6.284244639030392e-01 },
+ { 7.370105893063053e-10, 6.362153767444958e-01 },
+ { 7.196230516231919e-10, 6.440552068636356e-01 },
+ { 7.022084205389746e-10, 6.519437741060674e-01 },
+ { 6.847673517046416e-10, 6.598808937346672e-01 },
+ { 6.673005017664976e-10, 6.678663764322770e-01 },
+ { 6.498085283416530e-10, 6.759000283046127e-01 },
+ { 6.322920899929834e-10, 6.839816508836737e-01 },
+ { 6.147518462045659e-10, 6.921110411311926e-01 },
+ { 5.971884573565851e-10, 7.002879914425926e-01 },
+ { 5.796025847007168e-10, 7.085122896509806e-01 },
+ { 5.619948903351406e-10, 7.167837190315758e-01 },
+ { 5.443660371796048e-10, 7.251020583063744e-01 },
+ { 5.267166889504394e-10, 7.334670816491009e-01 },
+ { 5.090475101356742e-10, 7.418785586903696e-01 },
+ { 4.913591659698399e-10, 7.503362545232619e-01 },
+ { 4.736523224091392e-10, 7.588399297089872e-01 },
+ { 4.559276461062478e-10, 7.673893402829834e-01 },
+ { 4.381858043851147e-10, 7.759842377612828e-01 },
+ { 4.204274652161870e-10, 7.846243691469355e-01 },
+ { 4.026532971908398e-10, 7.933094769370790e-01 },
+ { 3.848639694963359e-10, 8.020392991300200e-01 },
+ { 3.670601518910503e-10, 8.108135692324444e-01 },
+ { 3.492425146784233e-10, 8.196320162675177e-01 },
+ { 3.314117286825031e-10, 8.284943647824689e-01 },
+ { 3.135684652223755e-10, 8.374003348569865e-01 },
+ { 2.957133960867535e-10, 8.463496421118015e-01 },
+ { 2.778471935089361e-10, 8.553419977173513e-01 },
+ { 2.599705301412391e-10, 8.643771084029740e-01 },
+ { 2.420840790301135e-10, 8.734546764660205e-01 },
+ { 2.241885135902046e-10, 8.825743997817682e-01 },
+ { 2.062845075795238e-10, 8.917359718130367e-01 },
+ { 1.883727350736140e-10, 9.009390816205823e-01 },
+ { 1.704538704408269e-10, 9.101834138731877e-01 },
+ { 1.525285883160648e-10, 9.194686488588080e-01 },
+ { 1.345975635762696e-10, 9.287944624950824e-01 },
+ { 1.166614713141648e-10, 9.381605263410157e-01 },
+ { 9.872098681369190e-11, 9.475665076080466e-01 },
+ { 8.077678552380464e-11, 9.570120691722380e-01 },
+ { 6.282954303364090e-11, 9.664968695860140e-01 },
+ { 4.487993504668797e-11, 9.760205630906909e-01 },
+ { 2.692863735553042e-11, 9.855827996289697e-01 },
+ { 8.976325816439114e-12, 9.951832248577780e-01 },
+ { -8.976323676304494e-12, 1.004821480161519e+00 },
+ { -2.692863521550168e-11, 1.014497202665280e+00 },
+ { -4.487993290681805e-11, 1.024210025248670e+00 },
+ { -6.282954089398273e-11, 1.033959576559617e+00 },
+ { -8.077678338451706e-11, 1.043745481028715e+00 },
+ { -9.872098467477489e-11, 1.053567358883467e+00 },
+ { -1.166614691757772e-10, 1.063424826163223e+00 },
+ { -1.345975614383584e-10, 1.073317494734013e+00 },
+ { -1.525285861788948e-10, 1.083244972303963e+00 },
+ { -1.704538683042922e-10, 1.093206862438572e+00 },
+ { -1.883727329379793e-10, 1.103202764576806e+00 },
+ { -2.062845054446831e-10, 1.113232274046796e+00 },
+ { -2.241885114563697e-10, 1.123294982082432e+00 },
+ { -2.420840768973375e-10, 1.133390475839767e+00 },
+ { -2.599705280096278e-10, 1.143518338413855e+00 },
+ { -2.778471913784365e-10, 1.153678148855860e+00 },
+ { -2.957133939575774e-10, 1.163869482190458e+00 },
+ { -3.135684630945758e-10, 1.174091909433296e+00 },
+ { -3.314117265561857e-10, 1.184344997608959e+00 },
+ { -3.492425125535882e-10, 1.194628309769018e+00 },
+ { -3.670601497678034e-10, 1.204941405010466e+00 },
+ { -3.848639673748360e-10, 1.215283838494269e+00 },
+ { -4.026532950710339e-10, 1.225655161464298e+00 },
+ { -4.204274630982869e-10, 1.236054921266445e+00 },
+ { -4.381858022691734e-10, 1.246482661367958e+00 },
+ { -4.559276439922654e-10, 1.256937921377146e+00 },
+ { -4.736523202972214e-10, 1.267420237063216e+00 },
+ { -4.913591638600925e-10, 1.277929140376502e+00 },
+ { -5.090475080282032e-10, 1.288464159468706e+00 },
+ { -5.267166868452449e-10, 1.299024818713528e+00 },
+ { -5.443660350768455e-10, 1.309610638727845e+00 },
+ { -5.619948882348695e-10, 1.320221136392390e+00 },
+ { -5.796025826029868e-10, 1.330855824873457e+00 },
+ { -5.971884552615020e-10, 1.341514213644420e+00 },
+ { -6.147518441122357e-10, 1.352195808507556e+00 },
+ { -6.322920879034590e-10, 1.362900111616144e+00 },
+ { -6.498085262549874e-10, 1.373626621496939e+00 },
+ { -6.673004996827436e-10, 1.384374833072571e+00 },
+ { -6.847673496239581e-10, 1.395144237684605e+00 },
+ { -7.022084184613616e-10, 1.405934323116231e+00 },
+ { -7.196230495488082e-10, 1.416744573616104e+00 },
+ { -7.370105872352039e-10, 1.427574469921397e+00 },
+ { -7.543703768894941e-10, 1.438423489281758e+00 },
+ { -7.717017649255453e-10, 1.449291105483472e+00 },
+ { -7.890040988262324e-10, 1.460176788873383e+00 },
+ { -8.062767271686383e-10, 1.471080006383765e+00 },
+ { -8.235189996479819e-10, 1.482000221556656e+00 },
+ { -8.407302671024475e-10, 1.492936894569018e+00 },
+ { -8.579098815375368e-10, 1.503889482257845e+00 },
+ { -8.750571961505266e-10, 1.514857438145604e+00 },
+ { -8.921715653546624e-10, 1.525840212465756e+00 },
+ { -9.092523448036167e-10, 1.536837252188703e+00 },
+ { -9.262988914157881e-10, 1.547848001047890e+00 },
+ { -9.433105633981766e-10, 1.558871899565883e+00 },
+ { -9.602867202711075e-10, 1.569908385081254e+00 },
+ { -9.772267228916820e-10, 1.580956891774897e+00 },
+ { -9.941299334786078e-10, 1.592016850697478e+00 },
+ { -1.010995715635332e-09, 1.603087689796053e+00 },
+ { -1.027823434374870e-09, 1.614168833942028e+00 },
+ { -1.044612456143047e-09, 1.625259704958335e+00 },
+ { -1.061362148842745e-09, 1.636359721647526e+00 },
+ { -1.078071881857297e-09, 1.647468299819543e+00 },
+ { -1.094741026074900e-09, 1.658584852320419e+00 },
+ { -1.111368953911690e-09, 1.669708789060341e+00 },
+ { -1.127955039335462e-09, 1.680839517042381e+00 },
+ { -1.144498657889600e-09, 1.691976440391624e+00 },
+ { -1.160999186716154e-09, 1.703118960383971e+00 },
+ { -1.177456004579561e-09, 1.714266475475616e+00 },
+ { -1.193868491889832e-09, 1.725418381332405e+00 },
+ { -1.210236030726319e-09, 1.736574070859850e+00 },
+ { -1.226558004860220e-09, 1.747732934232508e+00 },
+ { -1.242833799778447e-09, 1.758894358924547e+00 },
+ { -1.259062802706714e-09, 1.770057729740021e+00 },
+ { -1.275244402631982e-09, 1.781222428842935e+00 },
+ { -1.291377990326492e-09, 1.792387835788660e+00 },
+ { -1.307462958369363e-09, 1.803553327553897e+00 },
+ { -1.323498701170897e-09, 1.814718278568759e+00 },
+ { -1.339484614994490e-09, 1.825882060747428e+00 },
+ { -1.355420097979292e-09, 1.837044043519582e+00 },
+ { -1.371304550163662e-09, 1.848203593862598e+00 },
+ { -1.387137373506711e-09, 1.859360076332671e+00 },
+ { -1.402917971911754e-09, 1.870512853097495e+00 },
+ { -1.418645751248018e-09, 1.881661283967967e+00 },
+ { -1.434320119373722e-09, 1.892804726431080e+00 },
+ { -1.449940486157623e-09, 1.903942535681972e+00 },
+ { -1.465506263501516e-09, 1.915074064656886e+00 },
+ { -1.481016865363264e-09, 1.926198664066737e+00 },
+ { -1.496471707776859e-09, 1.937315682428795e+00 },
+ { -1.511870208876724e-09, 1.948424466101625e+00 },
+ { -1.527211788917509e-09, 1.959524359317042e+00 },
+ { -1.542495870297867e-09, 1.970614704215133e+00 },
+ { -1.557721877580406e-09, 1.981694840876775e+00 },
+ { -1.572889237514880e-09, 1.992764107358707e+00 },
+ { -1.587997379058514e-09, 2.003821839726753e+00 },
+ { -1.603045733398246e-09, 2.014867372090665e+00 },
+ { -1.618033733972424e-09, 2.025900036638798e+00 },
+ { -1.632960816490822e-09, 2.036919163671778e+00 },
+ { -1.647826418957721e-09, 2.047924081638631e+00 },
+ { -1.662629981691070e-09, 2.058914117170269e+00 },
+ { -1.677370947345626e-09, 2.069888595116115e+00 },
+ { -1.692048760931849e-09, 2.080846838577820e+00 },
+ { -1.706662869838827e-09, 2.091788168946183e+00 },
+ { -1.721212723853279e-09, 2.102711905935372e+00 },
+ { -1.735697775181424e-09, 2.113617367619504e+00 },
+ { -1.750117478469621e-09, 2.124503870468520e+00 },
+ { -1.764471290823748e-09, 2.135370729383332e+00 },
+ { -1.778758671831281e-09, 2.146217257733207e+00 },
+ { -1.792979083579974e-09, 2.157042767390815e+00 },
+ { -1.807131990679890e-09, 2.167846568770014e+00 },
+ { -1.821216860281448e-09, 2.178627970860822e+00 },
+ { -1.835233162097977e-09, 2.189386281268046e+00 },
+ { -1.849180368423027e-09, 2.200120806246095e+00 },
+ { -1.863057954152340e-09, 2.210830850737588e+00 },
+ { -1.876865396802907e-09, 2.221515718409926e+00 },
+ { -1.890602176531920e-09, 2.232174711691990e+00 },
+ { -1.904267776157843e-09, 2.242807131812679e+00 },
+ { -1.917861681178094e-09, 2.253412278837029e+00 },
+ { -1.931383379790273e-09, 2.263989451705295e+00 },
+ { -1.944832362909578e-09, 2.274537948269257e+00 },
+ { -1.958208124189984e-09, 2.285057065331676e+00 },
+ { -1.971510160041235e-09, 2.295546098682665e+00 },
+ { -1.984737969649064e-09, 2.306004343138794e+00 },
+ { -1.997891054994522e-09, 2.316431092581699e+00 },
+ { -2.010968920870647e-09, 2.326825639994779e+00 },
+ { -2.023971074903858e-09, 2.337187277503834e+00 },
+ { -2.036897027569834e-09, 2.347515296413520e+00 },
+ { -2.049746292214264e-09, 2.357808987247877e+00 },
+ { -2.062518385069210e-09, 2.368067639787542e+00 },
+ { -2.075212825272584e-09, 2.378290543109652e+00 },
+ { -2.087829134886364e-09, 2.388476985626922e+00 },
+ { -2.100366838912949e-09, 2.398626255125417e+00 },
+ { -2.112825465315542e-09, 2.408737638805759e+00 },
+ { -2.125204545033289e-09, 2.418810423320288e+00 },
+ { -2.137503612001452e-09, 2.428843894814472e+00 },
+ { -2.149722203166389e-09, 2.438837338964302e+00 },
+ { -2.161859858505829e-09, 2.448790041018174e+00 },
+ { -2.173916121043380e-09, 2.458701285834241e+00 },
+ { -2.185890536867478e-09, 2.468570357921585e+00 },
+ { -2.197782655148702e-09, 2.478396541480230e+00 },
+ { -2.209592028154913e-09, 2.488179120439544e+00 },
+ { -2.221318211270522e-09, 2.497917378500214e+00 },
+ { -2.232960763010574e-09, 2.507610599172123e+00 },
+ { -2.244519245040444e-09, 2.517258065817044e+00 },
+ { -2.255993222189014e-09, 2.526859061686102e+00 },
+ { -2.267382262468209e-09, 2.536412869962689e+00 },
+ { -2.278685937086658e-09, 2.545918773800664e+00 },
+ { -2.289903820467374e-09, 2.555376056366064e+00 },
+ { -2.301035490263848e-09, 2.564784000877677e+00 },
+ { -2.312080527374447e-09, 2.574141890646339e+00 },
+ { -2.323038515960257e-09, 2.583449009117307e+00 },
+ { -2.333909043458635e-09, 2.592704639909166e+00 },
+ { -2.344691700601153e-09, 2.601908066856634e+00 },
+ { -2.355386081425938e-09, 2.611058574048749e+00 },
+ { -2.365991783296513e-09, 2.620155445872768e+00 },
+ { -2.376508406913500e-09, 2.629197967052127e+00 },
+ { -2.386935556332088e-09, 2.638185422689490e+00 },
+ { -2.397272838976436e-09, 2.647117098307332e+00 },
+ { -2.407519865653114e-09, 2.655992279887846e+00 },
+ { -2.417676250567891e-09, 2.664810253915885e+00 },
+ { -2.427741611338014e-09, 2.673570307418169e+00 },
+ { -2.437715569009093e-09, 2.682271728006635e+00 },
+ { -2.447597748066437e-09, 2.690913803917100e+00 },
+ { -2.457387776452357e-09, 2.699495824053297e+00 },
+ { -2.467085285577292e-09, 2.708017078025636e+00 },
+ { -2.476689910335470e-09, 2.716476856194105e+00 },
+ { -2.486201289118733e-09, 2.724874449709689e+00 },
+ { -2.495619063828443e-09, 2.733209150554255e+00 },
+ { -2.504942879891263e-09, 2.741480251583985e+00 },
+ { -2.514172386270163e-09, 2.749687046568741e+00 },
+ { -2.523307235480146e-09, 2.757828830235740e+00 },
+ { -2.532347083598520e-09, 2.765904898308531e+00 },
+ { -2.541291590280960e-09, 2.773914547551261e+00 },
+ { -2.550140418771202e-09, 2.781857075807392e+00 },
+ { -2.558893235915887e-09, 2.789731782043156e+00 },
+ { -2.567549712176927e-09, 2.797537966388929e+00 },
+ { -2.576109521642196e-09, 2.805274930179221e+00 },
+ { -2.584572342040407e-09, 2.812941975996573e+00 },
+ { -2.592937854750428e-09, 2.820538407710556e+00 },
+ { -2.601205744816134e-09, 2.828063530521908e+00 },
+ { -2.609375700955458e-09, 2.835516651001539e+00 },
+ { -2.617447415574869e-09, 2.842897077134583e+00 },
+ { -2.625420584778350e-09, 2.850204118359573e+00 },
+ { -2.633294908380520e-09, 2.857437085611509e+00 },
+ { -2.641070089918234e-09, 2.864595291363663e+00 },
+ { -2.648745836659391e-09, 2.871678049666939e+00 },
+ { -2.656321859617343e-09, 2.878684676194483e+00 },
+ { -2.663797873558322e-09, 2.885614488280000e+00 },
+ { -2.671173597015318e-09, 2.892466804962122e+00 },
+ { -2.678448752295859e-09, 2.899240947023252e+00 },
+ { -2.685623065495139e-09, 2.905936237033475e+00 },
+ { -2.692696266503800e-09, 2.912551999389617e+00 },
+ { -2.699668089019767e-09, 2.919087560358171e+00 },
+ { -2.706538270558513e-09, 2.925542248116882e+00 },
+ { -2.713306552460767e-09, 2.931915392794031e+00 },
+ { -2.719972679905295e-09, 2.938206326512581e+00 },
+ { -2.726536401915442e-09, 2.944414383428562e+00 },
+ { -2.732997471371516e-09, 2.950538899775061e+00 },
+ { -2.739355645017194e-09, 2.956579213900666e+00 },
+ { -2.745610683471516e-09, 2.962534666313284e+00 },
+ { -2.751762351235315e-09, 2.968404599718795e+00 },
+ { -2.757810416701751e-09, 2.974188359063684e+00 },
+ { -2.763754652165128e-09, 2.979885291576143e+00 },
+ { -2.769594833827588e-09, 2.985494746805227e+00 },
+ { -2.775330741810390e-09, 2.991016076664491e+00 },
+ { -2.780962160159068e-09, 2.996448635469842e+00 },
+ { -2.786488876854607e-09, 3.001791779983262e+00 },
+ { -2.791910683818570e-09, 3.007044869450794e+00 },
+ { -2.797227376923695e-09, 3.012207265645876e+00 },
+ { -2.802438755998943e-09, 3.017278332907412e+00 },
+ { -2.807544624838820e-09, 3.022257438182037e+00 },
+ { -2.812544791210840e-09, 3.027143951064684e+00 },
+ { -2.817439066860792e-09, 3.031937243837070e+00 },
+ { -2.822227267522746e-09, 3.036636691510884e+00 },
+ { -2.826909212922864e-09, 3.041241671864994e+00 },
+ { -2.831484726789317e-09, 3.045751565488710e+00 },
+ { -2.835953636855826e-09, 3.050165755818853e+00 },
+ { -2.840315774871260e-09, 3.054483629182857e+00 },
+ { -2.844570976602957e-09, 3.058704574835744e+00 },
+ { -2.848719081844986e-09, 3.062827985002047e+00 },
+ { -2.852759934424164e-09, 3.066853254915581e+00 },
+ { -2.856693382203833e-09, 3.070779782857041e+00 },
+ { -2.860519277092708e-09, 3.074606970196721e+00 },
+ { -2.864237475047239e-09, 3.078334221430809e+00 },
+ { -2.867847836080156e-09, 3.081960944223928e+00 },
+ { -2.871350224262603e-09, 3.085486549445314e+00 },
+ { -2.874744507732462e-09, 3.088910451211251e+00 },
+ { -2.878030558696270e-09, 3.092232066921130e+00 },
+ { -2.881208253436038e-09, 3.095450817298478e+00 },
+ { -2.884277472313999e-09, 3.098566126429974e+00 },
+ { -2.887238099774968e-09, 3.101577421802070e+00 },
+ { -2.890090024353816e-09, 3.104484134342861e+00 },
+ { -2.892833138676371e-09, 3.107285698457308e+00 },
+ { -2.895467339466766e-09, 3.109981552069083e+00 },
+ { -2.897992527547963e-09, 3.112571136655481e+00 },
+ { -2.900408607848946e-09, 3.115053897289195e+00 },
+ { -2.902715489404992e-09, 3.117429282673042e+00 },
+ { -2.904913085363323e-09, 3.119696745180238e+00 },
+ { -2.907001312986328e-09, 3.121855740892224e+00 },
+ { -2.908980093652563e-09, 3.123905729634218e+00 },
+ { -2.910849352862924e-09, 3.125846175016163e+00 },
+ { -2.912609020239985e-09, 3.127676544466606e+00 },
+ { -2.914259029534118e-09, 3.129396309273659e+00 },
+ { -2.915799318622574e-09, 3.131004944618667e+00 },
+ { -2.917229829515169e-09, 3.132501929616775e+00 },
+ { -2.918550508353347e-09, 3.133886747350606e+00 },
+ { -2.919761305414294e-09, 3.135158884909254e+00 },
+ { -2.920862175112829e-09, 3.136317833424958e+00 },
+ { -2.921853076000972e-09, 3.137363088107359e+00 },
+ { -2.922733970772719e-09, 3.138294148283254e+00 },
+ { -2.923504826262027e-09, 3.139110517429204e+00 },
+ { -2.924165613447473e-09, 3.139811703211207e+00 },
+ { -2.924716307449950e-09, 3.140397217517018e+00 },
+ { -2.925156887536978e-09, 3.140866576495489e+00 },
+ { -2.925487337120335e-09, 3.141219300588825e+00 },
+ { -2.925707643758784e-09, 3.141454914570261e+00 },
+ { -2.925817799158535e-09, 3.141572947579352e+00 },
+ { -2.925817799171455e-09, 3.141572933154836e+00 },
+ { -2.925707643798390e-09, 3.141454409272987e+00 },
+ { -2.925487337185779e-09, 3.141216918378770e+00 },
+ { -2.925156887628892e-09, 3.140860007424112e+00 },
+ { -2.924716307568119e-09, 3.140383227898687e+00 },
+ { -2.924165613591896e-09, 3.139786135867868e+00 },
+ { -2.923504826432903e-09, 3.139068292003385e+00 },
+ { -2.922733970969412e-09, 3.138229261619561e+00 },
+ { -2.921853076224321e-09, 3.137268614707029e+00 },
+ { -2.920862175361976e-09, 3.136185925964038e+00 },
+ { -2.919761305690083e-09, 3.134980774833275e+00 },
+ { -2.918550508654911e-09, 3.133652745531368e+00 },
+ { -2.917229829843137e-09, 3.132201427085629e+00 },
+ { -2.915799318976726e-09, 3.130626413363146e+00 },
+ { -2.914259029914435e-09, 3.128927303107136e+00 },
+ { -2.912609020646661e-09, 3.127103699965947e+00 },
+ { -2.910849353295315e-09, 3.125155212527586e+00 },
+ { -2.908980094111509e-09, 3.123081454351802e+00 },
+ { -2.907001313470937e-09, 3.120882043999591e+00 },
+ { -2.904913085874448e-09, 3.118556605068443e+00 },
+ { -2.902715489941767e-09, 3.116104766219928e+00 },
+ { -2.900408608411958e-09, 3.113526161214776e+00 },
+ { -2.897992528137022e-09, 3.110820428940251e+00 },
+ { -2.895467340081818e-09, 3.107987213444579e+00 },
+ { -2.892833139317615e-09, 3.105026163964191e+00 },
+ { -2.890090025020589e-09, 3.101936934956479e+00 },
+ { -2.887238100468092e-09, 3.098719186130021e+00 },
+ { -2.884277473032614e-09, 3.095372582472161e+00 },
+ { -2.881208254180937e-09, 3.091896794282404e+00 },
+ { -2.878030559466594e-09, 3.088291497198199e+00 },
+ { -2.874744508528832e-09, 3.084556372228054e+00 },
+ { -2.871350225084755e-09, 3.080691105776848e+00 },
+ { -2.867847836928063e-09, 3.076695389678615e+00 },
+ { -2.864237475921086e-09, 3.072568921221621e+00 },
+ { -2.860519277991847e-09, 3.068311403179147e+00 },
+ { -2.856693383129018e-09, 3.063922543837792e+00 },
+ { -2.852759935374575e-09, 3.059402057023109e+00 },
+ { -2.848719082821403e-09, 3.054749662130841e+00 },
+ { -2.844570977604520e-09, 3.049965084150782e+00 },
+ { -2.840315775898525e-09, 3.045048053697736e+00 },
+ { -2.835953637908582e-09, 3.039998307034967e+00 },
+ { -2.831484727867511e-09, 3.034815586104635e+00 },
+ { -2.826909214026628e-09, 3.029499638550941e+00 },
+ { -2.822227268651470e-09, 3.024050217748861e+00 },
+ { -2.817439068015245e-09, 3.018467082830179e+00 },
+ { -2.812544792390175e-09, 3.012749998707001e+00 },
+ { -2.807544626043751e-09, 3.006898736100911e+00 },
+ { -2.802438757228650e-09, 3.000913071564665e+00 },
+ { -2.797227378178760e-09, 2.994792787510961e+00 },
+ { -2.791910685098702e-09, 2.988537672233504e+00 },
+ { -2.786488878159805e-09, 2.982147519935565e+00 },
+ { -2.780962161489413e-09, 2.975622130750641e+00 },
+ { -2.775330743165298e-09, 2.968961310769028e+00 },
+ { -2.769594835207775e-09, 2.962164872061613e+00 },
+ { -2.763754653569747e-09, 2.955232632701135e+00 },
+ { -2.757810418131543e-09, 2.948164416789036e+00 },
+ { -2.751762352689432e-09, 2.940960054474719e+00 },
+ { -2.745610684950541e-09, 2.933619381982341e+00 },
+ { -2.739355646520809e-09, 2.926142241629213e+00 },
+ { -2.732997472899722e-09, 2.918528481852205e+00 },
+ { -2.726536403468318e-09, 2.910777957226018e+00 },
+ { -2.719972681482232e-09, 2.902890528487386e+00 },
+ { -2.713306554062453e-09, 2.894866062556452e+00 },
+ { -2.706538272184154e-09, 2.886704432555728e+00 },
+ { -2.699668090670078e-09, 2.878405517834426e+00 },
+ { -2.692696268177908e-09, 2.869969203985464e+00 },
+ { -2.685623067193599e-09, 2.861395382869544e+00 },
+ { -2.678448754018380e-09, 2.852683952631486e+00 },
+ { -2.671173598761847e-09, 2.843834817723832e+00 },
+ { -2.663797875328991e-09, 2.834847888922988e+00 },
+ { -2.656321861411517e-09, 2.825723083350459e+00 },
+ { -2.648745838477759e-09, 2.816460324492298e+00 },
+ { -2.641070091759922e-09, 2.807059542215146e+00 },
+ { -2.633294910246296e-09, 2.797520672788269e+00 },
+ { -2.625420586667340e-09, 2.787843658897949e+00 },
+ { -2.617447417487602e-09, 2.778028449668942e+00 },
+ { -2.609375702891616e-09, 2.768075000678399e+00 },
+ { -2.601205746775692e-09, 2.757983273976943e+00 },
+ { -2.592937856733464e-09, 2.747753238101915e+00 },
+ { -2.584572344046340e-09, 2.737384868096553e+00 },
+ { -2.576109523671634e-09, 2.726878145526201e+00 },
+ { -2.567549714229129e-09, 2.716233058492422e+00 },
+ { -2.558893237991435e-09, 2.705449601651722e+00 },
+ { -2.550140420869302e-09, 2.694527776227857e+00 },
+ { -2.541291592402089e-09, 2.683467590030445e+00 },
+ { -2.532347085742440e-09, 2.672269057466213e+00 },
+ { -2.523307237646751e-09, 2.660932199557362e+00 },
+ { -2.514172388459584e-09, 2.649457043952206e+00 },
+ { -2.504942882102813e-09, 2.637843624941622e+00 },
+ { -2.495619066062810e-09, 2.626091983472908e+00 },
+ { -2.486201291375123e-09, 2.614202167160335e+00 },
+ { -2.476689912614465e-09, 2.602174230302269e+00 },
+ { -2.467085287878098e-09, 2.590008233889805e+00 },
+ { -2.457387778775451e-09, 2.577704245623143e+00 },
+ { -2.447597750411553e-09, 2.565262339920002e+00 },
+ { -2.437715571376127e-09, 2.552682597931055e+00 },
+ { -2.427741613727123e-09, 2.539965107548168e+00 },
+ { -2.417676252978335e-09, 2.527109963417675e+00 },
+ { -2.407519868085581e-09, 2.514117266951687e+00 },
+ { -2.397272841430131e-09, 2.500987126335739e+00 },
+ { -2.386935558807595e-09, 2.487719656543254e+00 },
+ { -2.376508409410024e-09, 2.474314979341178e+00 },
+ { -2.365991785814531e-09, 2.460773223303822e+00 },
+ { -2.355386083965131e-09, 2.447094523817833e+00 },
+ { -2.344691703161363e-09, 2.433279023095734e+00 },
+ { -2.333909046040126e-09, 2.419326870180582e+00 },
+ { -2.323038518562289e-09, 2.405238220956597e+00 },
+ { -2.312080529997549e-09, 2.391013238157397e+00 },
+ { -2.301035492907384e-09, 2.376652091371587e+00 },
+ { -2.289903823131822e-09, 2.362154957053137e+00 },
+ { -2.278685939771276e-09, 2.347522018525197e+00 },
+ { -2.267382265173420e-09, 2.332753465990296e+00 },
+ { -2.255993224914501e-09, 2.317849496533128e+00 },
+ { -2.244519247786155e-09, 2.302810314130351e+00 },
+ { -2.232960765776561e-09, 2.287636129652823e+00 },
+ { -2.221318214056095e-09, 2.272327160873552e+00 },
+ { -2.209592030960763e-09, 2.256883632472565e+00 },
+ { -2.197782657974034e-09, 2.241305776039511e+00 },
+ { -2.185890539712767e-09, 2.225593830081461e+00 },
+ { -2.173916123907886e-09, 2.209748040023618e+00 },
+ { -2.161859861389976e-09, 2.193768658216360e+00 },
+ { -2.149722206070124e-09, 2.177655943935795e+00 },
+ { -2.137503614923981e-09, 2.161410163388424e+00 },
+ { -2.125204547975352e-09, 2.145031589714984e+00 },
+ { -2.112825468276292e-09, 2.128520502989477e+00 },
+ { -2.100366841892917e-09, 2.111877190225612e+00 },
+ { -2.087829137884807e-09, 2.095101945374541e+00 },
+ { -2.075212828290086e-09, 2.078195069329960e+00 },
+ { -2.062518388104923e-09, 2.061156869925600e+00 },
+ { -2.049746295268559e-09, 2.043987661939897e+00 },
+ { -2.036897030642658e-09, 2.026687767092888e+00 },
+ { -2.023971077994576e-09, 2.009257514048162e+00 },
+ { -2.010968923979840e-09, 1.991697238413571e+00 },
+ { -1.997891058121344e-09, 1.974007282737320e+00 },
+ { -1.984737972794098e-09, 1.956187996511354e+00 },
+ { -1.971510163203686e-09, 1.938239736166060e+00 },
+ { -1.958208127370276e-09, 1.920162865072273e+00 },
+ { -1.944832366107339e-09, 1.901957753535934e+00 },
+ { -1.931383383005451e-09, 1.883624778799427e+00 },
+ { -1.917861684410531e-09, 1.865164325035177e+00 },
+ { -1.904267779407432e-09, 1.846576783346324e+00 },
+ { -1.890602179798714e-09, 1.827862551760622e+00 },
+ { -1.876865400086483e-09, 1.809022035228338e+00 },
+ { -1.863057957452539e-09, 1.790055645617624e+00 },
+ { -1.849180371740008e-09, 1.770963801711725e+00 },
+ { -1.835233165431475e-09, 1.751746929201178e+00 },
+ { -1.821216863631569e-09, 1.732405460681919e+00 },
+ { -1.807131994045840e-09, 1.712939835648088e+00 },
+ { -1.792979086962494e-09, 1.693350500488565e+00 },
+ { -1.778758675229683e-09, 1.673637908477153e+00 },
+ { -1.764471294238191e-09, 1.653802519770021e+00 },
+ { -1.750117481899733e-09, 1.633844801396848e+00 },
+ { -1.735697778626995e-09, 1.613765227254186e+00 },
+ { -1.721212727314574e-09, 1.593564278099856e+00 },
+ { -1.706662873315474e-09, 1.573242441540939e+00 },
+ { -1.692048764423848e-09, 1.552800212030258e+00 },
+ { -1.677370950852395e-09, 1.532238090855187e+00 },
+ { -1.662629985213192e-09, 1.511556586131055e+00 },
+ { -1.647826422494560e-09, 1.490756212788764e+00 },
+ { -1.632960820042537e-09, 1.469837492568651e+00 },
+ { -1.618033737538645e-09, 1.448800954008929e+00 },
+ { -1.603045736978760e-09, 1.427647132435469e+00 },
+ { -1.587997382653428e-09, 1.406376569953373e+00 },
+ { -1.572889241124034e-09, 1.384989815432507e+00 },
+ { -1.557721881203696e-09, 1.363487424499449e+00 },
+ { -1.542495873934815e-09, 1.341869959524515e+00 },
+ { -1.527211792568486e-09, 1.320137989611176e+00 },
+ { -1.511870212541253e-09, 1.298292090581491e+00 },
+ { -1.496471711454994e-09, 1.276332844965754e+00 },
+ { -1.481016869054634e-09, 1.254260841988828e+00 },
+ { -1.465506267206068e-09, 1.232076677556547e+00 },
+ { -1.449940489875303e-09, 1.209780954243628e+00 },
+ { -1.434320123104372e-09, 1.187374281276747e+00 },
+ { -1.418645754991533e-09, 1.164857274523495e+00 },
+ { -1.402917975667710e-09, 1.142230556475749e+00 },
+ { -1.387137377275425e-09, 1.119494756236361e+00 },
+ { -1.371304553944712e-09, 1.096650509501278e+00 },
+ { -1.355420101772623e-09, 1.073698458546610e+00 },
+ { -1.339484618799891e-09, 1.050639252211352e+00 },
+ { -1.323498704988051e-09, 1.027473545880543e+00 },
+ { -1.307462962198534e-09, 1.004202001471034e+00 },
+ { -1.291377994167204e-09, 9.808252874104182e-01 },
+ { -1.275244406484394e-09, 9.573440786237052e-01 },
+ { -1.259062806570190e-09, 9.337590565128454e-01 },
+ { -1.242833803653464e-09, 9.100709089414796e-01 },
+ { -1.226558008746195e-09, 8.862803302125812e-01 },
+ { -1.210236034623253e-09, 8.623880210538113e-01 },
+ { -1.193868495797618e-09, 8.383946885959868e-01 },
+ { -1.177456008497777e-09, 8.143010463544786e-01 },
+ { -1.160999190645010e-09, 7.901078142102129e-01 },
+ { -1.144498661828833e-09, 7.658157183877095e-01 },
+ { -1.127955043284965e-09, 7.414254914366063e-01 },
+ { -1.111368957870986e-09, 7.169378722095157e-01 },
+ { -1.094741030044308e-09, 6.923536058430697e-01 },
+ { -1.078071885836393e-09, 6.676734437331688e-01 },
+ { -1.061362152831423e-09, 6.428981435165511e-01 },
+ { -1.044612460141255e-09, 6.180284690466404e-01 },
+ { -1.027823438382183e-09, 5.930651903718045e-01 },
+ { -1.010995719652015e-09, 5.680090837138436e-01 },
+ { -9.941299375042378e-10, 5.428609314418970e-01 },
+ { -9.772267269262058e-10, 5.176215220520872e-01 },
+ { -9.602867243141016e-10, 4.922916501421032e-01 },
+ { -9.433105674499058e-10, 4.668721163885412e-01 },
+ { -9.262988954758817e-10, 4.413637275202624e-01 },
+ { -9.092523488719689e-10, 4.157672962958654e-01 },
+ { -8.921715694311144e-10, 3.900836414778084e-01 },
+ { -8.750572002347607e-10, 3.643135878065193e-01 },
+ { -8.579098856296589e-10, 3.384579659762392e-01 },
+ { -8.407302712022458e-10, 3.125176126069478e-01 },
+ { -8.235190037551917e-10, 2.864933702193017e-01 },
+ { -8.062767312831008e-10, 2.603860872080448e-01 },
+ { -7.890041029479477e-10, 2.341966178147619e-01 },
+ { -7.717017690542486e-10, 2.079258220999725e-01 },
+ { -7.543703810250266e-10, 1.815745659161734e-01 },
+ { -7.370105913774597e-10, 1.551437208801425e-01 },
+ { -7.196230536974697e-10, 1.286341643433767e-01 },
+ { -7.022084226165876e-10, 1.020467793657360e-01 },
+ { -6.847673537853251e-10, 7.538245468350446e-02 },
+ { -6.673005038502516e-10, 4.864208468284503e-02 },
+ { -6.498085304282128e-10, 2.182656936863137e-02 },
+ { -6.322920920826137e-10, -5.063185663820913e-03 },
+ { -6.147518482969490e-10, -3.202626926150343e-02 },
+ { -5.971884594516681e-10, -5.906176474160862e-02 },
+ { -5.796025867984469e-10, -8.616874992366363e-02 },
+ { -5.619948924353588e-10, -1.133462971605448e-01 },
+ { -5.443660392823640e-10, -1.405934733692621e-01 },
+ { -5.267166910556339e-10, -1.679093400638023e-01 },
+ { -5.090475122431451e-10, -1.952929533862739e-01 },
+ { -4.913591680795342e-10, -2.227433641394564e-01 },
+ { -4.736523245210571e-10, -2.502596178194491e-01 },
+ { -4.559276482202303e-10, -2.778407546490776e-01 },
+ { -4.381858065011618e-10, -3.054858096104932e-01 },
+ { -4.204274673340870e-10, -3.331938124792702e-01 },
+ { -4.026532993105397e-10, -3.609637878577768e-01 },
+ { -3.848639716178888e-10, -3.887947552098022e-01 },
+ { -3.670601540142443e-10, -4.166857288948674e-01 },
+ { -3.492425168032583e-10, -4.446357182029681e-01 },
+ { -3.314117308088734e-10, -4.726437273896633e-01 },
+ { -3.135684673501752e-10, -5.007087557112619e-01 },
+ { -2.957133982159296e-10, -5.288297974607742e-01 },
+ { -2.778471956393828e-10, -5.570058420037128e-01 },
+ { -2.599705322729564e-10, -5.852358738143247e-01 },
+ { -2.420840811628366e-10, -6.135188725122560e-01 },
+ { -2.241885157240923e-10, -6.418538128986450e-01 },
+ { -2.062845097142585e-10, -6.702396649949099e-01 },
+ { -1.883727372093546e-10, -6.986753940779493e-01 },
+ { -1.704538725773087e-10, -7.271599607197149e-01 },
+ { -1.525285904532877e-10, -7.556923208240308e-01 },
+ { -1.345975657140748e-10, -7.842714256651911e-01 },
+ { -1.166614734526054e-10, -8.128962219265712e-01 },
+ { -9.872098895260891e-11, -8.415656517393372e-01 },
+ { -8.077678766314517e-11, -8.702786527215916e-01 },
+ { -6.282954517324612e-11, -8.990341580176152e-01 },
+ { -4.487993718655790e-11, -9.278310963373758e-01 },
+ { -2.692863949561210e-11, -9.566683919968972e-01 },
+ { -8.976327956520795e-12, -9.855449649582175e-01 },
+ { 8.976321536169872e-12, -1.014459730869357e+00 },
+ { 2.692863307547294e-11, -1.043411601105914e+00 },
+ { 4.487993076694813e-11, -1.072399482811314e+00 },
+ { 6.282953875437751e-11, -1.101422278938424e+00 },
+ { 8.077678124517653e-11, -1.130478888291020e+00 },
+ { 9.872098253591082e-11, -1.159568205565684e+00 },
+ { 1.166614670373367e-10, -1.188689121393192e+00 },
+ { 1.345975593005002e-10, -1.217840522381901e+00 },
+ { 1.525285840416718e-10, -1.247021291159495e+00 },
+ { 1.704538661678104e-10, -1.276230306415868e+00 },
+ { 1.883727308022916e-10, -1.305466442946703e+00 },
+ { 2.062845033098954e-10, -1.334728571696106e+00 },
+ { 2.241885093225349e-10, -1.364015559800721e+00 },
+ { 2.420840747645085e-10, -1.393326270633325e+00 },
+ { 2.599705258779635e-10, -1.422659563847049e+00 },
+ { 2.778471892479898e-10, -1.452014295419243e+00 },
+ { 2.957133918284542e-10, -1.481389317696831e+00 },
+ { 3.135684609667761e-10, -1.510783479440191e+00 },
+ { 3.314117244297624e-10, -1.540195625869043e+00 },
+ { 3.492425104288060e-10, -1.569624598707558e+00 },
+ { 3.670601476445565e-10, -1.599069236228850e+00 },
+ { 3.848639652533361e-10, -1.628528373302631e+00 },
+ { 4.026532929512281e-10, -1.658000841439269e+00 },
+ { 4.204274609803869e-10, -1.687485468837799e+00 },
+ { 4.381858001531792e-10, -1.716981080430596e+00 },
+ { 4.559276418782829e-10, -1.746486497931567e+00 },
+ { 4.736523181853565e-10, -1.776000539882225e+00 },
+ { 4.913591617503452e-10, -1.805522021699094e+00 },
+ { 5.090475059206794e-10, -1.835049755721194e+00 },
+ { 5.267166847401562e-10, -1.864582551257262e+00 },
+ { 5.443660329740862e-10, -1.894119214633676e+00 },
+ { 5.619948861345454e-10, -1.923658549242818e+00 },
+ { 5.796025805053097e-10, -1.953199355591180e+00 },
+ { 5.971884531664190e-10, -1.982740431347091e+00 },
+ { 6.147518420199055e-10, -2.012280571390674e+00 },
+ { 6.322920858139346e-10, -2.041818567861395e+00 },
+ { 6.498085241682158e-10, -2.071353210208005e+00 },
+ { 6.673004975990425e-10, -2.100883285238127e+00 },
+ { 6.847673475432746e-10, -2.130407577166309e+00 },
+ { 7.022084163838545e-10, -2.159924867664933e+00 },
+ { 7.196230474743716e-10, -2.189433935913779e+00 },
+ { 7.370105851640495e-10, -2.218933558650552e+00 },
+ { 7.543703748217808e-10, -2.248422510220072e+00 },
+ { 7.717017628611672e-10, -2.277899562625407e+00 },
+ { 7.890040967654542e-10, -2.307363485579104e+00 },
+ { 8.062767251113011e-10, -2.336813046552684e+00 },
+ { 8.235189975944034e-10, -2.366247010829556e+00 },
+ { 8.407302650525749e-10, -2.395664141553858e+00 },
+ { 8.579098794915287e-10, -2.425063199784153e+00 },
+ { 8.750571941082773e-10, -2.454442944543319e+00 },
+ { 8.921715633164894e-10, -2.483802132872044e+00 },
+ { 9.092523427695200e-10, -2.513139519878584e+00 },
+ { 9.262988893857148e-10, -2.542453858792682e+00 },
+ { 9.433105613723914e-10, -2.571743901017465e+00 },
+ { 9.602867182493987e-10, -2.601008396180870e+00 },
+ { 9.772267208744730e-10, -2.630246092190425e+00 },
+ { 9.941299314658458e-10, -2.659455735283526e+00 },
+ { 1.010995713627070e-09, -2.688636070081818e+00 },
+ { 1.027823432371055e-09, -2.717785839644439e+00 },
+ { 1.044612454143997e-09, -2.746903785521352e+00 },
+ { 1.061362146848353e-09, -2.775988647805256e+00 },
+ { 1.078071879867828e-09, -2.805039165187255e+00 },
+ { 1.094741024090249e-09, -2.834054075009077e+00 },
+ { 1.111368951931856e-09, -2.863032113318052e+00 },
+ { 1.127955037360817e-09, -2.891972014920939e+00 },
+ { 1.144498655920037e-09, -2.920872513436805e+00 },
+ { 1.160999184751779e-09, -2.949732341353290e+00 },
+ { 1.177456002620215e-09, -2.978550230079517e+00 },
+ { 1.193868489936097e-09, -3.007324910002949e+00 },
+ { 1.210236028777826e-09, -3.036055110540183e+00 },
+ { 1.226558002917232e-09, -3.064739560196251e+00 },
+ { 1.242833797841123e-09, -3.093376986616735e+00 },
+ { 1.259062800774685e-09, -3.121966116643377e+00 },
+ { 1.275244400705935e-09, -3.150505676371791e+00 },
+ { 1.291377988406056e-09, -3.178994391202159e+00 },
+ { 1.307462956454857e-09, -3.207430985899192e+00 },
+ { 1.323498699262108e-09, -3.235814184645077e+00 },
+ { 1.339484613091842e-09, -3.264142711097884e+00 },
+ { 1.355420096082785e-09, -3.292415288443373e+00 },
+ { 1.371304548273191e-09, -3.320630639454825e+00 },
+ { 1.387137371622433e-09, -3.348787486547389e+00 },
+ { 1.402917970033511e-09, -3.376884551834256e+00 },
+ { 1.418645749376393e-09, -3.404920557184582e+00 },
+ { 1.434320117508396e-09, -3.432894224276359e+00 },
+ { 1.449940484298756e-09, -3.460804274656981e+00 },
+ { 1.465506261649108e-09, -3.488649429796768e+00 },
+ { 1.481016863517580e-09, -3.516428411149154e+00 },
+ { 1.496471705937951e-09, -3.544139940202303e+00 },
+ { 1.511870207044433e-09, -3.571782738540999e+00 },
+ { 1.527211787092206e-09, -3.599355527901174e+00 },
+ { 1.542495868479076e-09, -3.626857030226671e+00 },
+ { 1.557721875768920e-09, -3.654285967729458e+00 },
+ { 1.572889235710329e-09, -3.681641062941412e+00 },
+ { 1.587997377261005e-09, -3.708921038776707e+00 },
+ { 1.603045731607830e-09, -3.736124618586623e+00 },
+ { 1.618033732189314e-09, -3.763250526218862e+00 },
+ { 1.632960814715177e-09, -3.790297486071938e+00 },
+ { 1.647826417189275e-09, -3.817264223155802e+00 },
+ { 1.662629979930247e-09, -3.844149463148589e+00 },
+ { 1.677370945591844e-09, -3.870951932452996e+00 },
+ { 1.692048759186008e-09, -3.897670358257890e+00 },
+ { 1.706662868100504e-09, -3.924303468590212e+00 },
+ { 1.721212722122685e-09, -3.950849992378278e+00 },
+ { 1.735697773458400e-09, -3.977308659506432e+00 },
+ { 1.750117476754591e-09, -4.003678200876669e+00 },
+ { 1.764471289116712e-09, -4.029957348461003e+00 },
+ { 1.778758670132079e-09, -4.056144835364877e+00 },
+ { 1.792979081888926e-09, -4.082239395882965e+00 },
+ { 1.807131988996465e-09, -4.108239765556996e+00 },
+ { 1.821216858606652e-09, -4.134144681236933e+00 },
+ { 1.835233160431175e-09, -4.159952881133585e+00 },
+ { 1.849180366764537e-09, -4.185663104882633e+00 },
+ { 1.863057952502055e-09, -4.211274093599509e+00 },
+ { 1.876865395161145e-09, -4.236784589940537e+00 },
+ { 1.890602174898734e-09, -4.262193338157148e+00 },
+ { 1.904267774533022e-09, -4.287499084158302e+00 },
+ { 1.917861679562008e-09, -4.312700575567174e+00 },
+ { 1.931383378182392e-09, -4.337796561778708e+00 },
+ { 1.944832361310856e-09, -4.362785794021793e+00 },
+ { 1.958208122599839e-09, -4.387667025411434e+00 },
+ { 1.971510158459931e-09, -4.412439011013396e+00 },
+ { 1.984737968076495e-09, -4.437100507898339e+00 },
+ { 1.997891053431005e-09, -4.461650275204912e+00 },
+ { 2.010968919316289e-09, -4.486087074191693e+00 },
+ { 2.023971073358447e-09, -4.510409668301784e+00 },
+ { 2.036897026033634e-09, -4.534616823217992e+00 },
+ { 2.049746290686799e-09, -4.558707306921882e+00 },
+ { 2.062518383551274e-09, -4.582679889754607e+00 },
+ { 2.075212823764071e-09, -4.606533344469879e+00 },
+ { 2.087829133387063e-09, -4.630266446298172e+00 },
+ { 2.100366837422912e-09, -4.653877973001258e+00 },
+ { 2.112825463835087e-09, -4.677366704934605e+00 },
+ { 2.125204543562522e-09, -4.700731425099899e+00 },
+ { 2.137503610540056e-09, -4.723970919208608e+00 },
+ { 2.149722201714786e-09, -4.747083975738060e+00 },
+ { 2.161859857063438e-09, -4.770069385989595e+00 },
+ { 2.173916119610994e-09, -4.792925944149308e+00 },
+ { 2.185890535445098e-09, -4.815652447340950e+00 },
+ { 2.197782653735957e-09, -4.838247695689436e+00 },
+ { 2.209592026751962e-09, -4.860710492376411e+00 },
+ { 2.221318209877576e-09, -4.883039643700314e+00 },
+ { 2.232960761627846e-09, -4.905233959130168e+00 },
+ { 2.244519243667616e-09, -4.927292251368517e+00 },
+ { 2.255993220826402e-09, -4.949213336406265e+00 },
+ { 2.267382261115285e-09, -4.970996033581527e+00 },
+ { 2.278685935744269e-09, -4.992639165639563e+00 },
+ { 2.289903819135414e-09, -5.014141558784778e+00 },
+ { 2.301035488942000e-09, -5.035502042744443e+00 },
+ { 2.312080526062763e-09, -5.056719450823151e+00 },
+ { 2.323038514659161e-09, -5.077792619963239e+00 },
+ { 2.333909042168180e-09, -5.098720390796817e+00 },
+ { 2.344691699320969e-09, -5.119501607709159e+00 },
+ { 2.355386080156553e-09, -5.140135118892792e+00 },
+ { 2.365991782037187e-09, -5.160619776404897e+00 },
+ { 2.376508405665132e-09, -5.180954436227641e+00 },
+ { 2.386935555094626e-09, -5.201137958319343e+00 },
+ { 2.397272837749508e-09, -5.221169206676762e+00 },
+ { 2.407519864436774e-09, -5.241047049389645e+00 },
+ { 2.417676249362563e-09, -5.260770358700167e+00 },
+ { 2.427741610143750e-09, -5.280338011053974e+00 },
+ { 2.437715567825576e-09, -5.299748887163106e+00 },
+ { 2.447597746894037e-09, -5.319001872058887e+00 },
+ { 2.457387775290440e-09, -5.338095855149190e+00 },
+ { 2.467085284426756e-09, -5.357029730277389e+00 },
+ { 2.476689909196263e-09, -5.375802395772283e+00 },
+ { 2.486201287990485e-09, -5.394412754510426e+00 },
+ { 2.495619062711154e-09, -5.412859713968929e+00 },
+ { 2.504942878785408e-09, -5.431142186284682e+00 },
+ { 2.514172385175743e-09, -5.449259088303476e+00 },
+ { 2.523307234396791e-09, -5.467209341642627e+00 },
+ { 2.532347082526785e-09, -5.484991872743321e+00 },
+ { 2.541291589219998e-09, -5.502605612925014e+00 },
+ { 2.550140417722072e-09, -5.520049498445633e+00 },
+ { 2.558893234878378e-09, -5.537322470548212e+00 },
+ { 2.567549711150773e-09, -5.554423475524196e+00 },
+ { 2.576109520627371e-09, -5.571351464763084e+00 },
+ { 2.584572341037361e-09, -5.588105394812198e+00 },
+ { 2.592937853759161e-09, -5.604684227423386e+00 },
+ { 2.601205743836355e-09, -5.621086929615246e+00 },
+ { 2.609375699987564e-09, -5.637312473723475e+00 },
+ { 2.617447414618146e-09, -5.653359837454964e+00 },
+ { 2.625420583833750e-09, -5.669228003945694e+00 },
+ { 2.633294907447937e-09, -5.684915961806963e+00 },
+ { 2.641070088997271e-09, -5.700422705186584e+00 },
+ { 2.648745835750128e-09, -5.715747233817712e+00 },
+ { 2.656321858720176e-09, -5.730888553077074e+00 },
+ { 2.663797872673252e-09, -5.745845674030161e+00 },
+ { 2.671173596142054e-09, -5.760617613492118e+00 },
+ { 2.678448751434797e-09, -5.775203394076705e+00 },
+ { 2.685623064645538e-09, -5.789602044248679e+00 },
+ { 2.692696265666640e-09, -5.803812598380606e+00 },
+ { 2.699668088194915e-09, -5.817834096797069e+00 },
+ { 2.706538269745573e-09, -5.831665585834668e+00 },
+ { 2.713306551659817e-09, -5.845306117889361e+00 },
+ { 2.719972679116734e-09, -5.858754751472542e+00 },
+ { 2.726536401139295e-09, -5.872010551255358e+00 },
+ { 2.732997470607439e-09, -5.885072588127400e+00 },
+ { 2.739355644265558e-09, -5.897939939244211e+00 },
+ { 2.745610682731633e-09, -5.910611688078208e+00 },
+ { 2.751762350508137e-09, -5.923086924473290e+00 },
+ { 2.757810415987146e-09, -5.935364744687794e+00 },
+ { 2.763754651462700e-09, -5.947444251452243e+00 },
+ { 2.769594833137415e-09, -5.959324554015538e+00 },
+ { 2.775330741132843e-09, -5.971004768198829e+00 },
+ { 2.780962159494174e-09, -5.982484016437981e+00 },
+ { 2.786488876202047e-09, -5.993761427840588e+00 },
+ { 2.791910683178690e-09, -6.004836138231525e+00 },
+ { 2.797227376295779e-09, -6.015707290202086e+00 },
+ { 2.802438755383971e-09, -6.026374033162623e+00 },
+ { 2.807544624236659e-09, -6.036835523383457e+00 },
+ { 2.812544790621093e-09, -6.047090924050914e+00 },
+ { 2.817439066283459e-09, -6.057139405311101e+00 },
+ { 2.822227266958278e-09, -6.066980144322601e+00 },
+ { 2.826909212371261e-09, -6.076612325295799e+00 },
+ { 2.831484726250221e-09, -6.086035139548830e+00 },
+ { 2.835953636329660e-09, -6.095247785550617e+00 },
+ { 2.840315774357203e-09, -6.104249468967751e+00 },
+ { 2.844570976102082e-09, -6.113039402715685e+00 },
+ { 2.848719081357095e-09, -6.121616806996519e+00 },
+ { 2.852759933948860e-09, -6.129980909353977e+00 },
+ { 2.856693381741114e-09, -6.138130944714082e+00 },
+ { 2.860519276643053e-09, -6.146066155436312e+00 },
+ { 2.864237474610633e-09, -6.153785791350256e+00 },
+ { 2.867847835656203e-09, -6.161289109809551e+00 },
+ { 2.871350223851726e-09, -6.168575375732642e+00 },
+ { 2.874744507333867e-09, -6.175643861647406e+00 },
+ { 2.878030558310989e-09, -6.182493847739853e+00 },
+ { 2.881208253063899e-09, -6.189124621889823e+00 },
+ { 2.884277471954592e-09, -6.195535479723423e+00 },
+ { 2.887238099428306e-09, -6.201725724651554e+00 },
+ { 2.890090024020323e-09, -6.207694667918394e+00 },
+ { 2.892833138356060e-09, -6.213441628635915e+00 },
+ { 2.895467339159240e-09, -6.218965933835304e+00 },
+ { 2.897992527253659e-09, -6.224266918505075e+00 },
+ { 2.900408607567016e-09, -6.229343925633495e+00 },
+ { 2.902715489136496e-09, -6.234196306254763e+00 },
+ { 2.904913085108075e-09, -6.238823419482017e+00 },
+ { 2.907001312743911e-09, -6.243224632557377e+00 },
+ { 2.908980093422997e-09, -6.247399320887848e+00 },
+ { 2.910849352646620e-09, -6.251346868091392e+00 },
+ { 2.912609020036956e-09, -6.255066666028537e+00 },
+ { 2.914259029343965e-09, -6.258558114851525e+00 },
+ { 2.915799318445710e-09, -6.261820623039620e+00 },
+ { 2.917229829350759e-09, -6.264853607438842e+00 },
+ { 2.918550508202463e-09, -6.267656493305673e+00 },
+ { 2.919761305276718e-09, -6.270228714337005e+00 },
+ { 2.920862174988150e-09, -6.272569712717951e+00 },
+ { 2.921853075889193e-09, -6.274678939154603e+00 },
+ { 2.922733970674264e-09, -6.276555852917634e+00 },
+ { 2.923504826176907e-09, -6.278199921870962e+00 },
+ { 2.924165613375264e-09, -6.279610622518139e+00 },
+ { 2.924716307391075e-09, -6.280787440034993e+00 },
+ { 2.925156887490598e-09, -6.281729868306345e+00 },
+ { 2.925487337087508e-09, -6.282437409966992e+00 },
+ { 2.925707643739298e-09, -6.282909576428774e+00 },
+ { 2.925817799151970e-09, -6.283145887925411e+00 },
diff --git a/gnuradio-runtime/lib/math/vco.h b/gnuradio-runtime/lib/math/vco.h
new file mode 100644
index 0000000000..fa11732c1f
--- /dev/null
+++ b/gnuradio-runtime/lib/math/vco.h
@@ -0,0 +1,99 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GR_VCO_H_
+#define _GR_VCO_H_
+
+#include <gnuradio/sincos.h>
+#include <gnuradio/gr_complex.h>
+#include <vector>
+#include <cmath>
+
+namespace gr {
+
+ /*!
+ * \brief base class template for Voltage Controlled Oscillator (VCO)
+ * \ingroup misc
+ */
+ template<class o_type, class i_type>
+ class vco
+ {
+ public:
+ vco() : d_phase(0) {}
+
+ virtual ~vco() {}
+
+ // radians
+ void set_phase(double angle) {
+ d_phase = angle;
+ }
+
+ void adjust_phase(double delta_phase) {
+ d_phase += delta_phase;
+ if(fabs (d_phase) > M_PI){
+
+ while(d_phase > M_PI)
+ d_phase -= 2*M_PI;
+
+ while(d_phase < -M_PI)
+ d_phase += 2*M_PI;
+ }
+ }
+
+ double get_phase() const { return d_phase; }
+
+ // compute sin and cos for current phase angle
+ void sincos(float *sinx, float *cosx) const;
+
+ // compute cos or sin for current phase angle
+ float cos() const { return std::cos(d_phase); }
+ float sin() const { return std::sin(d_phase); }
+
+ // compute a block at a time
+ void cos(float *output, const float *input,
+ int noutput_items, double k, double ampl = 1.0);
+
+ protected:
+ double d_phase;
+ };
+
+ template<class o_type, class i_type>
+ void
+ vco<o_type,i_type>::sincos(float *sinx, float *cosx) const
+ {
+ gr::sincosf(d_phase, sinx, cosx);
+ }
+
+ template<class o_type, class i_type>
+ void
+ vco<o_type,i_type>::cos(float *output, const float *input,
+ int noutput_items, double k, double ampl)
+ {
+ for(int i = 0; i < noutput_items; i++) {
+ output[i] = cos() * ampl;
+ adjust_phase(input[i] * k);
+ }
+ }
+
+} /* namespace gr */
+
+#endif /* _GR_VCO_H_ */
diff --git a/gnuradio-runtime/lib/message.cc b/gnuradio-runtime/lib/message.cc
new file mode 100644
index 0000000000..ac066d668e
--- /dev/null
+++ b/gnuradio-runtime/lib/message.cc
@@ -0,0 +1,82 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/message.h>
+#include <assert.h>
+#include <string.h>
+
+namespace gr {
+
+ static long s_ncurrently_allocated = 0;
+
+ message::sptr
+ message::make(long type, double arg1, double arg2, size_t length)
+ {
+ return message::sptr(new message(type, arg1, arg2, length));
+ }
+
+ message::sptr
+ message::make_from_string(const std::string s, long type, double arg1, double arg2)
+ {
+ message::sptr m = message::make(type, arg1, arg2, s.size());
+ memcpy(m->msg(), s.data(), s.size());
+ return m;
+ }
+
+ message::message(long type, double arg1, double arg2, size_t length)
+ : d_type(type), d_arg1(arg1), d_arg2(arg2)
+ {
+ if(length == 0)
+ d_buf_start = d_msg_start = d_msg_end = d_buf_end = 0;
+ else {
+ d_buf_start = new unsigned char[length];
+ d_msg_start = d_buf_start;
+ d_msg_end = d_buf_end = d_buf_start + length;
+ }
+ s_ncurrently_allocated++;
+ }
+
+ message::~message()
+ {
+ assert (d_next == 0);
+ delete [] d_buf_start;
+ d_msg_start = d_msg_end = d_buf_end = 0;
+ s_ncurrently_allocated--;
+ }
+
+ std::string
+ message::to_string() const
+ {
+ return std::string((char *)d_msg_start, length());
+ }
+
+ long
+ message_ncurrently_allocated()
+ {
+ return s_ncurrently_allocated;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/messages/msg_accepter.cc b/gnuradio-runtime/lib/messages/msg_accepter.cc
index a0d2d840c6..cc86a6ff8a 100644
--- a/gnuradio-runtime/lib/messages/msg_accepter.cc
+++ b/gnuradio-runtime/lib/messages/msg_accepter.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <messages/msg_accepter.h>
+#include <gnuradio/messages/msg_accepter.h>
namespace gr {
namespace messages {
diff --git a/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc b/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc
index adbea5ebc6..7ee6ea02c1 100644
--- a/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc
+++ b/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc
@@ -23,9 +23,7 @@
#include <config.h>
#endif
-#include <messages/msg_accepter_msgq.h>
-
-using namespace pmt;
+#include <gnuradio/messages/msg_accepter_msgq.h>
namespace gr {
namespace messages {
@@ -41,7 +39,7 @@ namespace gr {
}
void
- msg_accepter_msgq::post(pmt_t msg)
+ msg_accepter_msgq::post(pmt::pmt_t msg)
{
d_msg_queue->insert_tail(msg);
}
diff --git a/gnuradio-runtime/lib/messages/msg_producer.cc b/gnuradio-runtime/lib/messages/msg_producer.cc
index c354422aa6..3f56bc6637 100644
--- a/gnuradio-runtime/lib/messages/msg_producer.cc
+++ b/gnuradio-runtime/lib/messages/msg_producer.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <messages/msg_producer.h>
+#include <gnuradio/messages/msg_producer.h>
namespace gr {
namespace messages {
diff --git a/gnuradio-runtime/lib/messages/msg_queue.cc b/gnuradio-runtime/lib/messages/msg_queue.cc
index 0d460dc05c..6db2d2daa2 100644
--- a/gnuradio-runtime/lib/messages/msg_queue.cc
+++ b/gnuradio-runtime/lib/messages/msg_queue.cc
@@ -24,11 +24,9 @@
#include "config.h"
#endif
-#include <messages/msg_queue.h>
+#include <gnuradio/messages/msg_queue.h>
#include <stdexcept>
-using namespace pmt;
-
namespace gr {
namespace messages {
@@ -49,7 +47,7 @@ namespace gr {
}
void
- msg_queue::insert_tail(pmt_t msg)
+ msg_queue::insert_tail(pmt::pmt_t msg)
{
gr::thread::scoped_lock guard(d_mutex);
@@ -60,7 +58,7 @@ namespace gr {
d_not_empty.notify_one();
}
- pmt_t
+ pmt::pmt_t
msg_queue::delete_head()
{
gr::thread::scoped_lock guard(d_mutex);
@@ -68,7 +66,7 @@ namespace gr {
while(empty_p())
d_not_empty.wait(guard);
- pmt_t m(d_msgs.front());
+ pmt::pmt_t m(d_msgs.front());
d_msgs.pop_front();
if(d_limit > 0) // Unlimited length queues never block on write
@@ -77,15 +75,15 @@ namespace gr {
return m;
}
- pmt_t
+ pmt::pmt_t
msg_queue::delete_head_nowait()
{
gr::thread::scoped_lock guard(d_mutex);
if(empty_p())
- return pmt_t();
+ return pmt::pmt_t();
- pmt_t m(d_msgs.front());
+ pmt::pmt_t m(d_msgs.front());
d_msgs.pop_front();
if(d_limit > 0) // Unlimited length queues never block on write
@@ -97,7 +95,7 @@ namespace gr {
void
msg_queue::flush()
{
- while(delete_head_nowait() != pmt_t())
+ while(delete_head_nowait() != pmt::pmt_t())
;
}
diff --git a/gnuradio-runtime/lib/misc.cc b/gnuradio-runtime/lib/misc.cc
new file mode 100644
index 0000000000..f9ad6ca89c
--- /dev/null
+++ b/gnuradio-runtime/lib/misc.cc
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "misc.h"
+
+namespace gr {
+
+ unsigned int
+ rounduppow2(unsigned int n)
+ {
+ int i;
+ for(i=0;((n-1)>>i) != 0;i++)
+ ;
+ return 1<<i;
+ }
+
+ // ----------------------------------------------------------------
+
+ void
+ zero_vector(std::vector<float> &v)
+ {
+ for(unsigned int i=0; i < v.size(); i++)
+ v[i] = 0;
+ }
+
+ void
+ zero_vector(std::vector<double> &v)
+ {
+ for(unsigned int i=0; i < v.size(); i++)
+ v[i] = 0;
+ }
+
+ void
+ zero_vector(std::vector<int> &v)
+ {
+ for(unsigned int i=0; i < v.size(); i++)
+ v[i] = 0;
+ }
+
+ void
+ zero_vector(std::vector<gr_complex> &v)
+ {
+ for(unsigned int i=0; i < v.size(); i++)
+ v[i] = 0;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/misc.h b/gnuradio-runtime/lib/misc.h
new file mode 100644
index 0000000000..833b6470a5
--- /dev/null
+++ b/gnuradio-runtime/lib/misc.h
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MISC_H
+#define INCLUDED_GR_MISC_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/types.h>
+
+namespace gr {
+
+ GR_RUNTIME_API unsigned int
+ rounduppow2(unsigned int n);
+
+ // FIXME should be template
+ GR_RUNTIME_API void zero_vector(std::vector<float> &v);
+ GR_RUNTIME_API void zero_vector(std::vector<double> &v);
+ GR_RUNTIME_API void zero_vector(std::vector<int> &v);
+ GR_RUNTIME_API void zero_vector(std::vector<gr_complex> &v);
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-runtime/lib/msg_accepter.cc b/gnuradio-runtime/lib/msg_accepter.cc
new file mode 100644
index 0000000000..354fce0c3d
--- /dev/null
+++ b/gnuradio-runtime/lib/msg_accepter.cc
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/msg_accepter.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/hier_block2.h>
+#include <stdexcept>
+
+namespace gr {
+
+ msg_accepter::msg_accepter()
+ {
+ }
+
+ msg_accepter::~msg_accepter()
+ {
+ // NOP, required as virtual destructor
+ }
+
+ void
+ msg_accepter::post(pmt::pmt_t which_port, pmt::pmt_t msg)
+ {
+ // Notify derived class, handled case by case
+ block *p = dynamic_cast<block *>(this);
+ if(p) {
+ p->_post(which_port, msg);
+ return;
+ }
+
+ hier_block2 *p2 = dynamic_cast<hier_block2 *>(this);
+ if(p2) {
+ // FIXME do the right thing
+ return;
+ }
+
+ throw std::runtime_error("unknown derived class");
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/msg_handler.cc b/gnuradio-runtime/lib/msg_handler.cc
new file mode 100644
index 0000000000..32d14eb715
--- /dev/null
+++ b/gnuradio-runtime/lib/msg_handler.cc
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/msg_handler.h>
+
+namespace gr {
+
+ msg_handler::~msg_handler()
+ {
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/msg_queue.cc b/gnuradio-runtime/lib/msg_queue.cc
new file mode 100644
index 0000000000..9961f76296
--- /dev/null
+++ b/gnuradio-runtime/lib/msg_queue.cc
@@ -0,0 +1,130 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/msg_queue.h>
+#include <stdexcept>
+
+namespace gr {
+
+ msg_queue::sptr
+ msg_queue::make(unsigned int limit)
+ {
+ return msg_queue::sptr(new msg_queue(limit));
+ }
+
+ msg_queue::msg_queue(unsigned int limit)
+ : d_not_empty(), d_not_full(),
+ /*d_head(0), d_tail(0),*/ d_count(0), d_limit(limit)
+ {
+ }
+
+ msg_queue::~msg_queue()
+ {
+ flush ();
+ }
+
+ void
+ msg_queue::insert_tail(message::sptr msg)
+ {
+ if(msg->d_next)
+ throw std::invalid_argument("gr::msg_queue::insert_tail: msg already in queue");
+
+ gr::thread::scoped_lock guard(d_mutex);
+
+ while(full_p())
+ d_not_full.wait(guard);
+
+ if(d_tail == 0) {
+ d_tail = d_head = msg;
+ //msg->d_next = 0;
+ msg->d_next.reset();
+ }
+ else {
+ d_tail->d_next = msg;
+ d_tail = msg;
+ //msg->d_next = 0;
+ msg->d_next.reset();
+ }
+ d_count++;
+ d_not_empty.notify_one();
+ }
+
+ message::sptr
+ msg_queue::delete_head()
+ {
+ gr::thread::scoped_lock guard(d_mutex);
+ message::sptr m;
+
+ while((m = d_head) == 0)
+ d_not_empty.wait(guard);
+
+ d_head = m->d_next;
+ if(d_head == 0){
+ //d_tail = 0;
+ d_tail.reset();
+ }
+
+ d_count--;
+ // m->d_next = 0;
+ m->d_next.reset();
+ d_not_full.notify_one();
+ return m;
+ }
+
+ message::sptr
+ msg_queue::delete_head_nowait()
+ {
+ gr::thread::scoped_lock guard(d_mutex);
+ message::sptr m;
+
+ if((m = d_head) == 0) {
+ //return 0;
+ return message::sptr();
+ }
+
+ d_head = m->d_next;
+ if(d_head == 0) {
+ //d_tail = 0;
+ d_tail.reset();
+ }
+
+ d_count--;
+ //m->d_next = 0;
+ m->d_next.reset();
+ d_not_full.notify_one();
+ return m;
+ }
+
+ void
+ msg_queue::flush()
+ {
+ message::sptr m;
+
+ while((m = delete_head_nowait ()) != 0)
+ ;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/pagesize.cc b/gnuradio-runtime/lib/pagesize.cc
new file mode 100644
index 0000000000..373c0b6654
--- /dev/null
+++ b/gnuradio-runtime/lib/pagesize.cc
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pagesize.h"
+#include <unistd.h>
+#include <stdio.h>
+
+namespace gr {
+
+#if defined(_WIN32) && defined(HAVE_GETPAGESIZE)
+ extern "C" size_t getpagesize(void);
+#endif
+
+ int
+ pagesize()
+ {
+ static int s_pagesize = -1;
+
+ if(s_pagesize == -1) {
+#if defined(HAVE_GETPAGESIZE)
+ s_pagesize = getpagesize();
+#elif defined (HAVE_SYSCONF)
+ s_pagesize = sysconf(_SC_PAGESIZE);
+ if(s_pagesize == -1) {
+ perror("_SC_PAGESIZE");
+ s_pagesize = 4096;
+ }
+#else
+ fprintf(stderr, "gr::pagesize: no info; setting pagesize = 4096\n");
+ s_pagesize = 4096;
+#endif
+ }
+ return s_pagesize;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/pagesize.h b/gnuradio-runtime/lib/pagesize.h
new file mode 100644
index 0000000000..6a16882002
--- /dev/null
+++ b/gnuradio-runtime/lib/pagesize.h
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_PAGESIZE_H_
+#define GR_PAGESIZE_H_
+
+#include <gnuradio/api.h>
+
+namespace gr {
+
+ /*!
+ * \brief return the page size in bytes
+ */
+ GR_RUNTIME_API int pagesize();
+
+} /* namespace gr */
+
+#endif /* GR_PAGESIZE_H_ */
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index b6b3004331..f3f7783839 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -27,7 +27,7 @@
#include <vector>
#include <pmt/pmt.h>
#include "pmt_int.h"
-#include <messages/msg_accepter.h>
+#include <gnuradio/messages/msg_accepter.h>
#include <pmt/pmt_pool.h>
#include <stdio.h>
#include <string.h>
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt.h b/gnuradio-runtime/lib/pmt/qa_pmt.h
index 3e0c91abac..9293a076a6 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt.h
+++ b/gnuradio-runtime/lib/pmt/qa_pmt.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_QA_PMT_H
#define INCLUDED_QA_PMT_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for pmt
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
index e9a897deac..bfe71fbe5a 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
@@ -22,7 +22,7 @@
#include <qa_pmt_prims.h>
#include <cppunit/TestAssert.h>
-#include <messages/msg_passing.h>
+#include <gnuradio/messages/msg_passing.h>
#include <boost/format.hpp>
#include <cstdio>
#include <cstring>
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.h b/gnuradio-runtime/lib/pmt/qa_pmt_prims.h
index 8c3f5c6220..f2f3dd77f7 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.h
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.h
@@ -22,13 +22,13 @@
#ifndef INCLUDED_QA_PMT_PRIMS_H
#define INCLUDED_QA_PMT_PRIMS_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <pmt/api.h> //reason: suppress warnings
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestCase.h>
-class __GR_ATTR_EXPORT qa_pmt_prims : public CppUnit::TestCase {
-
+class __GR_ATTR_EXPORT qa_pmt_prims : public CppUnit::TestCase
+{
CPPUNIT_TEST_SUITE(qa_pmt_prims);
CPPUNIT_TEST(test_symbols);
CPPUNIT_TEST(test_booleans);
diff --git a/gnuradio-runtime/lib/pmt/unv_qa_template.cc.t b/gnuradio-runtime/lib/pmt/unv_qa_template.cc.t
index a04d532b4e..ea675cee16 100644
--- a/gnuradio-runtime/lib/pmt/unv_qa_template.cc.t
+++ b/gnuradio-runtime/lib/pmt/unv_qa_template.cc.t
@@ -2,7 +2,7 @@ void
qa_pmt_unv::test_@TAG@vector()
{
static const size_t N = 3;
- pmt_t v1 = pmt::make_@TAG@vector(N, 0);
+ pmt::pmt_t v1 = pmt::make_@TAG@vector(N, 0);
CPPUNIT_ASSERT_EQUAL(N, pmt::length(v1));
@TYPE@ s0 = @TYPE@(10);
@TYPE@ s1 = @TYPE@(20);
diff --git a/gnuradio-runtime/lib/posix_memalign.cc b/gnuradio-runtime/lib/posix_memalign.cc
index aaeff78042..a08e9e127a 100644
--- a/gnuradio-runtime/lib/posix_memalign.cc
+++ b/gnuradio-runtime/lib/posix_memalign.cc
@@ -36,7 +36,7 @@
/* emulate posix_memalign functionality, to some degree */
#include <errno.h>
-#include "gr_pagesize.h"
+#include "pagesize.h"
int posix_memalign
(void **memptr, size_t alignment, size_t size)
@@ -86,7 +86,7 @@ int posix_memalign
/* try valloc if it exists */
/* cheap and easy way to make sure alignment is met, so long as it
* is <= pagesize () */
- if (alignment <= (size_t) gr_pagesize ()) {
+ if (alignment <= (size_t) gr::pagesize ()) {
*memptr = valloc (size);
}
}
diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc
new file mode 100644
index 0000000000..468532f33b
--- /dev/null
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -0,0 +1,401 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/prefs.h>
+#include <gnuradio/sys_paths.h>
+#include <gnuradio/constants.h>
+#include <algorithm>
+
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+namespace fs = boost::filesystem;
+
+namespace gr {
+
+ /*
+ * Stub implementations
+ */
+ static prefs s_default_singleton;
+ static prefs *s_singleton = &s_default_singleton;
+
+ prefs *
+ prefs::singleton()
+ {
+ return s_singleton;
+ }
+
+ void
+ prefs::set_singleton(prefs *p)
+ {
+ s_singleton = p;
+ }
+
+ prefs::prefs()
+ {
+ _read_files();
+ }
+
+ prefs::~prefs()
+ {
+ // nop
+ }
+
+ std::vector<std::string>
+ prefs::_sys_prefs_filenames()
+ {
+ std::vector<std::string> fnames;
+
+ fs::path dir = prefsdir();
+ if(!fs::is_directory(dir))
+ return fnames;
+
+ fs::directory_iterator diritr(dir);
+ while(diritr != fs::directory_iterator()) {
+ fs::path p = *diritr++;
+ if(p.extension() != ".swp")
+ fnames.push_back(p.string());
+ }
+ std::sort(fnames.begin(), fnames.end());
+
+ // Find if there is a ~/.gnuradio/config.conf file and add this to
+ // the end of the file list to override any preferences in the
+ // installed path config files.
+ fs::path homedir = fs::path(gr::appdata_path());
+ homedir = homedir/".gnuradio/config.conf";
+ if(fs::exists(homedir)) {
+ fnames.push_back(homedir.string());
+ }
+
+ return fnames;
+ }
+
+ void
+ prefs::_read_files()
+ {
+ std::string config;
+
+ std::vector<std::string> filenames = _sys_prefs_filenames();
+ std::vector<std::string>::iterator sitr;
+ char tmp[1024];
+ for(sitr = filenames.begin(); sitr != filenames.end(); sitr++) {
+ fs::ifstream fin(*sitr);
+ while(!fin.eof()) {
+ fin.getline(tmp, 1024);
+ std::string t(tmp);
+ // ignore empty lines or lines of just comments
+ if((t.size() > 0) && (t[0] != '#')) {
+ // remove any comments in the line
+ size_t hash = t.find("#");
+
+ // Use hash marks at the end of each segment as a delimiter
+ config += t.substr(0, hash) + '#';
+ }
+ }
+ fin.close();
+ }
+
+ // Remove all whitespace.
+ config.erase(std::remove_if(config.begin(), config.end(),
+ ::isspace), config.end());
+
+ // Convert the string into a map
+ _convert_to_map(config);
+ }
+
+ void
+ prefs::_convert_to_map(const std::string &conf)
+ {
+ // Convert the string into an map of maps
+ // Map is structured as {section name: map of options}
+ // And options map is simply: {option name: option value}
+ std::string sub = conf;
+ size_t sec_start = sub.find("[");
+ while(sec_start != std::string::npos) {
+ sub = sub.substr(sec_start);
+
+ size_t sec_end = sub.find("]");
+ if(sec_end == std::string::npos)
+ throw std::runtime_error("Config file error: Mismatched section label.\n");
+
+ std::string sec = sub.substr(1, sec_end-1);
+ size_t next_sec_start = sub.find("[", sec_end);
+ std::string subsec = sub.substr(sec_end+1, next_sec_start-sec_end-2);
+
+ std::transform(sec.begin(), sec.end(), sec.begin(), ::tolower);
+
+ std::map<std::string, std::string> options_map = d_config_map[sec];
+ size_t next_opt = 0;
+ size_t next_val = 0;
+ next_opt = subsec.find("#");
+ while(next_opt < subsec.size()-1) {
+ next_val = subsec.find("=", next_opt);
+ std::string option = subsec.substr(next_opt+1, next_val-next_opt-1);
+
+ next_opt = subsec.find("#", next_val);
+ std::string value = subsec.substr(next_val+1, next_opt-next_val-1);
+
+ std::transform(option.begin(), option.end(), option.begin(), ::tolower);
+ options_map[option] = value;
+ }
+
+ d_config_map[sec] = options_map;
+
+ sec_start = sub.find("[", sec_end);
+ }
+ }
+
+ std::string
+ prefs::to_string()
+ {
+ config_map_itr sections;
+ config_map_elem_itr options;
+ std::stringstream s;
+
+ for(sections = d_config_map.begin(); sections != d_config_map.end(); sections++) {
+ s << "[" << sections->first << "]" << std::endl;
+ for(options = sections->second.begin(); options != sections->second.end(); options++) {
+ s << options->first << " = " << options->second << std::endl;
+ }
+ s << std::endl;
+ }
+
+ return s.str();
+ }
+
+ void
+ prefs::save()
+ {
+ std::string conf = to_string();
+
+ fs::path homedir = fs::path(gr::appdata_path());
+ homedir = homedir/".gnuradio/config.conf";
+ fs::ofstream fout(homedir);
+ fout << conf;
+ fout.close();
+ }
+
+ char *
+ prefs::option_to_env(std::string section, std::string option)
+ {
+ std::stringstream envname;
+ std::string secname=section, optname=option;
+
+ std::transform(section.begin(), section.end(), secname.begin(), ::toupper);
+ std::transform(option.begin(), option.end(), optname.begin(), ::toupper);
+ envname << "GR_CONF_" << secname << "_" << optname;
+
+ return getenv(envname.str().c_str());
+ }
+
+ bool
+ prefs::has_section(const std::string §ion)
+ {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+ return d_config_map.count(s) > 0;
+ }
+
+ bool
+ prefs::has_option(const std::string §ion, const std::string &option)
+ {
+ if(option_to_env(section, option))
+ return true;
+
+ if(has_section(section)) {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ config_map_itr sec = d_config_map.find(s);
+ return sec->second.count(o) > 0;
+ }
+ else {
+ return false;
+ }
+ }
+
+ const std::string
+ prefs::get_string(const std::string §ion, const std::string &option,
+ const std::string &default_val)
+ {
+ char *env = option_to_env(section, option);
+ if(env)
+ return std::string(env);
+
+ if(has_option(section, option)) {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ config_map_itr sec = d_config_map.find(s);
+ config_map_elem_itr opt = sec->second.find(o);
+ return opt->second;
+ }
+ else {
+ return default_val;
+ }
+ }
+
+ void
+ prefs::set_string(const std::string §ion, const std::string &option,
+ const std::string &val)
+ {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ std::map<std::string, std::string> opt_map = d_config_map[s];
+
+ opt_map[o] = val;
+
+ d_config_map[s] = opt_map;
+ }
+
+ bool
+ prefs::get_bool(const std::string §ion, const std::string &option,
+ bool default_val)
+ {
+ if(has_option(section, option)) {
+ std::string str = get_string(section, option, "");
+ if(str == "") {
+ return default_val;
+ }
+ std::transform(str.begin(), str.end(), str.begin(), ::tolower);
+ if((str == "true") || (str == "on") || (str == "1"))
+ return true;
+ else if((str == "false") || (str == "off") || (str == "0"))
+ return false;
+ else
+ return default_val;
+ }
+ else {
+ return default_val;
+ }
+ }
+
+ void
+ prefs::set_bool(const std::string §ion, const std::string &option,
+ bool val)
+ {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ std::map<std::string, std::string> opt_map = d_config_map[s];
+
+ std::stringstream sstr;
+ sstr << (val == true);
+ opt_map[o] = sstr.str();
+
+ d_config_map[s] = opt_map;
+ }
+
+ long
+ prefs::get_long(const std::string §ion, const std::string &option,
+ long default_val)
+ {
+ if(has_option(section, option)) {
+ std::string str = get_string(section, option, "");
+ if(str == "") {
+ return default_val;
+ }
+ std::stringstream sstr(str);
+ long n;
+ sstr >> n;
+ return n;
+ }
+ else {
+ return default_val;
+ }
+ }
+
+ void
+ prefs::set_long(const std::string §ion, const std::string &option,
+ long val)
+ {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ std::map<std::string, std::string> opt_map = d_config_map[s];
+
+ std::stringstream sstr;
+ sstr << val;
+ opt_map[o] = sstr.str();
+
+ d_config_map[s] = opt_map;
+ }
+
+ double
+ prefs::get_double(const std::string §ion, const std::string &option,
+ double default_val)
+ {
+ if(has_option(section, option)) {
+ std::string str = get_string(section, option, "");
+ if(str == "") {
+ return default_val;
+ }
+ std::stringstream sstr(str);
+ double n;
+ sstr >> n;
+ return n;
+ }
+ else {
+ return default_val;
+ }
+ }
+
+ void
+ prefs::set_double(const std::string §ion, const std::string &option,
+ double val)
+ {
+ std::string s = section;
+ std::transform(section.begin(), section.end(), s.begin(), ::tolower);
+
+ std::string o = option;
+ std::transform(option.begin(), option.end(), o.begin(), ::tolower);
+
+ std::map<std::string, std::string> opt_map = d_config_map[s];
+
+ std::stringstream sstr;
+ sstr << val;
+ opt_map[o] = sstr.str();
+
+ d_config_map[s] = opt_map;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/qa_buffer.cc b/gnuradio-runtime/lib/qa_buffer.cc
new file mode 100644
index 0000000000..5f1dece0ad
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_buffer.cc
@@ -0,0 +1,304 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_buffer.h>
+#include <gnuradio/buffer.h>
+#include <cppunit/TestAssert.h>
+#include <stdlib.h>
+#include <gnuradio/random.h>
+
+static void
+leak_check(void f())
+{
+ long buffer_count = gr::buffer_ncurrently_allocated();
+ long buffer_reader_count = gr::buffer_reader_ncurrently_allocated();
+
+ f();
+
+ CPPUNIT_ASSERT_EQUAL(buffer_reader_count, gr::buffer_reader_ncurrently_allocated());
+ CPPUNIT_ASSERT_EQUAL(buffer_count, gr::buffer_ncurrently_allocated());
+}
+
+
+// ----------------------------------------------------------------------------
+// test single writer, no readers...
+//
+
+static void
+t0_body()
+{
+ int nitems = 4000 / sizeof(int);
+ int counter = 0;
+
+ gr::buffer_sptr buf(gr::make_buffer(nitems, sizeof(int), gr::block_sptr()));
+
+ int last_sa;
+ int sa;
+
+ sa = buf->space_available();
+ CPPUNIT_ASSERT(sa > 0);
+ last_sa = sa;
+
+ for(int i = 0; i < 5; i++) {
+ sa = buf->space_available();
+ CPPUNIT_ASSERT_EQUAL(last_sa, sa);
+ last_sa = sa;
+
+ int *p = (int*)buf->write_pointer();
+ CPPUNIT_ASSERT(p != 0);
+
+ for(int j = 0; j < sa; j++)
+ *p++ = counter++;
+
+ buf->update_write_pointer(sa);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// test single writer, single reader
+//
+
+static void
+t1_body()
+{
+ int nitems = 4000 / sizeof(int);
+ int write_counter = 0;
+ int read_counter = 0;
+
+ gr::buffer_sptr buf(gr::make_buffer(nitems, sizeof(int), gr::block_sptr()));
+ gr::buffer_reader_sptr r1(gr::buffer_add_reader(buf, 0, gr::block_sptr()));
+
+ int sa;
+
+ // write 1/3 of buffer
+
+ sa = buf->space_available();
+ CPPUNIT_ASSERT(sa > 0);
+
+ int *p = (int*)buf->write_pointer();
+ CPPUNIT_ASSERT(p != 0);
+
+ for(int j = 0; j < sa/3; j++) {
+ *p++ = write_counter++;
+ }
+ buf->update_write_pointer(sa/3);
+
+ // write the next 1/3 (1/2 of what's left)
+
+ sa = buf->space_available();
+ CPPUNIT_ASSERT(sa > 0);
+
+ p = (int*)buf->write_pointer();
+ CPPUNIT_ASSERT(p != 0);
+
+ for(int j = 0; j < sa/2; j++) {
+ *p++ = write_counter++;
+ }
+ buf->update_write_pointer(sa/2);
+
+ // check that we can read it OK
+
+ int ia = r1->items_available();
+ CPPUNIT_ASSERT_EQUAL(write_counter, ia);
+
+ int *rp = (int*)r1->read_pointer();
+ CPPUNIT_ASSERT(rp != 0);
+
+ for(int i = 0; i < ia/2; i++) {
+ CPPUNIT_ASSERT_EQUAL(read_counter, *rp);
+ read_counter++;
+ rp++;
+ }
+ r1->update_read_pointer(ia/2);
+
+ // read the rest
+
+ ia = r1->items_available();
+ rp = (int *) r1->read_pointer();
+ CPPUNIT_ASSERT(rp != 0);
+
+ for(int i = 0; i < ia; i++) {
+ CPPUNIT_ASSERT_EQUAL(read_counter, *rp);
+ read_counter++;
+ rp++;
+ }
+ r1->update_read_pointer(ia);
+}
+
+// ----------------------------------------------------------------------------
+// single writer, single reader: check wrap-around
+//
+
+static void
+t2_body()
+{
+ // 64K is the largest granularity we've seen so far (MS windows file mapping).
+ // This allows a bit of "white box testing"
+
+ int nitems = (64 * (1L << 10)) / sizeof(int); // 64K worth of ints
+
+ gr::buffer_sptr buf(gr::make_buffer(nitems, sizeof(int), gr::block_sptr()));
+ gr::buffer_reader_sptr r1(gr::buffer_add_reader(buf, 0, gr::block_sptr()));
+
+ int read_counter = 0;
+ int write_counter = 0;
+ int n;
+ int *wp = 0;
+ int *rp = 0;
+
+ // Write 3/4 of buffer
+
+ n = (int)(buf->space_available() * 0.75);
+ wp = (int*)buf->write_pointer();
+
+ for(int i = 0; i < n; i++)
+ *wp++ = write_counter++;
+ buf->update_write_pointer(n);
+
+ // Now read it all
+
+ int m = r1->items_available();
+ CPPUNIT_ASSERT_EQUAL(n, m);
+ rp = (int*)r1->read_pointer();
+
+ for(int i = 0; i < m; i++) {
+ CPPUNIT_ASSERT_EQUAL(read_counter, *rp);
+ read_counter++;
+ rp++;
+ }
+ r1->update_read_pointer(m);
+
+ // Now write as much as we can.
+ // This will wrap around the buffer
+
+ n = buf->space_available();
+ CPPUNIT_ASSERT_EQUAL(nitems - 1, n); // white box test
+ wp = (int*)buf->write_pointer();
+
+ for(int i = 0; i < n; i++)
+ *wp++ = write_counter++;
+ buf->update_write_pointer(n);
+
+ // now read it all
+
+ m = r1->items_available();
+ CPPUNIT_ASSERT_EQUAL(n, m);
+ rp = (int*)r1->read_pointer();
+
+ for(int i = 0; i < m; i++) {
+ CPPUNIT_ASSERT_EQUAL(read_counter, *rp);
+ read_counter++;
+ rp++;
+ }
+ r1->update_read_pointer(m);
+}
+
+// ----------------------------------------------------------------------------
+// single writer, N readers, randomized order and lengths
+// ----------------------------------------------------------------------------
+
+static void
+t3_body()
+{
+ int nitems = (64 * (1L << 10)) / sizeof(int);
+
+ static const int N = 5;
+ gr::buffer_sptr buf(gr::make_buffer(nitems, sizeof(int), gr::block_sptr()));
+ gr::buffer_reader_sptr reader[N];
+ int read_counter[N];
+ int write_counter = 0;
+ gr::random random;
+
+ for(int i = 0; i < N; i++) {
+ read_counter[i] = 0;
+ reader[i] = buffer_add_reader(buf, 0, gr::block_sptr());
+ }
+
+ for(int lc = 0; lc < 1000; lc++) {
+
+ // write some
+
+ int n = (int)(buf->space_available() * random.ran1());
+ int *wp = (int*)buf->write_pointer();
+
+ for(int i = 0; i < n; i++)
+ *wp++ = write_counter++;
+
+ buf->update_write_pointer(n);
+
+ // pick a random reader and read some
+
+ int r = (int)(N * random.ran1());
+ CPPUNIT_ASSERT(0 <= r && r < N);
+
+ int m = reader[r]->items_available();
+ int *rp = (int*)reader[r]->read_pointer();
+
+ for(int i = 0; i < m; i++) {
+ CPPUNIT_ASSERT_EQUAL(read_counter[r], *rp);
+ read_counter[r]++;
+ rp++;
+ }
+ reader[r]->update_read_pointer (m);
+ }
+}
+
+
+// ----------------------------------------------------------------------------
+
+void
+qa_buffer::t0()
+{
+ leak_check(t0_body);
+}
+
+void
+qa_buffer::t1()
+{
+ leak_check(t1_body);
+}
+
+void
+qa_buffer::t2()
+{
+ leak_check(t2_body);
+}
+
+void
+qa_buffer::t3()
+{
+ leak_check(t3_body);
+}
+
+void
+qa_buffer::t4()
+{
+}
+
+void
+qa_buffer::t5()
+{
+}
diff --git a/gnuradio-runtime/lib/qa_buffer.h b/gnuradio-runtime/lib/qa_buffer.h
new file mode 100644
index 0000000000..a41e69dd48
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_buffer.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_BUFFER_H
+#define INCLUDED_QA_GR_BUFFER_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_buffer : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_buffer);
+ CPPUNIT_TEST(t0);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST(t3);
+ CPPUNIT_TEST(t4);
+ CPPUNIT_TEST(t5);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+ void t0();
+ void t1();
+ void t2();
+ void t3();
+ void t4();
+ void t5();
+};
+
+#endif /* INCLUDED_QA_GR_BUFFER_H */
diff --git a/gnuradio-runtime/lib/qa_circular_file.cc b/gnuradio-runtime/lib/qa_circular_file.cc
new file mode 100644
index 0000000000..d80831b4b9
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_circular_file.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "qa_circular_file.h"
+#include "circular_file.h"
+#include <cppunit/TestAssert.h>
+#include <iostream>
+#include <stdio.h>
+#include <unistd.h>
+
+static const char *test_file = "qa_gr_circular_file.data";
+static const int BUFFER_SIZE = 8192;
+static const int NWRITE = 8192 * 9 / 8;
+
+void
+qa_circular_file::t1()
+{
+#ifdef HAVE_MMAP
+ gr::circular_file *cf_writer;
+ gr::circular_file *cf_reader;
+
+ // write the data...
+ cf_writer = new gr::circular_file(test_file, true,
+ BUFFER_SIZE * sizeof(short));
+
+ short sd;
+ for(int i = 0; i < NWRITE; i++) {
+ sd = i;
+ cf_writer->write(&sd, sizeof (sd));
+ }
+
+ delete cf_writer;
+
+ // now read it back...
+ cf_reader = new gr::circular_file(test_file);
+ for(int i = 0; i < BUFFER_SIZE; i++) {
+ int n = cf_reader->read (&sd, sizeof(sd));
+ CPPUNIT_ASSERT_EQUAL((int) sizeof (sd), n);
+ CPPUNIT_ASSERT_EQUAL(NWRITE - BUFFER_SIZE + i, (int)sd);
+ }
+
+ int n = cf_reader->read(&sd, sizeof(sd));
+ CPPUNIT_ASSERT_EQUAL(0, n);
+
+ delete cf_reader;
+ unlink(test_file);
+#endif // HAVE_MMAP
+}
+
diff --git a/gnuradio-runtime/lib/qa_circular_file.h b/gnuradio-runtime/lib/qa_circular_file.h
new file mode 100644
index 0000000000..fd5c156b56
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_circular_file.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef QA_GR_CIRCULAR_FILE_H
+#define QA_GR_CIRCULAR_FILE_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_circular_file : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_circular_file);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void t1();
+};
+
+#endif /* QA_GR_CIRCULAR_FILE_H */
diff --git a/gnuradio-runtime/lib/qa_gr_buffer.cc b/gnuradio-runtime/lib/qa_gr_buffer.cc
deleted file mode 100644
index c74baf398e..0000000000
--- a/gnuradio-runtime/lib/qa_gr_buffer.cc
+++ /dev/null
@@ -1,307 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <qa_gr_buffer.h>
-#include <gr_buffer.h>
-#include <cppunit/TestAssert.h>
-#include <stdlib.h>
-#include <gr_random.h>
-
-static void
-leak_check (void f ())
-{
- long buffer_count = gr_buffer_ncurrently_allocated ();
- long buffer_reader_count = gr_buffer_reader_ncurrently_allocated ();
-
- f ();
-
- CPPUNIT_ASSERT_EQUAL (buffer_reader_count, gr_buffer_reader_ncurrently_allocated ());
- CPPUNIT_ASSERT_EQUAL (buffer_count, gr_buffer_ncurrently_allocated ());
-}
-
-
-// ----------------------------------------------------------------------------
-// test single writer, no readers...
-//
-
-static void
-t0_body ()
-{
- int nitems = 4000 / sizeof (int);
- int counter = 0;
-
- gr_buffer_sptr buf(gr_make_buffer(nitems, sizeof (int), gr_block_sptr()));
-
- int last_sa;
- int sa;
-
- sa = buf->space_available ();
- CPPUNIT_ASSERT (sa > 0);
- last_sa = sa;
-
- for (int i = 0; i < 5; i++){
- sa = buf->space_available ();
- CPPUNIT_ASSERT_EQUAL (last_sa, sa);
- last_sa = sa;
-
- int *p = (int *) buf->write_pointer ();
- CPPUNIT_ASSERT (p != 0);
-
- for (int j = 0; j < sa; j++)
- *p++ = counter++;
-
- buf->update_write_pointer (sa);
- }
-}
-
-// ----------------------------------------------------------------------------
-// test single writer, single reader
-//
-
-static void
-t1_body ()
- {
- int nitems = 4000 / sizeof (int);
- int write_counter = 0;
- int read_counter = 0;
-
- gr_buffer_sptr buf(gr_make_buffer(nitems, sizeof (int), gr_block_sptr()));
- gr_buffer_reader_sptr r1 (gr_buffer_add_reader (buf, 0, gr_block_sptr()));
-
-
- int sa;
-
- // write 1/3 of buffer
-
- sa = buf->space_available ();
- CPPUNIT_ASSERT (sa > 0);
-
- int *p = (int *) buf->write_pointer ();
- CPPUNIT_ASSERT (p != 0);
-
- for (int j = 0; j < sa/3; j++){
- *p++ = write_counter++;
- }
- buf->update_write_pointer (sa/3);
-
-
- // write the next 1/3 (1/2 of what's left)
-
- sa = buf->space_available ();
- CPPUNIT_ASSERT (sa > 0);
-
- p = (int *) buf->write_pointer ();
- CPPUNIT_ASSERT (p != 0);
-
- for (int j = 0; j < sa/2; j++){
- *p++ = write_counter++;
- }
- buf->update_write_pointer (sa/2);
-
-
- // check that we can read it OK
-
- int ia = r1->items_available ();
- CPPUNIT_ASSERT_EQUAL (write_counter, ia);
-
- int *rp = (int *) r1->read_pointer ();
- CPPUNIT_ASSERT (rp != 0);
-
- for (int i = 0; i < ia/2; i++){
- CPPUNIT_ASSERT_EQUAL (read_counter, *rp);
- read_counter++;
- rp++;
- }
- r1->update_read_pointer (ia/2);
-
- // read the rest
-
- ia = r1->items_available ();
- rp = (int *) r1->read_pointer ();
- CPPUNIT_ASSERT (rp != 0);
-
- for (int i = 0; i < ia; i++){
- CPPUNIT_ASSERT_EQUAL (read_counter, *rp);
- read_counter++;
- rp++;
- }
- r1->update_read_pointer (ia);
-}
-
-// ----------------------------------------------------------------------------
-// single writer, single reader: check wrap-around
-//
-
-static void
-t2_body ()
-{
- // 64K is the largest granularity we've seen so far (MS windows file mapping).
- // This allows a bit of "white box testing"
-
- int nitems = (64 * (1L << 10)) / sizeof (int); // 64K worth of ints
-
- gr_buffer_sptr buf(gr_make_buffer (nitems, sizeof (int), gr_block_sptr()));
- gr_buffer_reader_sptr r1 (gr_buffer_add_reader (buf, 0, gr_block_sptr()));
-
- int read_counter = 0;
- int write_counter = 0;
- int n;
- int *wp = 0;
- int *rp = 0;
-
- // Write 3/4 of buffer
-
- n = (int) (buf->space_available () * 0.75);
- wp = (int *) buf->write_pointer ();
-
- for (int i = 0; i < n; i++)
- *wp++ = write_counter++;
- buf->update_write_pointer (n);
-
- // Now read it all
-
- int m = r1->items_available ();
- CPPUNIT_ASSERT_EQUAL (n, m);
- rp = (int *) r1->read_pointer ();
-
- for (int i = 0; i < m; i++){
- CPPUNIT_ASSERT_EQUAL (read_counter, *rp);
- read_counter++;
- rp++;
- }
- r1->update_read_pointer (m);
-
- // Now write as much as we can.
- // This will wrap around the buffer
-
- n = buf->space_available ();
- CPPUNIT_ASSERT_EQUAL (nitems - 1, n); // white box test
- wp = (int *) buf->write_pointer ();
-
- for (int i = 0; i < n; i++)
- *wp++ = write_counter++;
- buf->update_write_pointer (n);
-
- // now read it all
-
- m = r1->items_available ();
- CPPUNIT_ASSERT_EQUAL (n, m);
- rp = (int *) r1->read_pointer ();
-
- for (int i = 0; i < m; i++){
- CPPUNIT_ASSERT_EQUAL (read_counter, *rp);
- read_counter++;
- rp++;
- }
- r1->update_read_pointer (m);
-
-}
-
-// ----------------------------------------------------------------------------
-// single writer, N readers, randomized order and lengths
-// ----------------------------------------------------------------------------
-
-static void
-t3_body ()
-{
- int nitems = (64 * (1L << 10)) / sizeof (int);
-
- static const int N = 5;
- gr_buffer_sptr buf(gr_make_buffer(nitems, sizeof (int), gr_block_sptr()));
- gr_buffer_reader_sptr reader[N];
- int read_counter[N];
- int write_counter = 0;
- gr_random random;
-
- for (int i = 0; i < N; i++){
- read_counter[i] = 0;
- reader[i] = gr_buffer_add_reader (buf, 0, gr_block_sptr());
- }
-
- for (int lc = 0; lc < 1000; lc++){
-
- // write some
-
- int n = (int) (buf->space_available () * random.ran1 ());
- int *wp = (int *) buf->write_pointer ();
-
- for (int i = 0; i < n; i++)
- *wp++ = write_counter++;
-
- buf->update_write_pointer (n);
-
- // pick a random reader and read some
-
- int r = (int) (N * random.ran1 ());
- CPPUNIT_ASSERT (0 <= r && r < N);
-
- int m = reader[r]->items_available ();
- int *rp = (int *) reader[r]->read_pointer ();
-
- for (int i = 0; i < m; i++){
- CPPUNIT_ASSERT_EQUAL (read_counter[r], *rp);
- read_counter[r]++;
- rp++;
- }
- reader[r]->update_read_pointer (m);
- }
-}
-
-
-// ----------------------------------------------------------------------------
-
-void
-qa_gr_buffer::t0 ()
-{
- leak_check (t0_body);
-}
-
-void
-qa_gr_buffer::t1 ()
-{
- leak_check (t1_body);
-}
-
-void
-qa_gr_buffer::t2 ()
-{
- leak_check (t2_body);
-}
-
-void
-qa_gr_buffer::t3 ()
-{
- leak_check (t3_body);
-}
-
-void
-qa_gr_buffer::t4 ()
-{
-}
-
-void
-qa_gr_buffer::t5 ()
-{
-}
diff --git a/gnuradio-runtime/lib/qa_gr_buffer.h b/gnuradio-runtime/lib/qa_gr_buffer.h
deleted file mode 100644
index 2937c24b68..0000000000
--- a/gnuradio-runtime/lib/qa_gr_buffer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_QA_GR_BUFFER_H
-#define INCLUDED_QA_GR_BUFFER_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_buffer : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_buffer);
- CPPUNIT_TEST (t0);
- CPPUNIT_TEST (t1);
- CPPUNIT_TEST (t2);
- CPPUNIT_TEST (t3);
- CPPUNIT_TEST (t4);
- CPPUNIT_TEST (t5);
- CPPUNIT_TEST_SUITE_END ();
-
-
- private:
-
- void t0 ();
- void t1 ();
- void t2 ();
- void t3 ();
- void t4 ();
- void t5 ();
-};
-
-
-
-#endif /* INCLUDED_QA_GR_BUFFER_H */
diff --git a/gnuradio-runtime/lib/qa_gr_circular_file.cc b/gnuradio-runtime/lib/qa_gr_circular_file.cc
deleted file mode 100644
index 243e44784b..0000000000
--- a/gnuradio-runtime/lib/qa_gr_circular_file.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <qa_gr_circular_file.h>
-#include <gr_circular_file.h>
-#include <cppunit/TestAssert.h>
-#include <iostream>
-#include <stdio.h>
-#include <unistd.h>
-
-static const char *test_file = "qa_gr_circular_file.data";
-static const int BUFFER_SIZE = 8192;
-static const int NWRITE = 8192 * 9 / 8;
-
-void
-qa_gr_circular_file::t1 ()
-{
-#ifdef HAVE_MMAP
- gr_circular_file *cf_writer;
- gr_circular_file *cf_reader;
-
- // write the data...
-
- cf_writer = new gr_circular_file (test_file, true, BUFFER_SIZE * sizeof (short));
-
- short sd;
- for (int i = 0; i < NWRITE; i++){
- sd = i;
- cf_writer->write (&sd, sizeof (sd));
- }
-
- delete cf_writer;
-
- // now read it back...
-
- cf_reader = new gr_circular_file (test_file);
- for (int i = 0; i < BUFFER_SIZE; i++){
- int n = cf_reader->read (&sd, sizeof (sd));
- CPPUNIT_ASSERT_EQUAL ((int) sizeof (sd), n);
- CPPUNIT_ASSERT_EQUAL (NWRITE - BUFFER_SIZE + i, (int) sd);
- }
-
- int n = cf_reader->read (&sd, sizeof (sd));
- CPPUNIT_ASSERT_EQUAL (0, n);
-
- delete cf_reader;
- unlink (test_file);
-#endif // HAVE_MMAP
-}
-
diff --git a/gnuradio-runtime/lib/qa_gr_circular_file.h b/gnuradio-runtime/lib/qa_gr_circular_file.h
deleted file mode 100644
index df35ab077b..0000000000
--- a/gnuradio-runtime/lib/qa_gr_circular_file.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _QA_GR_CIRCULAR_FILE_H_
-#define _QA_GR_CIRCULAR_FILE_H_
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_circular_file : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_circular_file);
- CPPUNIT_TEST (t1);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void t1 ();
-
-};
-
-
-#endif /* _QA_GR_CIRCULAR_FILE_H_ */
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt.cc b/gnuradio-runtime/lib/qa_gr_fxpt.cc
deleted file mode 100644
index 7eac0d8964..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <qa_gr_fxpt.h>
-#include <gr_fxpt.h>
-#include <cppunit/TestAssert.h>
-#include <iostream>
-#include <stdio.h>
-#include <unistd.h>
-#include <math.h>
-
-static const float SIN_COS_TOLERANCE = 1e-5;
-
-void
-qa_gr_fxpt::t0 ()
-{
- CPPUNIT_ASSERT_DOUBLES_EQUAL (M_PI/2, gr_fxpt::fixed_to_float (0x40000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, gr_fxpt::fixed_to_float (0x00000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (-M_PI, gr_fxpt::fixed_to_float (0x80000000), SIN_COS_TOLERANCE);
-
- if (0){
- /*
- * These are disabled because of some precision issues.
- *
- * Different compilers seem to have different opinions on whether
- * the calulations are done single or double (or extended)
- * precision. Any of the answers are fine for our real purpose, but
- * sometimes the answer is off by a few bits at the bottom.
- * Hence, the disabled check.
- */
- CPPUNIT_ASSERT_EQUAL ((gr_int32) 0x40000000, gr_fxpt::float_to_fixed (M_PI/2));
- CPPUNIT_ASSERT_EQUAL ((gr_int32) 0, gr_fxpt::float_to_fixed (0));
- CPPUNIT_ASSERT_EQUAL ((gr_int32) 0x80000000, gr_fxpt::float_to_fixed (-M_PI));
- }
-}
-
-void
-qa_gr_fxpt::t1 ()
-{
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0, gr_fxpt::sin (0x00000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0.707106781, gr_fxpt::sin (0x20000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 1, gr_fxpt::sin (0x40000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0.707106781, gr_fxpt::sin (0x60000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0, gr_fxpt::sin (0x7fffffff), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0, gr_fxpt::sin (0x80000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL ( 0, gr_fxpt::sin (0x80000001), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (-1, gr_fxpt::sin (-0x40000000), SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (-0.707106781, gr_fxpt::sin (-0x20000000), SIN_COS_TOLERANCE);
-
-
- for (float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600){
- float expected = sin (p);
- float actual = gr_fxpt::sin (gr_fxpt::float_to_fixed (p));
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected, actual, SIN_COS_TOLERANCE);
- }
-}
-
-void
-qa_gr_fxpt::t2 ()
-{
- for (float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600){
- float expected = cos (p);
- float actual = gr_fxpt::cos (gr_fxpt::float_to_fixed (p));
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected, actual, SIN_COS_TOLERANCE);
- }
-}
-
-void
-qa_gr_fxpt::t3 ()
-{
- for (float p = -M_PI; p < M_PI; p += 2 * M_PI / 3600){
- float expected_sin = sin (p);
- float expected_cos = cos (p);
- float actual_sin;
- float actual_cos;
- gr_fxpt::sincos (gr_fxpt::float_to_fixed (p), &actual_sin, &actual_cos);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected_sin, actual_sin, SIN_COS_TOLERANCE);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (expected_cos, actual_cos, SIN_COS_TOLERANCE);
- }
-}
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt.h b/gnuradio-runtime/lib/qa_gr_fxpt.h
deleted file mode 100644
index 72211563e7..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_QA_GR_FXPT_H
-#define INCLUDED_QA_GR_FXPT_H
-
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_fxpt : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_fxpt);
- CPPUNIT_TEST (t0);
- CPPUNIT_TEST (t1);
- CPPUNIT_TEST (t2);
- CPPUNIT_TEST (t3);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void t0 ();
- void t1 ();
- void t2 ();
- void t3 ();
-
-};
-
-#endif /* INCLUDED_QA_GR_FXPT_H */
-
-
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt_nco.cc b/gnuradio-runtime/lib/qa_gr_fxpt_nco.cc
deleted file mode 100644
index 6f208eac80..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt_nco.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <qa_gr_fxpt_nco.h>
-#include <gr_fxpt_nco.h>
-#include <gr_nco.h>
-#include <cppunit/TestAssert.h>
-#include <iostream>
-#include <stdio.h>
-#include <unistd.h>
-#include <math.h>
-
-static const float SIN_COS_TOLERANCE = 1e-5;
-
-//static const float SIN_COS_FREQ = 5003;
-static const float SIN_COS_FREQ = 4096;
-
-static const int SIN_COS_BLOCK_SIZE = 100000;
-
-static double max_d(double a, double b)
-{
- return fabs(a) > fabs(b) ? a : b;
-}
-
-void
-qa_gr_fxpt_nco::t0 ()
-{
- gr_nco<float,float> ref_nco;
- gr_fxpt_nco new_nco;
- double max_error = 0, max_phase_error = 0;
-
- ref_nco.set_freq ((float)(2 * M_PI / SIN_COS_FREQ));
- new_nco.set_freq ((float)(2 * M_PI / SIN_COS_FREQ));
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_nco.get_freq(), new_nco.get_freq(), SIN_COS_TOLERANCE);
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- float ref_sin = ref_nco.sin ();
- float new_sin = new_nco.sin ();
- //printf ("i = %6d\n", i);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_sin, new_sin, SIN_COS_TOLERANCE);
-
- max_error = max_d (max_error, ref_sin-new_sin);
-
- float ref_cos = ref_nco.cos ();
- float new_cos = new_nco.cos ();
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_cos, new_cos, SIN_COS_TOLERANCE);
-
- max_error = max_d (max_error, ref_cos-new_cos);
-
- ref_nco.step ();
- new_nco.step ();
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_nco.get_phase(), new_nco.get_phase(), SIN_COS_TOLERANCE);
-
- max_phase_error = max_d (max_phase_error, ref_nco.get_phase()-new_nco.get_phase());
- }
- // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
-}
-
-void
-qa_gr_fxpt_nco::t1 ()
-{
- gr_nco<float,float> ref_nco;
- gr_fxpt_nco new_nco;
- gr_complex ref_block[SIN_COS_BLOCK_SIZE];
- gr_complex new_block[SIN_COS_BLOCK_SIZE];
- double max_error = 0;
-
- ref_nco.set_freq ((float)(2 * M_PI / SIN_COS_FREQ));
- new_nco.set_freq ((float)(2 * M_PI / SIN_COS_FREQ));
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_nco.get_freq(), new_nco.get_freq(), SIN_COS_TOLERANCE);
-
- ref_nco.sincos ((gr_complex*)ref_block, SIN_COS_BLOCK_SIZE);
- new_nco.sincos ((gr_complex*)new_block, SIN_COS_BLOCK_SIZE);
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_block[i].real(), new_block[i].real(), SIN_COS_TOLERANCE);
- max_error = max_d (max_error, ref_block[i].real()-new_block[i].real());
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_block[i].imag(), new_block[i].imag(), SIN_COS_TOLERANCE);
- max_error = max_d (max_error, ref_block[i].imag()-new_block[i].imag());
- }
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_nco.get_phase(), new_nco.get_phase(), SIN_COS_TOLERANCE);
- // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
-}
-
-void
-qa_gr_fxpt_nco::t2 ()
-{
-}
-
-void
-qa_gr_fxpt_nco::t3 ()
-{
-}
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt_nco.h b/gnuradio-runtime/lib/qa_gr_fxpt_nco.h
deleted file mode 100644
index 8998922bbb..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt_nco.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_QA_GR_FXPT_NCO_H
-#define INCLUDED_QA_GR_FXPT_NCO_H
-
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_fxpt_nco : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_fxpt_nco);
- CPPUNIT_TEST (t0);
- CPPUNIT_TEST (t1);
- CPPUNIT_TEST (t2);
- CPPUNIT_TEST (t3);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void t0 ();
- void t1 ();
- void t2 ();
- void t3 ();
-
-};
-
-#endif /* INCLUDED_QA_GR_FXPT_NCO_H */
-
-
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt_vco.cc b/gnuradio-runtime/lib/qa_gr_fxpt_vco.cc
deleted file mode 100644
index 5b6993a30c..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt_vco.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <qa_gr_fxpt_vco.h>
-#include <gr_fxpt_vco.h>
-#include <gr_vco.h>
-#include <cppunit/TestAssert.h>
-#include <iostream>
-#include <stdio.h>
-#include <unistd.h>
-#include <math.h>
-
-static const float SIN_COS_TOLERANCE = 1e-5;
-
-static const float SIN_COS_K = 0.42;
-static const float SIN_COS_AMPL = 0.8;
-
-static const int SIN_COS_BLOCK_SIZE = 100000;
-
-static double max_d(double a, double b)
-{
- return fabs(a) > fabs(b) ? a : b;
-}
-
-void
-qa_gr_fxpt_vco::t0 ()
-{
- gr_vco<float,float> ref_vco;
- gr_fxpt_vco new_vco;
- double max_error = 0, max_phase_error = 0;
- float input[SIN_COS_BLOCK_SIZE];
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- input[i] = sin(double(i));
- }
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- float ref_cos = ref_vco.cos ();
- float new_cos = new_vco.cos ();
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_cos, new_cos, SIN_COS_TOLERANCE);
-
- max_error = max_d (max_error, ref_cos-new_cos);
-
- ref_vco.adjust_phase (input[i]);
- new_vco.adjust_phase (input[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_vco.get_phase(), new_vco.get_phase(), SIN_COS_TOLERANCE);
-
- max_phase_error = max_d (max_phase_error, ref_vco.get_phase()-new_vco.get_phase());
- }
- // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, max_phase_error);
-}
-
-
-void
-qa_gr_fxpt_vco::t1 ()
-{
- gr_vco<float,float> ref_vco;
- gr_fxpt_vco new_vco;
- float ref_block[SIN_COS_BLOCK_SIZE];
- float new_block[SIN_COS_BLOCK_SIZE];
- float input[SIN_COS_BLOCK_SIZE];
- double max_error = 0;
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- input[i] = sin(double(i));
- }
-
- ref_vco.cos (ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL);
- new_vco.cos (new_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL);
-
- for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_block[i], new_block[i], SIN_COS_TOLERANCE);
- max_error = max_d (max_error, ref_block[i]-new_block[i]);
- }
- CPPUNIT_ASSERT_DOUBLES_EQUAL (ref_vco.get_phase(), new_vco.get_phase(), SIN_COS_TOLERANCE);
- // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, ref_vco.get_phase()-new_vco.get_phase());
-}
-
-void
-qa_gr_fxpt_vco::t2 ()
-{
-}
-
-void
-qa_gr_fxpt_vco::t3 ()
-{
-}
diff --git a/gnuradio-runtime/lib/qa_gr_fxpt_vco.h b/gnuradio-runtime/lib/qa_gr_fxpt_vco.h
deleted file mode 100644
index fab8022e36..0000000000
--- a/gnuradio-runtime/lib/qa_gr_fxpt_vco.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_QA_GR_FXPT_VCO_H
-#define INCLUDED_QA_GR_FXPT_VCO_H
-
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_fxpt_vco : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_fxpt_vco);
- CPPUNIT_TEST (t0);
- CPPUNIT_TEST (t1);
- CPPUNIT_TEST (t2);
- CPPUNIT_TEST (t3);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void t0 ();
- void t1 ();
- void t2 ();
- void t3 ();
-
-};
-
-#endif /* INCLUDED_QA_GR_FXPT_VCO_H */
-
-
diff --git a/gnuradio-runtime/lib/qa_gr_io_signature.cc b/gnuradio-runtime/lib/qa_gr_io_signature.cc
deleted file mode 100644
index c1737ffb8e..0000000000
--- a/gnuradio-runtime/lib/qa_gr_io_signature.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <qa_gr_io_signature.h>
-#include <gr_io_signature.h>
-
-void
-qa_gr_io_signature::t0 ()
-{
- gr_make_io_signature (1, 1, sizeof (int));
-}
-
-void
-qa_gr_io_signature::t1 ()
-{
- gr_make_io_signature (3, 1, sizeof (int)); // throws std::invalid_argument
-}
-
-void
-qa_gr_io_signature::t2 ()
-{
- gr_io_signature_sptr p =
- gr_make_io_signature (3, gr_io_signature::IO_INFINITE, sizeof (int));
-
- CPPUNIT_ASSERT_EQUAL (p->min_streams (), 3);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item (0), (int) sizeof (int));
-}
-
-void
-qa_gr_io_signature::t3 ()
-{
- gr_io_signature_sptr p =
- gr_make_io_signature3 (0, 5, 1, 2, 3);
-
- CPPUNIT_ASSERT_EQUAL (p->min_streams (), 0);
- CPPUNIT_ASSERT_EQUAL (p->max_streams (), 5);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item(0), 1);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item(1), 2);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item(2), 3);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item(3), 3);
- CPPUNIT_ASSERT_EQUAL (p->sizeof_stream_item(4), 3);
-}
diff --git a/gnuradio-runtime/lib/qa_gr_io_signature.h b/gnuradio-runtime/lib/qa_gr_io_signature.h
deleted file mode 100644
index 9cd6bb5247..0000000000
--- a/gnuradio-runtime/lib/qa_gr_io_signature.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_QA_GR_IO_SIGNATURE_H
-#define INCLUDED_QA_GR_IO_SIGNATURE_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-#include <stdexcept>
-
-class qa_gr_io_signature : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_io_signature);
- CPPUNIT_TEST (t0);
- CPPUNIT_TEST_EXCEPTION (t1, std::invalid_argument);
- CPPUNIT_TEST (t2);
- CPPUNIT_TEST (t3);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void t0 ();
- void t1 ();
- void t2 ();
- void t3 ();
-};
-
-#endif /* INCLUDED_QA_GR_IO_SIGNATURE_H */
diff --git a/gnuradio-runtime/lib/qa_gr_logger.cc b/gnuradio-runtime/lib/qa_gr_logger.cc
deleted file mode 100644
index a8e4a1d766..0000000000
--- a/gnuradio-runtime/lib/qa_gr_logger.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * This class gathers together all the test cases for the example
- * directory into a single test suite. As you create new test cases,
- * add them here.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qa_gr_logger.h>
-#include <gr_logger.h>
-
-void
-qa_gr_logger::t1()
-{
-#ifdef ENABLE_GR_LOG
- // This doesn't really test anything, more just
- // making sure nothing's gone horribly wrong.
-
- GR_LOG_GETLOGGER(LOG,"main");
- GR_ADD_CONSOLE_APPENDER("main","cout","%d{%H:%M:%S} : %m%n");
- GR_LOG_NOTICE(LOG,"test from c++ NOTICE");
- GR_LOG_DEBUG(LOG,"test from c++ DEBUG");
- GR_LOG_INFO(LOG,"test from c++ INFO");
- GR_LOG_WARN(LOG,"test from c++ WARN");
- GR_LOG_ERROR(LOG,"test from c++ ERROR");
- GR_LOG_FATAL(LOG,"test from c++ FATAL");
- CPPUNIT_ASSERT(true);
-#endif
-}
diff --git a/gnuradio-runtime/lib/qa_gr_logger.h b/gnuradio-runtime/lib/qa_gr_logger.h
deleted file mode 100644
index b0d3711523..0000000000
--- a/gnuradio-runtime/lib/qa_gr_logger.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Example Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Example Public License for more details.
- *
- * You should have received a copy of the GNU Example Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_QA_GR_LOG_H
-#define INCLUDED_QA_GR_LOG_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestSuite.h>
-
-//! collect all the tests for the example directory
-
-class qa_gr_logger : public CppUnit::TestCase {
- public:
- CPPUNIT_TEST_SUITE(qa_gr_logger);
- CPPUNIT_TEST(t1);
- CPPUNIT_TEST_SUITE_END();
-
- private:
- void t1();
-
-};
-
-#endif /* INCLUDED_QA_GR_LOG_H */
diff --git a/gnuradio-runtime/lib/qa_gr_math.cc b/gnuradio-runtime/lib/qa_gr_math.cc
deleted file mode 100644
index 74d51b536e..0000000000
--- a/gnuradio-runtime/lib/qa_gr_math.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_math.h>
-#include <qa_gr_math.h>
-#include <cppunit/TestAssert.h>
-#include <stdio.h>
-
-void
-qa_gr_math::test_binary_slicer1 ()
-{
- float x[5] = {-1, -0.5, 0, 0.5, 1.0};
- unsigned int z[5] = {0, 0, 1, 1, 1};
- unsigned int y;
-
- //printf("\nBinary\n");
- for (unsigned int i = 0; i < 5; i++) {
- y = gr_binary_slicer(x[i]);
- //printf("in: %f out: %d desired: %d\n", x[i], y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-
- //printf("\nBranchless Binary\n");
- for (unsigned int i = 0; i < 5; i++) {
- y = gr_branchless_binary_slicer(x[i]);
- //printf("in: %f out: %d desired: %d\n", x[i], y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-}
-
-void
-qa_gr_math::test_quad_0deg_slicer1 ()
-{
- gr_complex x[4] = {gr_complex(1, 0),
- gr_complex(0, 1),
- gr_complex(-1, 0),
- gr_complex(0, -1)};
-
- unsigned int z[4] = {0, 1, 2, 3};
- unsigned int y;
-
- //printf("\nQuad0\n");
- for (unsigned int i = 0; i < 4; i++) {
- y = gr_quad_0deg_slicer(x[i]);
- //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-
- //printf("\nBranchless Quad0\n");
- for (unsigned int i = 0; i < 4; i++) {
- y = gr_branchless_quad_0deg_slicer(x[i]);
- //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-}
-
-void
-qa_gr_math::test_quad_45deg_slicer1 ()
-{
- gr_complex x[4] = {gr_complex(0.707, 0.707),
- gr_complex(-0.707, 0.707),
- gr_complex(-0.707, -0.707),
- gr_complex(0.707, -0.707)};
-
- unsigned int z[4] = {0, 1, 2, 3};
- unsigned int y;
-
- //printf("\nQuad45\n");
- for (unsigned int i = 0; i < 4; i++) {
- y = gr_quad_45deg_slicer(x[i]);
- //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-
- //printf("\nBranchless Quad45\n");
- for (unsigned int i = 0; i < 4; i++) {
- y = gr_branchless_quad_45deg_slicer(x[i]);
- //printf("in: %.4f+j%.4f out: %d desired: %d\n", x[i].real(), x[i].imag(), y, z[i]);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(y, z[i], 1e-9);
- }
-}
diff --git a/gnuradio-runtime/lib/qa_gr_math.h b/gnuradio-runtime/lib/qa_gr_math.h
deleted file mode 100644
index 86858c03d5..0000000000
--- a/gnuradio-runtime/lib/qa_gr_math.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _QA_GR_MATH_H_
-#define _QA_GR_MATH_H_
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_math : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE(qa_gr_math);
- CPPUNIT_TEST(test_binary_slicer1);
- CPPUNIT_TEST(test_quad_0deg_slicer1);
- CPPUNIT_TEST(test_quad_45deg_slicer1);
- CPPUNIT_TEST_SUITE_END();
-
- private:
- void test_binary_slicer1();
- void test_quad_0deg_slicer1();
- void test_quad_45deg_slicer1();
-};
-
-#endif /* _QA_GR_MATH_H_ */
diff --git a/gnuradio-runtime/lib/qa_gr_vmcircbuf.cc b/gnuradio-runtime/lib/qa_gr_vmcircbuf.cc
deleted file mode 100644
index e3b36d8829..0000000000
--- a/gnuradio-runtime/lib/qa_gr_vmcircbuf.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qa_gr_vmcircbuf.h>
-#include <cppunit/TestAssert.h>
-#include <gr_vmcircbuf.h>
-#include <stdio.h>
-
-void
-qa_gr_vmcircbuf::test_all ()
-{
- int verbose = 1; // summary
-
- bool ok = gr_vmcircbuf_sysconfig::test_all_factories (verbose);
-
- CPPUNIT_ASSERT_EQUAL (true, ok);
-}
diff --git a/gnuradio-runtime/lib/qa_gr_vmcircbuf.h b/gnuradio-runtime/lib/qa_gr_vmcircbuf.h
deleted file mode 100644
index 3576660d5a..0000000000
--- a/gnuradio-runtime/lib/qa_gr_vmcircbuf.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef _QA_GR_VMCIRCBUF_H_
-#define _QA_GR_VMCIRCBUF_H_
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gr_vmcircbuf : public CppUnit::TestCase {
-
- CPPUNIT_TEST_SUITE (qa_gr_vmcircbuf);
- CPPUNIT_TEST (test_all);
- CPPUNIT_TEST_SUITE_END ();
-
- private:
- void test_all ();
-};
-
-
-#endif /* _QA_GR_VMCIRCBUF_H_ */
diff --git a/gnuradio-runtime/lib/qa_io_signature.cc b/gnuradio-runtime/lib/qa_io_signature.cc
new file mode 100644
index 0000000000..bc3509a260
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_io_signature.cc
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_io_signature.h>
+#include <gnuradio/io_signature.h>
+
+void
+qa_io_signature::t0()
+{
+ gr::io_signature::make(1, 1, sizeof(int));
+}
+
+void
+qa_io_signature::t1()
+{
+ gr::io_signature::make(3, 1, sizeof(int)); // throws std::invalid_argument
+}
+
+void
+qa_io_signature::t2()
+{
+ gr::io_signature::sptr p =
+ gr::io_signature::make(3, gr::io_signature::IO_INFINITE, sizeof(int));
+
+ CPPUNIT_ASSERT_EQUAL(p->min_streams(), 3);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(0), (int)sizeof(int));
+}
+
+void
+qa_io_signature::t3()
+{
+ gr::io_signature::sptr p =
+ gr::io_signature::make3(0, 5, 1, 2, 3);
+
+ CPPUNIT_ASSERT_EQUAL(p->min_streams(), 0);
+ CPPUNIT_ASSERT_EQUAL(p->max_streams(), 5);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(0), 1);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(1), 2);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(2), 3);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(3), 3);
+ CPPUNIT_ASSERT_EQUAL(p->sizeof_stream_item(4), 3);
+}
diff --git a/gnuradio-runtime/lib/qa_io_signature.h b/gnuradio-runtime/lib/qa_io_signature.h
new file mode 100644
index 0000000000..981ad03b59
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_io_signature.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_IO_SIGNATURE_H
+#define INCLUDED_QA_GR_IO_SIGNATURE_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+#include <stdexcept>
+
+class qa_io_signature : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_io_signature);
+ CPPUNIT_TEST(t0);
+ CPPUNIT_TEST_EXCEPTION(t1, std::invalid_argument);
+ CPPUNIT_TEST(t2);
+ CPPUNIT_TEST(t3);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+ void t0();
+ void t1();
+ void t2();
+ void t3();
+};
+
+#endif /* INCLUDED_QA_GR_IO_SIGNATURE_H */
diff --git a/gnuradio-runtime/lib/qa_logger.cc b/gnuradio-runtime/lib/qa_logger.cc
new file mode 100644
index 0000000000..b147b36da1
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_logger.cc
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * This class gathers together all the test cases for the example
+ * directory into a single test suite. As you create new test cases,
+ * add them here.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_logger.h>
+#include <gnuradio/logger.h>
+
+void
+qa_logger::t1()
+{
+#ifdef ENABLE_GR_LOG
+ // This doesn't really test anything, more just
+ // making sure nothing's gone horribly wrong.
+
+ GR_LOG_GETLOGGER(LOG,"main");
+ GR_ADD_CONSOLE_APPENDER("main","cout","%d{%H:%M:%S} : %m%n");
+ GR_LOG_NOTICE(LOG,"test from c++ NOTICE");
+ GR_LOG_DEBUG(LOG,"test from c++ DEBUG");
+ GR_LOG_INFO(LOG,"test from c++ INFO");
+ GR_LOG_WARN(LOG,"test from c++ WARN");
+ GR_LOG_ERROR(LOG,"test from c++ ERROR");
+ GR_LOG_FATAL(LOG,"test from c++ FATAL");
+ CPPUNIT_ASSERT(true);
+#endif
+}
diff --git a/gnuradio-runtime/lib/qa_logger.h b/gnuradio-runtime/lib/qa_logger.h
new file mode 100644
index 0000000000..35f7f1f6c4
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_logger.h
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Example Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Example Public License for more details.
+ *
+ * You should have received a copy of the GNU Example Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QA_GR_LOG_H
+#define INCLUDED_QA_GR_LOG_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestSuite.h>
+
+//! collect all the tests for the example directory
+
+class qa_logger : public CppUnit::TestCase
+{
+public:
+ CPPUNIT_TEST_SUITE(qa_logger);
+ CPPUNIT_TEST(t1);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+ void t1();
+};
+
+#endif /* INCLUDED_QA_GR_LOG_H */
diff --git a/gnuradio-runtime/lib/qa_runtime.cc b/gnuradio-runtime/lib/qa_runtime.cc
index b15051c2ad..dbf7e5bb9a 100644
--- a/gnuradio-runtime/lib/qa_runtime.cc
+++ b/gnuradio-runtime/lib/qa_runtime.cc
@@ -30,32 +30,32 @@
#endif
#include <qa_runtime.h>
-#include <qa_gr_buffer.h>
-#include <qa_gr_circular_file.h>
-#include <qa_gr_fxpt.h>
-#include <qa_gr_fxpt_nco.h>
-#include <qa_gr_fxpt_vco.h>
-#include <qa_gr_io_signature.h>
-#include <qa_gr_logger.h>
-#include <qa_gr_math.h>
-#include <qa_gr_vmcircbuf.h>
+#include <qa_buffer.h>
+#include <qa_io_signature.h>
+#include <qa_circular_file.h>
+#include <qa_fxpt.h>
+#include <qa_fxpt_nco.h>
+#include <qa_fxpt_vco.h>
+#include <qa_logger.h>
+#include <qa_math.h>
+#include <qa_vmcircbuf.h>
#include <qa_sincos.h>
CppUnit::TestSuite *
-qa_runtime::suite ()
+qa_runtime::suite()
{
- CppUnit::TestSuite *s = new CppUnit::TestSuite ("runtime");
+ CppUnit::TestSuite *s = new CppUnit::TestSuite("runtime");
- s->addTest (qa_gr_buffer::suite ());
- s->addTest (qa_gr_circular_file::suite ());
- s->addTest (qa_gr_fxpt::suite ());
- s->addTest (qa_gr_fxpt_nco::suite ());
- s->addTest (qa_gr_fxpt_vco::suite ());
- s->addTest (qa_gr_io_signature::suite ());
- s->addTest (qa_gr_logger::suite ());
- s->addTest (qa_gr_math::suite ());
- s->addTest (qa_gr_vmcircbuf::suite ());
- s->addTest (qa_sincos::suite ());
+ s->addTest(qa_buffer::suite());
+ s->addTest(qa_io_signature::suite());
+ s->addTest(qa_circular_file::suite());
+ s->addTest(qa_fxpt::suite());
+ s->addTest(qa_fxpt_nco::suite());
+ s->addTest(qa_fxpt_vco::suite());
+ s->addTest(qa_logger::suite());
+ s->addTest(qa_math::suite());
+ s->addTest(qa_vmcircbuf::suite());
+ s->addTest(qa_sincos::suite());
return s;
}
diff --git a/gnuradio-runtime/lib/qa_runtime.h b/gnuradio-runtime/lib/qa_runtime.h
index b03e3db721..a1e58190d6 100644
--- a/gnuradio-runtime/lib/qa_runtime.h
+++ b/gnuradio-runtime/lib/qa_runtime.h
@@ -23,7 +23,7 @@
#ifndef _QA_RUNTIME_H_
#define _QA_RUNTIME_H_
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the runtime directory
diff --git a/gnuradio-runtime/lib/qa_sincos.cc b/gnuradio-runtime/lib/qa_sincos.cc
deleted file mode 100644
index be163117de..0000000000
--- a/gnuradio-runtime/lib/qa_sincos.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qa_sincos.h>
-#include <gr_sincos.h>
-#include <attributes.h>
-#include <cppunit/TestAssert.h>
-#include <cmath>
-
-void
-qa_sincos::t1()
-{
- static const unsigned int N = 1000;
- double c_sin, c_cos;
- double gr_sin, gr_cos;
-
- for(unsigned i = 0; i < N; i++) {
- double x = i/100.0;
- c_sin = sin(x);
- c_cos = cos(x);
-
- gr_sincos(x, &gr_sin, &gr_cos);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
- }
-}
-
-void
-qa_sincos::t2()
-{
- static const unsigned int N = 1000;
- float c_sin, c_cos;
- float gr_sin, gr_cos;
-
- for(unsigned i = 0; i < N; i++) {
- float x = i/100.0;
- c_sin = sinf(x);
- c_cos = cosf(x);
-
- gr_sincosf(x, &gr_sin, &gr_cos);
-
- CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
- }
-}
diff --git a/gnuradio-runtime/lib/qa_sincos.h b/gnuradio-runtime/lib/qa_sincos.h
deleted file mode 100644
index c54b75f97f..0000000000
--- a/gnuradio-runtime/lib/qa_sincos.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _QA_SINCOS_H_
-#define _QA_SINCOS_H_
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_sincos : public CppUnit::TestCase
-{
- CPPUNIT_TEST_SUITE(qa_sincos);
- CPPUNIT_TEST(t1);
- CPPUNIT_TEST(t2);
- CPPUNIT_TEST_SUITE_END();
-
-private:
- void t1();
- void t2();
-};
-
-#endif /* _QA_SINCOS_H_ */
diff --git a/gnuradio-runtime/lib/qa_vmcircbuf.cc b/gnuradio-runtime/lib/qa_vmcircbuf.cc
new file mode 100644
index 0000000000..7301b4cf17
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_vmcircbuf.cc
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qa_vmcircbuf.h>
+#include <cppunit/TestAssert.h>
+#include "vmcircbuf.h"
+#include <stdio.h>
+
+void
+qa_vmcircbuf::test_all()
+{
+ int verbose = 1; // summary
+
+ bool ok = gr::vmcircbuf_sysconfig::test_all_factories(verbose);
+
+ CPPUNIT_ASSERT_EQUAL(true, ok);
+}
diff --git a/gnuradio-runtime/lib/qa_vmcircbuf.h b/gnuradio-runtime/lib/qa_vmcircbuf.h
new file mode 100644
index 0000000000..93f46cf4a8
--- /dev/null
+++ b/gnuradio-runtime/lib/qa_vmcircbuf.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef QA_GR_VMCIRCBUF_H
+#define QA_GR_VMCIRCBUF_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
+
+class qa_vmcircbuf : public CppUnit::TestCase
+{
+ CPPUNIT_TEST_SUITE(qa_vmcircbuf);
+ CPPUNIT_TEST(test_all);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void test_all();
+};
+
+#endif /* QA_GR_VMCIRCBUF_H */
diff --git a/gnuradio-runtime/lib/random.h b/gnuradio-runtime/lib/random.h
deleted file mode 100644
index c643c3e422..0000000000
--- a/gnuradio-runtime/lib/random.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003, 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _RANDOM_H_
-#define _RANDOM_H_
-
-// While rand(3) specifies RAND_MAX, random(3) says that the output
-// ranges from 0 to 2^31-1 but does not specify a macro to denote
-// this. We define RANDOM_MAX for cleanliness. We must omit the
-// definition for systems that have made the same choice. (Note that
-// random(3) is from 4.2BSD, and not specified by POSIX.)
-
-#ifndef RANDOM_MAX
-static const int RANDOM_MAX = 2147483647; // 2^31-1
-#endif /* RANDOM_MAX */
-
-#include <stdlib.h>
-
-#endif // _RANDOM_H_
diff --git a/gnuradio-runtime/lib/realtime.cc b/gnuradio-runtime/lib/realtime.cc
index 5dadc26bbd..81f92ae488 100644
--- a/gnuradio-runtime/lib/realtime.cc
+++ b/gnuradio-runtime/lib/realtime.cc
@@ -24,155 +24,14 @@
#include <config.h>
#endif
-#include <realtime.h>
-
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-#include <algorithm>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-
-#if defined(HAVE_PTHREAD_SETSCHEDPARAM) || defined(HAVE_SCHED_SETSCHEDULER)
-#include <pthread.h>
-
-namespace gr {
-
- /*!
- * Rescale our virtual priority so that it maps to the middle 1/2 of
- * the priorities given by min_real_pri and max_real_pri.
- */
- static int
- rescale_virtual_pri(int virtual_pri, int min_real_pri, int max_real_pri)
- {
- float rmin = min_real_pri + (0.25 * (max_real_pri - min_real_pri));
- float rmax = min_real_pri + (0.75 * (max_real_pri - min_real_pri));
- float m = (rmax - rmin) / (rt_priority_max() - rt_priority_min());
- float y = m * (virtual_pri - rt_priority_min()) + rmin;
- int y_int = static_cast<int>(rint(y));
- return std::max(min_real_pri, std::min(max_real_pri, y_int));
- }
-
-} // namespace gr
-
-#endif
-
-
-#if defined(HAVE_PTHREAD_SETSCHEDPARAM)
-
-namespace gr {
-
- rt_status_t
- enable_realtime_scheduling(rt_sched_param p)
- {
- int policy = p.policy == RT_SCHED_FIFO ? SCHED_FIFO : SCHED_RR;
- int min_real_pri = sched_get_priority_min(policy);
- int max_real_pri = sched_get_priority_max(policy);
- int pri = rescale_virtual_pri(p.priority, min_real_pri, max_real_pri);
-
- // FIXME check hard and soft limits with getrlimit, and limit the value we ask for.
- // fprintf(stderr, "pthread_setschedparam: policy = %d, pri = %d\n", policy, pri);
-
- struct sched_param param;
- memset (¶m, 0, sizeof (param));
- param.sched_priority = pri;
- int result = pthread_setschedparam (pthread_self(), policy, ¶m);
- if (result != 0) {
- if (result == EPERM) // N.B., return value, not errno
- return RT_NO_PRIVS;
- else {
- fprintf(stderr,
- "pthread_setschedparam: failed to set real time priority: %s\n",
- strerror(result));
- return RT_OTHER_ERROR;
- }
- }
-
- //printf("SCHED_FIFO enabled with priority = %d\n", pri);
- return RT_OK;
- }
-} // namespace gr
-
-
-#elif defined(HAVE_SCHED_SETSCHEDULER)
-
-namespace gr {
-
- rt_status_t
- enable_realtime_scheduling(rt_sched_param p)
- {
- int policy = p.policy == RT_SCHED_FIFO ? SCHED_FIFO : SCHED_RR;
- int min_real_pri = sched_get_priority_min(policy);
- int max_real_pri = sched_get_priority_max(policy);
- int pri = rescale_virtual_pri(p.priority, min_real_pri, max_real_pri);
-
- // FIXME check hard and soft limits with getrlimit, and limit the value we ask for.
- // fprintf(stderr, "sched_setscheduler: policy = %d, pri = %d\n", policy, pri);
-
- int pid = 0; // this process
- struct sched_param param;
- memset(¶m, 0, sizeof(param));
- param.sched_priority = pri;
- int result = sched_setscheduler(pid, policy, ¶m);
- if (result != 0){
- if (errno == EPERM)
- return RT_NO_PRIVS;
- else {
- perror ("sched_setscheduler: failed to set real time priority");
- return RT_OTHER_ERROR;
- }
- }
-
- //printf("SCHED_FIFO enabled with priority = %d\n", pri);
- return RT_OK;
- }
-
-} // namespace gr
-
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-
-#include <windows.h>
-
-namespace gr {
-
- rt_status_t enable_realtime_scheduling(rt_sched_param p){
-
- //set the priority class on the process
- int pri_class = (true)? REALTIME_PRIORITY_CLASS : NORMAL_PRIORITY_CLASS;
- if (SetPriorityClass(GetCurrentProcess(), pri_class) == 0)
- return RT_OTHER_ERROR;
-
- //scale the priority value to the constants
- int priorities[] = {
- THREAD_PRIORITY_IDLE, THREAD_PRIORITY_LOWEST, THREAD_PRIORITY_BELOW_NORMAL, THREAD_PRIORITY_NORMAL,
- THREAD_PRIORITY_ABOVE_NORMAL, THREAD_PRIORITY_HIGHEST, THREAD_PRIORITY_TIME_CRITICAL
- };
- const double priority = double(p.priority)/(rt_priority_max() - rt_priority_min());
- size_t pri_index = size_t((priority+1.0)*6/2.0); // -1 -> 0, +1 -> 6
- pri_index %= sizeof(priorities)/sizeof(*priorities); //range check
-
- //set the thread priority on the thread
- if (SetThreadPriority(GetCurrentThread(), priorities[pri_index]) == 0)
- return RT_OTHER_ERROR;
-
- //printf("SetPriorityClass + SetThreadPriority\n");
- return RT_OK;
- }
-
-} // namespace gr
-
-#else
+#include <gnuradio/realtime.h>
namespace gr {
-
+
rt_status_t
- enable_realtime_scheduling(rt_sched_param p)
+ enable_realtime_scheduling()
{
- return RT_NOT_IMPLEMENTED;
+ return enable_realtime_scheduling();
}
-} // namespace gr
-#endif
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/realtime_impl.cc b/gnuradio-runtime/lib/realtime_impl.cc
new file mode 100644
index 0000000000..5dadc26bbd
--- /dev/null
+++ b/gnuradio-runtime/lib/realtime_impl.cc
@@ -0,0 +1,178 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <realtime.h>
+
+#ifdef HAVE_SCHED_H
+#include <sched.h>
+#endif
+
+#include <algorithm>
+#include <math.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#if defined(HAVE_PTHREAD_SETSCHEDPARAM) || defined(HAVE_SCHED_SETSCHEDULER)
+#include <pthread.h>
+
+namespace gr {
+
+ /*!
+ * Rescale our virtual priority so that it maps to the middle 1/2 of
+ * the priorities given by min_real_pri and max_real_pri.
+ */
+ static int
+ rescale_virtual_pri(int virtual_pri, int min_real_pri, int max_real_pri)
+ {
+ float rmin = min_real_pri + (0.25 * (max_real_pri - min_real_pri));
+ float rmax = min_real_pri + (0.75 * (max_real_pri - min_real_pri));
+ float m = (rmax - rmin) / (rt_priority_max() - rt_priority_min());
+ float y = m * (virtual_pri - rt_priority_min()) + rmin;
+ int y_int = static_cast<int>(rint(y));
+ return std::max(min_real_pri, std::min(max_real_pri, y_int));
+ }
+
+} // namespace gr
+
+#endif
+
+
+#if defined(HAVE_PTHREAD_SETSCHEDPARAM)
+
+namespace gr {
+
+ rt_status_t
+ enable_realtime_scheduling(rt_sched_param p)
+ {
+ int policy = p.policy == RT_SCHED_FIFO ? SCHED_FIFO : SCHED_RR;
+ int min_real_pri = sched_get_priority_min(policy);
+ int max_real_pri = sched_get_priority_max(policy);
+ int pri = rescale_virtual_pri(p.priority, min_real_pri, max_real_pri);
+
+ // FIXME check hard and soft limits with getrlimit, and limit the value we ask for.
+ // fprintf(stderr, "pthread_setschedparam: policy = %d, pri = %d\n", policy, pri);
+
+ struct sched_param param;
+ memset (¶m, 0, sizeof (param));
+ param.sched_priority = pri;
+ int result = pthread_setschedparam (pthread_self(), policy, ¶m);
+ if (result != 0) {
+ if (result == EPERM) // N.B., return value, not errno
+ return RT_NO_PRIVS;
+ else {
+ fprintf(stderr,
+ "pthread_setschedparam: failed to set real time priority: %s\n",
+ strerror(result));
+ return RT_OTHER_ERROR;
+ }
+ }
+
+ //printf("SCHED_FIFO enabled with priority = %d\n", pri);
+ return RT_OK;
+ }
+} // namespace gr
+
+
+#elif defined(HAVE_SCHED_SETSCHEDULER)
+
+namespace gr {
+
+ rt_status_t
+ enable_realtime_scheduling(rt_sched_param p)
+ {
+ int policy = p.policy == RT_SCHED_FIFO ? SCHED_FIFO : SCHED_RR;
+ int min_real_pri = sched_get_priority_min(policy);
+ int max_real_pri = sched_get_priority_max(policy);
+ int pri = rescale_virtual_pri(p.priority, min_real_pri, max_real_pri);
+
+ // FIXME check hard and soft limits with getrlimit, and limit the value we ask for.
+ // fprintf(stderr, "sched_setscheduler: policy = %d, pri = %d\n", policy, pri);
+
+ int pid = 0; // this process
+ struct sched_param param;
+ memset(¶m, 0, sizeof(param));
+ param.sched_priority = pri;
+ int result = sched_setscheduler(pid, policy, ¶m);
+ if (result != 0){
+ if (errno == EPERM)
+ return RT_NO_PRIVS;
+ else {
+ perror ("sched_setscheduler: failed to set real time priority");
+ return RT_OTHER_ERROR;
+ }
+ }
+
+ //printf("SCHED_FIFO enabled with priority = %d\n", pri);
+ return RT_OK;
+ }
+
+} // namespace gr
+
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#include <windows.h>
+
+namespace gr {
+
+ rt_status_t enable_realtime_scheduling(rt_sched_param p){
+
+ //set the priority class on the process
+ int pri_class = (true)? REALTIME_PRIORITY_CLASS : NORMAL_PRIORITY_CLASS;
+ if (SetPriorityClass(GetCurrentProcess(), pri_class) == 0)
+ return RT_OTHER_ERROR;
+
+ //scale the priority value to the constants
+ int priorities[] = {
+ THREAD_PRIORITY_IDLE, THREAD_PRIORITY_LOWEST, THREAD_PRIORITY_BELOW_NORMAL, THREAD_PRIORITY_NORMAL,
+ THREAD_PRIORITY_ABOVE_NORMAL, THREAD_PRIORITY_HIGHEST, THREAD_PRIORITY_TIME_CRITICAL
+ };
+ const double priority = double(p.priority)/(rt_priority_max() - rt_priority_min());
+ size_t pri_index = size_t((priority+1.0)*6/2.0); // -1 -> 0, +1 -> 6
+ pri_index %= sizeof(priorities)/sizeof(*priorities); //range check
+
+ //set the thread priority on the thread
+ if (SetThreadPriority(GetCurrentThread(), priorities[pri_index]) == 0)
+ return RT_OTHER_ERROR;
+
+ //printf("SetPriorityClass + SetThreadPriority\n");
+ return RT_OK;
+ }
+
+} // namespace gr
+
+#else
+
+namespace gr {
+
+ rt_status_t
+ enable_realtime_scheduling(rt_sched_param p)
+ {
+ return RT_NOT_IMPLEMENTED;
+ }
+} // namespace gr
+
+#endif
diff --git a/gnuradio-runtime/lib/rpcmanager.cc b/gnuradio-runtime/lib/rpcmanager.cc
deleted file mode 100644
index 4d164b63f3..0000000000
--- a/gnuradio-runtime/lib/rpcmanager.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcmanager.h>
-#include <iostream>
-#include <stdexcept>
-
-bool rpcmanager::booter_registered(false);
-bool rpcmanager::aggregator_registered(false);
-rpcserver_booter_base* rpcmanager::boot(0);
-std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
-
-rpcmanager::rpcmanager() {;}
-
-rpcmanager::~rpcmanager()
-{
- if(boot)
- delete boot;
-}
-
-rpcserver_booter_base*
-rpcmanager::get()
-{
- if(aggregator_registered) {
- return aggregator.get();
- }
- else if(booter_registered) {
- return boot;
- }
- assert(booter_registered || aggregator_registered);
- return boot;
-}
-
-void
-rpcmanager::register_booter(rpcserver_booter_base* booter)
-{
- if(make_aggregator && !aggregator_registered) {
- aggregator.reset(new rpcserver_booter_aggregator());
- aggregator_registered = true;
- }
-
- if(aggregator_registered) {
- rpcmanager::rpcserver_booter_base_sptr bootreg(booter);
- aggregator->agg()->registerServer(bootreg);
- }
- else if(!booter_registered) {
- boot = booter;
- booter_registered = true;
- }
- else {
- throw std::runtime_error("rpcmanager: Aggregator not in use, and a rpc booter is already registered\n");
- }
-}
diff --git a/gnuradio-runtime/lib/rpcpmtconverters_ice.cc b/gnuradio-runtime/lib/rpcpmtconverters_ice.cc
deleted file mode 100644
index 7c8b6041e9..0000000000
--- a/gnuradio-runtime/lib/rpcpmtconverters_ice.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcpmtconverters_ice.h>
-#include <Ice/Ice.h>
-#include <gnuradio.h>
-
-GNURadio::KnobPtr
-rpcpmtconverter::from_pmt(const pmt::pmt_t& knob, const Ice::Current& c)
-{
- if(pmt::is_real(knob)) {
- return new GNURadio::KnobD(Ice::Double(pmt::to_double(knob)));
- }
- else if(pmt::is_symbol(knob)) {
- std::string stuff = pmt::symbol_to_string(knob);
- return new GNURadio::KnobS(stuff);
- }
- else if(pmt::is_integer(knob)) {
- return new GNURadio::KnobI(pmt::to_long(knob));
- }
- else if(pmt::is_bool(knob)) {
- return new GNURadio::KnobB(pmt::to_bool(knob));
- }
- else if(pmt::is_uint64(knob)) {
- return new GNURadio::KnobL(pmt::to_uint64(knob));
- //const std::complex<float> *c32vector_elements(pmt_t v, size_t &len); //< len is in elements
- }
- else if(pmt::is_c32vector(knob)) { // c32 sent as interleaved floats
- size_t size(pmt::length(knob));
- const float* start((const float*) pmt::c32vector_elements(knob,size));
- return new GNURadio::KnobVecF(std::vector<float>(start,start+size*2));
- }
- else if (pmt::is_s32vector(knob)) {
- size_t size(pmt::length(knob));
- const int* start((const int*) pmt::s32vector_elements(knob,size));
- return new GNURadio::KnobVecI(std::vector<int>(start,start+size));
- }
- else if(pmt::is_f32vector(knob)) {
- size_t size(pmt::length(knob));
- const float* start((const float*) pmt::f32vector_elements(knob,size));
- return new GNURadio::KnobVecF(std::vector<float>(start,start+size));
- }
- else if (pmt::is_u8vector(knob)) {
- size_t size(pmt::length(knob));
- const uint8_t* start((const uint8_t*) pmt::u8vector_elements(knob,size));
- return new GNURadio::KnobVecC(std::vector<Ice::Byte>(start,start+size));
- }
- else {
- std::cerr << "Error: Don't know how to handle Knob Type (from): " << std::endl; assert(0);}
- //TODO: VECTORS!!!
- return new GNURadio::Knob();
-}
-
-pmt::pmt_t
-rpcpmtconverter::to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c)
-{
- std::string id(knob->ice_id(c).substr(12));
- if(id == "KnobD") {
- GNURadio::KnobDPtr k(GNURadio::KnobDPtr::dynamicCast(knob));
- return pmt::mp(k->value);
- }
- else if(id == "KnobF") {
- GNURadio::KnobFPtr k(GNURadio::KnobFPtr::dynamicCast(knob));
- return pmt::mp(k->value);
- }
- else if(id == "KnobI") {
- GNURadio::KnobIPtr k(GNURadio::KnobIPtr::dynamicCast(knob));
- return pmt::mp(k->value);
- }
- else if(id == "KnobS") {
- GNURadio::KnobSPtr k(GNURadio::KnobSPtr::dynamicCast(knob));
- return pmt::string_to_symbol(k->value);
- }
- else if(id == "KnobB") {
- GNURadio::KnobBPtr k(GNURadio::KnobBPtr::dynamicCast(knob));
- return pmt::mp(k->value);
- }
- else if(id == "KnobC") {
- GNURadio::KnobCPtr k(GNURadio::KnobCPtr::dynamicCast(knob));
- return pmt::mp(k->value);
- }
- else if(id == "KnobL") {
- GNURadio::KnobLPtr k(GNURadio::KnobLPtr::dynamicCast(knob));
- return pmt::mp((long)k->value);
- }
- else if(id == "KnobVecC") {
- GNURadio::KnobVecCPtr k(GNURadio::KnobVecCPtr::dynamicCast(knob));
- return pmt::init_u8vector(k->value.size(), &k->value[0]);
- }
- else if(id == "KnobVecI") {
- GNURadio::KnobVecIPtr k(GNURadio::KnobVecIPtr::dynamicCast(knob));
- return pmt::init_s32vector(k->value.size(), &k->value[0]);
- }
- //else if(id == "KnobVecF") {
- // GNURadio::KnobVecFPtr k(GNURadio::KnobVecFPtr::dynamicCast(knob));
- // return pmt::mp(k->value);
- //TODO: FLOAT!!!
- //TODO: VECTORS!!!
- else {
- std::cerr << "Error: Don't know how to handle Knob Type: " << id << std::endl; assert(0);
- }
-
- return pmt::pmt_t();
-}
diff --git a/gnuradio-runtime/lib/rpcserver_aggregator.cc b/gnuradio-runtime/lib/rpcserver_aggregator.cc
deleted file mode 100644
index d750d64905..0000000000
--- a/gnuradio-runtime/lib/rpcserver_aggregator.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcserver_aggregator.h>
-#include <rpcserver_booter_base.h>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-rpcserver_aggregator::rpcserver_aggregator()
- : d_type(std::string("aggregator"))
-{;}
-
-rpcserver_aggregator::~rpcserver_aggregator()
-{;}
-
-const std::string&
-rpcserver_aggregator::type()
-{
- return d_type;
-}
-
-const std::vector<std::string>&
-rpcserver_aggregator::registeredServers()
-{
- return d_registeredServers;
-}
-
-void
-rpcserver_aggregator::registerConfigureCallback(const std::string &id,
- const configureCallback_t callback)
-{
- std::for_each(d_serverlist.begin(), d_serverlist.end(),
- registerConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id, callback));
-}
-
-void
-rpcserver_aggregator::unregisterConfigureCallback(const std::string &id)
-{
- std::for_each(d_serverlist.begin(), d_serverlist.end(),
- unregisterConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id));
-}
-
-void
-rpcserver_aggregator::registerQueryCallback(const std::string &id, const queryCallback_t callback)
-{
- std::for_each(d_serverlist.begin(), d_serverlist.end(),
- registerQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id, callback));
-}
-
-void
-rpcserver_aggregator::unregisterQueryCallback(const std::string &id)
-{
- std::for_each(d_serverlist.begin(), d_serverlist.end(),
- unregisterQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id));
-}
-
-void
-rpcserver_aggregator::registerServer(rpcmanager_base::rpcserver_booter_base_sptr server)
-{
- std::vector<std::string>::iterator it(std::find(d_registeredServers.begin(),
- d_registeredServers.end(),
- server->type()));
- if(it != d_registeredServers.end()) {
- d_serverlist.push_back(server);
- d_registeredServers.push_back(server->type());
- }
- else {
- std::stringstream s;
- s << "rpcserver_aggregator::registerServer: server of type "
- << server->type() << " already registered" << std::endl;
- throw std::runtime_error(s.str().c_str());
- }
-}
diff --git a/gnuradio-runtime/lib/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/rpcserver_booter_aggregator.cc
deleted file mode 100644
index c4c1b03c15..0000000000
--- a/gnuradio-runtime/lib/rpcserver_booter_aggregator.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcserver_booter_aggregator.h>
-
-rpcserver_booter_aggregator::rpcserver_booter_aggregator() :
- d_type(std::string("aggregator")), server(new rpcserver_aggregator())
-{;}
-
-rpcserver_booter_aggregator::~rpcserver_booter_aggregator()
-{;}
-
-rpcserver_base*
-rpcserver_booter_aggregator::i()
-{
- return &(*server);
-}
-
-const std::string&
-rpcserver_booter_aggregator::type()
-{
- return d_type;
-}
-
-const std::vector<std::string>
-rpcserver_booter_aggregator::endpoints()
-{
- std::vector<std::string> ep;
- ep.push_back(std::string("TODO"));
- return ep;
-}
-
-const std::vector<std::string>&
-rpcserver_booter_aggregator::registeredServers()
-{
- return server->registeredServers();
-}
-
-rpcserver_aggregator*
-rpcserver_booter_aggregator::agg()
-{
- return &(*server);
-}
diff --git a/gnuradio-runtime/lib/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/rpcserver_booter_ice.cc
deleted file mode 100644
index 7cc8cc8938..0000000000
--- a/gnuradio-runtime/lib/rpcserver_booter_ice.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcserver_ice.h>
-#include <rpcserver_booter_ice.h>
-
-namespace {
- static const char* const CONTROL_PORT_CLASS("ice");
- static const char* const CONTROL_PORT_NAME("ControlPort");
- static const char* const ENDPOINT_NAME("gnuradio");
-};
-
-rpcserver_booter_ice::rpcserver_booter_ice() :
- ice_server_template<rpcserver_base, rpcserver_ice,
- rpcserver_booter_ice, GNURadio::ControlPortPtr>
- (this, std::string(CONTROL_PORT_NAME), std::string(ENDPOINT_NAME)),
- d_type(std::string(CONTROL_PORT_CLASS))
-{;}
-
-rpcserver_booter_ice::~rpcserver_booter_ice()
-{;}
-
-rpcserver_base*
-rpcserver_booter_ice::i()
-{
- return ice_server_template<rpcserver_base, rpcserver_ice,
- rpcserver_booter_ice, GNURadio::ControlPortPtr>::i();
-}
-
-const std::vector<std::string>
-rpcserver_booter_ice::endpoints()
-{
- return ice_server_template<rpcserver_base, rpcserver_ice,
- rpcserver_booter_ice, GNURadio::ControlPortPtr>::endpoints();
-}
diff --git a/gnuradio-runtime/lib/rpcserver_ice.cc b/gnuradio-runtime/lib/rpcserver_ice.cc
deleted file mode 100644
index 2454bf2580..0000000000
--- a/gnuradio-runtime/lib/rpcserver_ice.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcserver_ice.h>
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-#include <pmt/pmt.h>
-
-#define DEBUG 0
-
-using namespace rpcpmtconverter;
-
-rpcserver_ice::rpcserver_ice()
-{}
-
-rpcserver_ice::~rpcserver_ice()
-{}
-
-void
-rpcserver_ice::registerConfigureCallback(const std::string &id,
- const configureCallback_t callback)
-{
- {
- ConfigureCallbackMap_t::const_iterator iter(d_setcallbackmap.find(id));
- if(iter != d_setcallbackmap.end()) {
- std::stringstream s;
- s << "rpcserver_ice:: rpcserver_ice ERROR registering set, already registered: "
- << id << std::endl;
- throw std::runtime_error(s.str().c_str());
- }
- }
-
- if(DEBUG)
- std::cout << "rpcserver_ice registering set: " << id << std::endl;
-
- d_setcallbackmap.insert(ConfigureCallbackMap_t::value_type(id, callback));
-}
-
-void
-rpcserver_ice::unregisterConfigureCallback(const std::string &id)
-{
- ConfigureCallbackMap_t::iterator iter(d_setcallbackmap.find(id));
- if(iter == d_setcallbackmap.end()) {
- std::stringstream s;
- s << "rpcserver_ice:: rpcserver_ice ERROR unregistering set, not registered: "
- << id << std::endl;
- throw std::runtime_error(s.str().c_str());
- }
-
- if(DEBUG)
- std::cout << "rpcserver_ice unregistering set: " << id << std::endl;
-
- d_setcallbackmap.erase(iter);
-}
-
-void
-rpcserver_ice::registerQueryCallback(const std::string &id,
- const queryCallback_t callback)
-{
- {
- QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(id));
- if(iter != d_getcallbackmap.end()) {
- std::stringstream s;
- s << "rpcserver_ice:: rpcserver_ice ERROR registering get, already registered: "
- << id << std::endl;
- throw std::runtime_error(s.str().c_str());
- }
- }
-
- if(DEBUG)
- std::cout << "rpcserver_ice registering get: " << id << std::endl;
-
- d_getcallbackmap.insert(QueryCallbackMap_t::value_type(id, callback));
-}
-
-void
-rpcserver_ice::unregisterQueryCallback(const std::string &id)
-{
- QueryCallbackMap_t::iterator iter(d_getcallbackmap.find(id));
- if(iter == d_getcallbackmap.end()) {
- std::stringstream s;
- s << "rpcserver_ice:: rpcserver_ice ERROR unregistering get, registered: "
- << id << std::endl;
- throw std::runtime_error(s.str().c_str());
- }
-
- if(DEBUG)
- std::cout << "rpcserver_ice unregistering get: " << id << std::endl;
-
- d_getcallbackmap.erase(iter);
-}
-
-void
-rpcserver_ice::set(const GNURadio::KnobMap& knobs, const Ice::Current& c)
-{
- std::for_each(knobs.begin(), knobs.end(),
- set_f<GNURadio::KnobMap::value_type,ConfigureCallbackMap_t>
- (c, d_setcallbackmap, cur_priv));
-}
-
-GNURadio::KnobMap
-rpcserver_ice::get(const GNURadio::KnobIDList& knobs, const Ice::Current& c)
-{
- GNURadio::KnobMap outknobs;
-
- if(knobs.size() == 0) {
- std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(),
- get_all_f<QueryCallbackMap_t::value_type, QueryCallbackMap_t, GNURadio::KnobMap>
- (c, d_getcallbackmap, cur_priv, outknobs));
- }
- else {
- std::for_each(knobs.begin(), knobs.end(),
- get_f<GNURadio::KnobIDList::value_type, QueryCallbackMap_t>
- (c, d_getcallbackmap, cur_priv, outknobs));
- }
- return outknobs;
-}
-
-GNURadio::KnobPropMap
-rpcserver_ice::properties(const GNURadio::KnobIDList& knobs, const Ice::Current& c)
-{
- GNURadio::KnobPropMap outknobs;
-
- if(knobs.size() == 0) {
- std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(),
- properties_all_f<QueryCallbackMap_t::value_type,
- QueryCallbackMap_t,GNURadio::KnobPropMap>(c, d_getcallbackmap, cur_priv, outknobs));
- }
- else {
- std::for_each(knobs.begin(), knobs.end(),
- properties_f<GNURadio::KnobIDList::value_type,
- QueryCallbackMap_t, GNURadio::KnobPropMap>(c, d_getcallbackmap, cur_priv, outknobs));
- }
- return outknobs;
-}
-
-void
-rpcserver_ice::shutdown(const Ice::Current& c)
-{
- if(DEBUG)
- std::cout << "Shutting down..." << std::endl;
- c.adapter->getCommunicator()->shutdown();
-}
diff --git a/gnuradio-runtime/lib/rpcserver_selector.cc b/gnuradio-runtime/lib/rpcserver_selector.cc
deleted file mode 100644
index 362d5f060a..0000000000
--- a/gnuradio-runtime/lib/rpcserver_selector.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <rpcserver_booter_aggregator.h>
-#include <rpcmanager.h>
-#include <rpcserver_selector.h>
-
-bool rpcmanager::make_aggregator(false);
-
-#ifdef RPCSERVER_ICE
- #include <rpcserver_booter_ice.h>
- rpcmanager::rpcserver_booter_register_helper<rpcserver_booter_ice> boot_ice;
-#endif
-
-#ifdef RPCSERVER_ERLANG
- #error TODO ERLANG
-#endif
-
-#ifdef RPCSERVER_XMLRPC
- #error TODO XMLRPC
-#endif
diff --git a/gnuradio-runtime/lib/runtime_block_gateway.cc b/gnuradio-runtime/lib/runtime_block_gateway.cc
deleted file mode 100644
index 11d16af41e..0000000000
--- a/gnuradio-runtime/lib/runtime_block_gateway.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2011-2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <runtime_block_gateway.h>
-#include <gr_io_signature.h>
-#include <iostream>
-#include <boost/bind.hpp>
-
-/***********************************************************************
- * Helper routines
- **********************************************************************/
-template <typename OutType, typename InType>
-void copy_pointers(OutType &out, const InType &in){
- out.resize(in.size());
- for (size_t i = 0; i < in.size(); i++){
- out[i] = (void *)(in[i]);
- }
-}
-
-/***********************************************************************
- * The gr_block gateway implementation class
- **********************************************************************/
-class runtime_block_gateway_impl : public runtime_block_gateway{
-public:
- runtime_block_gateway_impl(
- gr_feval_ll *handler,
- const std::string &name,
- gr_io_signature_sptr in_sig,
- gr_io_signature_sptr out_sig,
- const gr_block_gw_work_type work_type,
- const unsigned factor
- ):
- gr_block(name, in_sig, out_sig),
- _handler(handler),
- _work_type(work_type)
- {
- switch(_work_type){
- case GR_BLOCK_GW_WORK_GENERAL:
- _decim = 1; //not relevant, but set anyway
- _interp = 1; //not relevant, but set anyway
- break;
-
- case GR_BLOCK_GW_WORK_SYNC:
- _decim = 1;
- _interp = 1;
- this->set_fixed_rate(true);
- break;
-
- case GR_BLOCK_GW_WORK_DECIM:
- _decim = factor;
- _interp = 1;
- break;
-
- case GR_BLOCK_GW_WORK_INTERP:
- _decim = 1;
- _interp = factor;
- this->set_output_multiple(_interp);
- break;
- }
- }
-
- /*******************************************************************
- * Overloads for various scheduler-called functions
- ******************************************************************/
- void forecast(
- int noutput_items,
- gr_vector_int &ninput_items_required
- ){
- switch(_work_type){
- case GR_BLOCK_GW_WORK_GENERAL:
- _message.action = gr_block_gw_message_type::ACTION_FORECAST;
- _message.forecast_args_noutput_items = noutput_items;
- _message.forecast_args_ninput_items_required = ninput_items_required;
- _handler->calleval(0);
- ninput_items_required = _message.forecast_args_ninput_items_required;
- return;
-
- default:
- unsigned ninputs = ninput_items_required.size();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
- return;
- }
- }
-
- int general_work(
- int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items
- ){
- switch(_work_type){
- case GR_BLOCK_GW_WORK_GENERAL:
- _message.action = gr_block_gw_message_type::ACTION_GENERAL_WORK;
- _message.general_work_args_noutput_items = noutput_items;
- _message.general_work_args_ninput_items = ninput_items;
- copy_pointers(_message.general_work_args_input_items, input_items);
- _message.general_work_args_output_items = output_items;
- _handler->calleval(0);
- return _message.general_work_args_return_value;
-
- default:
- int r = work (noutput_items, input_items, output_items);
- if (r > 0) consume_each(r*_decim/_interp);
- return r;
- }
- }
-
- int work(
- int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items
- ){
- _message.action = gr_block_gw_message_type::ACTION_WORK;
- _message.work_args_ninput_items = fixed_rate_noutput_to_ninput(noutput_items);
- if (_message.work_args_ninput_items == 0) return -1;
- _message.work_args_noutput_items = noutput_items;
- copy_pointers(_message.work_args_input_items, input_items);
- _message.work_args_output_items = output_items;
- _handler->calleval(0);
- return _message.work_args_return_value;
- }
-
- int fixed_rate_noutput_to_ninput(int noutput_items){
- return (noutput_items*_decim/_interp) + history() - 1;
- }
-
- int fixed_rate_ninput_to_noutput(int ninput_items){
- return std::max(0, ninput_items - (int)history() + 1)*_interp/_decim;
- }
-
- bool start(void){
- _message.action = gr_block_gw_message_type::ACTION_START;
- _handler->calleval(0);
- return _message.start_args_return_value;
- }
-
- bool stop(void){
- _message.action = gr_block_gw_message_type::ACTION_STOP;
- _handler->calleval(0);
- return _message.stop_args_return_value;
- }
-
- gr_block_gw_message_type &gr_block_message(void){
- return _message;
- }
-
-private:
- gr_feval_ll *_handler;
- gr_block_gw_message_type _message;
- const gr_block_gw_work_type _work_type;
- unsigned _decim, _interp;
-};
-
-boost::shared_ptr<runtime_block_gateway> runtime_make_block_gateway(
- gr_feval_ll *handler,
- const std::string &name,
- gr_io_signature_sptr in_sig,
- gr_io_signature_sptr out_sig,
- const gr_block_gw_work_type work_type,
- const unsigned factor
-){
- return boost::shared_ptr<runtime_block_gateway>(
- new runtime_block_gateway_impl(handler, name, in_sig, out_sig,
- work_type, factor)
- );
-}
diff --git a/gnuradio-runtime/lib/scheduler.cc b/gnuradio-runtime/lib/scheduler.cc
new file mode 100644
index 0000000000..38d95e6fb2
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler.cc
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "scheduler.h"
+
+namespace gr {
+
+ scheduler::scheduler(flat_flowgraph_sptr ffg,
+ int max_noutput_items)
+ {
+ }
+
+ scheduler::~scheduler()
+ {
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h
new file mode 100644
index 0000000000..575862b27d
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler.h
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_SCHEDULER_H
+#define INCLUDED_GR_SCHEDULER_H
+
+#include <gnuradio/api.h>
+#include <boost/utility.hpp>
+#include <gnuradio/block.h>
+#include "flat_flowgraph.h"
+
+namespace gr {
+
+ class scheduler;
+ typedef boost::shared_ptr<scheduler> scheduler_sptr;
+
+ /*!
+ * \brief Abstract scheduler that takes a flattened flow graph and
+ * runs it.
+ *
+ * Preconditions: details, buffers and buffer readers have been
+ * assigned.
+ */
+ class GR_RUNTIME_API scheduler : boost::noncopyable
+ {
+ public:
+ /*!
+ * \brief Construct a scheduler and begin evaluating the graph.
+ *
+ * The scheduler will continue running until all blocks until they
+ * report that they are done or the stop method is called.
+ */
+ scheduler(flat_flowgraph_sptr ffg, int max_noutput_items);
+
+ virtual ~scheduler();
+
+ /*!
+ * \brief Tell the scheduler to stop executing.
+ */
+ virtual void stop() = 0;
+
+ /*!
+ * \brief Block until the graph is done.
+ */
+ virtual void wait() = 0;
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SCHEDULER_H */
diff --git a/gnuradio-runtime/lib/scheduler_sts.cc b/gnuradio-runtime/lib/scheduler_sts.cc
new file mode 100644
index 0000000000..cc60b55f02
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler_sts.cc
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "scheduler_sts.h"
+#include <gnuradio/single_threaded_scheduler.h>
+#include <gnuradio/thread/thread_body_wrapper.h>
+
+namespace gr {
+
+ class sts_container
+ {
+ block_vector_t d_blocks;
+
+ public:
+ sts_container(block_vector_t blocks)
+ : d_blocks(blocks) {}
+
+ void operator()()
+ {
+ make_single_threaded_scheduler(d_blocks)->run();
+ }
+ };
+
+ scheduler_sptr
+ scheduler_sts::make(flat_flowgraph_sptr ffg, int max_noutput_items)
+ {
+ return scheduler_sptr(new scheduler_sts(ffg, max_noutput_items));
+ }
+
+ scheduler_sts::scheduler_sts(flat_flowgraph_sptr ffg, int max_noutput_items)
+ : scheduler(ffg, max_noutput_items)
+ {
+ // Split the flattened flow graph into discrete partitions, each
+ // of which is topologically sorted.
+
+ std::vector<basic_block_vector_t> graphs = ffg->partition();
+
+ // For each partition, create a thread to evaluate it using
+ // an instance of the gr_single_threaded_scheduler
+
+ for(std::vector<basic_block_vector_t>::iterator p = graphs.begin();
+ p != graphs.end(); p++) {
+
+ block_vector_t blocks = flat_flowgraph::make_block_vector(*p);
+ d_threads.create_thread(
+ gr::thread::thread_body_wrapper<sts_container>(sts_container(blocks),
+ "single-threaded-scheduler"));
+ }
+ }
+
+ scheduler_sts::~scheduler_sts()
+ {
+ stop();
+ }
+
+ void
+ scheduler_sts::stop()
+ {
+ d_threads.interrupt_all();
+ }
+
+ void
+ scheduler_sts::wait()
+ {
+ d_threads.join_all();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/scheduler_sts.h b/gnuradio-runtime/lib/scheduler_sts.h
new file mode 100644
index 0000000000..b4cddb4614
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler_sts.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_SCHEDULER_STS_H
+#define INCLUDED_GR_SCHEDULER_STS_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread_group.h>
+#include "scheduler.h"
+
+namespace gr {
+
+ /*!
+ * \brief Concrete scheduler that uses the single_threaded_scheduler
+ */
+ class GR_RUNTIME_API scheduler_sts : public scheduler
+ {
+ gr::thread::thread_group d_threads;
+
+ protected:
+ /*!
+ * \brief Construct a scheduler and begin evaluating the graph.
+ *
+ * The scheduler will continue running until all blocks until they
+ * report that they are done or the stop method is called.
+ */
+ scheduler_sts(flat_flowgraph_sptr ffg, int max_noutput_items);
+
+ public:
+ static scheduler_sptr make(flat_flowgraph_sptr ffg,
+ int max_noutput_items);
+
+ ~scheduler_sts();
+
+ /*!
+ * \brief Tell the scheduler to stop executing.
+ */
+ void stop();
+
+ /*!
+ * \brief Block until the graph is done.
+ */
+ void wait();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SCHEDULER_STS_H */
diff --git a/gnuradio-runtime/lib/scheduler_tpb.cc b/gnuradio-runtime/lib/scheduler_tpb.cc
new file mode 100644
index 0000000000..d35c37fb34
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler_tpb.cc
@@ -0,0 +1,106 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "scheduler_tpb.h"
+#include "tpb_thread_body.h"
+#include <gnuradio/thread/thread_body_wrapper.h>
+#include <sstream>
+
+namespace gr {
+
+ class tpb_container
+ {
+ block_sptr d_block;
+ int d_max_noutput_items;
+
+ public:
+ tpb_container(block_sptr block, int max_noutput_items)
+ : d_block(block), d_max_noutput_items(max_noutput_items) {}
+
+ void operator()()
+ {
+ tpb_thread_body body(d_block, d_max_noutput_items);
+ }
+ };
+
+ scheduler_sptr
+ scheduler_tpb::make(flat_flowgraph_sptr ffg, int max_noutput_items)
+ {
+ return scheduler_sptr(new scheduler_tpb(ffg, max_noutput_items));
+ }
+
+ scheduler_tpb::scheduler_tpb(flat_flowgraph_sptr ffg,
+ int max_noutput_items)
+ : scheduler(ffg, max_noutput_items)
+ {
+ // Get a topologically sorted vector of all the blocks in use.
+ // Being topologically sorted probably isn't going to matter, but
+ // there's a non-zero chance it might help...
+
+ basic_block_vector_t used_blocks = ffg->calc_used_blocks();
+ used_blocks = ffg->topological_sort(used_blocks);
+ block_vector_t blocks = flat_flowgraph::make_block_vector(used_blocks);
+
+ // Ensure that the done flag is clear on all blocks
+
+ for(size_t i = 0; i < blocks.size(); i++) {
+ blocks[i]->detail()->set_done(false);
+ }
+
+ // Fire off a thead for each block
+
+ for(size_t i = 0; i < blocks.size(); i++) {
+ std::stringstream name;
+ name << "thread-per-block[" << i << "]: " << blocks[i];
+
+ // If set, use internal value instead of global value
+ if(blocks[i]->is_set_max_noutput_items())
+ max_noutput_items = blocks[i]->max_noutput_items();
+
+ d_threads.create_thread(
+ gr::thread::thread_body_wrapper<tpb_container>
+ (tpb_container(blocks[i], max_noutput_items),
+ name.str()));
+ }
+ }
+
+ scheduler_tpb::~scheduler_tpb()
+ {
+ stop();
+ }
+
+ void
+ scheduler_tpb::stop()
+ {
+ d_threads.interrupt_all();
+ }
+
+ void
+ scheduler_tpb::wait()
+ {
+ d_threads.join_all();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/scheduler_tpb.h b/gnuradio-runtime/lib/scheduler_tpb.h
new file mode 100644
index 0000000000..f5ab21f269
--- /dev/null
+++ b/gnuradio-runtime/lib/scheduler_tpb.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_GR_SCHEDULER_TPB_H
+#define INCLUDED_GR_SCHEDULER_TPB_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/thread/thread_group.h>
+#include "scheduler.h"
+
+namespace gr {
+
+ /*!
+ * \brief Concrete scheduler that uses a kernel thread-per-block
+ */
+ class GR_RUNTIME_API scheduler_tpb : public scheduler
+ {
+ gr::thread::thread_group d_threads;
+
+ protected:
+ /*!
+ * \brief Construct a scheduler and begin evaluating the graph.
+ *
+ * The scheduler will continue running until all blocks until they
+ * report that they are done or the stop method is called.
+ */
+ scheduler_tpb(flat_flowgraph_sptr ffg, int max_noutput_items);
+
+ public:
+ static scheduler_sptr make(flat_flowgraph_sptr ffg,
+ int max_noutput_items=100000);
+
+ ~scheduler_tpb();
+
+ /*!
+ * \brief Tell the scheduler to stop executing.
+ */
+ void stop();
+
+ /*!
+ * \brief Block until the graph is done.
+ */
+ void wait();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SCHEDULER_TPB_H */
diff --git a/gnuradio-runtime/lib/select_handler.cc b/gnuradio-runtime/lib/select_handler.cc
new file mode 100644
index 0000000000..ca99ce6ce8
--- /dev/null
+++ b/gnuradio-runtime/lib/select_handler.cc
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/select_handler.h>
+
+namespace gr {
+
+ select_handler::select_handler(int fd)
+ : d_fd(fd)
+ {
+ }
+
+ select_handler::~select_handler()
+ {
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/sine_table.h b/gnuradio-runtime/lib/sine_table.h
deleted file mode 100644
index 69834943bc..0000000000
--- a/gnuradio-runtime/lib/sine_table.h
+++ /dev/null
@@ -1,1025 +0,0 @@
- // max_error = 2.353084136763606e-06
- { 2.925817799165007e-09, 7.219194364267018e-09 },
- { 2.925707643778599e-09, 2.526699001579799e-07 },
- { 2.925487337153070e-09, 1.191140162167675e-06 },
- { 2.925156887582842e-09, 3.284585035595589e-06 },
- { 2.924716307509151e-09, 6.994872605695784e-06 },
- { 2.924165613519592e-09, 1.278374920658798e-05 },
- { 2.923504826347475e-09, 2.111280464718590e-05 },
- { 2.922733970871080e-09, 3.244343744537165e-05 },
- { 2.921853076112655e-09, 4.723682007436170e-05 },
- { 2.920862175237416e-09, 6.595386421935634e-05 },
- { 2.919761305552202e-09, 8.905518605213658e-05 },
- { 2.918550508504146e-09, 1.170010715193098e-04 },
- { 2.917229829679050e-09, 1.502514416517192e-04 },
- { 2.915799318799769e-09, 1.892658178912071e-04 },
- { 2.914259029724184e-09, 2.345032874456615e-04 },
- { 2.912609020443340e-09, 2.864224686607020e-04 },
- { 2.910849353079123e-09, 3.454814764261432e-04 },
- { 2.908980093882049e-09, 4.121378876027343e-04 },
- { 2.907001313228646e-09, 4.868487064877691e-04 },
- { 2.904913085618902e-09, 5.700703303049837e-04 },
- { 2.902715489673383e-09, 6.622585147355725e-04 },
- { 2.900408608130373e-09, 7.638683394782519e-04 },
- { 2.897992527842612e-09, 8.753541738578119e-04 },
- { 2.895467339774186e-09, 9.971696424604937e-04 },
- { 2.892833138996999e-09, 1.129767590823255e-03 },
- { 2.890090024687216e-09, 1.273600051161478e-03 },
- { 2.887238100121550e-09, 1.429118208142094e-03 },
- { 2.884277472673313e-09, 1.596772364709564e-03 },
- { 2.881208253808507e-09, 1.777011907950626e-03 },
- { 2.878030559081432e-09, 1.970285275029487e-03 },
- { 2.874744508130554e-09, 2.177039919152579e-03 },
- { 2.871350224673798e-09, 2.397722275614272e-03 },
- { 2.867847836504030e-09, 2.632777727878843e-03 },
- { 2.864237475484149e-09, 2.882650573737405e-03 },
- { 2.860519277542297e-09, 3.147783991507308e-03 },
- { 2.856693382666432e-09, 3.428620006328931e-03 },
- { 2.852759934899389e-09, 3.725599456482154e-03 },
- { 2.848719082333207e-09, 4.039161959812243e-03 },
- { 2.844570977103752e-09, 4.369745880190706e-03 },
- { 2.840315775384800e-09, 4.717788294077374e-03 },
- { 2.835953637382310e-09, 5.083724957128360e-03 },
- { 2.831484727328322e-09, 5.467990270896617e-03 },
- { 2.826909213474759e-09, 5.871017249604038e-03 },
- { 2.822227268087134e-09, 6.293237486988512e-03 },
- { 2.817439067438018e-09, 6.735081123237729e-03 },
- { 2.812544791800534e-09, 7.196976811989608e-03 },
- { 2.807544625441273e-09, 7.679351687456759e-03 },
- { 2.802438756613836e-09, 8.182631331563162e-03 },
- { 2.797227377551135e-09, 8.707239741274575e-03 },
- { 2.791910684458716e-09, 9.253599295902304e-03 },
- { 2.786488877507140e-09, 9.822130724578715e-03 },
- { 2.780962160824228e-09, 1.041325307382490e-02 },
- { 2.775330742487884e-09, 1.102738367513773e-02 },
- { 2.769594834517682e-09, 1.166493811278924e-02 },
- { 2.763754652867477e-09, 1.232633019159818e-02 },
- { 2.757810417416620e-09, 1.301197190494069e-02 },
- { 2.751762351962413e-09, 1.372227340270610e-02 },
- { 2.745610684210923e-09, 1.445764295952962e-02 },
- { 2.739355645769094e-09, 1.521848694296229e-02 },
- { 2.732997472135539e-09, 1.600520978188769e-02 },
- { 2.726536402691907e-09, 1.681821393496225e-02 },
- { 2.719972680693777e-09, 1.765789985920713e-02 },
- { 2.713306553261610e-09, 1.852466597868779e-02 },
- { 2.706538271371373e-09, 1.941890865333146e-02 },
- { 2.699668089844909e-09, 2.034102214787814e-02 },
- { 2.692696267340880e-09, 2.129139860085272e-02 },
- { 2.685623066344263e-09, 2.227042799383416e-02 },
- { 2.678448753157212e-09, 2.327849812064098e-02 },
- { 2.671173597888530e-09, 2.431599455681316e-02 },
- { 2.663797874443630e-09, 2.538330062913108e-02 },
- { 2.656321860514457e-09, 2.648079738524795e-02 },
- { 2.648745837568575e-09, 2.760886356354952e-02 },
- { 2.641070090839117e-09, 2.876787556300114e-02 },
- { 2.633294909313421e-09, 2.995820741329835e-02 },
- { 2.625420585722845e-09, 3.118023074495535e-02 },
- { 2.617447416531143e-09, 3.243431475972608e-02 },
- { 2.609375701923643e-09, 3.372082620101990e-02 },
- { 2.601205745795833e-09, 3.504012932452527e-02 },
- { 2.592937855741933e-09, 3.639258586895711e-02 },
- { 2.584572343043400e-09, 3.777855502693250e-02 },
- { 2.576109522656942e-09, 3.919839341605197e-02 },
- { 2.567549713203028e-09, 4.065245505002102e-02 },
- { 2.558893236953688e-09, 4.214109131001403e-02 },
- { 2.550140419820252e-09, 4.366465091617666e-02 },
- { 2.541291591341445e-09, 4.522347989919473e-02 },
- { 2.532347084670572e-09, 4.681792157215026e-02 },
- { 2.523307236563343e-09, 4.844831650239501e-02 },
- { 2.514172387364900e-09, 5.011500248369893e-02 },
- { 2.504942880997064e-09, 5.181831450849345e-02 },
- { 2.495619064945627e-09, 5.355858474024022e-02 },
- { 2.486201290246928e-09, 5.533614248606705e-02 },
- { 2.476689911475047e-09, 5.715131416942842e-02 },
- { 2.467085286727668e-09, 5.900442330315692e-02 },
- { 2.457387777613798e-09, 6.089579046229943e-02 },
- { 2.447597749239101e-09, 6.282573325755320e-02 },
- { 2.437715570192557e-09, 6.479456630859221e-02 },
- { 2.427741612532542e-09, 6.680260121764925e-02 },
- { 2.417676251773166e-09, 6.885014654319160e-02 },
- { 2.407519866869294e-09, 7.093750777401114e-02 },
- { 2.397272840203310e-09, 7.306498730310884e-02 },
- { 2.386935557569868e-09, 7.523288440214027e-02 },
- { 2.376508408161815e-09, 7.744149519577415e-02 },
- { 2.365991784555363e-09, 7.969111263635709e-02 },
- { 2.355386082695641e-09, 8.198202647865405e-02 },
- { 2.344691701881232e-09, 8.431452325495814e-02 },
- { 2.333909044749407e-09, 8.668888625021409e-02 },
- { 2.323038517261246e-09, 8.910539547731611e-02 },
- { 2.312080528685971e-09, 9.156432765274414e-02 },
- { 2.301035491585642e-09, 9.406595617227698e-02 },
- { 2.289903821799651e-09, 9.661055108691619e-02 },
- { 2.278685938428940e-09, 9.919837907903295e-02 },
- { 2.267382263820762e-09, 1.018297034385580e-01 },
- { 2.255993223551837e-09, 1.045047840397028e-01 },
- { 2.244519246413220e-09, 1.072238773174577e-01 },
- { 2.232960764393620e-09, 1.099872362446146e-01 },
- { 2.221318212663309e-09, 1.127951103088245e-01 },
- { 2.209592029557811e-09, 1.156477454898748e-01 },
- { 2.197782656561395e-09, 1.185453842371912e-01 },
- { 2.185890538290176e-09, 1.214882654476019e-01 },
- { 2.173916122475606e-09, 1.244766244431883e-01 },
- { 2.161859859947797e-09, 1.275106929493488e-01 },
- { 2.149722204618256e-09, 1.305906990731841e-01 },
- { 2.137503613462743e-09, 1.337168672820376e-01 },
- { 2.125204546504321e-09, 1.368894183821595e-01 },
- { 2.112825466795944e-09, 1.401085694976751e-01 },
- { 2.100366840402933e-09, 1.433745340497602e-01 },
- { 2.087829136385612e-09, 1.466875217359607e-01 },
- { 2.075212826781308e-09, 1.500477385098620e-01 },
- { 2.062518386587093e-09, 1.534553865607503e-01 },
- { 2.049746293741359e-09, 1.569106642937665e-01 },
- { 2.036897029106193e-09, 1.604137663100403e-01 },
- { 2.023971076449323e-09, 1.639648833871233e-01 },
- { 2.010968922425217e-09, 1.675642024598467e-01 },
- { 1.997891056557933e-09, 1.712119066008896e-01 },
- { 1.984737971221581e-09, 1.749081750021970e-01 },
- { 1.971510161622434e-09, 1.786531829561379e-01 },
- { 1.958208125780130e-09, 1.824471018371070e-01 },
- { 1.944832364508511e-09, 1.862900990834311e-01 },
- { 1.931383381397782e-09, 1.901823381790926e-01 },
- { 1.917861682794392e-09, 1.941239786363039e-01 },
- { 1.904267777782611e-09, 1.981151759777950e-01 },
- { 1.890602178165317e-09, 2.021560817195309e-01 },
- { 1.876865398444616e-09, 2.062468433536743e-01 },
- { 1.863057955802572e-09, 2.103876043317229e-01 },
- { 1.849180370081465e-09, 2.145785040479915e-01 },
- { 1.835233163764673e-09, 2.188196778231083e-01 },
- { 1.821216861956509e-09, 2.231112568880342e-01 },
- { 1.807131992362945e-09, 2.274533683680190e-01 },
- { 1.792979085271234e-09, 2.318461352671018e-01 },
- { 1.778758673530482e-09, 2.362896764525300e-01 },
- { 1.764471292530943e-09, 2.407841066397789e-01 },
- { 1.750117480184598e-09, 2.453295363773890e-01 },
- { 1.735697776904342e-09, 2.499260720324433e-01 },
- { 1.721212725583874e-09, 2.545738157760434e-01 },
- { 1.706662871577097e-09, 2.592728655691494e-01 },
- { 1.692048762677849e-09, 2.640233151485341e-01 },
- { 1.677370949099090e-09, 2.688252540131204e-01 },
- { 1.662629983452104e-09, 2.736787674105404e-01 },
- { 1.647826420726167e-09, 2.785839363237506e-01 },
- { 1.632960818266680e-09, 2.835408374583758e-01 },
- { 1.618033735755429e-09, 2.885495432295704e-01 },
- { 1.603045735188609e-09, 2.936101217498361e-01 },
- { 1.587997380855918e-09, 2.987226368167127e-01 },
- { 1.572889239319430e-09, 3.038871479007593e-01 },
- { 1.557721879392051e-09, 3.091037101339017e-01 },
- { 1.542495872116447e-09, 3.143723742978435e-01 },
- { 1.527211790743024e-09, 3.196931868130269e-01 },
- { 1.511870210708909e-09, 3.250661897274744e-01 },
- { 1.496471709615926e-09, 3.304914207062036e-01 },
- { 1.481016867208896e-09, 3.359689130207621e-01 },
- { 1.465506265353924e-09, 3.414986955389885e-01 },
- { 1.449940488016384e-09, 3.470807927151147e-01 },
- { 1.434320121238994e-09, 3.527152245800635e-01 },
- { 1.418645753119802e-09, 3.584020067320109e-01 },
- { 1.402917973789838e-09, 3.641411503272979e-01 },
- { 1.387137375391042e-09, 3.699326620714776e-01 },
- { 1.371304552054134e-09, 3.757765442106153e-01 },
- { 1.355420099875958e-09, 3.816727945230153e-01 },
- { 1.339484616897137e-09, 3.876214063110671e-01 },
- { 1.323498703079580e-09, 3.936223683933865e-01 },
- { 1.307462960283922e-09, 3.996756650972121e-01 },
- { 1.291377992246768e-09, 4.057812762511174e-01 },
- { 1.275244404558188e-09, 4.119391771778626e-01 },
- { 1.259062804638585e-09, 4.181493386877248e-01 },
- { 1.242833801715929e-09, 4.244117270719281e-01 },
- { 1.226558006803155e-09, 4.307263040962509e-01 },
- { 1.210236032674760e-09, 4.370930269951803e-01 },
- { 1.193868493843725e-09, 4.435118484661861e-01 },
- { 1.177456006538695e-09, 4.499827166641340e-01 },
- { 1.160999188680582e-09, 4.565055751961679e-01 },
- { 1.144498659859216e-09, 4.630803631168164e-01 },
- { 1.127955041310214e-09, 4.697070149232604e-01 },
- { 1.111368955891417e-09, 4.763854605510119e-01 },
- { 1.094741028059551e-09, 4.831156253697562e-01 },
- { 1.078071883846871e-09, 4.898974301794375e-01 },
- { 1.061362150836978e-09, 4.967307912069362e-01 },
- { 1.044612458142151e-09, 5.036156201023686e-01 },
- { 1.027823436378632e-09, 5.105518239364775e-01 },
- { 1.010995717643647e-09, 5.175393051975563e-01 },
- { 9.941299354913699e-10, 5.245779617890562e-01 },
- { 9.772267249089968e-10, 5.316676870274011e-01 },
- { 9.602867222926046e-10, 5.388083696401416e-01 },
- { 9.433105654240147e-10, 5.459998937639375e-01 },
- { 9.262988934458084e-10, 5.532421389435711e-01 },
- { 9.092523468378193e-10, 5.605349801305876e-01 },
- { 8.921715673928355e-10, 5.678782876825250e-01 },
- { 8.750571981926701e-10, 5.752719273622372e-01 },
- { 8.579098835836508e-10, 5.827157603377209e-01 },
- { 8.407302691522673e-10, 5.902096431821322e-01 },
- { 8.235190017016133e-10, 5.977534278737073e-01 },
- { 8.062767292259225e-10, 6.053469617967722e-01 },
- { 7.890041008871165e-10, 6.129900877421282e-01 },
- { 7.717017669898175e-10, 6.206826439083659e-01 },
- { 7.543703789572603e-10, 6.284244639030392e-01 },
- { 7.370105893063053e-10, 6.362153767444958e-01 },
- { 7.196230516231919e-10, 6.440552068636356e-01 },
- { 7.022084205389746e-10, 6.519437741060674e-01 },
- { 6.847673517046416e-10, 6.598808937346672e-01 },
- { 6.673005017664976e-10, 6.678663764322770e-01 },
- { 6.498085283416530e-10, 6.759000283046127e-01 },
- { 6.322920899929834e-10, 6.839816508836737e-01 },
- { 6.147518462045659e-10, 6.921110411311926e-01 },
- { 5.971884573565851e-10, 7.002879914425926e-01 },
- { 5.796025847007168e-10, 7.085122896509806e-01 },
- { 5.619948903351406e-10, 7.167837190315758e-01 },
- { 5.443660371796048e-10, 7.251020583063744e-01 },
- { 5.267166889504394e-10, 7.334670816491009e-01 },
- { 5.090475101356742e-10, 7.418785586903696e-01 },
- { 4.913591659698399e-10, 7.503362545232619e-01 },
- { 4.736523224091392e-10, 7.588399297089872e-01 },
- { 4.559276461062478e-10, 7.673893402829834e-01 },
- { 4.381858043851147e-10, 7.759842377612828e-01 },
- { 4.204274652161870e-10, 7.846243691469355e-01 },
- { 4.026532971908398e-10, 7.933094769370790e-01 },
- { 3.848639694963359e-10, 8.020392991300200e-01 },
- { 3.670601518910503e-10, 8.108135692324444e-01 },
- { 3.492425146784233e-10, 8.196320162675177e-01 },
- { 3.314117286825031e-10, 8.284943647824689e-01 },
- { 3.135684652223755e-10, 8.374003348569865e-01 },
- { 2.957133960867535e-10, 8.463496421118015e-01 },
- { 2.778471935089361e-10, 8.553419977173513e-01 },
- { 2.599705301412391e-10, 8.643771084029740e-01 },
- { 2.420840790301135e-10, 8.734546764660205e-01 },
- { 2.241885135902046e-10, 8.825743997817682e-01 },
- { 2.062845075795238e-10, 8.917359718130367e-01 },
- { 1.883727350736140e-10, 9.009390816205823e-01 },
- { 1.704538704408269e-10, 9.101834138731877e-01 },
- { 1.525285883160648e-10, 9.194686488588080e-01 },
- { 1.345975635762696e-10, 9.287944624950824e-01 },
- { 1.166614713141648e-10, 9.381605263410157e-01 },
- { 9.872098681369190e-11, 9.475665076080466e-01 },
- { 8.077678552380464e-11, 9.570120691722380e-01 },
- { 6.282954303364090e-11, 9.664968695860140e-01 },
- { 4.487993504668797e-11, 9.760205630906909e-01 },
- { 2.692863735553042e-11, 9.855827996289697e-01 },
- { 8.976325816439114e-12, 9.951832248577780e-01 },
- { -8.976323676304494e-12, 1.004821480161519e+00 },
- { -2.692863521550168e-11, 1.014497202665280e+00 },
- { -4.487993290681805e-11, 1.024210025248670e+00 },
- { -6.282954089398273e-11, 1.033959576559617e+00 },
- { -8.077678338451706e-11, 1.043745481028715e+00 },
- { -9.872098467477489e-11, 1.053567358883467e+00 },
- { -1.166614691757772e-10, 1.063424826163223e+00 },
- { -1.345975614383584e-10, 1.073317494734013e+00 },
- { -1.525285861788948e-10, 1.083244972303963e+00 },
- { -1.704538683042922e-10, 1.093206862438572e+00 },
- { -1.883727329379793e-10, 1.103202764576806e+00 },
- { -2.062845054446831e-10, 1.113232274046796e+00 },
- { -2.241885114563697e-10, 1.123294982082432e+00 },
- { -2.420840768973375e-10, 1.133390475839767e+00 },
- { -2.599705280096278e-10, 1.143518338413855e+00 },
- { -2.778471913784365e-10, 1.153678148855860e+00 },
- { -2.957133939575774e-10, 1.163869482190458e+00 },
- { -3.135684630945758e-10, 1.174091909433296e+00 },
- { -3.314117265561857e-10, 1.184344997608959e+00 },
- { -3.492425125535882e-10, 1.194628309769018e+00 },
- { -3.670601497678034e-10, 1.204941405010466e+00 },
- { -3.848639673748360e-10, 1.215283838494269e+00 },
- { -4.026532950710339e-10, 1.225655161464298e+00 },
- { -4.204274630982869e-10, 1.236054921266445e+00 },
- { -4.381858022691734e-10, 1.246482661367958e+00 },
- { -4.559276439922654e-10, 1.256937921377146e+00 },
- { -4.736523202972214e-10, 1.267420237063216e+00 },
- { -4.913591638600925e-10, 1.277929140376502e+00 },
- { -5.090475080282032e-10, 1.288464159468706e+00 },
- { -5.267166868452449e-10, 1.299024818713528e+00 },
- { -5.443660350768455e-10, 1.309610638727845e+00 },
- { -5.619948882348695e-10, 1.320221136392390e+00 },
- { -5.796025826029868e-10, 1.330855824873457e+00 },
- { -5.971884552615020e-10, 1.341514213644420e+00 },
- { -6.147518441122357e-10, 1.352195808507556e+00 },
- { -6.322920879034590e-10, 1.362900111616144e+00 },
- { -6.498085262549874e-10, 1.373626621496939e+00 },
- { -6.673004996827436e-10, 1.384374833072571e+00 },
- { -6.847673496239581e-10, 1.395144237684605e+00 },
- { -7.022084184613616e-10, 1.405934323116231e+00 },
- { -7.196230495488082e-10, 1.416744573616104e+00 },
- { -7.370105872352039e-10, 1.427574469921397e+00 },
- { -7.543703768894941e-10, 1.438423489281758e+00 },
- { -7.717017649255453e-10, 1.449291105483472e+00 },
- { -7.890040988262324e-10, 1.460176788873383e+00 },
- { -8.062767271686383e-10, 1.471080006383765e+00 },
- { -8.235189996479819e-10, 1.482000221556656e+00 },
- { -8.407302671024475e-10, 1.492936894569018e+00 },
- { -8.579098815375368e-10, 1.503889482257845e+00 },
- { -8.750571961505266e-10, 1.514857438145604e+00 },
- { -8.921715653546624e-10, 1.525840212465756e+00 },
- { -9.092523448036167e-10, 1.536837252188703e+00 },
- { -9.262988914157881e-10, 1.547848001047890e+00 },
- { -9.433105633981766e-10, 1.558871899565883e+00 },
- { -9.602867202711075e-10, 1.569908385081254e+00 },
- { -9.772267228916820e-10, 1.580956891774897e+00 },
- { -9.941299334786078e-10, 1.592016850697478e+00 },
- { -1.010995715635332e-09, 1.603087689796053e+00 },
- { -1.027823434374870e-09, 1.614168833942028e+00 },
- { -1.044612456143047e-09, 1.625259704958335e+00 },
- { -1.061362148842745e-09, 1.636359721647526e+00 },
- { -1.078071881857297e-09, 1.647468299819543e+00 },
- { -1.094741026074900e-09, 1.658584852320419e+00 },
- { -1.111368953911690e-09, 1.669708789060341e+00 },
- { -1.127955039335462e-09, 1.680839517042381e+00 },
- { -1.144498657889600e-09, 1.691976440391624e+00 },
- { -1.160999186716154e-09, 1.703118960383971e+00 },
- { -1.177456004579561e-09, 1.714266475475616e+00 },
- { -1.193868491889832e-09, 1.725418381332405e+00 },
- { -1.210236030726319e-09, 1.736574070859850e+00 },
- { -1.226558004860220e-09, 1.747732934232508e+00 },
- { -1.242833799778447e-09, 1.758894358924547e+00 },
- { -1.259062802706714e-09, 1.770057729740021e+00 },
- { -1.275244402631982e-09, 1.781222428842935e+00 },
- { -1.291377990326492e-09, 1.792387835788660e+00 },
- { -1.307462958369363e-09, 1.803553327553897e+00 },
- { -1.323498701170897e-09, 1.814718278568759e+00 },
- { -1.339484614994490e-09, 1.825882060747428e+00 },
- { -1.355420097979292e-09, 1.837044043519582e+00 },
- { -1.371304550163662e-09, 1.848203593862598e+00 },
- { -1.387137373506711e-09, 1.859360076332671e+00 },
- { -1.402917971911754e-09, 1.870512853097495e+00 },
- { -1.418645751248018e-09, 1.881661283967967e+00 },
- { -1.434320119373722e-09, 1.892804726431080e+00 },
- { -1.449940486157623e-09, 1.903942535681972e+00 },
- { -1.465506263501516e-09, 1.915074064656886e+00 },
- { -1.481016865363264e-09, 1.926198664066737e+00 },
- { -1.496471707776859e-09, 1.937315682428795e+00 },
- { -1.511870208876724e-09, 1.948424466101625e+00 },
- { -1.527211788917509e-09, 1.959524359317042e+00 },
- { -1.542495870297867e-09, 1.970614704215133e+00 },
- { -1.557721877580406e-09, 1.981694840876775e+00 },
- { -1.572889237514880e-09, 1.992764107358707e+00 },
- { -1.587997379058514e-09, 2.003821839726753e+00 },
- { -1.603045733398246e-09, 2.014867372090665e+00 },
- { -1.618033733972424e-09, 2.025900036638798e+00 },
- { -1.632960816490822e-09, 2.036919163671778e+00 },
- { -1.647826418957721e-09, 2.047924081638631e+00 },
- { -1.662629981691070e-09, 2.058914117170269e+00 },
- { -1.677370947345626e-09, 2.069888595116115e+00 },
- { -1.692048760931849e-09, 2.080846838577820e+00 },
- { -1.706662869838827e-09, 2.091788168946183e+00 },
- { -1.721212723853279e-09, 2.102711905935372e+00 },
- { -1.735697775181424e-09, 2.113617367619504e+00 },
- { -1.750117478469621e-09, 2.124503870468520e+00 },
- { -1.764471290823748e-09, 2.135370729383332e+00 },
- { -1.778758671831281e-09, 2.146217257733207e+00 },
- { -1.792979083579974e-09, 2.157042767390815e+00 },
- { -1.807131990679890e-09, 2.167846568770014e+00 },
- { -1.821216860281448e-09, 2.178627970860822e+00 },
- { -1.835233162097977e-09, 2.189386281268046e+00 },
- { -1.849180368423027e-09, 2.200120806246095e+00 },
- { -1.863057954152340e-09, 2.210830850737588e+00 },
- { -1.876865396802907e-09, 2.221515718409926e+00 },
- { -1.890602176531920e-09, 2.232174711691990e+00 },
- { -1.904267776157843e-09, 2.242807131812679e+00 },
- { -1.917861681178094e-09, 2.253412278837029e+00 },
- { -1.931383379790273e-09, 2.263989451705295e+00 },
- { -1.944832362909578e-09, 2.274537948269257e+00 },
- { -1.958208124189984e-09, 2.285057065331676e+00 },
- { -1.971510160041235e-09, 2.295546098682665e+00 },
- { -1.984737969649064e-09, 2.306004343138794e+00 },
- { -1.997891054994522e-09, 2.316431092581699e+00 },
- { -2.010968920870647e-09, 2.326825639994779e+00 },
- { -2.023971074903858e-09, 2.337187277503834e+00 },
- { -2.036897027569834e-09, 2.347515296413520e+00 },
- { -2.049746292214264e-09, 2.357808987247877e+00 },
- { -2.062518385069210e-09, 2.368067639787542e+00 },
- { -2.075212825272584e-09, 2.378290543109652e+00 },
- { -2.087829134886364e-09, 2.388476985626922e+00 },
- { -2.100366838912949e-09, 2.398626255125417e+00 },
- { -2.112825465315542e-09, 2.408737638805759e+00 },
- { -2.125204545033289e-09, 2.418810423320288e+00 },
- { -2.137503612001452e-09, 2.428843894814472e+00 },
- { -2.149722203166389e-09, 2.438837338964302e+00 },
- { -2.161859858505829e-09, 2.448790041018174e+00 },
- { -2.173916121043380e-09, 2.458701285834241e+00 },
- { -2.185890536867478e-09, 2.468570357921585e+00 },
- { -2.197782655148702e-09, 2.478396541480230e+00 },
- { -2.209592028154913e-09, 2.488179120439544e+00 },
- { -2.221318211270522e-09, 2.497917378500214e+00 },
- { -2.232960763010574e-09, 2.507610599172123e+00 },
- { -2.244519245040444e-09, 2.517258065817044e+00 },
- { -2.255993222189014e-09, 2.526859061686102e+00 },
- { -2.267382262468209e-09, 2.536412869962689e+00 },
- { -2.278685937086658e-09, 2.545918773800664e+00 },
- { -2.289903820467374e-09, 2.555376056366064e+00 },
- { -2.301035490263848e-09, 2.564784000877677e+00 },
- { -2.312080527374447e-09, 2.574141890646339e+00 },
- { -2.323038515960257e-09, 2.583449009117307e+00 },
- { -2.333909043458635e-09, 2.592704639909166e+00 },
- { -2.344691700601153e-09, 2.601908066856634e+00 },
- { -2.355386081425938e-09, 2.611058574048749e+00 },
- { -2.365991783296513e-09, 2.620155445872768e+00 },
- { -2.376508406913500e-09, 2.629197967052127e+00 },
- { -2.386935556332088e-09, 2.638185422689490e+00 },
- { -2.397272838976436e-09, 2.647117098307332e+00 },
- { -2.407519865653114e-09, 2.655992279887846e+00 },
- { -2.417676250567891e-09, 2.664810253915885e+00 },
- { -2.427741611338014e-09, 2.673570307418169e+00 },
- { -2.437715569009093e-09, 2.682271728006635e+00 },
- { -2.447597748066437e-09, 2.690913803917100e+00 },
- { -2.457387776452357e-09, 2.699495824053297e+00 },
- { -2.467085285577292e-09, 2.708017078025636e+00 },
- { -2.476689910335470e-09, 2.716476856194105e+00 },
- { -2.486201289118733e-09, 2.724874449709689e+00 },
- { -2.495619063828443e-09, 2.733209150554255e+00 },
- { -2.504942879891263e-09, 2.741480251583985e+00 },
- { -2.514172386270163e-09, 2.749687046568741e+00 },
- { -2.523307235480146e-09, 2.757828830235740e+00 },
- { -2.532347083598520e-09, 2.765904898308531e+00 },
- { -2.541291590280960e-09, 2.773914547551261e+00 },
- { -2.550140418771202e-09, 2.781857075807392e+00 },
- { -2.558893235915887e-09, 2.789731782043156e+00 },
- { -2.567549712176927e-09, 2.797537966388929e+00 },
- { -2.576109521642196e-09, 2.805274930179221e+00 },
- { -2.584572342040407e-09, 2.812941975996573e+00 },
- { -2.592937854750428e-09, 2.820538407710556e+00 },
- { -2.601205744816134e-09, 2.828063530521908e+00 },
- { -2.609375700955458e-09, 2.835516651001539e+00 },
- { -2.617447415574869e-09, 2.842897077134583e+00 },
- { -2.625420584778350e-09, 2.850204118359573e+00 },
- { -2.633294908380520e-09, 2.857437085611509e+00 },
- { -2.641070089918234e-09, 2.864595291363663e+00 },
- { -2.648745836659391e-09, 2.871678049666939e+00 },
- { -2.656321859617343e-09, 2.878684676194483e+00 },
- { -2.663797873558322e-09, 2.885614488280000e+00 },
- { -2.671173597015318e-09, 2.892466804962122e+00 },
- { -2.678448752295859e-09, 2.899240947023252e+00 },
- { -2.685623065495139e-09, 2.905936237033475e+00 },
- { -2.692696266503800e-09, 2.912551999389617e+00 },
- { -2.699668089019767e-09, 2.919087560358171e+00 },
- { -2.706538270558513e-09, 2.925542248116882e+00 },
- { -2.713306552460767e-09, 2.931915392794031e+00 },
- { -2.719972679905295e-09, 2.938206326512581e+00 },
- { -2.726536401915442e-09, 2.944414383428562e+00 },
- { -2.732997471371516e-09, 2.950538899775061e+00 },
- { -2.739355645017194e-09, 2.956579213900666e+00 },
- { -2.745610683471516e-09, 2.962534666313284e+00 },
- { -2.751762351235315e-09, 2.968404599718795e+00 },
- { -2.757810416701751e-09, 2.974188359063684e+00 },
- { -2.763754652165128e-09, 2.979885291576143e+00 },
- { -2.769594833827588e-09, 2.985494746805227e+00 },
- { -2.775330741810390e-09, 2.991016076664491e+00 },
- { -2.780962160159068e-09, 2.996448635469842e+00 },
- { -2.786488876854607e-09, 3.001791779983262e+00 },
- { -2.791910683818570e-09, 3.007044869450794e+00 },
- { -2.797227376923695e-09, 3.012207265645876e+00 },
- { -2.802438755998943e-09, 3.017278332907412e+00 },
- { -2.807544624838820e-09, 3.022257438182037e+00 },
- { -2.812544791210840e-09, 3.027143951064684e+00 },
- { -2.817439066860792e-09, 3.031937243837070e+00 },
- { -2.822227267522746e-09, 3.036636691510884e+00 },
- { -2.826909212922864e-09, 3.041241671864994e+00 },
- { -2.831484726789317e-09, 3.045751565488710e+00 },
- { -2.835953636855826e-09, 3.050165755818853e+00 },
- { -2.840315774871260e-09, 3.054483629182857e+00 },
- { -2.844570976602957e-09, 3.058704574835744e+00 },
- { -2.848719081844986e-09, 3.062827985002047e+00 },
- { -2.852759934424164e-09, 3.066853254915581e+00 },
- { -2.856693382203833e-09, 3.070779782857041e+00 },
- { -2.860519277092708e-09, 3.074606970196721e+00 },
- { -2.864237475047239e-09, 3.078334221430809e+00 },
- { -2.867847836080156e-09, 3.081960944223928e+00 },
- { -2.871350224262603e-09, 3.085486549445314e+00 },
- { -2.874744507732462e-09, 3.088910451211251e+00 },
- { -2.878030558696270e-09, 3.092232066921130e+00 },
- { -2.881208253436038e-09, 3.095450817298478e+00 },
- { -2.884277472313999e-09, 3.098566126429974e+00 },
- { -2.887238099774968e-09, 3.101577421802070e+00 },
- { -2.890090024353816e-09, 3.104484134342861e+00 },
- { -2.892833138676371e-09, 3.107285698457308e+00 },
- { -2.895467339466766e-09, 3.109981552069083e+00 },
- { -2.897992527547963e-09, 3.112571136655481e+00 },
- { -2.900408607848946e-09, 3.115053897289195e+00 },
- { -2.902715489404992e-09, 3.117429282673042e+00 },
- { -2.904913085363323e-09, 3.119696745180238e+00 },
- { -2.907001312986328e-09, 3.121855740892224e+00 },
- { -2.908980093652563e-09, 3.123905729634218e+00 },
- { -2.910849352862924e-09, 3.125846175016163e+00 },
- { -2.912609020239985e-09, 3.127676544466606e+00 },
- { -2.914259029534118e-09, 3.129396309273659e+00 },
- { -2.915799318622574e-09, 3.131004944618667e+00 },
- { -2.917229829515169e-09, 3.132501929616775e+00 },
- { -2.918550508353347e-09, 3.133886747350606e+00 },
- { -2.919761305414294e-09, 3.135158884909254e+00 },
- { -2.920862175112829e-09, 3.136317833424958e+00 },
- { -2.921853076000972e-09, 3.137363088107359e+00 },
- { -2.922733970772719e-09, 3.138294148283254e+00 },
- { -2.923504826262027e-09, 3.139110517429204e+00 },
- { -2.924165613447473e-09, 3.139811703211207e+00 },
- { -2.924716307449950e-09, 3.140397217517018e+00 },
- { -2.925156887536978e-09, 3.140866576495489e+00 },
- { -2.925487337120335e-09, 3.141219300588825e+00 },
- { -2.925707643758784e-09, 3.141454914570261e+00 },
- { -2.925817799158535e-09, 3.141572947579352e+00 },
- { -2.925817799171455e-09, 3.141572933154836e+00 },
- { -2.925707643798390e-09, 3.141454409272987e+00 },
- { -2.925487337185779e-09, 3.141216918378770e+00 },
- { -2.925156887628892e-09, 3.140860007424112e+00 },
- { -2.924716307568119e-09, 3.140383227898687e+00 },
- { -2.924165613591896e-09, 3.139786135867868e+00 },
- { -2.923504826432903e-09, 3.139068292003385e+00 },
- { -2.922733970969412e-09, 3.138229261619561e+00 },
- { -2.921853076224321e-09, 3.137268614707029e+00 },
- { -2.920862175361976e-09, 3.136185925964038e+00 },
- { -2.919761305690083e-09, 3.134980774833275e+00 },
- { -2.918550508654911e-09, 3.133652745531368e+00 },
- { -2.917229829843137e-09, 3.132201427085629e+00 },
- { -2.915799318976726e-09, 3.130626413363146e+00 },
- { -2.914259029914435e-09, 3.128927303107136e+00 },
- { -2.912609020646661e-09, 3.127103699965947e+00 },
- { -2.910849353295315e-09, 3.125155212527586e+00 },
- { -2.908980094111509e-09, 3.123081454351802e+00 },
- { -2.907001313470937e-09, 3.120882043999591e+00 },
- { -2.904913085874448e-09, 3.118556605068443e+00 },
- { -2.902715489941767e-09, 3.116104766219928e+00 },
- { -2.900408608411958e-09, 3.113526161214776e+00 },
- { -2.897992528137022e-09, 3.110820428940251e+00 },
- { -2.895467340081818e-09, 3.107987213444579e+00 },
- { -2.892833139317615e-09, 3.105026163964191e+00 },
- { -2.890090025020589e-09, 3.101936934956479e+00 },
- { -2.887238100468092e-09, 3.098719186130021e+00 },
- { -2.884277473032614e-09, 3.095372582472161e+00 },
- { -2.881208254180937e-09, 3.091896794282404e+00 },
- { -2.878030559466594e-09, 3.088291497198199e+00 },
- { -2.874744508528832e-09, 3.084556372228054e+00 },
- { -2.871350225084755e-09, 3.080691105776848e+00 },
- { -2.867847836928063e-09, 3.076695389678615e+00 },
- { -2.864237475921086e-09, 3.072568921221621e+00 },
- { -2.860519277991847e-09, 3.068311403179147e+00 },
- { -2.856693383129018e-09, 3.063922543837792e+00 },
- { -2.852759935374575e-09, 3.059402057023109e+00 },
- { -2.848719082821403e-09, 3.054749662130841e+00 },
- { -2.844570977604520e-09, 3.049965084150782e+00 },
- { -2.840315775898525e-09, 3.045048053697736e+00 },
- { -2.835953637908582e-09, 3.039998307034967e+00 },
- { -2.831484727867511e-09, 3.034815586104635e+00 },
- { -2.826909214026628e-09, 3.029499638550941e+00 },
- { -2.822227268651470e-09, 3.024050217748861e+00 },
- { -2.817439068015245e-09, 3.018467082830179e+00 },
- { -2.812544792390175e-09, 3.012749998707001e+00 },
- { -2.807544626043751e-09, 3.006898736100911e+00 },
- { -2.802438757228650e-09, 3.000913071564665e+00 },
- { -2.797227378178760e-09, 2.994792787510961e+00 },
- { -2.791910685098702e-09, 2.988537672233504e+00 },
- { -2.786488878159805e-09, 2.982147519935565e+00 },
- { -2.780962161489413e-09, 2.975622130750641e+00 },
- { -2.775330743165298e-09, 2.968961310769028e+00 },
- { -2.769594835207775e-09, 2.962164872061613e+00 },
- { -2.763754653569747e-09, 2.955232632701135e+00 },
- { -2.757810418131543e-09, 2.948164416789036e+00 },
- { -2.751762352689432e-09, 2.940960054474719e+00 },
- { -2.745610684950541e-09, 2.933619381982341e+00 },
- { -2.739355646520809e-09, 2.926142241629213e+00 },
- { -2.732997472899722e-09, 2.918528481852205e+00 },
- { -2.726536403468318e-09, 2.910777957226018e+00 },
- { -2.719972681482232e-09, 2.902890528487386e+00 },
- { -2.713306554062453e-09, 2.894866062556452e+00 },
- { -2.706538272184154e-09, 2.886704432555728e+00 },
- { -2.699668090670078e-09, 2.878405517834426e+00 },
- { -2.692696268177908e-09, 2.869969203985464e+00 },
- { -2.685623067193599e-09, 2.861395382869544e+00 },
- { -2.678448754018380e-09, 2.852683952631486e+00 },
- { -2.671173598761847e-09, 2.843834817723832e+00 },
- { -2.663797875328991e-09, 2.834847888922988e+00 },
- { -2.656321861411517e-09, 2.825723083350459e+00 },
- { -2.648745838477759e-09, 2.816460324492298e+00 },
- { -2.641070091759922e-09, 2.807059542215146e+00 },
- { -2.633294910246296e-09, 2.797520672788269e+00 },
- { -2.625420586667340e-09, 2.787843658897949e+00 },
- { -2.617447417487602e-09, 2.778028449668942e+00 },
- { -2.609375702891616e-09, 2.768075000678399e+00 },
- { -2.601205746775692e-09, 2.757983273976943e+00 },
- { -2.592937856733464e-09, 2.747753238101915e+00 },
- { -2.584572344046340e-09, 2.737384868096553e+00 },
- { -2.576109523671634e-09, 2.726878145526201e+00 },
- { -2.567549714229129e-09, 2.716233058492422e+00 },
- { -2.558893237991435e-09, 2.705449601651722e+00 },
- { -2.550140420869302e-09, 2.694527776227857e+00 },
- { -2.541291592402089e-09, 2.683467590030445e+00 },
- { -2.532347085742440e-09, 2.672269057466213e+00 },
- { -2.523307237646751e-09, 2.660932199557362e+00 },
- { -2.514172388459584e-09, 2.649457043952206e+00 },
- { -2.504942882102813e-09, 2.637843624941622e+00 },
- { -2.495619066062810e-09, 2.626091983472908e+00 },
- { -2.486201291375123e-09, 2.614202167160335e+00 },
- { -2.476689912614465e-09, 2.602174230302269e+00 },
- { -2.467085287878098e-09, 2.590008233889805e+00 },
- { -2.457387778775451e-09, 2.577704245623143e+00 },
- { -2.447597750411553e-09, 2.565262339920002e+00 },
- { -2.437715571376127e-09, 2.552682597931055e+00 },
- { -2.427741613727123e-09, 2.539965107548168e+00 },
- { -2.417676252978335e-09, 2.527109963417675e+00 },
- { -2.407519868085581e-09, 2.514117266951687e+00 },
- { -2.397272841430131e-09, 2.500987126335739e+00 },
- { -2.386935558807595e-09, 2.487719656543254e+00 },
- { -2.376508409410024e-09, 2.474314979341178e+00 },
- { -2.365991785814531e-09, 2.460773223303822e+00 },
- { -2.355386083965131e-09, 2.447094523817833e+00 },
- { -2.344691703161363e-09, 2.433279023095734e+00 },
- { -2.333909046040126e-09, 2.419326870180582e+00 },
- { -2.323038518562289e-09, 2.405238220956597e+00 },
- { -2.312080529997549e-09, 2.391013238157397e+00 },
- { -2.301035492907384e-09, 2.376652091371587e+00 },
- { -2.289903823131822e-09, 2.362154957053137e+00 },
- { -2.278685939771276e-09, 2.347522018525197e+00 },
- { -2.267382265173420e-09, 2.332753465990296e+00 },
- { -2.255993224914501e-09, 2.317849496533128e+00 },
- { -2.244519247786155e-09, 2.302810314130351e+00 },
- { -2.232960765776561e-09, 2.287636129652823e+00 },
- { -2.221318214056095e-09, 2.272327160873552e+00 },
- { -2.209592030960763e-09, 2.256883632472565e+00 },
- { -2.197782657974034e-09, 2.241305776039511e+00 },
- { -2.185890539712767e-09, 2.225593830081461e+00 },
- { -2.173916123907886e-09, 2.209748040023618e+00 },
- { -2.161859861389976e-09, 2.193768658216360e+00 },
- { -2.149722206070124e-09, 2.177655943935795e+00 },
- { -2.137503614923981e-09, 2.161410163388424e+00 },
- { -2.125204547975352e-09, 2.145031589714984e+00 },
- { -2.112825468276292e-09, 2.128520502989477e+00 },
- { -2.100366841892917e-09, 2.111877190225612e+00 },
- { -2.087829137884807e-09, 2.095101945374541e+00 },
- { -2.075212828290086e-09, 2.078195069329960e+00 },
- { -2.062518388104923e-09, 2.061156869925600e+00 },
- { -2.049746295268559e-09, 2.043987661939897e+00 },
- { -2.036897030642658e-09, 2.026687767092888e+00 },
- { -2.023971077994576e-09, 2.009257514048162e+00 },
- { -2.010968923979840e-09, 1.991697238413571e+00 },
- { -1.997891058121344e-09, 1.974007282737320e+00 },
- { -1.984737972794098e-09, 1.956187996511354e+00 },
- { -1.971510163203686e-09, 1.938239736166060e+00 },
- { -1.958208127370276e-09, 1.920162865072273e+00 },
- { -1.944832366107339e-09, 1.901957753535934e+00 },
- { -1.931383383005451e-09, 1.883624778799427e+00 },
- { -1.917861684410531e-09, 1.865164325035177e+00 },
- { -1.904267779407432e-09, 1.846576783346324e+00 },
- { -1.890602179798714e-09, 1.827862551760622e+00 },
- { -1.876865400086483e-09, 1.809022035228338e+00 },
- { -1.863057957452539e-09, 1.790055645617624e+00 },
- { -1.849180371740008e-09, 1.770963801711725e+00 },
- { -1.835233165431475e-09, 1.751746929201178e+00 },
- { -1.821216863631569e-09, 1.732405460681919e+00 },
- { -1.807131994045840e-09, 1.712939835648088e+00 },
- { -1.792979086962494e-09, 1.693350500488565e+00 },
- { -1.778758675229683e-09, 1.673637908477153e+00 },
- { -1.764471294238191e-09, 1.653802519770021e+00 },
- { -1.750117481899733e-09, 1.633844801396848e+00 },
- { -1.735697778626995e-09, 1.613765227254186e+00 },
- { -1.721212727314574e-09, 1.593564278099856e+00 },
- { -1.706662873315474e-09, 1.573242441540939e+00 },
- { -1.692048764423848e-09, 1.552800212030258e+00 },
- { -1.677370950852395e-09, 1.532238090855187e+00 },
- { -1.662629985213192e-09, 1.511556586131055e+00 },
- { -1.647826422494560e-09, 1.490756212788764e+00 },
- { -1.632960820042537e-09, 1.469837492568651e+00 },
- { -1.618033737538645e-09, 1.448800954008929e+00 },
- { -1.603045736978760e-09, 1.427647132435469e+00 },
- { -1.587997382653428e-09, 1.406376569953373e+00 },
- { -1.572889241124034e-09, 1.384989815432507e+00 },
- { -1.557721881203696e-09, 1.363487424499449e+00 },
- { -1.542495873934815e-09, 1.341869959524515e+00 },
- { -1.527211792568486e-09, 1.320137989611176e+00 },
- { -1.511870212541253e-09, 1.298292090581491e+00 },
- { -1.496471711454994e-09, 1.276332844965754e+00 },
- { -1.481016869054634e-09, 1.254260841988828e+00 },
- { -1.465506267206068e-09, 1.232076677556547e+00 },
- { -1.449940489875303e-09, 1.209780954243628e+00 },
- { -1.434320123104372e-09, 1.187374281276747e+00 },
- { -1.418645754991533e-09, 1.164857274523495e+00 },
- { -1.402917975667710e-09, 1.142230556475749e+00 },
- { -1.387137377275425e-09, 1.119494756236361e+00 },
- { -1.371304553944712e-09, 1.096650509501278e+00 },
- { -1.355420101772623e-09, 1.073698458546610e+00 },
- { -1.339484618799891e-09, 1.050639252211352e+00 },
- { -1.323498704988051e-09, 1.027473545880543e+00 },
- { -1.307462962198534e-09, 1.004202001471034e+00 },
- { -1.291377994167204e-09, 9.808252874104182e-01 },
- { -1.275244406484394e-09, 9.573440786237052e-01 },
- { -1.259062806570190e-09, 9.337590565128454e-01 },
- { -1.242833803653464e-09, 9.100709089414796e-01 },
- { -1.226558008746195e-09, 8.862803302125812e-01 },
- { -1.210236034623253e-09, 8.623880210538113e-01 },
- { -1.193868495797618e-09, 8.383946885959868e-01 },
- { -1.177456008497777e-09, 8.143010463544786e-01 },
- { -1.160999190645010e-09, 7.901078142102129e-01 },
- { -1.144498661828833e-09, 7.658157183877095e-01 },
- { -1.127955043284965e-09, 7.414254914366063e-01 },
- { -1.111368957870986e-09, 7.169378722095157e-01 },
- { -1.094741030044308e-09, 6.923536058430697e-01 },
- { -1.078071885836393e-09, 6.676734437331688e-01 },
- { -1.061362152831423e-09, 6.428981435165511e-01 },
- { -1.044612460141255e-09, 6.180284690466404e-01 },
- { -1.027823438382183e-09, 5.930651903718045e-01 },
- { -1.010995719652015e-09, 5.680090837138436e-01 },
- { -9.941299375042378e-10, 5.428609314418970e-01 },
- { -9.772267269262058e-10, 5.176215220520872e-01 },
- { -9.602867243141016e-10, 4.922916501421032e-01 },
- { -9.433105674499058e-10, 4.668721163885412e-01 },
- { -9.262988954758817e-10, 4.413637275202624e-01 },
- { -9.092523488719689e-10, 4.157672962958654e-01 },
- { -8.921715694311144e-10, 3.900836414778084e-01 },
- { -8.750572002347607e-10, 3.643135878065193e-01 },
- { -8.579098856296589e-10, 3.384579659762392e-01 },
- { -8.407302712022458e-10, 3.125176126069478e-01 },
- { -8.235190037551917e-10, 2.864933702193017e-01 },
- { -8.062767312831008e-10, 2.603860872080448e-01 },
- { -7.890041029479477e-10, 2.341966178147619e-01 },
- { -7.717017690542486e-10, 2.079258220999725e-01 },
- { -7.543703810250266e-10, 1.815745659161734e-01 },
- { -7.370105913774597e-10, 1.551437208801425e-01 },
- { -7.196230536974697e-10, 1.286341643433767e-01 },
- { -7.022084226165876e-10, 1.020467793657360e-01 },
- { -6.847673537853251e-10, 7.538245468350446e-02 },
- { -6.673005038502516e-10, 4.864208468284503e-02 },
- { -6.498085304282128e-10, 2.182656936863137e-02 },
- { -6.322920920826137e-10, -5.063185663820913e-03 },
- { -6.147518482969490e-10, -3.202626926150343e-02 },
- { -5.971884594516681e-10, -5.906176474160862e-02 },
- { -5.796025867984469e-10, -8.616874992366363e-02 },
- { -5.619948924353588e-10, -1.133462971605448e-01 },
- { -5.443660392823640e-10, -1.405934733692621e-01 },
- { -5.267166910556339e-10, -1.679093400638023e-01 },
- { -5.090475122431451e-10, -1.952929533862739e-01 },
- { -4.913591680795342e-10, -2.227433641394564e-01 },
- { -4.736523245210571e-10, -2.502596178194491e-01 },
- { -4.559276482202303e-10, -2.778407546490776e-01 },
- { -4.381858065011618e-10, -3.054858096104932e-01 },
- { -4.204274673340870e-10, -3.331938124792702e-01 },
- { -4.026532993105397e-10, -3.609637878577768e-01 },
- { -3.848639716178888e-10, -3.887947552098022e-01 },
- { -3.670601540142443e-10, -4.166857288948674e-01 },
- { -3.492425168032583e-10, -4.446357182029681e-01 },
- { -3.314117308088734e-10, -4.726437273896633e-01 },
- { -3.135684673501752e-10, -5.007087557112619e-01 },
- { -2.957133982159296e-10, -5.288297974607742e-01 },
- { -2.778471956393828e-10, -5.570058420037128e-01 },
- { -2.599705322729564e-10, -5.852358738143247e-01 },
- { -2.420840811628366e-10, -6.135188725122560e-01 },
- { -2.241885157240923e-10, -6.418538128986450e-01 },
- { -2.062845097142585e-10, -6.702396649949099e-01 },
- { -1.883727372093546e-10, -6.986753940779493e-01 },
- { -1.704538725773087e-10, -7.271599607197149e-01 },
- { -1.525285904532877e-10, -7.556923208240308e-01 },
- { -1.345975657140748e-10, -7.842714256651911e-01 },
- { -1.166614734526054e-10, -8.128962219265712e-01 },
- { -9.872098895260891e-11, -8.415656517393372e-01 },
- { -8.077678766314517e-11, -8.702786527215916e-01 },
- { -6.282954517324612e-11, -8.990341580176152e-01 },
- { -4.487993718655790e-11, -9.278310963373758e-01 },
- { -2.692863949561210e-11, -9.566683919968972e-01 },
- { -8.976327956520795e-12, -9.855449649582175e-01 },
- { 8.976321536169872e-12, -1.014459730869357e+00 },
- { 2.692863307547294e-11, -1.043411601105914e+00 },
- { 4.487993076694813e-11, -1.072399482811314e+00 },
- { 6.282953875437751e-11, -1.101422278938424e+00 },
- { 8.077678124517653e-11, -1.130478888291020e+00 },
- { 9.872098253591082e-11, -1.159568205565684e+00 },
- { 1.166614670373367e-10, -1.188689121393192e+00 },
- { 1.345975593005002e-10, -1.217840522381901e+00 },
- { 1.525285840416718e-10, -1.247021291159495e+00 },
- { 1.704538661678104e-10, -1.276230306415868e+00 },
- { 1.883727308022916e-10, -1.305466442946703e+00 },
- { 2.062845033098954e-10, -1.334728571696106e+00 },
- { 2.241885093225349e-10, -1.364015559800721e+00 },
- { 2.420840747645085e-10, -1.393326270633325e+00 },
- { 2.599705258779635e-10, -1.422659563847049e+00 },
- { 2.778471892479898e-10, -1.452014295419243e+00 },
- { 2.957133918284542e-10, -1.481389317696831e+00 },
- { 3.135684609667761e-10, -1.510783479440191e+00 },
- { 3.314117244297624e-10, -1.540195625869043e+00 },
- { 3.492425104288060e-10, -1.569624598707558e+00 },
- { 3.670601476445565e-10, -1.599069236228850e+00 },
- { 3.848639652533361e-10, -1.628528373302631e+00 },
- { 4.026532929512281e-10, -1.658000841439269e+00 },
- { 4.204274609803869e-10, -1.687485468837799e+00 },
- { 4.381858001531792e-10, -1.716981080430596e+00 },
- { 4.559276418782829e-10, -1.746486497931567e+00 },
- { 4.736523181853565e-10, -1.776000539882225e+00 },
- { 4.913591617503452e-10, -1.805522021699094e+00 },
- { 5.090475059206794e-10, -1.835049755721194e+00 },
- { 5.267166847401562e-10, -1.864582551257262e+00 },
- { 5.443660329740862e-10, -1.894119214633676e+00 },
- { 5.619948861345454e-10, -1.923658549242818e+00 },
- { 5.796025805053097e-10, -1.953199355591180e+00 },
- { 5.971884531664190e-10, -1.982740431347091e+00 },
- { 6.147518420199055e-10, -2.012280571390674e+00 },
- { 6.322920858139346e-10, -2.041818567861395e+00 },
- { 6.498085241682158e-10, -2.071353210208005e+00 },
- { 6.673004975990425e-10, -2.100883285238127e+00 },
- { 6.847673475432746e-10, -2.130407577166309e+00 },
- { 7.022084163838545e-10, -2.159924867664933e+00 },
- { 7.196230474743716e-10, -2.189433935913779e+00 },
- { 7.370105851640495e-10, -2.218933558650552e+00 },
- { 7.543703748217808e-10, -2.248422510220072e+00 },
- { 7.717017628611672e-10, -2.277899562625407e+00 },
- { 7.890040967654542e-10, -2.307363485579104e+00 },
- { 8.062767251113011e-10, -2.336813046552684e+00 },
- { 8.235189975944034e-10, -2.366247010829556e+00 },
- { 8.407302650525749e-10, -2.395664141553858e+00 },
- { 8.579098794915287e-10, -2.425063199784153e+00 },
- { 8.750571941082773e-10, -2.454442944543319e+00 },
- { 8.921715633164894e-10, -2.483802132872044e+00 },
- { 9.092523427695200e-10, -2.513139519878584e+00 },
- { 9.262988893857148e-10, -2.542453858792682e+00 },
- { 9.433105613723914e-10, -2.571743901017465e+00 },
- { 9.602867182493987e-10, -2.601008396180870e+00 },
- { 9.772267208744730e-10, -2.630246092190425e+00 },
- { 9.941299314658458e-10, -2.659455735283526e+00 },
- { 1.010995713627070e-09, -2.688636070081818e+00 },
- { 1.027823432371055e-09, -2.717785839644439e+00 },
- { 1.044612454143997e-09, -2.746903785521352e+00 },
- { 1.061362146848353e-09, -2.775988647805256e+00 },
- { 1.078071879867828e-09, -2.805039165187255e+00 },
- { 1.094741024090249e-09, -2.834054075009077e+00 },
- { 1.111368951931856e-09, -2.863032113318052e+00 },
- { 1.127955037360817e-09, -2.891972014920939e+00 },
- { 1.144498655920037e-09, -2.920872513436805e+00 },
- { 1.160999184751779e-09, -2.949732341353290e+00 },
- { 1.177456002620215e-09, -2.978550230079517e+00 },
- { 1.193868489936097e-09, -3.007324910002949e+00 },
- { 1.210236028777826e-09, -3.036055110540183e+00 },
- { 1.226558002917232e-09, -3.064739560196251e+00 },
- { 1.242833797841123e-09, -3.093376986616735e+00 },
- { 1.259062800774685e-09, -3.121966116643377e+00 },
- { 1.275244400705935e-09, -3.150505676371791e+00 },
- { 1.291377988406056e-09, -3.178994391202159e+00 },
- { 1.307462956454857e-09, -3.207430985899192e+00 },
- { 1.323498699262108e-09, -3.235814184645077e+00 },
- { 1.339484613091842e-09, -3.264142711097884e+00 },
- { 1.355420096082785e-09, -3.292415288443373e+00 },
- { 1.371304548273191e-09, -3.320630639454825e+00 },
- { 1.387137371622433e-09, -3.348787486547389e+00 },
- { 1.402917970033511e-09, -3.376884551834256e+00 },
- { 1.418645749376393e-09, -3.404920557184582e+00 },
- { 1.434320117508396e-09, -3.432894224276359e+00 },
- { 1.449940484298756e-09, -3.460804274656981e+00 },
- { 1.465506261649108e-09, -3.488649429796768e+00 },
- { 1.481016863517580e-09, -3.516428411149154e+00 },
- { 1.496471705937951e-09, -3.544139940202303e+00 },
- { 1.511870207044433e-09, -3.571782738540999e+00 },
- { 1.527211787092206e-09, -3.599355527901174e+00 },
- { 1.542495868479076e-09, -3.626857030226671e+00 },
- { 1.557721875768920e-09, -3.654285967729458e+00 },
- { 1.572889235710329e-09, -3.681641062941412e+00 },
- { 1.587997377261005e-09, -3.708921038776707e+00 },
- { 1.603045731607830e-09, -3.736124618586623e+00 },
- { 1.618033732189314e-09, -3.763250526218862e+00 },
- { 1.632960814715177e-09, -3.790297486071938e+00 },
- { 1.647826417189275e-09, -3.817264223155802e+00 },
- { 1.662629979930247e-09, -3.844149463148589e+00 },
- { 1.677370945591844e-09, -3.870951932452996e+00 },
- { 1.692048759186008e-09, -3.897670358257890e+00 },
- { 1.706662868100504e-09, -3.924303468590212e+00 },
- { 1.721212722122685e-09, -3.950849992378278e+00 },
- { 1.735697773458400e-09, -3.977308659506432e+00 },
- { 1.750117476754591e-09, -4.003678200876669e+00 },
- { 1.764471289116712e-09, -4.029957348461003e+00 },
- { 1.778758670132079e-09, -4.056144835364877e+00 },
- { 1.792979081888926e-09, -4.082239395882965e+00 },
- { 1.807131988996465e-09, -4.108239765556996e+00 },
- { 1.821216858606652e-09, -4.134144681236933e+00 },
- { 1.835233160431175e-09, -4.159952881133585e+00 },
- { 1.849180366764537e-09, -4.185663104882633e+00 },
- { 1.863057952502055e-09, -4.211274093599509e+00 },
- { 1.876865395161145e-09, -4.236784589940537e+00 },
- { 1.890602174898734e-09, -4.262193338157148e+00 },
- { 1.904267774533022e-09, -4.287499084158302e+00 },
- { 1.917861679562008e-09, -4.312700575567174e+00 },
- { 1.931383378182392e-09, -4.337796561778708e+00 },
- { 1.944832361310856e-09, -4.362785794021793e+00 },
- { 1.958208122599839e-09, -4.387667025411434e+00 },
- { 1.971510158459931e-09, -4.412439011013396e+00 },
- { 1.984737968076495e-09, -4.437100507898339e+00 },
- { 1.997891053431005e-09, -4.461650275204912e+00 },
- { 2.010968919316289e-09, -4.486087074191693e+00 },
- { 2.023971073358447e-09, -4.510409668301784e+00 },
- { 2.036897026033634e-09, -4.534616823217992e+00 },
- { 2.049746290686799e-09, -4.558707306921882e+00 },
- { 2.062518383551274e-09, -4.582679889754607e+00 },
- { 2.075212823764071e-09, -4.606533344469879e+00 },
- { 2.087829133387063e-09, -4.630266446298172e+00 },
- { 2.100366837422912e-09, -4.653877973001258e+00 },
- { 2.112825463835087e-09, -4.677366704934605e+00 },
- { 2.125204543562522e-09, -4.700731425099899e+00 },
- { 2.137503610540056e-09, -4.723970919208608e+00 },
- { 2.149722201714786e-09, -4.747083975738060e+00 },
- { 2.161859857063438e-09, -4.770069385989595e+00 },
- { 2.173916119610994e-09, -4.792925944149308e+00 },
- { 2.185890535445098e-09, -4.815652447340950e+00 },
- { 2.197782653735957e-09, -4.838247695689436e+00 },
- { 2.209592026751962e-09, -4.860710492376411e+00 },
- { 2.221318209877576e-09, -4.883039643700314e+00 },
- { 2.232960761627846e-09, -4.905233959130168e+00 },
- { 2.244519243667616e-09, -4.927292251368517e+00 },
- { 2.255993220826402e-09, -4.949213336406265e+00 },
- { 2.267382261115285e-09, -4.970996033581527e+00 },
- { 2.278685935744269e-09, -4.992639165639563e+00 },
- { 2.289903819135414e-09, -5.014141558784778e+00 },
- { 2.301035488942000e-09, -5.035502042744443e+00 },
- { 2.312080526062763e-09, -5.056719450823151e+00 },
- { 2.323038514659161e-09, -5.077792619963239e+00 },
- { 2.333909042168180e-09, -5.098720390796817e+00 },
- { 2.344691699320969e-09, -5.119501607709159e+00 },
- { 2.355386080156553e-09, -5.140135118892792e+00 },
- { 2.365991782037187e-09, -5.160619776404897e+00 },
- { 2.376508405665132e-09, -5.180954436227641e+00 },
- { 2.386935555094626e-09, -5.201137958319343e+00 },
- { 2.397272837749508e-09, -5.221169206676762e+00 },
- { 2.407519864436774e-09, -5.241047049389645e+00 },
- { 2.417676249362563e-09, -5.260770358700167e+00 },
- { 2.427741610143750e-09, -5.280338011053974e+00 },
- { 2.437715567825576e-09, -5.299748887163106e+00 },
- { 2.447597746894037e-09, -5.319001872058887e+00 },
- { 2.457387775290440e-09, -5.338095855149190e+00 },
- { 2.467085284426756e-09, -5.357029730277389e+00 },
- { 2.476689909196263e-09, -5.375802395772283e+00 },
- { 2.486201287990485e-09, -5.394412754510426e+00 },
- { 2.495619062711154e-09, -5.412859713968929e+00 },
- { 2.504942878785408e-09, -5.431142186284682e+00 },
- { 2.514172385175743e-09, -5.449259088303476e+00 },
- { 2.523307234396791e-09, -5.467209341642627e+00 },
- { 2.532347082526785e-09, -5.484991872743321e+00 },
- { 2.541291589219998e-09, -5.502605612925014e+00 },
- { 2.550140417722072e-09, -5.520049498445633e+00 },
- { 2.558893234878378e-09, -5.537322470548212e+00 },
- { 2.567549711150773e-09, -5.554423475524196e+00 },
- { 2.576109520627371e-09, -5.571351464763084e+00 },
- { 2.584572341037361e-09, -5.588105394812198e+00 },
- { 2.592937853759161e-09, -5.604684227423386e+00 },
- { 2.601205743836355e-09, -5.621086929615246e+00 },
- { 2.609375699987564e-09, -5.637312473723475e+00 },
- { 2.617447414618146e-09, -5.653359837454964e+00 },
- { 2.625420583833750e-09, -5.669228003945694e+00 },
- { 2.633294907447937e-09, -5.684915961806963e+00 },
- { 2.641070088997271e-09, -5.700422705186584e+00 },
- { 2.648745835750128e-09, -5.715747233817712e+00 },
- { 2.656321858720176e-09, -5.730888553077074e+00 },
- { 2.663797872673252e-09, -5.745845674030161e+00 },
- { 2.671173596142054e-09, -5.760617613492118e+00 },
- { 2.678448751434797e-09, -5.775203394076705e+00 },
- { 2.685623064645538e-09, -5.789602044248679e+00 },
- { 2.692696265666640e-09, -5.803812598380606e+00 },
- { 2.699668088194915e-09, -5.817834096797069e+00 },
- { 2.706538269745573e-09, -5.831665585834668e+00 },
- { 2.713306551659817e-09, -5.845306117889361e+00 },
- { 2.719972679116734e-09, -5.858754751472542e+00 },
- { 2.726536401139295e-09, -5.872010551255358e+00 },
- { 2.732997470607439e-09, -5.885072588127400e+00 },
- { 2.739355644265558e-09, -5.897939939244211e+00 },
- { 2.745610682731633e-09, -5.910611688078208e+00 },
- { 2.751762350508137e-09, -5.923086924473290e+00 },
- { 2.757810415987146e-09, -5.935364744687794e+00 },
- { 2.763754651462700e-09, -5.947444251452243e+00 },
- { 2.769594833137415e-09, -5.959324554015538e+00 },
- { 2.775330741132843e-09, -5.971004768198829e+00 },
- { 2.780962159494174e-09, -5.982484016437981e+00 },
- { 2.786488876202047e-09, -5.993761427840588e+00 },
- { 2.791910683178690e-09, -6.004836138231525e+00 },
- { 2.797227376295779e-09, -6.015707290202086e+00 },
- { 2.802438755383971e-09, -6.026374033162623e+00 },
- { 2.807544624236659e-09, -6.036835523383457e+00 },
- { 2.812544790621093e-09, -6.047090924050914e+00 },
- { 2.817439066283459e-09, -6.057139405311101e+00 },
- { 2.822227266958278e-09, -6.066980144322601e+00 },
- { 2.826909212371261e-09, -6.076612325295799e+00 },
- { 2.831484726250221e-09, -6.086035139548830e+00 },
- { 2.835953636329660e-09, -6.095247785550617e+00 },
- { 2.840315774357203e-09, -6.104249468967751e+00 },
- { 2.844570976102082e-09, -6.113039402715685e+00 },
- { 2.848719081357095e-09, -6.121616806996519e+00 },
- { 2.852759933948860e-09, -6.129980909353977e+00 },
- { 2.856693381741114e-09, -6.138130944714082e+00 },
- { 2.860519276643053e-09, -6.146066155436312e+00 },
- { 2.864237474610633e-09, -6.153785791350256e+00 },
- { 2.867847835656203e-09, -6.161289109809551e+00 },
- { 2.871350223851726e-09, -6.168575375732642e+00 },
- { 2.874744507333867e-09, -6.175643861647406e+00 },
- { 2.878030558310989e-09, -6.182493847739853e+00 },
- { 2.881208253063899e-09, -6.189124621889823e+00 },
- { 2.884277471954592e-09, -6.195535479723423e+00 },
- { 2.887238099428306e-09, -6.201725724651554e+00 },
- { 2.890090024020323e-09, -6.207694667918394e+00 },
- { 2.892833138356060e-09, -6.213441628635915e+00 },
- { 2.895467339159240e-09, -6.218965933835304e+00 },
- { 2.897992527253659e-09, -6.224266918505075e+00 },
- { 2.900408607567016e-09, -6.229343925633495e+00 },
- { 2.902715489136496e-09, -6.234196306254763e+00 },
- { 2.904913085108075e-09, -6.238823419482017e+00 },
- { 2.907001312743911e-09, -6.243224632557377e+00 },
- { 2.908980093422997e-09, -6.247399320887848e+00 },
- { 2.910849352646620e-09, -6.251346868091392e+00 },
- { 2.912609020036956e-09, -6.255066666028537e+00 },
- { 2.914259029343965e-09, -6.258558114851525e+00 },
- { 2.915799318445710e-09, -6.261820623039620e+00 },
- { 2.917229829350759e-09, -6.264853607438842e+00 },
- { 2.918550508202463e-09, -6.267656493305673e+00 },
- { 2.919761305276718e-09, -6.270228714337005e+00 },
- { 2.920862174988150e-09, -6.272569712717951e+00 },
- { 2.921853075889193e-09, -6.274678939154603e+00 },
- { 2.922733970674264e-09, -6.276555852917634e+00 },
- { 2.923504826176907e-09, -6.278199921870962e+00 },
- { 2.924165613375264e-09, -6.279610622518139e+00 },
- { 2.924716307391075e-09, -6.280787440034993e+00 },
- { 2.925156887490598e-09, -6.281729868306345e+00 },
- { 2.925487337087508e-09, -6.282437409966992e+00 },
- { 2.925707643739298e-09, -6.282909576428774e+00 },
- { 2.925817799151970e-09, -6.283145887925411e+00 },
diff --git a/gnuradio-runtime/lib/single_threaded_scheduler.cc b/gnuradio-runtime/lib/single_threaded_scheduler.cc
new file mode 100644
index 0000000000..0d7f91670b
--- /dev/null
+++ b/gnuradio-runtime/lib/single_threaded_scheduler.cc
@@ -0,0 +1,363 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/single_threaded_scheduler.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <boost/thread.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+#include <limits>
+#include <assert.h>
+#include <stdio.h>
+
+namespace gr {
+
+ // must be defined to either 0 or 1
+#define ENABLE_LOGGING 0
+
+#if (ENABLE_LOGGING)
+#define LOG(x) do { x; } while(0)
+#else
+#define LOG(x) do {;} while(0)
+#endif
+
+ static int which_scheduler = 0;
+
+ single_threaded_scheduler_sptr
+ make_single_threaded_scheduler(const std::vector<block_sptr> &blocks)
+ {
+ return single_threaded_scheduler_sptr
+ (new single_threaded_scheduler(blocks));
+ }
+
+ single_threaded_scheduler::single_threaded_scheduler(const std::vector<block_sptr> &blocks)
+ : d_blocks(blocks), d_enabled(true), d_log(0)
+ {
+ if(ENABLE_LOGGING) {
+ std::string name = str(boost::format("sst-%d.log") % which_scheduler++);
+ d_log = new std::ofstream(name.c_str());
+ *d_log << "single_threaded_scheduler: "
+ << d_blocks.size ()
+ << " blocks\n";
+ }
+ }
+
+ single_threaded_scheduler::~single_threaded_scheduler()
+ {
+ if(ENABLE_LOGGING)
+ delete d_log;
+ }
+
+ void
+ single_threaded_scheduler::run()
+ {
+ // d_enabled = true; // KLUDGE
+ main_loop ();
+ }
+
+ void
+ single_threaded_scheduler::stop()
+ {
+ if(0)
+ std::cout << "gr_singled_threaded_scheduler::stop() "
+ << this << std::endl;
+ d_enabled = false;
+ }
+
+ inline static unsigned int
+ round_up(unsigned int n, unsigned int multiple)
+ {
+ return ((n + multiple - 1) / multiple) * multiple;
+ }
+
+ inline static unsigned int
+ round_down(unsigned int n, unsigned int multiple)
+ {
+ return (n / multiple) * multiple;
+ }
+
+ //
+ // Return minimum available write space in all our downstream
+ // buffers or -1 if we're output blocked and the output we're
+ // blocked on is done.
+ //
+ static int
+ min_available_space(block_detail *d, int output_multiple)
+ {
+ int min_space = std::numeric_limits<int>::max();
+
+ for(int i = 0; i < d->noutputs (); i++) {
+ int n = round_down (d->output(i)->space_available (), output_multiple);
+ if(n == 0) { // We're blocked on output.
+ if(d->output(i)->done()) { // Downstream is done, therefore we're done.
+ return -1;
+ }
+ return 0;
+ }
+ min_space = std::min (min_space, n);
+ }
+ return min_space;
+ }
+
+ void
+ single_threaded_scheduler::main_loop()
+ {
+ static const int DEFAULT_CAPACITY = 16;
+
+ int noutput_items;
+ gr_vector_int ninput_items_required(DEFAULT_CAPACITY);
+ gr_vector_int ninput_items(DEFAULT_CAPACITY);
+ gr_vector_const_void_star input_items(DEFAULT_CAPACITY);
+ gr_vector_void_star output_items(DEFAULT_CAPACITY);
+ unsigned int bi;
+ unsigned int nalive;
+ int max_items_avail;
+ bool made_progress_last_pass;
+ bool making_progress;
+
+ for(unsigned i = 0; i < d_blocks.size (); i++)
+ d_blocks[i]->detail()->set_done (false); // reset any done flags
+
+ for(unsigned i = 0; i < d_blocks.size (); i++) // enable any drivers, etc.
+ d_blocks[i]->start();
+
+ bi = 0;
+ made_progress_last_pass = true;
+ making_progress = false;
+
+ // Loop while there are still blocks alive
+
+ nalive = d_blocks.size ();
+ while(d_enabled && nalive > 0) {
+ if(boost::this_thread::interruption_requested())
+ break;
+
+ block *m = d_blocks[bi].get ();
+ block_detail *d = m->detail().get ();
+
+ LOG(*d_log << std::endl << m);
+
+ if(d->done ())
+ goto next_block;
+
+ if(d->source_p ()) {
+ // Invoke sources as a last resort. As long as the previous
+ // pass made progress, don't call a source.
+ if(made_progress_last_pass) {
+ LOG(*d_log << " Skipping source\n");
+ goto next_block;
+ }
+
+ ninput_items_required.resize (0);
+ ninput_items.resize (0);
+ input_items.resize (0);
+ output_items.resize (d->noutputs ());
+
+ // determine the minimum available output space
+ noutput_items = min_available_space (d, m->output_multiple ());
+ LOG(*d_log << " source\n noutput_items = " << noutput_items << std::endl);
+ if(noutput_items == -1) // we're done
+ goto were_done;
+
+ if(noutput_items == 0) { // we're output blocked
+ LOG(*d_log << " BLKD_OUT\n");
+ goto next_block;
+ }
+
+ goto setup_call_to_work; // jump to common code
+ }
+
+ else if(d->sink_p ()) {
+ ninput_items_required.resize (d->ninputs ());
+ ninput_items.resize (d->ninputs ());
+ input_items.resize (d->ninputs ());
+ output_items.resize (0);
+ LOG(*d_log << " sink\n");
+
+ max_items_avail = 0;
+ for(int i = 0; i < d->ninputs (); i++) {
+ ninput_items[i] = d->input(i)->items_available();
+ //if (ninput_items[i] == 0 && d->input(i)->done())
+ if(ninput_items[i] < m->output_multiple() && d->input(i)->done())
+ goto were_done;
+
+ max_items_avail = std::max (max_items_avail, ninput_items[i]);
+ }
+
+ // take a swag at how much output we can sink
+ noutput_items = (int) (max_items_avail * m->relative_rate ());
+ noutput_items = round_down (noutput_items, m->output_multiple ());
+ LOG(*d_log << " max_items_avail = " << max_items_avail << std::endl);
+ LOG(*d_log << " noutput_items = " << noutput_items << std::endl);
+
+ if(noutput_items == 0) { // we're blocked on input
+ LOG(*d_log << " BLKD_IN\n");
+ goto next_block;
+ }
+
+ goto try_again; // Jump to code shared with regular case.
+ }
+
+ else {
+ // do the regular thing
+ ninput_items_required.resize(d->ninputs ());
+ ninput_items.resize(d->ninputs ());
+ input_items.resize(d->ninputs ());
+ output_items.resize(d->noutputs ());
+
+ max_items_avail = 0;
+ for(int i = 0; i < d->ninputs (); i++) {
+ ninput_items[i] = d->input(i)->items_available ();
+ max_items_avail = std::max(max_items_avail, ninput_items[i]);
+ }
+
+ // determine the minimum available output space
+ noutput_items = min_available_space(d, m->output_multiple ());
+ if(ENABLE_LOGGING){
+ *d_log << " regular ";
+ if(m->relative_rate() >= 1.0)
+ *d_log << "1:" << m->relative_rate() << std::endl;
+ else
+ *d_log << 1.0/m->relative_rate() << ":1\n";
+ *d_log << " max_items_avail = " << max_items_avail << std::endl;
+ *d_log << " noutput_items = " << noutput_items << std::endl;
+ }
+ if(noutput_items == -1) // we're done
+ goto were_done;
+
+ if(noutput_items == 0) { // we're output blocked
+ LOG(*d_log << " BLKD_OUT\n");
+ goto next_block;
+ }
+
+#if 0
+ // Compute best estimate of noutput_items that we can really use.
+ noutput_items =
+ std::min((unsigned)noutput_items,
+ std::max((unsigned)m->output_multiple(),
+ round_up((unsigned)(max_items_avail * m->relative_rate()),
+ m->output_multiple())));
+
+ LOG(*d_log << " revised noutput_items = " << noutput_items << std::endl);
+#endif
+
+ try_again:
+ if(m->fixed_rate()) {
+ // try to work it forward starting with max_items_avail.
+ // We want to try to consume all the input we've got.
+ int reqd_noutput_items = m->fixed_rate_ninput_to_noutput(max_items_avail);
+ reqd_noutput_items = round_up(reqd_noutput_items, m->output_multiple());
+ if(reqd_noutput_items > 0 && reqd_noutput_items <= noutput_items)
+ noutput_items = reqd_noutput_items;
+ }
+
+ // ask the block how much input they need to produce noutput_items
+ m->forecast(noutput_items, ninput_items_required);
+
+ // See if we've got sufficient input available
+ int i;
+ for(i = 0; i < d->ninputs (); i++)
+ if(ninput_items_required[i] > ninput_items[i]) // not enough
+ break;
+
+ if(i < d->ninputs()) { // not enough input on input[i]
+ // if we can, try reducing the size of our output request
+ if(noutput_items > m->output_multiple ()){
+ noutput_items /= 2;
+ noutput_items = round_up (noutput_items, m->output_multiple ());
+ goto try_again;
+ }
+
+ // We're blocked on input
+ LOG(*d_log << " BLKD_IN\n");
+ if(d->input(i)->done()) // If the upstream block is done, we're done
+ goto were_done;
+
+ // Is it possible to ever fulfill this request?
+ if(ninput_items_required[i] > d->input(i)->max_possible_items_available ()) {
+ // Nope, never going to happen...
+ std::cerr << "\nsched: <block " << m->name()
+ << " (" << m->unique_id() << ")>"
+ << " is requesting more input data\n"
+ << " than we can provide.\n"
+ << " ninput_items_required = "
+ << ninput_items_required[i] << "\n"
+ << " max_possible_items_available = "
+ << d->input(i)->max_possible_items_available() << "\n"
+ << " If this is a filter, consider reducing the number of taps.\n";
+ goto were_done;
+ }
+
+ goto next_block;
+ }
+
+ // We've got enough data on each input to produce noutput_items.
+ // Finish setting up the call to work.
+ for(int i = 0; i < d->ninputs (); i++)
+ input_items[i] = d->input(i)->read_pointer();
+
+ setup_call_to_work:
+
+ for(int i = 0; i < d->noutputs (); i++)
+ output_items[i] = d->output(i)->write_pointer();
+
+ // Do the actual work of the block
+ int n = m->general_work(noutput_items, ninput_items,
+ input_items, output_items);
+ LOG(*d_log << " general_work: noutput_items = " << noutput_items
+ << " result = " << n << std::endl);
+
+ if(n == -1) // block is done
+ goto were_done;
+
+ d->produce_each(n); // advance write pointers
+ if(n > 0)
+ making_progress = true;
+
+ goto next_block;
+ }
+ assert(0);
+
+ were_done:
+ LOG(*d_log << " were_done\n");
+ d->set_done (true);
+ nalive--;
+
+ next_block:
+ if(++bi >= d_blocks.size ()) {
+ bi = 0;
+ made_progress_last_pass = making_progress;
+ making_progress = false;
+ }
+ }
+
+ for(unsigned i = 0; i < d_blocks.size(); i++) // disable any drivers, etc.
+ d_blocks[i]->stop();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc
new file mode 100644
index 0000000000..70596abb05
--- /dev/null
+++ b/gnuradio-runtime/lib/sptr_magic.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/sptr_magic.h>
+#include <gnuradio/hier_block2.h>
+#include <map>
+#include <stdexcept>
+
+#include <gnuradio/thread/thread.h>
+
+namespace gnuradio {
+
+ static gr::thread::mutex s_mutex;
+ typedef std::map<gr::basic_block*, gr::basic_block_sptr> sptr_map;
+ static sptr_map s_map;
+
+ void
+ detail::sptr_magic::create_and_stash_initial_sptr(gr::hier_block2 *p)
+ {
+ gr::basic_block_sptr sptr(p);
+ gr::thread::scoped_lock guard(s_mutex);
+ s_map.insert(sptr_map::value_type(static_cast<gr::basic_block *>(p), sptr));
+ }
+
+ gr::basic_block_sptr
+ detail::sptr_magic::fetch_initial_sptr(gr::basic_block *p)
+ {
+ /*
+ * If p isn't a subclass of gr::hier_block2, just create the
+ * shared ptr and return it.
+ */
+ gr::hier_block2 *hb2 = dynamic_cast<gr::hier_block2 *>(p);
+ if(!hb2) {
+ return gr::basic_block_sptr(p);
+ }
+
+ /*
+ * p is a subclass of gr::hier_block2, thus we've already created the shared pointer
+ * and stashed it away. Fish it out and return it.
+ */
+ gr::thread::scoped_lock guard(s_mutex);
+ sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block *>(p));
+ if(pos == s_map.end())
+ throw std::invalid_argument("sptr_magic: invalid pointer!");
+
+ gr::basic_block_sptr sptr = pos->second;
+ s_map.erase(pos);
+ return sptr;
+ }
+};
diff --git a/gnuradio-runtime/lib/sync_block.cc b/gnuradio-runtime/lib/sync_block.cc
new file mode 100644
index 0000000000..e00b80c79e
--- /dev/null
+++ b/gnuradio-runtime/lib/sync_block.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+
+ sync_block::sync_block(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature)
+ : block(name, input_signature, output_signature)
+ {
+ set_fixed_rate(true);
+ }
+
+ void
+ sync_block::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+ }
+
+ int
+ sync_block::fixed_rate_noutput_to_ninput(int noutput_items)
+ {
+ return noutput_items + history() - 1;
+ }
+
+ int
+ sync_block::fixed_rate_ninput_to_noutput(int ninput_items)
+ {
+ return std::max(0, ninput_items - (int)history() + 1);
+ }
+
+ int
+ sync_block::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ int r = work(noutput_items, input_items, output_items);
+ if(r > 0)
+ consume_each(r);
+ return r;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/sync_decimator.cc b/gnuradio-runtime/lib/sync_decimator.cc
new file mode 100644
index 0000000000..a9c2d1eeff
--- /dev/null
+++ b/gnuradio-runtime/lib/sync_decimator.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+
+ sync_decimator::sync_decimator(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature,
+ unsigned decimation)
+ : sync_block(name, input_signature, output_signature)
+ {
+ set_decimation(decimation);
+ }
+
+ void
+ sync_decimator::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+ }
+
+ int
+ sync_decimator::fixed_rate_noutput_to_ninput(int noutput_items)
+ {
+ return noutput_items * decimation() + history() - 1;
+ }
+
+ int
+ sync_decimator::fixed_rate_ninput_to_noutput(int ninput_items)
+ {
+ return std::max(0, ninput_items - (int)history() + 1) / decimation();
+ }
+
+ int
+ sync_decimator::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ int r = work(noutput_items, input_items, output_items);
+ if(r > 0)
+ consume_each(r * decimation ());
+ return r;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/sync_interpolator.cc b/gnuradio-runtime/lib/sync_interpolator.cc
new file mode 100644
index 0000000000..5721f24f0f
--- /dev/null
+++ b/gnuradio-runtime/lib/sync_interpolator.cc
@@ -0,0 +1,73 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+
+ sync_interpolator::sync_interpolator(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature,
+ unsigned interpolation)
+ : sync_block(name, input_signature, output_signature)
+ {
+ set_interpolation(interpolation);
+ }
+
+ void
+ sync_interpolator::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = fixed_rate_noutput_to_ninput(noutput_items);
+ }
+
+ int
+ sync_interpolator::fixed_rate_noutput_to_ninput(int noutput_items)
+ {
+ return noutput_items / interpolation() + history() - 1;
+ }
+
+ int
+ sync_interpolator::fixed_rate_ninput_to_noutput(int ninput_items)
+ {
+ return std::max(0, ninput_items - (int)history() + 1) * interpolation();
+ }
+
+ int
+ sync_interpolator::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ int r = work(noutput_items, input_items, output_items);
+ if(r > 0)
+ consume_each(r / interpolation());
+ return r;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc
new file mode 100644
index 0000000000..64853c68b2
--- /dev/null
+++ b/gnuradio-runtime/lib/sys_paths.cc
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/sys_paths.h>
+#include <cstdlib> //getenv
+#include <cstdio> //P_tmpdir (maybe)
+
+namespace gr {
+
+ const char *tmp_path()
+ {
+ const char *path;
+
+ //first case, try TMP environment variable
+ path = getenv("TMP");
+ if(path)
+ return path;
+
+ //second case, try P_tmpdir when its defined
+ #ifdef P_tmpdir
+ if(P_tmpdir)
+ return P_tmpdir;
+ #endif /*P_tmpdir*/
+
+ //fall-through case, nothing worked
+ return "/tmp";
+ }
+
+ const char *appdata_path()
+ {
+ const char *path;
+
+ //first case, try HOME environment variable (unix)
+ path = getenv("HOME");
+ if(path)
+ return path;
+
+ //second case, try APPDATA environment variable (windows)
+ path = getenv("APPDATA");
+ if(path)
+ return path;
+
+ //fall-through case, nothing worked
+ return tmp_path();
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/tagged_stream_block.cc b/gnuradio-runtime/lib/tagged_stream_block.cc
new file mode 100644
index 0000000000..40febfdeca
--- /dev/null
+++ b/gnuradio-runtime/lib/tagged_stream_block.cc
@@ -0,0 +1,144 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <boost/format.hpp>
+#include <gnuradio/tagged_stream_block.h>
+
+namespace gr {
+
+ tagged_stream_block::tagged_stream_block(const std::string &name,
+ io_signature::sptr input_signature,
+ io_signature::sptr output_signature,
+ const std::string &length_tag_key)
+ : block(name, input_signature, output_signature),
+ d_length_tag_key(pmt::string_to_symbol(length_tag_key)),
+ d_n_input_items_reqd(input_signature->min_streams(), 0),
+ d_length_tag_key_str(length_tag_key)
+ {
+ }
+
+ // This is evil hackery: We trick the scheduler into creating the right number of input items
+ void
+ tagged_stream_block::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++) {
+ if (i < d_n_input_items_reqd.size() && d_n_input_items_reqd[i] != 0) {
+ ninput_items_required[i] = d_n_input_items_reqd[i];
+ }
+ else {
+ // If there's no item, there's no tag--so there must at least be one!
+ ninput_items_required[i] = std::max(1, (int)std::floor((double) noutput_items / relative_rate() + 0.5));
+ }
+ }
+ }
+
+ void
+ tagged_stream_block::parse_length_tags(const std::vector<std::vector<tag_t> > &tags,
+ gr_vector_int &n_input_items_reqd)
+ {
+ for(unsigned i = 0; i < tags.size(); i++) {
+ for(unsigned k = 0; k < tags[i].size(); k++) {
+ if(tags[i][k].key == d_length_tag_key) {
+ n_input_items_reqd[i] = pmt::to_long(tags[i][k].value);
+ remove_item_tag(i, tags[i][k]);
+ }
+ }
+ }
+ }
+
+ int
+ tagged_stream_block::calculate_output_stream_length(const gr_vector_int &ninput_items)
+ {
+ int noutput_items = *std::max_element(ninput_items.begin(), ninput_items.end());
+ return (int)std::floor(relative_rate() * noutput_items + 0.5);
+ }
+
+ void
+ tagged_stream_block::update_length_tags(int n_produced, int n_ports)
+ {
+ for(int i = 0; i < n_ports; i++) {
+ add_item_tag(i, nitems_written(i),
+ d_length_tag_key,
+ pmt::from_long(n_produced));
+ }
+ return;
+ }
+
+ int
+ tagged_stream_block::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ if(d_length_tag_key_str.empty()) {
+ return work(noutput_items, ninput_items, input_items, output_items);
+ }
+
+ if(d_n_input_items_reqd[0] == 0) { // Otherwise, it's already set from a previous call
+ std::vector<std::vector<tag_t> > tags(input_items.size(), std::vector<tag_t>());
+ for(unsigned i = 0; i < input_items.size(); i++) {
+ get_tags_in_range(tags[i], i, nitems_read(i), nitems_read(i)+1);
+ }
+ d_n_input_items_reqd.assign(input_items.size(), -1);
+ parse_length_tags(tags, d_n_input_items_reqd);
+ }
+ for(unsigned i = 0; i < input_items.size(); i++) {
+ if(d_n_input_items_reqd[i] == -1) {
+ GR_LOG_FATAL(d_logger, boost::format("Missing a required length tag on port %1% at item #%2%") % i % nitems_read(i));
+ throw std::runtime_error("Missing length tag.");
+ }
+ if(d_n_input_items_reqd[i] > ninput_items[i]) {
+ return 0;
+ }
+ }
+
+ int min_output_size = calculate_output_stream_length(d_n_input_items_reqd);
+ if(noutput_items < min_output_size) {
+ set_min_noutput_items(min_output_size);
+ return 0;
+ }
+ set_min_noutput_items(1);
+
+ // WORK CALLED HERE //
+ int n_produced = work(noutput_items, d_n_input_items_reqd, input_items, output_items);
+ //////////////////////
+
+ if(n_produced == WORK_DONE) {
+ return n_produced;
+ }
+ for(int i = 0; i < (int) d_n_input_items_reqd.size(); i++) {
+ consume(i, d_n_input_items_reqd[i]);
+ }
+ update_length_tags(n_produced, output_items.size());
+
+ d_n_input_items_reqd.assign(input_items.size(), 0);
+
+ return n_produced;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc
new file mode 100644
index 0000000000..775dc2bde4
--- /dev/null
+++ b/gnuradio-runtime/lib/test.cc
@@ -0,0 +1,181 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2008,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "test.h"
+#include <gnuradio/io_signature.h>
+#include <stdexcept>
+#include <iostream>
+#include <string.h>
+
+namespace gr {
+
+ test_sptr
+ make_test(const std::string &name,
+ int min_inputs, int max_inputs, unsigned int sizeof_input_item,
+ int min_outputs, int max_outputs, unsigned int sizeof_output_item,
+ unsigned int history, unsigned int output_multiple, double relative_rate,
+ bool fixed_rate, consume_type_t cons_type, produce_type_t prod_type)
+ {
+ return gnuradio::get_initial_sptr
+ (new test(name, min_inputs, max_inputs, sizeof_input_item,
+ min_outputs, max_outputs, sizeof_output_item,
+ history, output_multiple, relative_rate,
+ fixed_rate,cons_type, prod_type));
+ }
+
+ test::test(const std::string &name,
+ int min_inputs, int max_inputs,
+ unsigned int sizeof_input_item,
+ int min_outputs, int max_outputs,
+ unsigned int sizeof_output_item,
+ unsigned int history,
+ unsigned int output_multiple,
+ double relative_rate,
+ bool fixed_rate,
+ consume_type_t cons_type, produce_type_t prod_type)
+ : block (name,
+ io_signature::make(min_inputs, max_inputs, sizeof_input_item),
+ io_signature::make(min_outputs, max_outputs, sizeof_output_item)),
+ d_sizeof_input_item(sizeof_input_item),
+ d_sizeof_output_item(sizeof_output_item),
+ d_check_topology(true),
+ d_consume_type(cons_type),
+ d_min_consume(0),
+ d_max_consume(0),
+ d_produce_type(prod_type),
+ d_min_produce(0),
+ d_max_produce(0)
+ {
+ set_history(history);
+ set_output_multiple(output_multiple);
+ set_relative_rate(relative_rate);
+ set_fixed_rate(fixed_rate);
+ }
+
+ int
+ test::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ //touch all inputs and outputs to detect segfaults
+ unsigned ninputs = input_items.size ();
+ unsigned noutputs= output_items.size();
+ for(unsigned i = 0; i < ninputs; i++) {
+ char * in=(char *)input_items[i];
+ if(ninput_items[i]< (int)(noutput_items+history())) {
+ std::cerr << "ERROR: ninput_items[" << i << "] < noutput_items+history()" << std::endl;
+ std::cerr << "ninput_items[" << i << "] = " << ninput_items[i] << std::endl;
+ std::cerr << "noutput_items+history() = " << noutput_items+history() << std::endl;
+ std::cerr << "noutput_items = " << noutput_items << std::endl;
+ std::cerr << "history() = " << history() << std::endl;
+ throw std::runtime_error ("test");
+ }
+ else {
+ for (int j = 0; j < ninput_items[i]; j++) {
+ //Touch every available input_item
+ //We use a class variable to avoid the compiler to optimize this away
+ for(unsigned int k = 0; k < d_sizeof_input_item; k++)
+ d_temp= in[j*d_sizeof_input_item+k];
+ }
+ switch(d_consume_type){
+ case CONSUME_NOUTPUT_ITEMS:
+ consume(i,noutput_items);
+ break;
+ case CONSUME_NOUTPUT_ITEMS_LIMIT_MAX:
+ consume(i,std::min(noutput_items,d_max_consume));
+ break;
+ case CONSUME_NOUTPUT_ITEMS_LIMIT_MIN:
+ consume(i,std::min(std::max(noutput_items,d_min_consume),ninput_items[i]));
+ break;
+ case CONSUME_ALL_AVAILABLE:
+ consume(i,ninput_items[i]);
+ break;
+ case CONSUME_ALL_AVAILABLE_LIMIT_MAX:
+ consume(i,std::min(ninput_items[i],d_max_consume));
+ break;
+/* //This could result in segfault, uncomment if you want to test this
+ case CONSUME_ALL_AVAILABLE_LIMIT_MIN:
+ consume(i,std::max(ninput_items[i],d_max_consume));
+ break;*/
+ case CONSUME_ZERO:
+ consume(i,0);
+ break;
+ case CONSUME_ONE:
+ consume(i,1);
+ break;
+ case CONSUME_MINUS_ONE:
+ consume(i,-1);
+ break;
+ default:
+ consume(i,noutput_items);
+ }
+ }
+ }
+ for(unsigned i = 0; i < noutputs; i++) {
+ char * out=(char *)output_items[i];
+ {
+ for(int j=0;j<noutput_items;j++) {
+ //Touch every available output_item
+ for(unsigned int k=0;k<d_sizeof_output_item;k++)
+ out[j*d_sizeof_input_item+k]=0;
+ }
+ }
+ }
+ //Now copy input to output until max ninputs or max noutputs is reached
+ int common_nports=std::min(ninputs,noutputs);
+ if(d_sizeof_output_item==d_sizeof_input_item)
+ for(int i = 0; i < common_nports; i++) {
+ memcpy(output_items[i],input_items[i],noutput_items*d_sizeof_input_item);
+ }
+ int noutput_items_produced=0;
+ switch(d_produce_type) {
+ case PRODUCE_NOUTPUT_ITEMS:
+ noutput_items_produced=noutput_items;
+ break;
+ case PRODUCE_NOUTPUT_ITEMS_LIMIT_MAX:
+ noutput_items_produced=std::min(noutput_items,d_max_produce);
+ break;
+/* //This could result in segfault, uncomment if you want to test this
+ case PRODUCE_NOUTPUT_ITEMS_LIMIT_MIN:
+ noutput_items_produced=std::max(noutput_items,d_min_produce);
+ break;*/
+ case PRODUCE_ZERO:
+ noutput_items_produced=0;
+ break;
+ case PRODUCE_ONE:
+ noutput_items_produced=1;
+ break;
+ case PRODUCE_MINUS_ONE:
+ noutput_items_produced=-1;
+ break;
+ default:
+ noutput_items_produced=noutput_items;
+ }
+ return noutput_items_produced;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h
new file mode 100644
index 0000000000..cbe42f94e8
--- /dev/null
+++ b/gnuradio-runtime/lib/test.h
@@ -0,0 +1,225 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TEST_H
+#define INCLUDED_GR_TEST_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/block.h>
+#include <string>
+#include "test_types.h"
+
+namespace gr {
+
+ class test;
+ typedef boost::shared_ptr<test> test_sptr;
+
+ // public constructor
+ GR_RUNTIME_API test_sptr
+ make_test(const std::string &name=std::string("test"),
+ int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
+ int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
+ unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
+ bool fixed_rate=true,consume_type_t cons_type=CONSUME_NOUTPUT_ITEMS,
+ produce_type_t prod_type=PRODUCE_NOUTPUT_ITEMS);
+
+ /*!
+ * \brief Test class for testing runtime system (setting up buffers and such.)
+ * \ingroup misc
+ *
+ * This block does not do any usefull actual data processing. It
+ * just exposes setting all standard block parameters using the
+ * contructor or public methods.
+ *
+ * This block can be usefull when testing the runtime system.
+ * You can force this block to have a large history, decimation
+ * factor and/or large output_multiple.
+ * The runtime system should detect this and create large enough buffers
+ * all through the signal chain.
+ */
+ class GR_RUNTIME_API test : public block
+ {
+ public:
+ ~test() {}
+
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ // ----------------------------------------------------------------
+ // override these to define your behavior
+ // ----------------------------------------------------------------
+
+ /*!
+ * \brief Estimate input requirements given output request
+ *
+ * \param noutput_items number of output items to produce
+ * \param ninput_items_required number of input items required on each input stream
+ *
+ * Given a request to product \p noutput_items, estimate the
+ * number of data items required on each input stream. The
+ * estimate doesn't have to be exact, but should be close.
+ */
+ void forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = (int)((double)noutput_items / relative_rate()) + (int)history();
+ }
+
+ /*!
+ * \brief Force check topology to return true or false.
+ *
+ * \param check_topology value to return when check_topology is
+ * called (true or false) default check_topology returns true
+ */
+ void set_check_topology(bool check_topology) {
+ d_check_topology=check_topology;
+ }
+
+ /*!
+ * \brief Confirm that ninputs and noutputs is an acceptable combination.
+ *
+ * \param ninputs number of input streams connected
+ * \param noutputs number of output streams connected
+ *
+ * \returns true if this is a valid configuration for this block.
+ *
+ * This function is called by the runtime system whenever the
+ * topology changes. Most classes do not need to override this.
+ * This check is in addition to the constraints specified by the
+ * input and output gr::io_signatures.
+ */
+ bool check_topology(int ninputs, int noutputs) {
+ return d_check_topology;
+ }
+
+ // ----------------------------------------------------------------
+ /*
+ * The following two methods provide special case info to the
+ * scheduler in the event that a block has a fixed input to output
+ * ratio. gr::sync_block, gr::sync_decimator and
+ * gr::sync_interpolator override these. If you're fixed rate,
+ * subclass one of those.
+ */
+ /*!
+ * \brief Given ninput samples, return number of output samples
+ * that will be produced. N.B. this is only defined if fixed_rate
+ * returns true. Generally speaking, you don't need to override
+ * this.
+ */
+ int fixed_rate_ninput_to_noutput(int ninput) {
+ return (int)((double)ninput/relative_rate());
+ }
+
+ /*!
+ * \brief Given noutput samples, return number of input samples
+ * required to produce noutput. N.B. this is only defined if
+ * fixed_rate returns true.
+ */
+ int fixed_rate_noutput_to_ninput(int noutput) {
+ return (int)((double)noutput*relative_rate());
+ }
+
+ /*!
+ * \brief Set if fixed rate should return true.
+ * N.B. This is normally a private method but we make it available here as public.
+ */
+ void set_fixed_rate_public(bool fixed_rate) {
+ set_fixed_rate(fixed_rate);
+ }
+
+ /*!
+ * \brief Set the consume pattern.
+ *
+ * \param cons_type which consume pattern to use
+ */
+ void set_consume_type(consume_type_t cons_type) {
+ d_consume_type=cons_type;
+ }
+
+ /*!
+ * \brief Set the consume limit.
+ *
+ * \param limit min or maximum items to consume (depending on
+ * consume_type)
+ */
+ void set_consume_limit(unsigned int limit) {
+ d_min_consume=limit; d_max_consume=limit;
+ }
+
+ /*!
+ * \brief Set the produce pattern.
+ *
+ * \param prod_type which produce pattern to use
+ */
+ void set_produce_type(produce_type_t prod_type) {
+ d_produce_type=prod_type;
+ }
+
+ /*!
+ * \brief Set the produce limit.
+ *
+ * \param limit min or maximum items to produce (depending on
+ * produce_type)
+ */
+ void set_produce_limit(unsigned int limit) {
+ d_min_produce=limit; d_max_produce=limit;
+ }
+
+ // ----------------------------------------------------------------------------
+
+ protected:
+ unsigned int d_sizeof_input_item;
+ unsigned int d_sizeof_output_item;
+ bool d_check_topology;
+ char d_temp;
+ consume_type_t d_consume_type;
+ int d_min_consume;
+ int d_max_consume;
+ produce_type_t d_produce_type;
+ int d_min_produce;
+ int d_max_produce;
+ test(const std::string &name,int min_inputs, int max_inputs,
+ unsigned int sizeof_input_item,
+ int min_outputs, int max_outputs, unsigned int sizeof_output_item,
+ unsigned int history, unsigned int output_multiple, double relative_rate,
+ bool fixed_rate, consume_type_t cons_type, produce_type_t prod_type);
+
+ friend GR_RUNTIME_API test_sptr make_test(const std::string &name,
+ int min_inputs, int max_inputs,
+ unsigned int sizeof_input_item,
+ int min_outputs, int max_outputs,
+ unsigned int sizeof_output_item,
+ unsigned int history,
+ unsigned int output_multiple,
+ double relative_rate,
+ bool fixed_rate,
+ consume_type_t cons_type,
+ produce_type_t prod_type);
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_TEST_H */
diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc
index 7dc7b17ea0..c85d325174 100644
--- a/gnuradio-runtime/lib/test_runtime.cc
+++ b/gnuradio-runtime/lib/test_runtime.cc
@@ -27,7 +27,7 @@
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include <qa_runtime.h>
#include <pmt/qa_pmt.h>
diff --git a/gnuradio-runtime/lib/test_types.h b/gnuradio-runtime/lib/test_types.h
new file mode 100644
index 0000000000..868a9e62a3
--- /dev/null
+++ b/gnuradio-runtime/lib/test_types.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TEST_TYPES_H
+#define INCLUDED_GR_TEST_TYPES_H
+
+namespace gr {
+
+ typedef enum {
+ CONSUME_NOUTPUT_ITEMS=0,
+ CONSUME_NOUTPUT_ITEMS_LIMIT_MAX=1,
+ CONSUME_NOUTPUT_ITEMS_LIMIT_MIN=2,
+ CONSUME_ALL_AVAILABLE=3,
+ CONSUME_ALL_AVAILABLE_LIMIT_MAX=4,
+ /*CONSUME_ALL_AVAILABLE_LIMIT_MIN=5,*/
+ CONSUME_ZERO=6,
+ CONSUME_ONE=7,
+ CONSUME_MINUS_ONE=8
+ } consume_type_t;
+
+ typedef enum {
+ PRODUCE_NOUTPUT_ITEMS=0,
+ PRODUCE_NOUTPUT_ITEMS_LIMIT_MAX=1,
+ /*PRODUCE_NOUTPUT_ITEMS_LIMIT_MIN=2,*/
+ PRODUCE_ZERO=6,
+ PRODUCE_ONE=7,
+ PRODUCE_MINUS_ONE=8
+ } produce_type_t;
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TEST_TYPES_H */
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc
index af0822445d..1727dc6621 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -23,7 +23,7 @@
#include <config.h>
#endif
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
diff --git a/gnuradio-runtime/lib/thread/thread_body_wrapper.cc b/gnuradio-runtime/lib/thread/thread_body_wrapper.cc
index 47feafdd42..e23b7d15d0 100644
--- a/gnuradio-runtime/lib/thread/thread_body_wrapper.cc
+++ b/gnuradio-runtime/lib/thread/thread_body_wrapper.cc
@@ -23,7 +23,7 @@
#include <config.h>
#endif
-#include <thread/thread_body_wrapper.h>
+#include <gnuradio/thread/thread_body_wrapper.h>
#ifdef HAVE_SIGNAL_H
#include <signal.h>
diff --git a/gnuradio-runtime/lib/thread/thread_group.cc b/gnuradio-runtime/lib/thread/thread_group.cc
index 034fe82e75..e467dfda5a 100644
--- a/gnuradio-runtime/lib/thread/thread_group.cc
+++ b/gnuradio-runtime/lib/thread/thread_group.cc
@@ -12,7 +12,7 @@
* This was extracted from Boost 1.35.0 and fixed.
*/
-#include <thread/thread_group.h>
+#include <gnuradio/thread/thread_group.h>
namespace gr {
namespace thread {
diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc
new file mode 100644
index 0000000000..8d2e42bb12
--- /dev/null
+++ b/gnuradio-runtime/lib/top_block.cc
@@ -0,0 +1,167 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "top_block_impl.h"
+#include <gnuradio/top_block.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
+#include <unistd.h>
+#include <iostream>
+
+namespace gr {
+ top_block_sptr
+ make_top_block(const std::string &name)
+ {
+ return gnuradio::get_initial_sptr
+ (new top_block(name));
+ }
+
+ top_block::top_block(const std::string &name)
+ : hier_block2(name,
+ io_signature::make(0,0,0),
+ io_signature::make(0,0,0))
+ {
+ d_impl = new top_block_impl(this);
+ }
+
+ top_block::~top_block()
+ {
+ stop();
+ wait();
+
+ delete d_impl;
+ }
+
+ void
+ top_block::start(int max_noutput_items)
+ {
+ d_impl->start(max_noutput_items);
+
+ if(prefs::singleton()->get_bool("ControlPort", "on", false)) {
+ setup_rpc();
+ }
+ }
+
+ void
+ top_block::stop()
+ {
+ d_impl->stop();
+ }
+
+ void
+ top_block::wait()
+ {
+ d_impl->wait();
+ }
+
+ void
+ top_block::run(int max_noutput_items)
+ {
+ start(max_noutput_items);
+ wait();
+ }
+
+ void
+ top_block::lock()
+ {
+ d_impl->lock();
+ }
+
+ void
+ top_block::unlock()
+ {
+ d_impl->unlock();
+ }
+
+ std::string
+ top_block::edge_list()
+ {
+ return d_impl->edge_list();
+ }
+
+ void
+ top_block::dump()
+ {
+ d_impl->dump();
+ }
+
+ int
+ top_block::max_noutput_items()
+ {
+ return d_impl->max_noutput_items();
+ }
+
+ void
+ top_block::set_max_noutput_items(int nmax)
+ {
+ d_impl->set_max_noutput_items(nmax);
+ }
+
+ top_block_sptr
+ top_block::to_top_block()
+ {
+ return cast_to_top_block_sptr(shared_from_this());
+ }
+
+ void
+ top_block::setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ if(is_rpc_set())
+ return;
+
+ // Getters
+ add_rpc_variable(
+ rpcbasic_sptr(new rpcbasic_register_get<top_block, int>(
+ alias(), "max noutput_items",
+ &top_block::max_noutput_items,
+ pmt::mp(0), pmt::mp(8192), pmt::mp(8192),
+ "items", "Max number of output items",
+ RPC_PRIVLVL_MIN, DISPNULL)));
+
+ if(prefs::singleton()->get_bool("ControlPort", "edges_list", false)) {
+ add_rpc_variable(
+ rpcbasic_sptr(new rpcbasic_register_get<top_block, std::string>(
+ alias(), "edge list",
+ &top_block::edge_list,
+ pmt::mp(""), pmt::mp(""), pmt::mp(""),
+ "edges", "List of edges in the graph",
+ RPC_PRIVLVL_MIN, DISPNULL)));
+ }
+
+ // Setters
+ add_rpc_variable(
+ rpcbasic_sptr(new rpcbasic_register_set<top_block, int>(
+ alias(), "max noutput_items",
+ &top_block::set_max_noutput_items,
+ pmt::mp(0), pmt::mp(8192), pmt::mp(8192),
+ "items", "Max number of output items",
+ RPC_PRIVLVL_MIN, DISPNULL)));
+ rpc_set();
+#endif /* GR_CTRLPORT */
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/top_block_impl.cc b/gnuradio-runtime/lib/top_block_impl.cc
new file mode 100644
index 0000000000..9d377f469f
--- /dev/null
+++ b/gnuradio-runtime/lib/top_block_impl.cc
@@ -0,0 +1,212 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "top_block_impl.h"
+#include "flat_flowgraph.h"
+#include "scheduler_sts.h"
+#include "scheduler_tpb.h"
+#include <gnuradio/top_block.h>
+#include <gnuradio/prefs.h>
+
+#include <stdexcept>
+#include <iostream>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+namespace gr {
+
+#define GR_TOP_BLOCK_IMPL_DEBUG 0
+
+ typedef scheduler_sptr(*scheduler_maker)(flat_flowgraph_sptr ffg,
+ int max_noutput_items);
+
+ static struct scheduler_table {
+ const char *name;
+ scheduler_maker f;
+ } scheduler_table[] = {
+ { "TPB", scheduler_tpb::make }, // first entry is default
+ { "STS", scheduler_sts::make }
+ };
+
+ static scheduler_sptr
+ make_scheduler(flat_flowgraph_sptr ffg, int max_noutput_items)
+ {
+ static scheduler_maker factory = 0;
+
+ if(factory == 0) {
+ char *v = getenv("GR_SCHEDULER");
+ if(!v)
+ factory = scheduler_table[0].f; // use default
+ else {
+ for(size_t i = 0; i < sizeof(scheduler_table)/sizeof(scheduler_table[0]); i++) {
+ if(strcmp(v, scheduler_table[i].name) == 0) {
+ factory = scheduler_table[i].f;
+ break;
+ }
+ }
+ if(factory == 0) {
+ std::cerr << "warning: Invalid GR_SCHEDULER environment variable value \""
+ << v << "\". Using \"" << scheduler_table[0].name << "\"\n";
+ factory = scheduler_table[0].f;
+ }
+ }
+ }
+ return factory(ffg, max_noutput_items);
+ }
+
+ top_block_impl::top_block_impl(top_block *owner)
+ : d_owner(owner), d_ffg(),
+ d_state(IDLE), d_lock_count(0)
+ {
+ }
+
+ top_block_impl::~top_block_impl()
+ {
+ d_owner = 0;
+ }
+
+ void
+ top_block_impl::start(int max_noutput_items)
+ {
+ gr::thread::scoped_lock l(d_mutex);
+
+ d_max_noutput_items = max_noutput_items;
+
+ if(d_state != IDLE)
+ throw std::runtime_error("top_block::start: top block already running or wait() not called after previous stop()");
+
+ if(d_lock_count > 0)
+ throw std::runtime_error("top_block::start: can't start with flow graph locked");
+
+ // Create new flat flow graph by flattening hierarchy
+ d_ffg = d_owner->flatten();
+
+ // Validate new simple flow graph and wire it up
+ d_ffg->validate();
+ d_ffg->setup_connections();
+
+ // Only export perf. counters if ControlPort config param is
+ // enabled and if the PerfCounter option 'export' is turned on.
+ prefs *p = prefs::singleton();
+ if(p->get_bool("ControlPort", "on", false) && p->get_bool("PerfCounters", "export", false))
+ d_ffg->enable_pc_rpc();
+
+ d_scheduler = make_scheduler(d_ffg, d_max_noutput_items);
+ d_state = RUNNING;
+ }
+
+ void
+ top_block_impl::stop()
+ {
+ if(d_scheduler)
+ d_scheduler->stop();
+ }
+
+ void
+ top_block_impl::wait()
+ {
+ if(d_scheduler)
+ d_scheduler->wait();
+
+ d_state = IDLE;
+ }
+
+ // N.B. lock() and unlock() cannot be called from a flow graph
+ // thread or deadlock will occur when reconfiguration happens
+ void
+ top_block_impl::lock()
+ {
+ gr::thread::scoped_lock lock(d_mutex);
+ d_lock_count++;
+ }
+
+ void
+ top_block_impl::unlock()
+ {
+ gr::thread::scoped_lock lock(d_mutex);
+
+ if(d_lock_count <= 0) {
+ d_lock_count = 0; // fix it, then complain
+ throw std::runtime_error("unpaired unlock() call");
+ }
+
+ d_lock_count--;
+ if(d_lock_count > 0 || d_state == IDLE) // nothing to do
+ return;
+
+ restart();
+ }
+
+ /*
+ * restart is called with d_mutex held
+ */
+ void
+ top_block_impl::restart()
+ {
+ stop(); // Stop scheduler and wait for completion
+ wait();
+
+ // Create new simple flow graph
+ flat_flowgraph_sptr new_ffg = d_owner->flatten();
+ new_ffg->validate(); // check consistency, sanity, etc
+ new_ffg->merge_connections(d_ffg); // reuse buffers, etc
+ d_ffg = new_ffg;
+
+ // Create a new scheduler to execute it
+ d_scheduler = make_scheduler(d_ffg, d_max_noutput_items);
+ d_state = RUNNING;
+ }
+
+ std::string
+ top_block_impl::edge_list()
+ {
+ if(d_ffg)
+ return d_ffg->edge_list();
+ else
+ return "";
+ }
+
+ void
+ top_block_impl::dump()
+ {
+ if(d_ffg)
+ d_ffg->dump();
+ }
+
+ int
+ top_block_impl::max_noutput_items()
+ {
+ return d_max_noutput_items;
+ }
+
+ void
+ top_block_impl::set_max_noutput_items(int nmax)
+ {
+ d_max_noutput_items = nmax;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/top_block_impl.h b/gnuradio-runtime/lib/top_block_impl.h
new file mode 100644
index 0000000000..9e0e661a02
--- /dev/null
+++ b/gnuradio-runtime/lib/top_block_impl.h
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
+#define INCLUDED_GR_TOP_BLOCK_IMPL_H
+
+#include <gnuradio/api.h>
+#include "scheduler.h"
+#include <gnuradio/thread/thread.h>
+
+namespace gr {
+
+ /*!
+ *\brief Abstract implementation details of top_block
+ * \ingroup internal
+ *
+ * The actual implementation of top_block. Separate class allows
+ * decoupling of changes from dependent classes.
+ */
+ class GR_RUNTIME_API top_block_impl
+ {
+ public:
+ top_block_impl(top_block *owner);
+ ~top_block_impl();
+
+ // Create and start scheduler threads
+ void start(int max_noutput_items=100000000);
+
+ // Signal scheduler threads to stop
+ void stop();
+
+ // Wait for scheduler threads to exit
+ void wait();
+
+ // Lock the top block to allow reconfiguration
+ void lock();
+
+ // Unlock the top block at end of reconfiguration
+ void unlock();
+
+ // Return a string list of edges
+ std::string edge_list();
+
+ // Dump the flowgraph to stdout
+ void dump();
+
+ // Get the number of max noutput_items in the flowgraph
+ int max_noutput_items();
+
+ // Set the maximum number of noutput_items in the flowgraph
+ void set_max_noutput_items(int nmax);
+
+ protected:
+ enum tb_state { IDLE, RUNNING };
+
+ top_block *d_owner;
+ flat_flowgraph_sptr d_ffg;
+ scheduler_sptr d_scheduler;
+
+ gr::thread::mutex d_mutex; // protects d_state and d_lock_count
+ tb_state d_state;
+ int d_lock_count;
+ int d_max_noutput_items;
+
+ private:
+ void restart();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TOP_BLOCK_IMPL_H */
diff --git a/gnuradio-runtime/lib/tpb_detail.cc b/gnuradio-runtime/lib/tpb_detail.cc
new file mode 100644
index 0000000000..cf05c2b102
--- /dev/null
+++ b/gnuradio-runtime/lib/tpb_detail.cc
@@ -0,0 +1,71 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnuradio/tpb_detail.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+
+namespace gr {
+
+ /*
+ * We assume that no worker threads are ever running when the graph
+ * structure is being manipulated, thus it's safe for us to poke
+ * around in our neighbors w/o holding any locks.
+ */
+ void
+ tpb_detail::notify_upstream(block_detail *d)
+ {
+ // For each of our inputs, tell the guy upstream that we've
+ // consumed some input, and that he most likely has more output
+ // buffer space available.
+
+ for(size_t i = 0; i < d->d_input.size(); i++) {
+ // Can you say, "pointer chasing?"
+ d->d_input[i]->buffer()->link()->detail()->d_tpb.set_output_changed();
+ }
+ }
+
+ void
+ tpb_detail::notify_downstream(block_detail *d)
+ {
+ // For each of our outputs, tell the guys downstream that they
+ // have new input available.
+
+ for(size_t i = 0; i < d->d_output.size(); i++) {
+ buffer_sptr buf = d->d_output[i];
+ for(size_t j = 0, k = buf->nreaders(); j < k; j++)
+ buf->reader(j)->link()->detail()->d_tpb.set_input_changed();
+ }
+ }
+
+ void
+ tpb_detail::notify_neighbors(block_detail *d)
+ {
+ notify_downstream(d);
+ notify_upstream(d);
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc
new file mode 100644
index 0000000000..ceb94fbb2a
--- /dev/null
+++ b/gnuradio-runtime/lib/tpb_thread_body.cc
@@ -0,0 +1,151 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "tpb_thread_body.h"
+#include <gnuradio/prefs.h>
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <pmt/pmt.h>
+#include <iostream>
+
+namespace gr {
+
+ tpb_thread_body::tpb_thread_body(block_sptr block, int max_noutput_items)
+ : d_exec(block, max_noutput_items)
+ {
+ //std::cerr << "tpb_thread_body: " << block << std::endl;
+
+ block_detail *d = block->detail().get();
+ block_executor::state s;
+ pmt::pmt_t msg;
+
+ d->threaded = true;
+ d->thread = gr::thread::get_current_thread_id();
+
+ prefs *p = prefs::singleton();
+ size_t max_nmsgs = static_cast<size_t>(p->get_long("DEFAULT", "max_messages", 100));
+
+ // Set thread affinity if it was set before fg was started.
+ if(block->processor_affinity().size() > 0) {
+ gr::thread::thread_bind_to_processor(d->thread, block->processor_affinity());
+ }
+
+ while(1) {
+ boost::this_thread::interruption_point();
+
+ // handle any queued up messages
+ //BOOST_FOREACH( pmt::pmt_t port, block->msg_queue.keys() )
+
+ BOOST_FOREACH(basic_block::msg_queue_map_t::value_type &i, block->msg_queue) {
+ // Check if we have a message handler attached before getting
+ // any messages. This is mostly a protection for the unknown
+ // startup sequence of the threads.
+ if(block->has_msg_handler(i.first)) {
+ while((msg = block->delete_head_nowait(i.first))) {
+ block->dispatch_msg(i.first,msg);
+ }
+ }
+ else {
+ // If we don't have a handler but are building up messages,
+ // prune the queue from the front to keep memory in check.
+ if(block->nmsgs(i.first) > max_nmsgs)
+ msg = block->delete_head_nowait(i.first);
+ }
+ }
+
+ d->d_tpb.clear_changed();
+ // run one iteration if we are a connected stream block
+ if(d->noutputs() >0 || d->ninputs()>0){
+ s = d_exec.run_one_iteration();
+ }
+ else {
+ s = block_executor::BLKD_IN;
+ }
+
+ switch(s){
+ case block_executor::READY: // Tell neighbors we made progress.
+ d->d_tpb.notify_neighbors(d);
+ break;
+
+ case block_executor::READY_NO_OUTPUT: // Notify upstream only
+ d->d_tpb.notify_upstream(d);
+ break;
+
+ case block_executor::DONE: // Game over.
+ d->d_tpb.notify_neighbors(d);
+ return;
+
+ case block_executor::BLKD_IN: // Wait for input.
+ {
+ gr::thread::scoped_lock guard(d->d_tpb.mutex);
+ while(!d->d_tpb.input_changed) {
+
+ // wait for input or message
+ while(!d->d_tpb.input_changed && block->empty_p())
+ d->d_tpb.input_cond.wait(guard);
+
+ // handle all pending messages
+ BOOST_FOREACH(basic_block::msg_queue_map_t::value_type &i, block->msg_queue) {
+ while((msg = block->delete_head_nowait(i.first))) {
+ guard.unlock(); // release lock while processing msg
+ block->dispatch_msg(i.first, msg);
+ guard.lock();
+ }
+ }
+ }
+ }
+ break;
+
+ case block_executor::BLKD_OUT: // Wait for output buffer space.
+ {
+ gr::thread::scoped_lock guard(d->d_tpb.mutex);
+ while(!d->d_tpb.output_changed) {
+ // wait for output room or message
+ while(!d->d_tpb.output_changed && block->empty_p())
+ d->d_tpb.output_cond.wait(guard);
+
+ // handle all pending messages
+ BOOST_FOREACH(basic_block::msg_queue_map_t::value_type &i, block->msg_queue) {
+ while((msg = block->delete_head_nowait(i.first))) {
+ guard.unlock(); // release lock while processing msg
+ block->dispatch_msg(i.first,msg);
+ guard.lock();
+ }
+ }
+ }
+ }
+ break;
+
+ default:
+ assert(0);
+ }
+ }
+ }
+
+ tpb_thread_body::~tpb_thread_body()
+ {
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/tpb_thread_body.h b/gnuradio-runtime/lib/tpb_thread_body.h
new file mode 100644
index 0000000000..9859b125dd
--- /dev/null
+++ b/gnuradio-runtime/lib/tpb_thread_body.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_GR_TPB_THREAD_BODY_H
+#define INCLUDED_GR_TPB_THREAD_BODY_H
+
+#include <gnuradio/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include "block_executor.h"
+
+namespace gr {
+
+ /*!
+ * \brief The body of each thread-per-block thread.
+ *
+ * One of these is instantiated in its own thread for each block.
+ * The constructor turns into the main loop which returns when the
+ * block is done or is interrupted.
+ */
+ class GR_RUNTIME_API tpb_thread_body
+ {
+ block_executor d_exec;
+
+ public:
+ tpb_thread_body(block_sptr block, int max_noutput_items=100000);
+ ~tpb_thread_body();
+ };
+
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TPB_THREAD_BODY_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf.cc b/gnuradio-runtime/lib/vmcircbuf.cc
new file mode 100644
index 0000000000..0fccb3d914
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf.cc
@@ -0,0 +1,299 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <assert.h>
+#include <stdexcept>
+#include <stdio.h>
+#include <string.h>
+#include <vector>
+#include <boost/format.hpp>
+#include "vmcircbuf.h"
+#include "vmcircbuf_prefs.h"
+#include "local_sighandler.h"
+
+// all the factories we know about
+#include "vmcircbuf_createfilemapping.h"
+#include "vmcircbuf_sysv_shm.h"
+#include "vmcircbuf_mmap_shm_open.h"
+#include "vmcircbuf_mmap_tmpfile.h"
+
+namespace gr {
+
+ static const char *FACTORY_PREF_KEY = "vmcircbuf_default_factory";
+
+ vmcircbuf::~vmcircbuf()
+ {
+ }
+
+ vmcircbuf_factory::~vmcircbuf_factory()
+ {
+ }
+
+ // ----------------------------------------------------------------
+
+ static vmcircbuf_factory *s_default_factory = 0;
+
+ vmcircbuf_factory *
+ vmcircbuf_sysconfig::get_default_factory()
+ {
+ if(s_default_factory)
+ return s_default_factory;
+
+ bool verbose = false;
+
+ std::vector<gr::vmcircbuf_factory *> all = all_factories ();
+
+ const char *name = gr::vmcircbuf_prefs::get(FACTORY_PREF_KEY);
+
+ if(name) {
+ for(unsigned int i = 0; i < all.size (); i++) {
+ if(strcmp(name, all[i]->name ()) == 0) {
+ s_default_factory = all[i];
+ if(verbose)
+ fprintf(stderr, "gr::vmcircbuf_sysconfig: using %s\n",
+ s_default_factory->name());
+ return s_default_factory;
+ }
+ }
+ }
+
+ // either we don't have a default, or the default named is not in our
+ // list of factories. Find the first factory that works.
+
+ if(verbose)
+ fprintf(stderr, "gr::vmcircbuf_sysconfig: finding a working factory...\n");
+
+ for(unsigned int i = 0; i < all.size (); i++) {
+ if(test_factory(all[i], verbose)) {
+ set_default_factory(all[i]);
+ return s_default_factory;
+ }
+ }
+
+ // We're screwed!
+ fprintf(stderr, "gr::vmcircbuf_sysconfig: unable to find a working factory!\n");
+ throw std::runtime_error("gr::vmcircbuf_sysconfig");
+ }
+
+ std::vector<vmcircbuf_factory *>
+ vmcircbuf_sysconfig::all_factories()
+ {
+ std::vector<vmcircbuf_factory*> result;
+
+ result.push_back(gr::vmcircbuf_createfilemapping_factory::singleton());
+#ifdef TRY_SHM_VMCIRCBUF
+ result.push_back(gr::vmcircbuf_sysv_shm_factory::singleton());
+ result.push_back(gr::vmcircbuf_mmap_shm_open_factory::singleton());
+#endif
+ result.push_back (gr::vmcircbuf_mmap_tmpfile_factory::singleton());
+
+ return result;
+ }
+
+ void
+ vmcircbuf_sysconfig::set_default_factory(vmcircbuf_factory *f)
+ {
+ gr::vmcircbuf_prefs::set(FACTORY_PREF_KEY, f->name());
+ s_default_factory = f;
+ }
+
+
+ // ------------------------------------------------------------------------
+ // test code for vmcircbuf factories
+ // ------------------------------------------------------------------------
+
+ static void
+ init_buffer(vmcircbuf *c, int counter, int size)
+ {
+ unsigned int *p = (unsigned int*)c->pointer_to_first_copy();
+ for(unsigned int i = 0; i < size / sizeof(int); i++)
+ p[i] = counter + i;
+ }
+
+ static bool
+ check_mapping(vmcircbuf *c, int counter, int size, const char *msg, bool verbose)
+ {
+ bool ok = true;
+
+ if(verbose)
+ fprintf(stderr, "... %s", msg);
+
+ unsigned int *p1 = (unsigned int *)c->pointer_to_first_copy();
+ unsigned int *p2 = (unsigned int *)c->pointer_to_second_copy();
+
+ // fprintf(stderr, "p1 = %p, p2 = %p\n", p1, p2);
+
+ for(unsigned int i = 0; i < size / sizeof (int); i++) {
+ if(p1[i] != counter + i) {
+ ok = false;
+ if(verbose)
+ fprintf(stderr, " p1[%d] == %u, expected %u\n", i, p1[i], counter + i);
+ break;
+ }
+ if(p2[i] != counter + i) {
+ if(verbose)
+ fprintf(stderr, " p2[%d] == %u, expected %u\n", i, p2[i], counter + i);
+ ok = false;
+ break;
+ }
+ }
+
+ if(ok && verbose) {
+ fprintf(stderr, " OK\n");
+ }
+ return ok;
+ }
+
+ static const char *
+ memsize(int size)
+ {
+ static std::string buf;
+ if(size >= (1 << 20)) {
+ buf = str(boost::format("%dMB") % (size / (1 << 20)));
+ }
+ else if(size >= (1 << 10)){
+ buf = str(boost::format("%dKB") % (size / (1 << 10)));
+ }
+ else {
+ buf = str(boost::format("%d") % size);
+ }
+ return buf.c_str();
+ }
+
+ static bool
+ test_a_bunch(vmcircbuf_factory *factory, int n, int size, int *start_ptr, bool verbose)
+ {
+ bool ok = true;
+ std::vector<int> counter(n);
+ std::vector<vmcircbuf*> c(n);
+ int cum_size = 0;
+
+ for(int i = 0; i < n; i++) {
+ counter[i] = *start_ptr;
+ *start_ptr += size;
+ if((c[i] = factory->make (size)) == 0) {
+ if(verbose)
+ fprintf(stderr,
+ "Failed to allocate gr::vmcircbuf number %d of size %d (cum = %s)\n",
+ i + 1, size, memsize(cum_size));
+ return false;
+ }
+ init_buffer(c[i], counter[i], size);
+ cum_size += size;
+ }
+
+ for(int i = 0; i < n; i++) {
+ std::string msg = str(boost::format("test_a_bunch_%dx%s[%d]") % n % memsize(size) % i);
+ ok &= check_mapping(c[i], counter[i], size, msg.c_str(), verbose);
+ }
+
+ for(int i = 0; i < n; i++) {
+ delete c[i];
+ c[i] = 0;
+ }
+
+ return ok;
+ }
+
+ static bool
+ standard_tests(vmcircbuf_factory *f, int verbose)
+ {
+ if(verbose >= 1)
+ fprintf(stderr, "Testing %s...\n", f->name());
+
+ bool v = verbose >= 2;
+ int granularity = f->granularity();
+ int start = 0;
+ bool ok = true;
+
+ ok &= test_a_bunch(f, 1, 1 * granularity, &start, v); // 1 x 4KB = 4KB
+
+ if(ok) {
+ ok &= test_a_bunch(f, 64, 4 * granularity, &start, v); // 64 x 16KB = 1MB
+ ok &= test_a_bunch(f, 4, 4 * (1L << 20), &start, v); // 4 x 4MB = 16MB
+ // ok &= test_a_bunch(f, 256, 256 * (1L << 10), &start, v); // 256 x 256KB = 64MB
+ }
+
+ if(verbose >= 1)
+ fprintf(stderr, "....... %s: %s", f->name(), ok ? "OK\n" : "Doesn't work\n");
+
+ return ok;
+ }
+
+ bool
+ vmcircbuf_sysconfig::test_factory(vmcircbuf_factory *f, int verbose)
+ {
+ // Install local signal handlers for SIGSEGV and SIGBUS.
+ // If something goes wrong, these signals may be invoked.
+
+#ifdef SIGSEGV
+ gr::local_sighandler sigsegv (SIGSEGV, gr::local_sighandler::throw_signal);
+#endif
+#ifdef SIGBUS
+ gr::local_sighandler sigbus (SIGBUS, gr::local_sighandler::throw_signal);
+#endif
+#ifdef SIGSYS
+ gr::local_sighandler sigsys (SIGSYS, gr::local_sighandler::throw_signal);
+#endif
+
+ try {
+ return standard_tests (f, verbose);
+ }
+ catch(gr::signal &sig) {
+ if(verbose) {
+ fprintf(stderr, "....... %s: %s", f->name(), "Doesn't work\n");
+ fprintf(stderr,
+ "gr::vmcircbuf_factory::test_factory (%s): caught %s\n",
+ f->name(), sig.name().c_str());
+ return false;
+ }
+ }
+ catch (...) {
+ if(verbose) {
+ fprintf(stderr, "....... %s: %s", f->name(), "Doesn't work\n");
+ fprintf(stderr,
+ "gr::vmcircbuf_factory::test_factory (%s): some kind of uncaught exception\n",
+ f->name());
+ }
+ return false;
+ }
+ return false; // never gets here. shut compiler up.
+ }
+
+ bool
+ vmcircbuf_sysconfig::test_all_factories(int verbose)
+ {
+ bool ok = false;
+
+ std::vector<vmcircbuf_factory *> all = all_factories();
+
+ for(unsigned int i = 0; i < all.size (); i++)
+ ok |= test_factory(all[i], verbose);
+
+ return ok;
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf.h b/gnuradio-runtime/lib/vmcircbuf.h
new file mode 100644
index 0000000000..c3ddfe0043
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf.h
@@ -0,0 +1,125 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_VMCIRCBUF_H
+#define GR_VMCIRCBUF_H
+
+#include <gnuradio/api.h>
+#include <vector>
+
+namespace gr {
+
+ /*!
+ * \brief abstract class to implement doubly mapped virtual memory circular buffers
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API vmcircbuf
+ {
+ protected:
+ int d_size;
+ char *d_base;
+
+ // CREATORS
+ vmcircbuf(int size) : d_size(size), d_base(0) {};
+
+ public:
+ virtual ~vmcircbuf();
+
+ // ACCESSORS
+ void *pointer_to_first_copy() const{ return d_base; }
+ void *pointer_to_second_copy() const{ return d_base + d_size; }
+ };
+
+ /*!
+ * \brief abstract factory for creating circular buffers
+ */
+ class GR_RUNTIME_API vmcircbuf_factory
+ {
+ protected:
+ vmcircbuf_factory() {};
+ virtual ~vmcircbuf_factory();
+
+ public:
+
+ /*!
+ * \brief return name of this factory
+ */
+ virtual const char *name() const = 0;
+
+ /*!
+ * \brief return granularity of mapping, typically equal to page size
+ */
+ virtual int granularity() = 0;
+
+ /*!
+ * \brief return a gr::vmcircbuf, or 0 if unable.
+ *
+ * Call this to create a doubly mapped circular buffer.
+ */
+ virtual vmcircbuf *make(int size) = 0;
+ };
+
+ /*
+ * \brief pulls together all implementations of gr::vmcircbuf
+ */
+ class GR_RUNTIME_API vmcircbuf_sysconfig
+ {
+ public:
+ /*
+ * \brief return the single instance of the default factory.
+ *
+ * returns the default factory to use if it's already defined,
+ * else find the first working factory and use it.
+ */
+ static vmcircbuf_factory *get_default_factory();
+
+ static int granularity() { return get_default_factory()->granularity(); }
+ static vmcircbuf *make(int size) { return get_default_factory()->make(size); }
+
+ // N.B. not all factories are guaranteed to work.
+ // It's too hard to check everything at config time, so we check at runtime
+ static std::vector<vmcircbuf_factory*> all_factories();
+
+ // make this factory the default
+ static void set_default_factory(vmcircbuf_factory *f);
+
+ /*!
+ * \brief Does this factory really work?
+ *
+ * verbose = 0: silent
+ * verbose = 1: names of factories tested and results
+ * verbose = 2: all intermediate results
+ */
+ static bool test_factory(vmcircbuf_factory *f, int verbose);
+
+ /*!
+ * \brief Test all factories, return true if at least one of them works
+ * verbose = 0: silent
+ * verbose = 1: names of factories tested and results
+ * verbose = 2: all intermediate results
+ */
+ static bool test_all_factories(int verbose);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_VMCIRCBUF_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
new file mode 100644
index 0000000000..2d345a29b1
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc
@@ -0,0 +1,204 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2005,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdexcept>
+#include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include "pagesize.h"
+#include "vmcircbuf_createfilemapping.h"
+#include <boost/format.hpp>
+
+namespace gr {
+
+#ifdef HAVE_CREATEFILEMAPPING
+ // Print Windows error (could/should be global?)
+ static void
+ werror(char *where, DWORD last_error)
+ {
+ char buf[1024];
+
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ last_error,
+ 0, // default language
+ buf,
+ sizeof(buf)/sizeof(TCHAR), // buffer size
+ NULL);
+ fprintf(stderr, "%s: Error %d: %s", where, last_error, buf);
+ return;
+ }
+#endif
+
+
+ vmcircbuf_createfilemapping::vmcircbuf_createfilemapping(int size)
+ : gr::vmcircbuf(size)
+ {
+#if !defined(HAVE_CREATEFILEMAPPING)
+ fprintf(stderr, "%s: createfilemapping is not available\n", __FUNCTION__);
+ throw std::runtime_error("gr::vmcircbuf_createfilemapping");
+#else
+ static int s_seg_counter = 0;
+
+ if(size <= 0 || (size % gr::pagesize ()) != 0) {
+ fprintf(stderr, "gr::vmcircbuf_createfilemapping: invalid size = %d\n", size);
+ throw std::runtime_error ("gr::vmcircbuf_createfilemapping");
+ }
+
+ std::string seg_name = str(boost::format("/gnuradio-%d-%d") % getpid() % s_seg_counter);
+
+ d_handle = CreateFileMapping(INVALID_HANDLE_VALUE, // use paging file
+ NULL, // default security
+ PAGE_READWRITE, // read/write access
+ 0, // max. object size
+ size, // buffer size
+ seg_name.c_str()); // name of mapping object
+
+ s_seg_counter++;
+ if(d_handle == NULL || d_handle == INVALID_HANDLE_VALUE) {
+ std::string msg = str(boost::format(
+ "gr::vmcircbuf_mmap_createfilemapping: CreateFileMapping [%s]") %
+ seg_name);
+ werror((char*)msg.c_str(), GetLastError());
+ throw std::runtime_error("gr::vmcircbuf_mmap_createfilemapping");
+ }
+
+ // Allocate virtual memory of the needed size, then free it so we can use it
+ LPVOID first_tmp;
+ first_tmp = VirtualAlloc( NULL, 2*size, MEM_RESERVE, PAGE_NOACCESS );
+ if(first_tmp == NULL) {
+ werror("gr::vmcircbuf_mmap_createfilemapping: VirtualAlloc", GetLastError());
+ CloseHandle(d_handle); // cleanup
+ throw std::runtime_error("gr::vmcircbuf_mmap_createfilemapping");
+ }
+
+ if(VirtualFree(first_tmp, 0, MEM_RELEASE) == 0) {
+ werror("gr::vmcircbuf_mmap_createfilemapping: VirtualFree", GetLastError());
+ CloseHandle(d_handle); // cleanup
+ throw std::runtime_error("gr::vmcircbuf_mmap_createfilemapping");
+ }
+
+ d_first_copy = MapViewOfFileEx((HANDLE)d_handle, // handle to map object
+ FILE_MAP_WRITE, // read/write permission
+ 0,
+ 0,
+ size,
+ first_tmp);
+ if(d_first_copy != first_tmp) {
+ werror( "gr::vmcircbuf_mmap_createfilemapping: MapViewOfFileEx(1)", GetLastError());
+ CloseHandle(d_handle); // cleanup
+ throw std::runtime_error ("gr::vmcircbuf_mmap_createfilemapping");
+ }
+
+ d_second_copy = MapViewOfFileEx((HANDLE)d_handle, // handle to map object
+ FILE_MAP_WRITE, // read/write permission
+ 0,
+ 0,
+ size,
+ (char*)first_tmp + size);//(LPVOID) ((char *)d_first_copy + size));
+
+ if(d_second_copy != (char *)first_tmp + size) {
+ werror( "gr::vmcircbuf_mmap_createfilemapping: MapViewOfFileEx(2)", GetLastError());
+ UnmapViewOfFile(d_first_copy);
+ CloseHandle(d_handle); // cleanup
+ throw std::runtime_error ("gr::vmcircbuf_mmap_createfilemapping");
+ }
+
+#ifdef DEBUG
+ fprintf(stderr,"gr::vmcircbuf_mmap_createfilemapping: contiguous? mmap %p %p %p %p\n",
+ (char*)d_first_copy, (char*)d_second_copy, size, (char*)d_first_copy + size);
+#endif
+
+ // Now remember the important stuff
+ d_base = (char*)d_first_copy;
+ d_size = size;
+#endif /*HAVE_CREATEFILEMAPPING*/
+ }
+
+ vmcircbuf_createfilemapping::~vmcircbuf_createfilemapping()
+ {
+#ifdef HAVE_CREATEFILEMAPPING
+ if(UnmapViewOfFile(d_first_copy) == 0) {
+ werror("gr::vmcircbuf_createfilemapping: UnmapViewOfFile(d_first_copy)", GetLastError());
+ }
+ d_base=NULL;
+ if(UnmapViewOfFile(d_second_copy) == 0) {
+ werror("gr::vmcircbuf_createfilemapping: UnmapViewOfFile(d_second_copy)", GetLastError());
+ }
+ //d_second=NULL;
+ CloseHandle(d_handle);
+#endif
+ }
+
+ // ----------------------------------------------------------------
+ // The factory interface
+ // ----------------------------------------------------------------
+
+ gr::vmcircbuf_factory *vmcircbuf_createfilemapping_factory::s_the_factory = 0;
+
+ gr::vmcircbuf_factory *
+ vmcircbuf_createfilemapping_factory::singleton()
+ {
+ if(s_the_factory)
+ return s_the_factory;
+ s_the_factory = new vmcircbuf_createfilemapping_factory();
+ return s_the_factory;
+ }
+
+ int
+ vmcircbuf_createfilemapping_factory::granularity()
+ {
+#ifdef HAVE_CREATEFILEMAPPING
+ // return 65536;//TODO, check, is this needed or can we just use gr::pagesize()
+ SYSTEM_INFO system_info;
+ GetSystemInfo(&system_info);
+ //fprintf(stderr,"win32 AllocationGranularity %p\n",(int)system_info.dwAllocationGranularity);
+ return (int)system_info.dwAllocationGranularity;
+#else
+ return gr::pagesize();
+#endif
+ }
+
+ gr::vmcircbuf *
+ vmcircbuf_createfilemapping_factory::make(int size)
+ {
+ try {
+ return new vmcircbuf_createfilemapping(size);
+ }
+ catch(...) {
+ return 0;
+ }
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
new file mode 100644
index 0000000000..0513112f23
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_VMCIRCBUF_CREATEFILEMAPPING_H
+#define GR_VMCIRCBUF_CREATEFILEMAPPING_H
+
+#include <gnuradio/api.h>
+#include "vmcircbuf.h"
+
+#ifdef HAVE_CREATEFILEMAPPING
+#include <windows.h>
+#endif
+
+namespace gr {
+
+ /*!
+ * \brief concrete class to implement circular buffers with mmap and shm_open
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API vmcircbuf_createfilemapping : public gr::vmcircbuf
+ {
+ public:
+ // CREATORS
+ vmcircbuf_createfilemapping(int size);
+ virtual ~vmcircbuf_createfilemapping();
+#ifdef HAVE_CREATEFILEMAPPING
+ private:
+ HANDLE d_handle;
+ LPVOID d_first_copy;
+ LPVOID d_second_copy;
+#endif
+ };
+
+ /*!
+ * \brief concrete factory for circular buffers built using mmap and shm_open
+ */
+ class GR_RUNTIME_API vmcircbuf_createfilemapping_factory : public gr::vmcircbuf_factory
+ {
+ private:
+ static gr::vmcircbuf_factory *s_the_factory;
+
+ public:
+ static gr::vmcircbuf_factory *singleton();
+
+ virtual const char *name() const { return "gr::vmcircbuf_createfilemapping_factory"; }
+
+ /*!
+ * \brief return granularity of mapping, typically equal to page size
+ */
+ virtual int granularity();
+
+ /*!
+ * \brief return a gr::vmcircbuf, or 0 if unable.
+ *
+ * Call this to create a doubly mapped circular buffer.
+ */
+ virtual gr::vmcircbuf *make(int size);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_VMCIRCBUF_CREATEFILEMAPPING_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
new file mode 100644
index 0000000000..7b461bc26b
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
@@ -0,0 +1,204 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vmcircbuf_mmap_shm_open.h"
+#include <stdexcept>
+#include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include "pagesize.h"
+#include <gnuradio/sys_paths.h>
+
+namespace gr {
+
+ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size)
+ : gr::vmcircbuf(size)
+ {
+#if !defined(HAVE_MMAP) || !defined(HAVE_SHM_OPEN)
+ fprintf(stderr, "gr::vmcircbuf_mmap_shm_open: mmap or shm_open is not available\n");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+#else
+ static int s_seg_counter = 0;
+
+ if(size <= 0 || (size % gr::pagesize ()) != 0) {
+ fprintf(stderr, "gr::vmcircbuf_mmap_shm_open: invalid size = %d\n", size);
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+ int shm_fd = -1;
+ char seg_name[1024];
+ static bool portable_format = true;
+
+ // open a new named shared memory segment
+ while(1) {
+ if(portable_format) {
+
+ // This is the POSIX recommended "portable format".
+ // Of course the "portable format" doesn't work on some systems...
+
+ snprintf(seg_name, sizeof(seg_name),
+ "/gnuradio-%d-%d", getpid(), s_seg_counter);
+ }
+ else {
+
+ // Where the "portable format" doesn't work, we try building
+ // a full filesystem pathname pointing into a suitable temporary directory.
+
+ snprintf(seg_name, sizeof(seg_name),
+ "%s/gnuradio-%d-%d", gr::tmp_path(), getpid(), s_seg_counter);
+ }
+
+ shm_fd = shm_open(seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
+ if(shm_fd == -1 && errno == EACCES && portable_format) {
+ portable_format = false;
+ continue; // try again using "non-portable format"
+ }
+
+ s_seg_counter++;
+
+ if(shm_fd == -1) {
+ if(errno == EEXIST) // Named segment already exists (shouldn't happen). Try again
+ continue;
+
+ char msg[1024];
+ snprintf(msg, sizeof(msg), "gr::vmcircbuf_mmap_shm_open: shm_open [%s]", seg_name);
+ perror(msg);
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+ break;
+ }
+
+ // We've got a new shared memory segment fd open.
+ // Now set it's length to 2x what we really want and mmap it in.
+ if(ftruncate(shm_fd, (off_t)2 * size) == -1) {
+ close(shm_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_shm_open: ftruncate (1)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+ void *first_copy = mmap(0, 2 * size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ shm_fd, (off_t) 0);
+
+ if(first_copy == MAP_FAILED) {
+ close(shm_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_shm_open: mmap (1)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+ // unmap the 2nd half
+ if(munmap ((char *) first_copy + size, size) == -1) {
+ close(shm_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_shm_open: munmap (1)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+ // map the first half into the now available hole where the
+ // second half used to be.
+ void *second_copy = mmap((char*)first_copy + size, size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ shm_fd, (off_t)0);
+
+ if(second_copy == MAP_FAILED) {
+ close(shm_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_shm_open: mmap (2)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+#if 0 // OS/X doesn't allow you to resize the segment
+
+ // cut the shared memory segment down to size
+ if(ftruncate(shm_fd, (off_t)size) == -1) {
+ close(shm_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_shm_open: ftruncate (2)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+#endif
+
+ close(shm_fd); // fd no longer needed. The mapping is retained.
+
+ if(shm_unlink(seg_name) == -1) { // unlink the seg_name.
+ perror("gr::vmcircbuf_mmap_shm_open: shm_unlink");
+ throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
+ }
+
+ // Now remember the important stuff
+ d_base = (char*)first_copy;
+ d_size = size;
+#endif
+ }
+
+ vmcircbuf_mmap_shm_open::~vmcircbuf_mmap_shm_open()
+ {
+#if defined(HAVE_MMAP)
+ if(munmap (d_base, 2 * d_size) == -1) {
+ perror("gr::vmcircbuf_mmap_shm_open: munmap (2)");
+ }
+#endif
+ }
+
+ // ----------------------------------------------------------------
+ // The factory interface
+ // ----------------------------------------------------------------
+
+ gr::vmcircbuf_factory *vmcircbuf_mmap_shm_open_factory::s_the_factory = 0;
+
+ gr::vmcircbuf_factory *
+ vmcircbuf_mmap_shm_open_factory::singleton()
+ {
+ if(s_the_factory)
+ return s_the_factory;
+
+ s_the_factory = new gr::vmcircbuf_mmap_shm_open_factory();
+ return s_the_factory;
+ }
+
+ int
+ vmcircbuf_mmap_shm_open_factory::granularity()
+ {
+ return gr::pagesize();
+ }
+
+ gr::vmcircbuf *
+ vmcircbuf_mmap_shm_open_factory::make(int size)
+ {
+ try {
+ return new vmcircbuf_mmap_shm_open(size);
+ }
+ catch (...) {
+ return 0;
+ }
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
new file mode 100644
index 0000000000..60654ee46e
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_VMCIRCBUF_MMAP_SHM_OPEN_H
+#define GR_VMCIRCBUF_MMAP_SHM_OPEN_H
+
+#include <gnuradio/api.h>
+#include "vmcircbuf.h"
+
+namespace gr {
+
+ /*!
+ * \brief concrete class to implement circular buffers with mmap and shm_open
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API vmcircbuf_mmap_shm_open : public gr::vmcircbuf
+ {
+ public:
+ vmcircbuf_mmap_shm_open(int size);
+ virtual ~vmcircbuf_mmap_shm_open();
+ };
+
+ /*!
+ * \brief concrete factory for circular buffers built using mmap and shm_open
+ */
+ class GR_RUNTIME_API vmcircbuf_mmap_shm_open_factory : public gr::vmcircbuf_factory
+ {
+ private:
+ static gr::vmcircbuf_factory *s_the_factory;
+
+ public:
+ static gr::vmcircbuf_factory *singleton();
+
+ virtual const char *name() const { return "gr::vmcircbuf_mmap_shm_open_factory"; }
+
+ /*!
+ * \brief return granularity of mapping, typically equal to page size
+ */
+ virtual int granularity();
+
+ /*!
+ * \brief return a gr::vmcircbuf, or 0 if unable.
+ *
+ * Call this to create a doubly mapped circular buffer.
+ */
+ virtual gr::vmcircbuf *make(int size);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_VMCIRCBUF_MMAP_SHM_OPEN_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
new file mode 100644
index 0000000000..ffe2a3d2c2
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
@@ -0,0 +1,197 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vmcircbuf_mmap_tmpfile.h"
+#include <stdexcept>
+#include <assert.h>
+#include <unistd.h>
+#include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "pagesize.h"
+#include <gnuradio/sys_paths.h>
+
+namespace gr {
+
+ vmcircbuf_mmap_tmpfile::vmcircbuf_mmap_tmpfile (int size)
+ : gr::vmcircbuf (size)
+ {
+#if !defined(HAVE_MMAP)
+ fprintf(stderr, "gr::vmcircbuf_mmap_tmpfile: mmap or mkstemp is not available\n");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+#else
+
+ if(size <= 0 || (size % gr::pagesize ()) != 0) {
+ fprintf(stderr, "gr::vmcircbuf_mmap_tmpfile: invalid size = %d\n", size);
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ int seg_fd = -1;
+ char seg_name[1024];
+
+ static int s_seg_counter = 0;
+
+ // open a temporary file that we'll map in a bit later
+ while(1) {
+ snprintf(seg_name, sizeof(seg_name),
+ "%s/gnuradio-%d-%d-XXXXXX", gr::tmp_path(), getpid(), s_seg_counter);
+ s_seg_counter++;
+
+ seg_fd = open(seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
+ if(seg_fd == -1) {
+ if(errno == EEXIST) // File already exists (shouldn't happen). Try again
+ continue;
+
+ char msg[1024];
+ snprintf(msg, sizeof (msg),
+ "gr::vmcircbuf_mmap_tmpfile: open [%s]", seg_name);
+ perror(msg);
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+ break;
+ }
+
+ if(unlink (seg_name) == -1) {
+ perror("gr::vmcircbuf_mmap_tmpfile: unlink");
+ throw std::runtime_error ("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ // We've got a valid file descriptor to a tmp file.
+ // Now set it's length to 2x what we really want and mmap it in.
+ if(ftruncate (seg_fd, (off_t) 2 * size) == -1) {
+ close(seg_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (1)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ void *first_copy = mmap(0, 2 * size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ seg_fd, (off_t)0);
+
+ if(first_copy == MAP_FAILED) {
+ close(seg_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_tmpfile: mmap (1)");
+ throw std::runtime_error ("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ // unmap the 2nd half
+ if(munmap ((char *) first_copy + size, size) == -1) {
+ close(seg_fd); // cleanup
+ perror("gr::vmcircbuf_mmap_tmpfile: munmap (1)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ // map the first half into the now available hole where the
+ // second half used to be.
+ void *second_copy = mmap((char*)first_copy + size, size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ seg_fd, (off_t)0);
+
+ if(second_copy == MAP_FAILED) {
+ munmap(first_copy, size); // cleanup
+ close(seg_fd);
+ perror("gr::vmcircbuf_mmap_tmpfile: mmap(2)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ // check for contiguity
+ if((char*)second_copy != (char*)first_copy + size) {
+ munmap(first_copy, size); // cleanup
+ munmap(second_copy, size);
+ close(seg_fd);
+ perror("gr::vmcircbuf_mmap_tmpfile: non-contiguous second copy");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ // cut the tmp file down to size
+ if(ftruncate (seg_fd, (off_t) size) == -1) {
+ munmap(first_copy, size); // cleanup
+ munmap(second_copy, size);
+ close(seg_fd);
+ perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (2)");
+ throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+ }
+
+ close(seg_fd); // fd no longer needed. The mapping is retained.
+
+ // Now remember the important stuff
+
+ d_base = (char*)first_copy;
+ d_size = size;
+#endif
+ }
+
+ vmcircbuf_mmap_tmpfile::~vmcircbuf_mmap_tmpfile()
+ {
+#if defined(HAVE_MMAP)
+ if(munmap(d_base, 2 * d_size) == -1) {
+ perror("gr::vmcircbuf_mmap_tmpfile: munmap(2)");
+ }
+#endif
+ }
+
+ // ----------------------------------------------------------------
+ // The factory interface
+ // ----------------------------------------------------------------
+
+ gr::vmcircbuf_factory *vmcircbuf_mmap_tmpfile_factory::s_the_factory = 0;
+
+ gr::vmcircbuf_factory *
+ vmcircbuf_mmap_tmpfile_factory::singleton()
+ {
+ if(s_the_factory)
+ return s_the_factory;
+
+ s_the_factory = new gr::vmcircbuf_mmap_tmpfile_factory();
+ return s_the_factory;
+ }
+
+ int
+ vmcircbuf_mmap_tmpfile_factory::granularity()
+ {
+ return gr::pagesize();
+ }
+
+ gr::vmcircbuf *
+ vmcircbuf_mmap_tmpfile_factory::make(int size)
+ {
+ try {
+ return new vmcircbuf_mmap_tmpfile(size);
+ }
+ catch (...) {
+ return 0;
+ }
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
new file mode 100644
index 0000000000..f8959c5736
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_VMCIRCBUF_MMAP_TMPFILE_H
+#define GR_VMCIRCBUF_MMAP_TMPFILE_H
+
+#include <gnuradio/api.h>
+#include "vmcircbuf.h"
+
+namespace gr {
+
+ /*!
+ * \brief concrete class to implement circular buffers with mmap and shm_open
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API vmcircbuf_mmap_tmpfile : public gr::vmcircbuf
+ {
+ public:
+ vmcircbuf_mmap_tmpfile(int size);
+ virtual ~vmcircbuf_mmap_tmpfile();
+ };
+
+ /*!
+ * \brief concrete factory for circular buffers built using mmap and shm_open
+ */
+ class GR_RUNTIME_API vmcircbuf_mmap_tmpfile_factory : public gr::vmcircbuf_factory
+ {
+ private:
+ static gr::vmcircbuf_factory *s_the_factory;
+
+ public:
+ static gr::vmcircbuf_factory *singleton();
+
+ virtual const char *name() const { return "gr::vmcircbuf_mmap_tmpfile_factory"; }
+
+ /*!
+ * \brief return granularity of mapping, typically equal to page size
+ */
+ virtual int granularity();
+
+ /*!
+ * \brief return a gr::vmcircbuf, or 0 if unable.
+ *
+ * Call this to create a doubly mapped circular buffer.
+ */
+ virtual gr::vmcircbuf *make(int size);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_VMCIRCBUF_MMAP_TMPFILE_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf_prefs.cc b/gnuradio-runtime/lib/vmcircbuf_prefs.cc
new file mode 100644
index 0000000000..1fa6350385
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_prefs.cc
@@ -0,0 +1,113 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2010,2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vmcircbuf_prefs.h"
+#include <gnuradio/sys_paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+namespace fs = boost::filesystem;
+
+namespace gr {
+
+ /*
+ * The simplest thing that could possibly work:
+ * the key is the filename; the value is the file contents.
+ */
+ static const char *
+ pathname(const char *key)
+ {
+ static fs::path path;
+ path = fs::path(gr::appdata_path()) / ".gnuradio" / "prefs" / key;
+ return path.string().c_str();
+ }
+
+ static void
+ ensure_dir_path()
+ {
+ fs::path path = fs::path(gr::appdata_path()) / ".gnuradio";
+ if(!fs::is_directory(path))
+ fs::create_directory(path);
+
+ path = path / "prefs";
+ if(!fs::is_directory(path))
+ fs::create_directory(path);
+ }
+
+ const char *
+ vmcircbuf_prefs::get(const char *key)
+ {
+ static char buf[1024];
+
+ FILE *fp = fopen(pathname (key), "r");
+ if(fp == 0) {
+ perror(pathname (key));
+ return 0;
+ }
+
+ memset(buf, 0, sizeof (buf));
+ size_t ret = fread(buf, 1, sizeof(buf) - 1, fp);
+ if(ret == 0) {
+ if(ferror(fp) != 0) {
+ perror(pathname (key));
+ fclose(fp);
+ return 0;
+ }
+ }
+ fclose(fp);
+ return buf;
+ }
+
+ void
+ vmcircbuf_prefs::set(const char *key, const char *value)
+ {
+ ensure_dir_path();
+
+ FILE *fp = fopen(pathname(key), "w");
+ if(fp == 0) {
+ perror(pathname (key));
+ return;
+ }
+
+ size_t ret = fwrite(value, 1, strlen(value), fp);
+ if(ret == 0) {
+ if(ferror(fp) != 0) {
+ perror(pathname (key));
+ fclose(fp);
+ return;
+ }
+ }
+ fclose(fp);
+ };
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf_prefs.h b/gnuradio-runtime/lib/vmcircbuf_prefs.h
new file mode 100644
index 0000000000..709b8ff459
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_prefs.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_PREFERENCES_H
+#define GR_PREFERENCES_H
+
+#include <gnuradio/api.h>
+
+namespace gr {
+
+ class GR_RUNTIME_API vmcircbuf_prefs
+ {
+ public:
+ static const char *get(const char *key);
+ static void set(const char *key, const char *value);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_PREFERENCES_H */
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
new file mode 100644
index 0000000000..0d7e9b7d34
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
@@ -0,0 +1,196 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vmcircbuf_sysv_shm.h"
+#include <stdexcept>
+#include <assert.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#ifdef HAVE_SYS_IPC_H
+#include <sys/ipc.h>
+#endif
+#ifdef HAVE_SYS_SHM_H
+#include <sys/shm.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include "pagesize.h"
+
+
+namespace gr {
+
+ vmcircbuf_sysv_shm::vmcircbuf_sysv_shm(int size)
+ : gr::vmcircbuf(size)
+ {
+#if !defined(HAVE_SYS_SHM_H)
+ fprintf(stderr, "gr::vmcircbuf_sysv_shm: sysv shared memory is not available\n");
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+#else
+
+ int pagesize = gr::pagesize();
+
+ if(size <= 0 || (size % pagesize) != 0) {
+ fprintf(stderr, "gr::vmcircbuf_sysv_shm: invalid size = %d\n", size);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ int shmid_guard = -1;
+ int shmid1 = -1;
+ int shmid2 = -1;
+
+ // We use this as a guard page. We'll map it read-only on both ends of the buffer.
+ // Ideally we'd map it no access, but I don't think that's possible with SysV
+ if((shmid_guard = shmget(IPC_PRIVATE, pagesize, IPC_CREAT | 0400)) == -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmget (0)");
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ if((shmid2 = shmget(IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmget(1)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ throw std::runtime_error ("gr::vmcircbuf_sysv_shm");
+ }
+
+ if((shmid1 = shmget(IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmget (2)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid2, IPC_RMID, 0);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ void *first_copy = shmat (shmid2, 0, 0);
+ if(first_copy == (void *) -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmat(1)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid2, IPC_RMID, 0);
+ shmctl(shmid1, IPC_RMID, 0);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ shmctl(shmid2, IPC_RMID, 0);
+
+ // There may be a race between our detach and attach.
+ //
+ // If the system allocates all shared memory segments at the same
+ // virtual addresses in all processes and if the system allocates
+ // some other segment to first_copy or first_copoy + size between
+ // our detach and attach, the attaches below could fail [I've never
+ // seen it fail for this reason].
+ shmdt(first_copy);
+
+ // first read-only guard page
+ if(shmat(shmid_guard, first_copy, SHM_RDONLY) == (void *) -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmat(2)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid1, IPC_RMID, 0);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ // first copy
+ if(shmat (shmid1, (char*)first_copy + pagesize, 0) == (void *) -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmat (3)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid1, IPC_RMID, 0);
+ shmdt(first_copy);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ // second copy
+ if(shmat (shmid1, (char*)first_copy + pagesize + size, 0) == (void *) -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmat (4)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid1, IPC_RMID, 0);
+ shmdt((char *)first_copy + pagesize);
+ throw std::runtime_error("gr::vmcircbuf_sysv_shm");
+ }
+
+ // second read-only guard page
+ if(shmat(shmid_guard, (char*)first_copy + pagesize + 2 * size, SHM_RDONLY) == (void *) -1) {
+ perror("gr::vmcircbuf_sysv_shm: shmat(5)");
+ shmctl(shmid_guard, IPC_RMID, 0);
+ shmctl(shmid1, IPC_RMID, 0);
+ shmdt(first_copy);
+ shmdt((char *)first_copy + pagesize);
+ shmdt((char *)first_copy + pagesize + size);
+ throw std::runtime_error ("gr::vmcircbuf_sysv_shm");
+ }
+
+ shmctl(shmid1, IPC_RMID, 0);
+ shmctl(shmid_guard, IPC_RMID, 0);
+
+ // Now remember the important stuff
+ d_base = (char*)first_copy + pagesize;
+ d_size = size;
+#endif
+ }
+
+ vmcircbuf_sysv_shm::~vmcircbuf_sysv_shm()
+ {
+#if defined(HAVE_SYS_SHM_H)
+ if(shmdt(d_base - gr::pagesize()) == -1
+ || shmdt(d_base) == -1
+ || shmdt(d_base + d_size) == -1
+ || shmdt(d_base + 2 * d_size) == -1){
+ perror("gr::vmcircbuf_sysv_shm: shmdt(2)");
+ }
+#endif
+ }
+
+ // ----------------------------------------------------------------
+ // The factory interface
+ // ----------------------------------------------------------------
+
+ gr::vmcircbuf_factory *vmcircbuf_sysv_shm_factory::s_the_factory = 0;
+
+ gr::vmcircbuf_factory *
+ vmcircbuf_sysv_shm_factory::singleton()
+ {
+ if(s_the_factory)
+ return s_the_factory;
+
+ s_the_factory = new gr::vmcircbuf_sysv_shm_factory();
+ return s_the_factory;
+ }
+
+ int
+ vmcircbuf_sysv_shm_factory::granularity()
+ {
+ return gr::pagesize();
+ }
+
+ gr::vmcircbuf *
+ vmcircbuf_sysv_shm_factory::make(int size)
+ {
+ try {
+ return new vmcircbuf_sysv_shm(size);
+ }
+ catch (...) {
+ return 0;
+ }
+ }
+
+} /* namespace gr */
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
new file mode 100644
index 0000000000..08e0040bf1
--- /dev/null
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_VMCIRCBUF_SYSV_SHM_H
+#define GR_VMCIRCBUF_SYSV_SHM_H
+
+#include <gnuradio/api.h>
+#include "vmcircbuf.h"
+
+namespace gr {
+
+ /*!
+ * \brief concrete class to implement circular buffers with mmap and shm_open
+ * \ingroup internal
+ */
+ class GR_RUNTIME_API vmcircbuf_sysv_shm : public gr::vmcircbuf
+ {
+ public:
+ vmcircbuf_sysv_shm(int size);
+ virtual ~vmcircbuf_sysv_shm();
+ };
+
+ /*!
+ * \brief concrete factory for circular buffers built using mmap and shm_open
+ */
+ class GR_RUNTIME_API vmcircbuf_sysv_shm_factory : public gr::vmcircbuf_factory
+ {
+ private:
+ static gr::vmcircbuf_factory *s_the_factory;
+
+ public:
+ static gr::vmcircbuf_factory *singleton();
+
+ virtual const char *name() const { return "gr::vmcircbuf_sysv_shm_factory"; }
+
+ /*!
+ * \brief return granularity of mapping, typically equal to page size
+ */
+ virtual int granularity();
+
+ /*!
+ * \brief return a gr::vmcircbuf, or 0 if unable.
+ *
+ * Call this to create a doubly mapped circular buffer.
+ */
+ virtual gr::vmcircbuf *make(int size);
+ };
+
+} /* namespace gr */
+
+#endif /* GR_VMCIRCBUF_SYSV_SHM_H */
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index af563d3327..c910433cf7 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@ -21,15 +21,15 @@
include(GrPython)
EXECUTE_PROCESS(
- COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib
+ COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport
--output-dir=${CMAKE_BINARY_DIR}/gnuradio-runtime/python
- ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/gnuradio.ice
+ ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/gnuradio.ice
)
EXECUTE_PROCESS(
- COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib
+ COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport
--output-dir=${CMAKE_BINARY_DIR}/gnuradio-runtime/python
- ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/frontend.ice
+ ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/frontend.ice
)
GR_PYTHON_INSTALL(
diff --git a/gnuradio-runtime/python/gnuradio/gr/__init__.py b/gnuradio-runtime/python/gnuradio/gr/__init__.py
index c1d6c87629..20a8f97f63 100644
--- a/gnuradio-runtime/python/gnuradio/gr/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/gr/__init__.py
@@ -36,4 +36,4 @@ from tag_utils import *
from gateway import basic_block, sync_block, decim_block, interp_block
# Force the preference database to be initialized
-prefs = gr_prefs.singleton
+prefs = prefs.singleton
diff --git a/gnuradio-runtime/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py
index b595959494..4ff0c4fe00 100644
--- a/gnuradio-runtime/python/gnuradio/gr/gateway.py
+++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py
@@ -21,7 +21,7 @@
import runtime_swig as gr
from runtime_swig import io_signature, io_signaturev
-from runtime_swig import gr_block_gw_message_type
+from runtime_swig import block_gw_message_type
from runtime_swig import block_gateway
import numpy
@@ -107,16 +107,16 @@ class gateway_block(object):
self.__handler.init(self.__gr_block_handle)
self.__gateway = block_gateway(
self.__handler, name, gr_in_sig, gr_out_sig, work_type, factor)
- self.__message = self.__gateway.gr_block_message()
+ self.__message = self.__gateway.block_message()
#dict to keep references to all message handlers
self.__msg_handlers = {}
- #register gr_block functions
- prefix = 'gr_block__'
+ #register block functions
+ prefix = 'block__'
for attr in [x for x in dir(self.__gateway) if x.startswith(prefix)]:
setattr(self, attr.replace(prefix, ''), getattr(self.__gateway, attr))
- self.pop_msg_queue = lambda: gr.gr_block_gw_pop_msg_queue_safe(self.__gateway)
+ self.pop_msg_queue = lambda: gr.block_gw_pop_msg_queue_safe(self.__gateway)
def to_basic_block(self):
"""
@@ -128,7 +128,7 @@ class gateway_block(object):
"""
Dispatch tasks according to the action type specified in the message.
"""
- if self.__message.action == gr_block_gw_message_type.ACTION_GENERAL_WORK:
+ if self.__message.action == gr.block_gw_message_type.ACTION_GENERAL_WORK:
self.__message.general_work_args_return_value = self.general_work(
input_items=[pointer_to_ndarray(
@@ -144,7 +144,7 @@ class gateway_block(object):
) for i in self.__out_indexes],
)
- elif self.__message.action == gr_block_gw_message_type.ACTION_WORK:
+ elif self.__message.action == gr.block_gw_message_type.ACTION_WORK:
self.__message.work_args_return_value = self.work(
input_items=[pointer_to_ndarray(
@@ -160,16 +160,16 @@ class gateway_block(object):
) for i in self.__out_indexes],
)
- elif self.__message.action == gr_block_gw_message_type.ACTION_FORECAST:
+ elif self.__message.action == gr.block_gw_message_type.ACTION_FORECAST:
self.forecast(
noutput_items=self.__message.forecast_args_noutput_items,
ninput_items_required=self.__message.forecast_args_ninput_items_required,
)
- elif self.__message.action == gr_block_gw_message_type.ACTION_START:
+ elif self.__message.action == gr.block_gw_message_type.ACTION_START:
self.__message.start_args_return_value = self.start()
- elif self.__message.action == gr_block_gw_message_type.ACTION_STOP:
+ elif self.__message.action == gr.block_gw_message_type.ACTION_STOP:
self.__message.stop_args_return_value = self.stop()
def forecast(self, noutput_items, ninput_items_required):
diff --git a/gnuradio-runtime/python/gnuradio/gr/prefs.py b/gnuradio-runtime/python/gnuradio/gr/prefs.py
index 25fa8cd6ae..abba6b57a6 100644
--- a/gnuradio-runtime/python/gnuradio/gr/prefs.py
+++ b/gnuradio-runtime/python/gnuradio/gr/prefs.py
@@ -20,7 +20,7 @@
#
import gnuradio_core as gsp
-_prefs_base = gsp.gr_prefs
+_prefs_base = gsp.prefs
import ConfigParser
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
index de1b5aa002..3a0e7889f9 100755
--- a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
@@ -38,7 +38,7 @@ class test_tag_utils (gr_unittest.TestCase):
self.tb = None
def test_001(self):
- t = gr.gr_tag_t()
+ t = gr.tag_t()
t.offset = 10
t.key = pmt.string_to_symbol('key')
t.value = pmt.from_long(23)
diff --git a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
index 8de7110e3f..e35564c1eb 100644
--- a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
@@ -25,7 +25,7 @@ import pmt
try:
from gnuradio import gr
except ImportError:
- from runtime_swig import gr_tag_t
+ from runtime_swig import tag_t
class PythonTag(object):
" Python container for tags "
@@ -46,7 +46,7 @@ def tag_to_python(tag):
def tag_to_pmt(tag):
""" Convert a Python-readable object to a stream tag """
- newtag = gr_tag_t()
+ newtag = tag_t()
newtag.offset = tag.offset
newtag.key = pmt.to_python(tag.key)
newtag.value = pmt.from_python(tag.value)
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt
index 3bff08383f..b2fcb180b2 100644
--- a/gnuradio-runtime/swig/CMakeLists.txt
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -90,38 +90,32 @@ GR_SWIG_INSTALL(
install(
FILES
gnuradio_swig_bug_workaround.h
+ runtime_swig.i
complex_vec_test.i
gnuradio.i
- gr_basic_block.i
- gr_block_detail.i
- gr_block.i
- gr_buffer.i
- gr_constants.i
+ basic_block.i
+ constants.i
gr_ctrlport.i
- gr_dispatcher.i
- gr_error_handler.i
- gr_feval.i
- gr_hier_block2.i
- gr_io_signature.i
+ dispatcher.i
+ error_handler.i
+ feval.i
+ hier_block2.i
+ io_signature.i
+ message.i
+ msg_handler.i
+ msg_queue.i
+ prefs.i
+ realtime.i
+ single_threaded_scheduler.i
+ tagged_stream_block.i
+ tags.i
+ top_block.i
+ block_gateway.i
gr_logger.i
- gr_message.i
- gr_msg_handler.i
- gr_msg_queue.i
- gr_prefs.i
- gr_realtime.i
gr_shared_ptr.i
- gr_single_threaded_scheduler.i
gr_swig_block_magic.i
- gr_sync_block.i
- gr_sync_decimator.i
- gr_sync_interpolator.i
- gr_tagged_stream_block.i
- gr_tags.i
- gr_top_block.i
gr_types.i
gr_extras.i
- runtime_block_gateway.i
- runtime_swig.i
gr_intrusive_ptr.i
pmt_swig.i
${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i
diff --git a/gnuradio-runtime/swig/basic_block.i b/gnuradio-runtime/swig/basic_block.i
new file mode 100644
index 0000000000..f4ed86aefc
--- /dev/null
+++ b/gnuradio-runtime/swig/basic_block.i
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::basic_block;
+typedef boost::shared_ptr<gr::basic_block> gr::basic_block_sptr;
+%template(basic_block_sptr) boost::shared_ptr<gr::basic_block>;
+
+%include "pmt_swig.i"
+
+// support vectors of these...
+namespace std {
+ %template(x_vector_basic_block_sptr) vector<gr::basic_block_sptr>;
+};
+
+namespace gr {
+
+ class gr::basic_block
+ {
+ protected:
+ basic_block();
+
+ public:
+ virtual ~basic_block();
+ std::string name() const;
+ std::string symbol_name() const;
+ gr::io_signature::sptr input_signature() const;
+ gr::io_signature::sptr output_signature() const;
+ long unique_id() const;
+ gr::basic_block_sptr to_basic_block();
+ bool check_topology(int ninputs, int noutputs);
+ std::string alias();
+ void set_block_alias(std::string name);
+ void _post(pmt::pmt_t which_port, pmt::pmt_t msg);
+ pmt::pmt_t message_ports_in();
+ pmt::pmt_t message_ports_out();
+ };
+
+ %rename(block_ncurrently_allocated) basic_block_ncurrently_allocated;
+ long basic_block_ncurrently_allocated();
+}
+
+#ifdef SWIGPYTHON
+%pythoncode %{
+basic_block_sptr.__repr__ = lambda self: "<basic_block %s (%d)>" % (self.name(), self.unique_id ())
+%}
+#endif
diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i
new file mode 100644
index 0000000000..f697089185
--- /dev/null
+++ b/gnuradio-runtime/swig/block.i
@@ -0,0 +1,94 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%include <basic_block.i>
+
+class gr::block;
+typedef boost::shared_ptr<gr::block> gr::block_sptr;
+%template(block_sptr) boost::shared_ptr<gr::block>;
+
+// support vectors of these...
+namespace std {
+ %template(x_vector_block_sptr) vector<gr::block_sptr>;
+};
+
+class gr::block : public gr::basic_block
+{
+ protected:
+ block (const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ public:
+
+ virtual ~block ();
+
+ unsigned history () const;
+
+ int output_multiple () const;
+ double relative_rate () const;
+
+ bool start();
+ bool stop();
+
+ uint64_t nitems_read(unsigned int which_input);
+ uint64_t nitems_written(unsigned int which_output);
+
+ // Methods to manage the block's max_noutput_items size.
+ int max_noutput_items();
+ void set_max_noutput_items(int m);
+ void unset_max_noutput_items();
+ bool is_set_max_noutput_items();
+
+ // Methods to manage block's min/max buffer sizes.
+ long max_output_buffer(int i);
+ void set_max_output_buffer(long max_output_buffer);
+ void set_max_output_buffer(int port, long max_output_buffer);
+ long min_output_buffer(int i);
+ void set_min_output_buffer(long min_output_buffer);
+ void set_min_output_buffer(int port, long min_output_buffer);
+
+ // Methods to access performance counters
+ float pc_noutput_items();
+ float pc_noutput_items_var();
+ float pc_nproduced();
+ float pc_nproduced_var();
+ float pc_input_buffers_full(int which);
+ float pc_input_buffers_full_var(int which);
+ std::vector<float> pc_input_buffers_full();
+ std::vector<float> pc_input_buffers_full_var();
+ float pc_output_buffers_full(int which);
+ float pc_output_buffers_full_var(int which);
+ std::vector<float> pc_output_buffers_full();
+ std::vector<float> pc_output_buffers_full_var();
+ float pc_work_time();
+ float pc_work_time_var();
+
+ // Methods to manage processor affinity.
+ void set_processor_affinity(const std::vector<int> &mask);
+ void unset_processor_affinity();
+ std::vector<int> processor_affinity();
+
+ // internal use
+ //block_detail_sptr detail () const { return d_detail; }
+ //void set_detail (block_detail_sptr detail) { d_detail = detail; }
+};
diff --git a/gnuradio-runtime/swig/block_detail.i b/gnuradio-runtime/swig/block_detail.i
new file mode 100644
index 0000000000..a43e02bc6a
--- /dev/null
+++ b/gnuradio-runtime/swig/block_detail.i
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::block_detail;
+typedef boost::shared_ptr<gr::block_detail> gr::block_detail_sptr;
+%template(block_detail_sptr) boost::shared_ptr<gr::block_detail>;
+%rename(block_detail) gr::make_block_detail;
+%ignore gr::block_detail;
+
+gr::block_detail_sptr gr::
+gr::make_block_detail(unsigned int ninputs, unsigned int noutputs);
+
+namespace gr {
+
+ class gr::block_detail {
+ public:
+
+ ~block_detail ();
+
+ int ninputs() const;
+ int noutputs() const;
+ bool sink_p() const;
+ bool source_p() const;
+
+ void set_input(unsigned int which, gr::buffer_reader_sptr reader);
+ gr::buffer_reader_sptr input(unsigned int which);
+
+ void set_output(unsigned int which, gr::buffer_sptr buffer);
+ gr::buffer_sptr output(unsigned int which);
+
+ private:
+ block_detail(unsigned int ninputs, unsigned int noutputs);
+ };
+
+ %rename(block_detail_ncurrently_allocated) block_detail_ncurrently_allocated;
+ long block_detail_ncurrently_allocated();
+}
diff --git a/gnuradio-runtime/swig/block_gateway.i b/gnuradio-runtime/swig/block_gateway.i
new file mode 100644
index 0000000000..95207a80a2
--- /dev/null
+++ b/gnuradio-runtime/swig/block_gateway.i
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011-2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+////////////////////////////////////////////////////////////////////////
+// standard includes
+////////////////////////////////////////////////////////////////////////
+%include <gnuradio.i>
+%include <tags.i>
+%include <feval.i>
+
+%template(void_start_vector_t) std::vector<void *>;
+
+////////////////////////////////////////////////////////////////////////
+// block headers
+////////////////////////////////////////////////////////////////////////
+%{
+#include <gnuradio/block_gateway.h>
+%}
+
+////////////////////////////////////////////////////////////////////////
+// block magic
+////////////////////////////////////////////////////////////////////////
+%include <gnuradio/block_gateway.h>
+
+%template(block_gateway_sptr) boost::shared_ptr<gr::block_gateway>;
+%pythoncode %{
+block_gateway_sptr.__repr__ = lambda self: "<block_gateway>"
+block_gateway = block_gateway.make;
+%}
+
diff --git a/gnuradio-runtime/swig/buffer.i b/gnuradio-runtime/swig/buffer.i
new file mode 100644
index 0000000000..44bd4887a8
--- /dev/null
+++ b/gnuradio-runtime/swig/buffer.i
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::buffer;
+typedef boost::shared_ptr<gr::buffer> gr::buffer_sptr;
+%template(buffer_sptr) boost::shared_ptr<gr::buffer>;
+%rename(buffer) gr::make_buffer;
+%ignore gr::buffer;
+
+gr::buffer_sptr
+gr::make_buffer (int nitems, size_t sizeof_item, gr::block_sptr link);
+
+class gr::buffer_reader;
+typedef boost::shared_ptr<gr::buffer_reader> gr::buffer_reader_sptr;
+%template(buffer_reader_sptr) boost::shared_ptr<gr::buffer_reader>;
+%ignore gr::buffer_reader;
+
+%rename(buffer_add_reader) gr::buffer_add_reader;
+gr::buffer_reader_sptr
+gr::buffer_add_reader (gr::buffer_sptr buf, int nzero_preload, gr::block_sptr link);
+
+namespace gr {
+
+ class gr::buffer
+ {
+ public:
+ ~buffer();
+
+ private:
+ buffer(int nitems, size_t sizeof_item, gr::block_sptr link);
+ };
+
+ class gr::buffer_reader
+ {
+ public:
+ ~buffer_reader();
+
+ private:
+ friend class buffer;
+ buffer_reader(gr::buffer_sptr buffer, unsigned int read_index, gr::block_sptr link);
+ };
+
+ %rename(buffer_ncurrently_allocated) buffer_ncurrently_allocated;
+ long buffer_ncurrently_allocated();
+
+ %rename(buffer_reader_ncurrently_allocated) buffer_reader_ncurrently_allocated;
+ long buffer_reader_ncurrently_allocated();
+}
diff --git a/gnuradio-runtime/swig/constants.i b/gnuradio-runtime/swig/constants.i
new file mode 100644
index 0000000000..ebc6a93515
--- /dev/null
+++ b/gnuradio-runtime/swig/constants.i
@@ -0,0 +1,13 @@
+/* -*- c++ -*- */
+
+%rename(prefix) gr::prefix;
+%rename(sysconfdir) gr::sysconfdir;
+%rename(prefsdir) gr::prefsdir;
+%rename(build_date) gr::build_date;
+%rename(version) gr::version;
+
+const std::string gr::prefix();
+const std::string gr::sysconfdir();
+const std::string gr::prefsdir();
+const std::string gr::build_date();
+const std::string gr::version();
diff --git a/gnuradio-runtime/swig/dispatcher.i b/gnuradio-runtime/swig/dispatcher.i
new file mode 100644
index 0000000000..4a039c61e3
--- /dev/null
+++ b/gnuradio-runtime/swig/dispatcher.i
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::dispatcher;
+typedef boost::shared_ptr<gr::dispatcher> gr::dispatcher_sptr;
+%template(dispatcher_sptr) boost::shared_ptr<gr::dispatcher>;
+
+%rename(dispatcher) gr::make_dispatcher;
+gr::dispatcher_sptr gr::make_dispatcher();
+
+%rename(dispatcher_singleton) gr::dispatcher_singleton;
+gr::dispatcher_sptr gr::dispatcher_singleton();
+
+/*!
+ * \brief invoke callbacks based on select.
+ *
+ * \sa gr::select_handler
+ */
+class gr::dispatcher
+{
+ dispatcher();
+
+public:
+ ~dispatcher();
+
+ /*!
+ * \brief Event dispatching loop.
+ *
+ * Enter a polling loop that only terminates after all gr::select_handlers
+ * have been removed. \p timeout sets the timeout parameter to the select()
+ * call, measured in seconds.
+ *
+ * \param timeout maximum number of seconds to block in select.
+ */
+ void loop(double timeout=10);
+};
+
diff --git a/gnuradio-runtime/swig/error_handler.i b/gnuradio-runtime/swig/error_handler.i
new file mode 100644
index 0000000000..8174128fa2
--- /dev/null
+++ b/gnuradio-runtime/swig/error_handler.i
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%rename(error_handler) gr::error_handler;
+%rename(file_error_handler) gr::file_error_handler;
+
+class gr::error_handler {
+public:
+ enum seriousness {
+ ERR_DEBUG = 0x00000000,
+ ERR_MESSAGE = 0x00010000,
+ ERR_WARNING = 0x00020000,
+ ERR_ERROR = 0x00030000,
+ ERR_FATAL = 0x00040000
+ };
+
+ error_handler() {}
+ virtual ~error_handler();
+
+ static gr::error_handler *default_handler();
+ static gr::error_handler *silent_handler();
+
+ static bool has_default_handler();
+ static void set_default_handler(gr::error_handler *errh);
+
+ virtual int nwarnings() const = 0;
+ virtual int nerrors() const = 0;
+ virtual void reset_counts() = 0;
+
+ void verror_text(seriousness s, const std::string &text);
+};
+
+%ignore gr::base_error_handler;
+class gr::base_error_handler : public gr::error_handler {
+ int d_nwarnings;
+ int d_nerrors;
+
+public:
+ base_error_handler() : d_nwarnings(0), d_nerrors(0) {}
+ int nwarnings() const { return d_nwarnings; }
+ int nerrors() const { return d_nerrors; }
+ void reset_counts() { d_nwarnings = d_nerrors = 0; }
+ void count_error(seriousness s);
+};
+
+class gr::file_error_handler : public gr::base_error_handler {
+public:
+ file_error_handler(int file_descriptor);
+ ~file_error_handler();
+};
diff --git a/gnuradio-runtime/swig/feval.i b/gnuradio-runtime/swig/feval.i
new file mode 100644
index 0000000000..f773346b1b
--- /dev/null
+++ b/gnuradio-runtime/swig/feval.i
@@ -0,0 +1,243 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+/*
+ * N.B., this is a _very_ non-standard SWIG .i file
+ *
+ * It contains a bunch of magic that is required to ensure that when
+ * these classes are used as base classes for python code,
+ * everything works when calling back from C++ into Python.
+ *
+ * The gist of the problem is that our C++ code is usually not holding
+ * the Python Global Interpreter Lock (GIL). Thus if we invoke a
+ * "director" method from C++, we'll end up in Python not holding the
+ * GIL. Disaster (SIGSEGV) will result. To avoid this we insert a
+ * "shim" that grabs and releases the GIL.
+ *
+ * If you don't understand SWIG "directors" or the Python GIL,
+ * don't bother trying to understand what's going on in here.
+ *
+ * [We could eliminate a bunch of this hair by requiring SWIG 1.3.29
+ * or later and some additional magic declarations, but many systems
+ * aren't shipping that version yet. Thus we kludge...]
+ */
+
+// Directors are only supported in Python, Java and C#
+#ifdef SWIGPYTHON
+
+%import "pmt_swig.i"
+
+ // Enable SWIG directors for these classes
+%feature("director") gr::py_feval_dd;
+%feature("director") gr::py_feval_cc;
+%feature("director") gr::py_feval_ll;
+%feature("director") gr::py_feval;
+%feature("director") gr::py_feval_p;
+
+%feature("nodirector") gr::py_feval_dd::calleval;
+%feature("nodirector") gr::py_feval_cc::calleval;
+%feature("nodirector") gr::py_feval_ll::calleval;
+%feature("nodirector") gr::py_feval::calleval;
+%feature("nodirector") gr::py_feval_p::calleval;
+
+//%exception {
+// try { $action }
+// catch (Swig::DirectorException &e) { std::cerr << e.getMessage(); SWIG_fail; }
+//}
+
+%{
+
+// class that ensures we acquire and release the Python GIL
+
+class ensure_py_gil_state {
+ PyGILState_STATE d_gstate;
+public:
+ ensure_py_gil_state() { d_gstate = PyGILState_Ensure(); }
+ ~ensure_py_gil_state() { PyGILState_Release(d_gstate); }
+};
+
+%}
+
+%ignore gr::feval_dd;
+%ignore gr::feval_cc;
+%ignore gr::feval_ll;
+%ignore gr::feval;
+%ignore gr::feval_p;
+
+namespace gr {
+/*
+ * These are the real C++ base classes, however we don't want these exposed.
+ */
+ class gr::feval_dd
+ {
+ protected:
+ virtual double eval(double x);
+
+ public:
+ feval_dd() {}
+ virtual ~feval_dd();
+
+ virtual double calleval(double x);
+ };
+ //%rename(feval_dd) gr::feval_dd;
+
+ class gr::feval_cc
+ {
+ protected:
+ virtual gr_complex eval(gr_complex x);
+
+ public:
+ feval_cc() {}
+ virtual ~feval_cc();
+
+ virtual gr_complex calleval(gr_complex x);
+ };
+ //%rename(feval_cc) gr::feval_cc;
+
+ class gr::feval_ll
+ {
+ protected:
+ virtual long eval(long x);
+
+ public:
+ feval_ll() {}
+ virtual ~feval_ll();
+
+ virtual long calleval(long x);
+ };
+ //%rename(feval_ll) gr::feval_ll;
+
+ class gr::feval
+ {
+ protected:
+ virtual void eval();
+
+ public:
+ feval() {}
+ virtual ~feval();
+
+ virtual void calleval();
+ };
+ //%rename(feval) gr::feval;
+
+ class gr::feval_p
+ {
+ protected:
+ virtual void eval(pmt::pmt_t x);
+
+ public:
+ feval_p() {}
+ virtual ~feval_p();
+
+ virtual void calleval(pmt::pmt_t x);
+ };
+ //%rename(feval_p) gr::feval_p;
+}
+
+/*
+ * These are the ones to derive from in Python. They have the magic shim
+ * that ensures that we're holding the Python GIL when we enter Python land...
+ */
+
+namespace gr {
+ %rename(feval_dd) py_feval_dd;
+ %rename(feval_cc) py_feval_cc;
+ %rename(feval_ll) py_feval_ll;
+ %rename(feval) py_feval;
+ %rename(feval_p) py_feval_p;
+}
+
+%inline %{
+#include <pmt/pmt.h>
+
+ namespace gr {
+
+ class py_feval_dd : public gr::feval_dd
+ {
+ public:
+ double calleval(double x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval_cc : public gr::feval_cc
+ {
+ public:
+ gr_complex calleval(gr_complex x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval_ll : public gr::feval_ll
+ {
+ public:
+ long calleval(long x)
+ {
+ ensure_py_gil_state _lock;
+ return eval(x);
+ }
+ };
+
+ class py_feval : public gr::feval
+ {
+ public:
+ void calleval()
+ {
+ ensure_py_gil_state _lock;
+ eval();
+ }
+ };
+
+ class py_feval_p : public gr::feval_p
+ {
+ public:
+ void calleval(pmt::pmt_t x)
+ {
+ ensure_py_gil_state _lock;
+ eval(x);
+ }
+ };
+ }
+%}
+
+namespace gr {
+ // examples / test cases
+
+ %rename(feval_dd_example) gr::feval_dd_example;
+ double gr::feval_dd_example(gr::feval_dd *f, double x);
+
+ %rename(feval_cc_example) gr::feval_cc_example;
+ gr_complex gr::feval_cc_example(gr::feval_cc *f, gr_complex x);
+
+ %rename(feval_ll_example) gr::feval_ll_example;
+ long gr::feval_ll_example(gr::feval_ll *f, long x);
+
+ %rename(feval_example) gr::feval_example;
+ void gr::feval_example(gr::feval *f);
+}
+
+#endif // SWIGPYTHON
diff --git a/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h b/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h
index 1994f06609..ad9168ce9e 100644
--- a/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h
+++ b/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h
@@ -29,17 +29,17 @@
* %import "gnuradio.i"
*/
-class gr_base_error_handler;
-class gr_basic_block;
-class gr_block;
-class gr_error_handler;
-class gr_file_error_handler;
-class gr_hier_block2;
-class gr_msg_handler;
-class gr_msg_queue;
-class gr_sync_block;
-class gr_sync_decimator;
-class gr_sync_interpolator;
-class gr_top_block;
+class base_error_handler;
+class basic_block;
+class block;
+class error_handler;
+class file_error_handler;
+class hier_block2;
+class msg_handler;
+class msg_queue;
+class sync_block;
+class sync_decimator;
+class sync_interpolator;
+class top_block;
#endif /* INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H */
diff --git a/gnuradio-runtime/swig/gr_basic_block.i b/gnuradio-runtime/swig/gr_basic_block.i
deleted file mode 100644
index 2e703278c5..0000000000
--- a/gnuradio-runtime/swig/gr_basic_block.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_basic_block;
-typedef boost::shared_ptr<gr_basic_block> gr_basic_block_sptr;
-%template(gr_basic_block_sptr) boost::shared_ptr<gr_basic_block>;
-
-%include "pmt_swig.i"
-using namespace pmt;
-
-// support vectors of these...
-namespace std {
- %template(x_vector_gr_basic_block_sptr) vector<gr_basic_block_sptr>;
-};
-
-class gr_basic_block
-{
-protected:
- gr_basic_block();
-
-public:
- virtual ~gr_basic_block();
- std::string name() const;
- std::string symbol_name() const;
- gr_io_signature_sptr input_signature() const;
- gr_io_signature_sptr output_signature() const;
- long unique_id() const;
- gr_basic_block_sptr to_basic_block();
- bool check_topology (int ninputs, int noutputs);
- std::string alias();
- void set_block_alias(std::string name);
- void _post(pmt_t which_port, pmt_t msg);
- pmt_t message_ports_in();
- pmt_t message_ports_out();
-};
-
-%rename(block_ncurrently_allocated) gr_basic_block_ncurrently_allocated;
-long gr_basic_block_ncurrently_allocated();
-
-#ifdef SWIGPYTHON
-%pythoncode %{
-gr_basic_block_sptr.__repr__ = lambda self: "<gr_basic_block %s (%d)>" % (self.name(), self.unique_id ())
-%}
-#endif
diff --git a/gnuradio-runtime/swig/gr_block.i b/gnuradio-runtime/swig/gr_block.i
deleted file mode 100644
index a53489f9a2..0000000000
--- a/gnuradio-runtime/swig/gr_block.i
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-%include <gr_basic_block.i>
-
-class gr_block;
-typedef boost::shared_ptr<gr_block> gr_block_sptr;
-%template(gr_block_sptr) boost::shared_ptr<gr_block>;
-
-// support vectors of these...
-namespace std {
- %template(x_vector_gr_block_sptr) vector<gr_block_sptr>;
-};
-
-class gr_block : public gr_basic_block {
- protected:
- gr_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
- public:
-
- virtual ~gr_block ();
-
- unsigned history () const;
-
- int output_multiple () const;
- double relative_rate () const;
-
- bool start();
- bool stop();
-
- uint64_t nitems_read(unsigned int which_input);
- uint64_t nitems_written(unsigned int which_output);
-
- // Methods to manage the block's max_noutput_items size.
- int max_noutput_items();
- void set_max_noutput_items(int m);
- void unset_max_noutput_items();
- bool is_set_max_noutput_items();
-
- // Methods to manage block's min/max buffer sizes.
- long max_output_buffer(int i);
- void set_max_output_buffer(long max_output_buffer);
- void set_max_output_buffer(int port, long max_output_buffer);
- long min_output_buffer(int i);
- void set_min_output_buffer(long min_output_buffer);
- void set_min_output_buffer(int port, long min_output_buffer);
-
- // Methods to access performance counters
- float pc_noutput_items();
- float pc_noutput_items_var();
- float pc_nproduced();
- float pc_nproduced_var();
- float pc_input_buffers_full(int which);
- float pc_input_buffers_full_var(int which);
- std::vector<float> pc_input_buffers_full();
- std::vector<float> pc_input_buffers_full_var();
- float pc_output_buffers_full(int which);
- float pc_output_buffers_full_var(int which);
- std::vector<float> pc_output_buffers_full();
- std::vector<float> pc_output_buffers_full_var();
- float pc_work_time();
- float pc_work_time_var();
-
- // Methods to manage processor affinity.
- void set_processor_affinity(const std::vector<int> &mask);
- void unset_processor_affinity();
- std::vector<int> processor_affinity();
-
- // internal use
- gr_block_detail_sptr detail () const { return d_detail; }
- void set_detail (gr_block_detail_sptr detail) { d_detail = detail; }
-};
diff --git a/gnuradio-runtime/swig/gr_block_detail.i b/gnuradio-runtime/swig/gr_block_detail.i
deleted file mode 100644
index 74ff463604..0000000000
--- a/gnuradio-runtime/swig/gr_block_detail.i
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_block_detail;
-typedef boost::shared_ptr<gr_block_detail> gr_block_detail_sptr;
-%template(gr_block_detail_sptr) boost::shared_ptr<gr_block_detail>;
-%rename(block_detail) gr_make_block_detail;
-%ignore gr_block_detail;
-
-gr_block_detail_sptr gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
-
-class gr_block_detail {
- public:
-
- ~gr_block_detail ();
-
- int ninputs () const { return d_ninputs; }
- int noutputs () const { return d_noutputs; }
- bool sink_p () const { return d_noutputs == 0; }
- bool source_p () const { return d_ninputs == 0; }
-
- void set_input (unsigned int which, gr_buffer_reader_sptr reader);
- gr_buffer_reader_sptr input (unsigned int which)
- {
- if (which >= d_ninputs)
- throw std::invalid_argument ("gr_block_detail::input");
- return d_input[which];
- }
-
- void set_output (unsigned int which, gr_buffer_sptr buffer);
- gr_buffer_sptr output (unsigned int which)
- {
- if (which >= d_noutputs)
- throw std::invalid_argument ("gr_block_detail::output");
- return d_output[which];
- }
-
- // ----------------------------------------------------------------------------
-
- private:
- gr_block_detail (unsigned int ninputs, unsigned int noutputs);
-
-};
-
-
-%rename(block_detail_ncurrently_allocated) gr_block_detail_ncurrently_allocated;
-long gr_block_detail_ncurrently_allocated ();
diff --git a/gnuradio-runtime/swig/gr_buffer.i b/gnuradio-runtime/swig/gr_buffer.i
deleted file mode 100644
index 390a94e050..0000000000
--- a/gnuradio-runtime/swig/gr_buffer.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_buffer;
-typedef boost::shared_ptr<gr_buffer> gr_buffer_sptr;
-%template(gr_buffer_sptr) boost::shared_ptr<gr_buffer>;
-%rename(buffer) gr_make_buffer;
-%ignore gr_buffer;
-
-gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
-
-class gr_buffer {
- public:
- ~gr_buffer ();
-
- private:
- gr_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
-};
-
-
-class gr_buffer_reader;
-typedef boost::shared_ptr<gr_buffer_reader> gr_buffer_reader_sptr;
-%template(gr_buffer_reader_sptr) boost::shared_ptr<gr_buffer_reader>;
-%ignore gr_buffer_reader;
-
-%rename(buffer_add_reader) gr_buffer_add_reader;
-gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
-
-class gr_buffer_reader {
- public:
- ~gr_buffer_reader ();
-
- private:
- friend class gr_buffer;
- gr_buffer_reader (gr_buffer_sptr buffer, unsigned int read_index, gr_block_sptr link);
-};
-
-
-%rename(buffer_ncurrently_allocated) gr_buffer_ncurrently_allocated;
-long gr_buffer_ncurrently_allocated ();
-
-%rename(buffer_reader_ncurrently_allocated) gr_buffer_reader_ncurrently_allocated;
-long gr_buffer_reader_ncurrently_allocated ();
-
diff --git a/gnuradio-runtime/swig/gr_constants.i b/gnuradio-runtime/swig/gr_constants.i
deleted file mode 100644
index a5aef14925..0000000000
--- a/gnuradio-runtime/swig/gr_constants.i
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- c++ -*- */
-
-%rename(prefix) gr_prefix;
-%rename(sysconfdir) gr_sysconfdir;
-%rename(prefsdir) gr_prefsdir;
-%rename(build_date) gr_build_date;
-%rename(version) gr_version;
-
-const std::string gr_prefix();
-const std::string gr_sysconfdir();
-const std::string gr_prefsdir();
-const std::string gr_build_date();
-const std::string gr_version();
diff --git a/gnuradio-runtime/swig/gr_ctrlport.i b/gnuradio-runtime/swig/gr_ctrlport.i
index fa3ae845d7..ac05c05ee5 100644
--- a/gnuradio-runtime/swig/gr_ctrlport.i
+++ b/gnuradio-runtime/swig/gr_ctrlport.i
@@ -53,14 +53,14 @@ enum KnobType {
};
%{
-#include <rpcserver_booter_base.h>
-#include <rpcserver_booter_aggregator.h>
-#include <pycallback_object.h>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/rpcserver_booter_aggregator.h>
+#include <gnuradio/pycallback_object.h>
%}
-%include <rpcserver_booter_base.h>
-%include <rpcserver_booter_aggregator.h>
-%include <pycallback_object.h>
+%include <gnuradio/rpcserver_booter_base.h>
+%include <gnuradio/rpcserver_booter_aggregator.h>
+%include <gnuradio/pycallback_object.h>
// Declare this class here but without the nested templated class
// inside (replaces include of rpcmanager.h)
diff --git a/gnuradio-runtime/swig/gr_dispatcher.i b/gnuradio-runtime/swig/gr_dispatcher.i
deleted file mode 100644
index 28737cd317..0000000000
--- a/gnuradio-runtime/swig/gr_dispatcher.i
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_dispatcher;
-typedef boost::shared_ptr<gr_dispatcher> gr_dispatcher_sptr;
-%template(gr_dispatcher_sptr) boost::shared_ptr<gr_dispatcher>;
-
-%rename(dispatcher) gr_make_dispatcher;
-gr_dispatcher_sptr gr_make_dispatcher();
-
-%rename(dispatcher_singleton) gr_dispatcher_singleton;
-gr_dispatcher_sptr gr_dispatcher_singleton();
-
-/*!
- * \brief invoke callbacks based on select.
- *
- * \sa gr_select_handler
- */
-class gr_dispatcher
-{
- gr_dispatcher();
-
-public:
- ~gr_dispatcher();
-
- /*!
- * \brief Event dispatching loop.
- *
- * Enter a polling loop that only terminates after all gr_select_handlers
- * have been removed. \p timeout sets the timeout parameter to the select()
- * call, measured in seconds.
- *
- * \param timeout maximum number of seconds to block in select.
- */
- void loop(double timeout=10);
-};
diff --git a/gnuradio-runtime/swig/gr_error_handler.i b/gnuradio-runtime/swig/gr_error_handler.i
deleted file mode 100644
index 072394a727..0000000000
--- a/gnuradio-runtime/swig/gr_error_handler.i
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-%rename(error_handler) gr_error_handler;
-%rename(file_error_handler) gr_file_error_handler;
-
-class gr_error_handler {
-public:
- enum seriousness {
- ERR_DEBUG = 0x00000000,
- ERR_MESSAGE = 0x00010000,
- ERR_WARNING = 0x00020000,
- ERR_ERROR = 0x00030000,
- ERR_FATAL = 0x00040000
- };
-
- gr_error_handler() {}
- virtual ~gr_error_handler();
-
- static gr_error_handler *default_handler();
- static gr_error_handler *silent_handler();
-
- static bool has_default_handler();
- static void set_default_handler(gr_error_handler *errh);
-
- virtual int nwarnings() const = 0;
- virtual int nerrors() const = 0;
- virtual void reset_counts() = 0;
-
- void verror_text(seriousness s, const std::string &text);
-};
-
-%ignore gr_base_error_handler;
-class gr_base_error_handler : public gr_error_handler {
- int d_nwarnings;
- int d_nerrors;
-
-public:
- gr_base_error_handler() : d_nwarnings(0), d_nerrors(0) {}
- int nwarnings() const { return d_nwarnings; }
- int nerrors() const { return d_nerrors; }
- void reset_counts() { d_nwarnings = d_nerrors = 0; }
- void count_error(seriousness s);
-};
-
-class gr_file_error_handler : public gr_base_error_handler {
-public:
- gr_file_error_handler(int file_descriptor);
- ~gr_file_error_handler();
-};
diff --git a/gnuradio-runtime/swig/gr_feval.i b/gnuradio-runtime/swig/gr_feval.i
deleted file mode 100644
index e3b8696fa6..0000000000
--- a/gnuradio-runtime/swig/gr_feval.i
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-/*
- * N.B., this is a _very_ non-standard SWIG .i file
- *
- * It contains a bunch of magic that is required to ensure that when
- * these classes are used as base classes for python code,
- * everything works when calling back from C++ into Python.
- *
- * The gist of the problem is that our C++ code is usually not holding
- * the Python Global Interpreter Lock (GIL). Thus if we invoke a
- * "director" method from C++, we'll end up in Python not holding the
- * GIL. Disaster (SIGSEGV) will result. To avoid this we insert a
- * "shim" that grabs and releases the GIL.
- *
- * If you don't understand SWIG "directors" or the Python GIL,
- * don't bother trying to understand what's going on in here.
- *
- * [We could eliminate a bunch of this hair by requiring SWIG 1.3.29
- * or later and some additional magic declarations, but many systems
- * aren't shipping that version yet. Thus we kludge...]
- */
-
-
-// Directors are only supported in Python, Java and C#
-#ifdef SWIGPYTHON
-%include "pmt_swig.i"
-using namespace pmt;
-
-// Enable SWIG directors for these classes
-%feature("director") gr_py_feval_dd;
-%feature("director") gr_py_feval_cc;
-%feature("director") gr_py_feval_ll;
-%feature("director") gr_py_feval;
-%feature("director") gr_py_feval_p;
-
-%feature("nodirector") gr_py_feval_dd::calleval;
-%feature("nodirector") gr_py_feval_cc::calleval;
-%feature("nodirector") gr_py_feval_ll::calleval;
-%feature("nodirector") gr_py_feval::calleval;
-%feature("nodirector") gr_py_feval_p::calleval;
-
-
-%rename(feval_dd) gr_py_feval_dd;
-%rename(feval_cc) gr_py_feval_cc;
-%rename(feval_ll) gr_py_feval_ll;
-%rename(feval) gr_py_feval;
-%rename(feval_p) gr_py_feval_p;
-
-//%exception {
-// try { $action }
-// catch (Swig::DirectorException &e) { std::cerr << e.getMessage(); SWIG_fail; }
-//}
-
-%{
-
-// class that ensures we acquire and release the Python GIL
-
-class ensure_py_gil_state {
- PyGILState_STATE d_gstate;
-public:
- ensure_py_gil_state() { d_gstate = PyGILState_Ensure(); }
- ~ensure_py_gil_state() { PyGILState_Release(d_gstate); }
-};
-
-%}
-
-/*
- * These are the real C++ base classes, however we don't want these exposed.
- */
-%ignore gr_feval_dd;
-class gr_feval_dd
-{
-protected:
- virtual double eval(double x);
-
-public:
- gr_feval_dd() {}
- virtual ~gr_feval_dd();
-
- virtual double calleval(double x);
-};
-
-%ignore gr_feval_cc;
-class gr_feval_cc
-{
-protected:
- virtual gr_complex eval(gr_complex x);
-
-public:
- gr_feval_cc() {}
- virtual ~gr_feval_cc();
-
- virtual gr_complex calleval(gr_complex x);
-};
-
-%ignore gr_feval_ll;
-class gr_feval_ll
-{
-protected:
- virtual long eval(long x);
-
-public:
- gr_feval_ll() {}
- virtual ~gr_feval_ll();
-
- virtual long calleval(long x);
-};
-
-%ignore gr_feval;
-class gr_feval
-{
-protected:
- virtual void eval();
-
-public:
- gr_feval() {}
- virtual ~gr_feval();
-
- virtual void calleval();
-};
-
-%ignore gr_feval_p;
-class gr_feval_p
-{
-protected:
- virtual void eval(pmt_t x);
-
-public:
- gr_feval_p() {}
- virtual ~gr_feval_p();
-
- virtual void calleval(pmt_t x);
-};
-
-/*
- * These are the ones to derive from in Python. They have the magic shim
- * that ensures that we're holding the Python GIL when we enter Python land...
- */
-
-%inline %{
-#include <pmt/pmt.h>
-
-class gr_py_feval_dd : public gr_feval_dd
-{
- public:
- double calleval(double x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval_cc : public gr_feval_cc
-{
- public:
- gr_complex calleval(gr_complex x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval_ll : public gr_feval_ll
-{
- public:
- long calleval(long x)
- {
- ensure_py_gil_state _lock;
- return eval(x);
- }
-};
-
-class gr_py_feval : public gr_feval
-{
- public:
- void calleval()
- {
- ensure_py_gil_state _lock;
- eval();
- }
-};
-
-class gr_py_feval_p : public gr_feval_p
-{
- public:
- void calleval(pmt::pmt_t x)
- {
- ensure_py_gil_state _lock;
- eval(x);
- }
-};
-
-%}
-
-
-
-// examples / test cases
-
-%rename(feval_dd_example) gr_feval_dd_example;
-double gr_feval_dd_example(gr_feval_dd *f, double x);
-
-%rename(feval_cc_example) gr_feval_cc_example;
-gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
-
-%rename(feval_ll_example) gr_feval_ll_example;
-long gr_feval_ll_example(gr_feval_ll *f, long x);
-
-%rename(feval_example) gr_feval_example;
-void gr_feval_example(gr_feval *f);
-
-#endif // SWIGPYTHON
diff --git a/gnuradio-runtime/swig/gr_hier_block2.i b/gnuradio-runtime/swig/gr_hier_block2.i
deleted file mode 100644
index a857394ca7..0000000000
--- a/gnuradio-runtime/swig/gr_hier_block2.i
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2006,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-%include <gr_basic_block.i>
-
-class gr_hier_block2;
-typedef boost::shared_ptr<gr_hier_block2> gr_hier_block2_sptr;
-%template(gr_hier_block2_sptr) boost::shared_ptr<gr_hier_block2>;
-
-// Hack to have a Python shim implementation of gr.hier_block2
-// that instantiates one of these and passes through calls
-%rename(hier_block2_swig) gr_make_hier_block2;
-gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature)
- throw (std::runtime_error);
-
-// Rename connect and disconnect so that we can more easily build a
-// better interface in scripting land.
-%rename(primitive_connect) gr_hier_block2::connect;
-%rename(primitive_disconnect) gr_hier_block2::disconnect;
-%rename(primitive_msg_connect) gr_hier_block2::msg_connect;
-%rename(primitive_msg_disconnect) gr_hier_block2::msg_disconnect;
-%rename(primitive_message_port_register_hier_in) gr_hier_block2::message_port_register_hier_in;
-%rename(primitive_message_port_register_hier_out) gr_hier_block2::message_port_register_hier_out;
-
-class gr_hier_block2 : public gr_basic_block
-{
-private:
- gr_hier_block2(const std::string name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-
-public:
- ~gr_hier_block2 ();
-
- void connect(gr_basic_block_sptr block)
- throw (std::invalid_argument);
- void connect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
- throw (std::invalid_argument);
- void msg_connect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
- throw (std::runtime_error);
- void msg_connect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport)
- throw (std::runtime_error);
- void msg_disconnect(gr_basic_block_sptr src, pmt::pmt_t srcport,
- gr_basic_block_sptr dst, pmt::pmt_t dstport)
- throw (std::runtime_error);
- void msg_disconnect(gr_basic_block_sptr src, std::string srcport,
- gr_basic_block_sptr dst, std::string dstport)
- throw (std::runtime_error);
-
- void disconnect(gr_basic_block_sptr block)
- throw (std::invalid_argument);
- void disconnect(gr_basic_block_sptr src, int src_port,
- gr_basic_block_sptr dst, int dst_port)
- throw (std::invalid_argument);
- void disconnect_all();
- void lock();
- void unlock();
-
- void message_port_register_hier_in(pmt::pmt_t port_id);
- void message_port_register_hier_out(pmt::pmt_t port_id);
-
-
- gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
-};
diff --git a/gnuradio-runtime/swig/gr_io_signature.i b/gnuradio-runtime/swig/gr_io_signature.i
deleted file mode 100644
index fe1707e410..0000000000
--- a/gnuradio-runtime/swig/gr_io_signature.i
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2005,2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_io_signature;
-typedef boost::shared_ptr<gr_io_signature> gr_io_signature_sptr;
-%template(gr_io_signature_sptr) boost::shared_ptr<gr_io_signature>;
-
-%rename(io_signature) gr_make_io_signature;
-%rename(io_signature2) gr_make_io_signature2;
-%rename(io_signature3) gr_make_io_signature3;
-%rename(io_signaturev) gr_make_io_signaturev;
-
-
-gr_io_signature_sptr
-gr_make_io_signature(int min_streams, int max_streams,
- int sizeof_stream_item);
-
-gr_io_signature_sptr
-gr_make_io_signature2(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2
- );
-gr_io_signature_sptr
-gr_make_io_signature3(int min_streams, int max_streams,
- int sizeof_stream_item1,
- int sizeof_stream_item2,
- int sizeof_stream_item3
- );
-gr_io_signature_sptr
-gr_make_io_signaturev(int min_streams, int max_streams,
- const std::vector<int> &sizeof_stream_items);
-
-
-class gr_io_signature {
- gr_io_signature (int min_streams, int max_streams, int sizeof_stream_item);
-
- friend gr_io_signature_sptr
- gr_make_io_signaturev(int min_streams,
- int max_streams,
- const std::vector<int> &sizeof_stream_item);
-
- public:
-
- // disabled. Suspected bug in SWIG 1.3.24
- // static const int IO_INFINITE = -1;
-
- ~gr_io_signature ();
-
- int min_streams () const { return d_min_streams; }
- int max_streams () const { return d_max_streams; }
- int sizeof_stream_item (int index) const;
- std::vector<int> sizeof_stream_items() const;
-};
-
diff --git a/gnuradio-runtime/swig/gr_logger.i b/gnuradio-runtime/swig/gr_logger.i
index b43bff5a89..d87ee01b44 100644
--- a/gnuradio-runtime/swig/gr_logger.i
+++ b/gnuradio-runtime/swig/gr_logger.i
@@ -41,39 +41,43 @@
%{
// The .h files
-#include <gr_logger.h>
+#include <gnuradio/logger.h>
%}
-%rename(logger) gr_logger;
-%rename(logger_config) gr_logger_config;
-%rename(logger_get_names) gr_logger_get_logger_names;
-%rename(logger_reset_config) gr_logger_reset_config;
+%rename(logger) gr::logger;
+%rename(logger_config) gr::logger_config;
+%rename(logger_get_names) gr::logger_get_logger_names;
+%rename(logger_reset_config) gr::logger_reset_config;
+namespace gr {
-void gr_logger_config(const std::string config_filename,unsigned int watch_period = 0);
-std::vector<std::string> gr_logger_get_logger_names(void);
-void gr_logger_reset_config(void);
+ void logger_config(const std::string config_filename, unsigned int watch_period = 0);
+ std::vector<std::string> logger_get_logger_names(void);
+ void logger_reset_config(void);
-class gr_logger
-{
- public:
- gr_logger(std::string logger_name);
- void set_level(std::string level){GR_LOG_SET_LEVEL(d_logger,level);}
- void get_level(std::string &level){GR_LOG_GET_LEVEL(d_logger,level);}
- void debug(std::string msg){GR_LOG_DEBUG(d_logger,msg);};
- void info(std::string msg){GR_LOG_INFO(d_logger,msg);};
- void notice(std::string msg){GR_LOG_NOTICE(d_logger,msg);};
- void warn(std::string msg){GR_LOG_WARN(d_logger,msg);};
- void error(std::string msg){GR_LOG_ERROR(d_logger,msg);};
- void crit(std::string msg){GR_LOG_CRIT(d_logger,msg);};
- void alert(std::string msg){GR_LOG_ALERT(d_logger,msg);};
- void fatal(std::string msg){GR_LOG_FATAL(d_logger,msg);};
- void emerg(std::string msg){GR_LOG_EMERG(d_logger,msg);};
- void errorIF(bool cond,std::string msg){GR_LOG_ERRORIF(d_logger,cond,msg);};
- void log_assert(bool cond,std::string msg){GR_LOG_ASSERT(d_logger,cond,msg);};
+ class logger
+ {
+ public:
+ logger(std::string logger_name);
+ void set_level(std::string level){LOG_SET_LEVEL(d_logger,level);}
+ void get_level(std::string &level){LOG_GET_LEVEL(d_logger,level);}
+ void debug(std::string msg){LOG_DEBUG(d_logger,msg);};
+ void info(std::string msg){LOG_INFO(d_logger,msg);};
+ void notice(std::string msg){LOG_NOTICE(d_logger,msg);};
+ void warn(std::string msg){LOG_WARN(d_logger,msg);};
+ void error(std::string msg){LOG_ERROR(d_logger,msg);};
+ void crit(std::string msg){LOG_CRIT(d_logger,msg);};
+ void alert(std::string msg){LOG_ALERT(d_logger,msg);};
+ void fatal(std::string msg){LOG_FATAL(d_logger,msg);};
+ void emerg(std::string msg){LOG_EMERG(d_logger,msg);};
+ void errorIF(bool cond,std::string msg){LOG_ERRORIF(d_logger,cond,msg);};
+ void log_assert(bool cond,std::string msg){LOG_ASSERT(d_logger,cond,msg);};
void add_console_appender(std::string target,std::string pattern);
void add_file_appender(std::string filename,bool append,std::string pattern);
- void add_rollingfile_appender(std::string filename,size_t filesize,int bkup_index,bool append,mode_t mode,std::string pattern);
-};
+ void add_rollingfile_appender(std::string filename, size_t filesize,
+ int bkup_index, bool append, mode_t mode,
+ std::string pattern);
+ };
+} /* namespace gr */
diff --git a/gnuradio-runtime/swig/gr_message.i b/gnuradio-runtime/swig/gr_message.i
deleted file mode 100644
index 356bba5b58..0000000000
--- a/gnuradio-runtime/swig/gr_message.i
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_message;
-typedef boost::shared_ptr<gr_message> gr_message_sptr;
-%template(gr_message_sptr) boost::shared_ptr<gr_message>;
-
-%rename(message_from_string) gr_make_message_from_string;
-gr_message_sptr
-gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0, double arg2 = 0);
-
-%rename(message) gr_make_message;
-gr_message_sptr
-gr_make_message(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
-
-/*!
- * \brief Message.
- *
- * The ideas and method names for adjustable message length were
- * lifted from the click modular router "Packet" class.
- */
-class gr_message {
- gr_message (long type, double arg1, double arg2, size_t length);
-
- unsigned char *buf_data() const { return d_buf_start; }
- size_t buf_len() const { return d_buf_end - d_buf_start; }
-
-public:
- ~gr_message ();
-
- long type() const { return d_type; }
- double arg1() const { return d_arg1; }
- double arg2() const { return d_arg2; }
-
- void set_type(long type) { d_type = type; }
- void set_arg1(double arg1) { d_arg1 = arg1; }
- void set_arg2(double arg2) { d_arg2 = arg2; }
-
- size_t length() const;
- std::string to_string() const;
-
-};
-
-%rename(message_ncurrently_allocated) gr_message_ncurrently_allocated;
-long gr_message_ncurrently_allocated();
-
diff --git a/gnuradio-runtime/swig/gr_msg_handler.i b/gnuradio-runtime/swig/gr_msg_handler.i
deleted file mode 100644
index f493dac1b2..0000000000
--- a/gnuradio-runtime/swig/gr_msg_handler.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-/*!
- * \brief abstract class of message handlers
- */
-class gr_msg_handler {
-public:
- virtual ~gr_msg_handler () = 0;
-
- //! handle \p msg
- virtual void handle (gr_message_sptr msg) = 0;
-};
diff --git a/gnuradio-runtime/swig/gr_msg_queue.i b/gnuradio-runtime/swig/gr_msg_queue.i
deleted file mode 100644
index 65cbe782b9..0000000000
--- a/gnuradio-runtime/swig/gr_msg_queue.i
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2009,2010,2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_msg_queue;
-typedef boost::shared_ptr<gr_msg_queue> gr_msg_queue_sptr;
-%template(gr_msg_queue_sptr) boost::shared_ptr<gr_msg_queue>;
-
-%rename(msg_queue) gr_make_msg_queue;
-gr_msg_queue_sptr gr_make_msg_queue(unsigned limit=0);
-
-/*!
- * \brief thread-safe message queue
- */
-%ignore gr_msg_queue;
-class gr_msg_queue : public gr_msg_handler {
-public:
- gr_msg_queue(unsigned int limit);
- ~gr_msg_queue();
-
- //! Generic msg_handler method: insert the message.
- //void handle(gr_message_sptr msg) { insert_tail (msg); }
-
- /*!
- * \brief Insert message at tail of queue.
- * \param msg message
- *
- * Block if queue if full.
- */
- //void insert_tail(gr_message_sptr msg);
-
- /*!
- * \brief Delete message from head of queue and return it.
- * Block if no message is available.
- */
- //gr_message_sptr delete_head();
-
- /*!
- * \brief If there's a message in the q, delete it and return it.
- * If no message is available, return 0.
- */
- gr_message_sptr delete_head_nowait();
-
- //! is the queue empty?
- bool empty_p() const;
-
- //! is the queue full?
- bool full_p() const;
-
- //! return number of messages in queue
- unsigned int count() const;
-
- //! Delete all messages from the queue
- void flush();
-};
-
-/*
- * The following kludge-o-rama releases the Python global interpreter
- * lock around these potentially blocking calls. We don't want
- * libgnuradio-core to be dependent on Python, thus we create these
- * functions that serve as replacements for the normal C++ delete_head
- * and insert_tail methods. The %pythoncode smashes these new C++
- * functions into the gr.msg_queue wrapper class, so that everything
- * appears normal. (An evil laugh is heard in the distance...)
- */
-#ifdef SWIGPYTHON
-%inline %{
- gr_message_sptr gr_py_msg_queue__delete_head(gr_msg_queue_sptr q) {
- gr_message_sptr msg;
- GR_PYTHON_BLOCKING_CODE(
- msg = q->delete_head();
- )
- return msg;
- }
-
- void gr_py_msg_queue__insert_tail(gr_msg_queue_sptr q, gr_message_sptr msg) {
- GR_PYTHON_BLOCKING_CODE(
- q->insert_tail(msg);
- )
- }
-%}
-
-// smash in new python delete_head and insert_tail methods...
-%pythoncode %{
-gr_msg_queue_sptr.delete_head = gr_py_msg_queue__delete_head
-gr_msg_queue_sptr.insert_tail = gr_py_msg_queue__insert_tail
-gr_msg_queue_sptr.handle = gr_py_msg_queue__insert_tail
-%}
-#endif // SWIGPYTHON
diff --git a/gnuradio-runtime/swig/gr_prefs.i b/gnuradio-runtime/swig/gr_prefs.i
deleted file mode 100644
index c8c4242002..0000000000
--- a/gnuradio-runtime/swig/gr_prefs.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_prefs
-{
-public:
- static gr_prefs *singleton();
- static void set_singleton(gr_prefs *p);
-
- virtual ~gr_prefs();
-
- std::string to_string();
-
- void save();
-
- virtual bool has_section(const std::string §ion);
- virtual bool has_option(const std::string §ion, const std::string &option);
-
- virtual const std::string get_string(const std::string §ion,
- const std::string &option,
- const std::string &default_val);
- virtual void set_string(const std::string §ion,
- const std::string &option,
- const std::string &val);
- virtual bool get_bool(const std::string §ion,
- const std::string &option,
- bool default_val);
- virtual void set_bool(const std::string §ion,
- const std::string &option,
- bool val);
- virtual long get_long(const std::string §ion,
- const std::string &option,
- long default_val);
- virtual void set_long(const std::string §ion,
- const std::string &option,
- long val);
- virtual double get_double(const std::string §ion,
- const std::string &option,
- double default_val);
- virtual void set_double(const std::string §ion,
- const std::string &option,
- double val);
-};
-
diff --git a/gnuradio-runtime/swig/gr_realtime.i b/gnuradio-runtime/swig/gr_realtime.i
deleted file mode 100644
index 4d5c2b856f..0000000000
--- a/gnuradio-runtime/swig/gr_realtime.i
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-%rename(enable_realtime_scheduling) gr_enable_realtime_scheduling;
-
-// NOTE: This is duplicated from gnuradio-runtime/include/gr_realtime.h,
-// and must be kept in sync with it. This is the least evil workaround
-// for allowing 3rd party code builds to work when GNU Radio is
-// installed from binary packages into the standard system directories.
-// Otherwise, they can't find #include <gr_realtime.h>, since
-// pkg-config strips -I/usr/include from the --cflags path.
-
-namespace gr {
-
- typedef enum {
- RT_OK = 0,
- RT_NOT_IMPLEMENTED,
- RT_NO_PRIVS,
- RT_OTHER_ERROR
- } rt_status_t;
-
-}
-
-typedef gr::rt_status_t gr_rt_status_t;
-gr_rt_status_t gr_enable_realtime_scheduling();
diff --git a/gnuradio-runtime/swig/gr_single_threaded_scheduler.i b/gnuradio-runtime/swig/gr_single_threaded_scheduler.i
deleted file mode 100644
index 7305cc9ada..0000000000
--- a/gnuradio-runtime/swig/gr_single_threaded_scheduler.i
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_runtime.h>
-
-class gr_single_threaded_scheduler;
-typedef boost::shared_ptr<gr_single_threaded_scheduler> gr_single_threaded_scheduler_sptr;
-%template(gr_single_threaded_scheduler_sptr) boost::shared_ptr<gr_single_threaded_scheduler>;
-%rename(single_threaded_scheduler) gr_make_single_threaded_scheduler;
-%ignore gr_single_threaded_scheduler;
-
-gr_single_threaded_scheduler_sptr
-gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &modules);
-
-class gr_single_threaded_scheduler {
- public:
- ~gr_single_threaded_scheduler ();
-
- // void run ();
- void stop ();
-
- private:
- gr_single_threaded_scheduler (const std::vector<gr_block_sptr> &modules);
-};
-
-#ifdef SWIGPYTHON
-%inline %{
- void sts_pyrun (gr_single_threaded_scheduler_sptr s) {
- Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
- s->run ();
- Py_END_ALLOW_THREADS; // acquire global interpreter lock
- }
-%}
-#endif
-
diff --git a/gnuradio-runtime/swig/gr_sync_block.i b/gnuradio-runtime/swig/gr_sync_block.i
deleted file mode 100644
index d3e1bb9578..0000000000
--- a/gnuradio-runtime/swig/gr_sync_block.i
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-class gr_sync_block : public gr_block
-{
- protected:
-
- gr_sync_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
-};
diff --git a/gnuradio-runtime/swig/gr_sync_decimator.i b/gnuradio-runtime/swig/gr_sync_decimator.i
deleted file mode 100644
index af4574b193..0000000000
--- a/gnuradio-runtime/swig/gr_sync_decimator.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_sync_decimator : public gr_sync_block
-{
- protected:
-
- gr_sync_decimator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned decimation);
-};
diff --git a/gnuradio-runtime/swig/gr_sync_interpolator.i b/gnuradio-runtime/swig/gr_sync_interpolator.i
deleted file mode 100644
index 6f8b08252f..0000000000
--- a/gnuradio-runtime/swig/gr_sync_interpolator.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_sync_interpolator : public gr_sync_block
-{
- protected:
-
- gr_sync_interpolator (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- unsigned interpolation);
-};
diff --git a/gnuradio-runtime/swig/gr_tagged_stream_block.i b/gnuradio-runtime/swig/gr_tagged_stream_block.i
deleted file mode 100644
index 9fc803dca1..0000000000
--- a/gnuradio-runtime/swig/gr_tagged_stream_block.i
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-class gr_tagged_stream_block : public gr_block
-{
- protected:
- gr_tagged_stream_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature,
- const std::string &length_tag_key);
-};
-
diff --git a/gnuradio-runtime/swig/gr_tags.i b/gnuradio-runtime/swig/gr_tags.i
deleted file mode 100644
index 828d0147ce..0000000000
--- a/gnuradio-runtime/swig/gr_tags.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-%{
-#include <gr_tags.h>
-%}
-
-%include <pmt_swig.i> //for pmt support
-
-%include <gr_tags.h>
-
-//gives support for a vector of tags (get tags in range)
-%include "std_vector.i"
-%template(tags_vector_t) std::vector<gr_tag_t>;
diff --git a/gnuradio-runtime/swig/gr_top_block.i b/gnuradio-runtime/swig/gr_top_block.i
deleted file mode 100644
index 1612ddf8c5..0000000000
--- a/gnuradio-runtime/swig/gr_top_block.i
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-class gr_top_block;
-typedef boost::shared_ptr<gr_top_block> gr_top_block_sptr;
-%template(gr_top_block_sptr) boost::shared_ptr<gr_top_block>;
-
-// Hack to have a Python shim implementation of gr.top_block
-// that instantiates one of these and passes through calls
-%rename(top_block_swig) gr_make_top_block;
-gr_top_block_sptr gr_make_top_block(const std::string name)
- throw (std::logic_error);
-
-class gr_top_block : public gr_hier_block2
-{
-private:
- gr_top_block(const std::string &name);
-
-public:
- ~gr_top_block();
-
- void start(int max_noutput_items=100000000) throw (std::runtime_error);
- void stop();
- //void wait();
- //void run() throw (std::runtime_error);
- void lock();
- void unlock() throw (std::runtime_error);
- std::string edge_list();
- void dump();
-
- int max_noutput_items();
- void set_max_noutput_items(int nmax);
-
- gr_top_block_sptr to_top_block(); // Needed for Python type coercion
-};
-
-#ifdef SWIGPYTHON
-
-%inline %{
-void top_block_run_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
-{
- Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
- r->run();
- Py_END_ALLOW_THREADS; // acquire global interpreter lock
-}
-
-void top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
-{
- Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
- r->wait();
- Py_END_ALLOW_THREADS; // acquire global interpreter lock
-}
-%}
-
-#endif
diff --git a/gnuradio-runtime/swig/gr_types.i b/gnuradio-runtime/swig/gr_types.i
index b9bf3ba80b..65577bf35b 100644
--- a/gnuradio-runtime/swig/gr_types.i
+++ b/gnuradio-runtime/swig/gr_types.i
@@ -30,7 +30,7 @@
#include <string>
#include <stddef.h> // size_t
#include <stdint.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
%}
%include <std_complex.i>
diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i
new file mode 100644
index 0000000000..b455e02a7e
--- /dev/null
+++ b/gnuradio-runtime/swig/hier_block2.i
@@ -0,0 +1,92 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005-2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%include <basic_block.i>
+
+class gr::hier_block2;
+typedef boost::shared_ptr<gr::hier_block2> gr::hier_block2_sptr;
+%template(hier_block2_sptr) boost::shared_ptr<gr::hier_block2>;
+
+namespace gr {
+ // Hack to have a Python shim implementation of gr.hier_block2
+ // that instantiates one of these and passes through calls
+ %rename(hier_block2_swig) make_hier_block2;
+ gr::hier_block2_sptr
+ make_hier_block2(const std::string name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature)
+ throw (std::runtime_error);
+}
+
+// Rename connect and disconnect so that we can more easily build a
+// better interface in scripting land.
+%rename(primitive_connect) gr::hier_block2::connect;
+%rename(primitive_disconnect) gr::hier_block2::disconnect;
+%rename(primitive_msg_connect) gr::hier_block2::msg_connect;
+%rename(primitive_msg_disconnect) gr::hier_block2::msg_disconnect;
+%rename(primitive_message_port_register_hier_in) gr::hier_block2::message_port_register_hier_in;
+%rename(primitive_message_port_register_hier_out) gr::hier_block2::message_port_register_hier_out;
+
+namespace gr {
+ class hier_block2 : public gr::basic_block
+ {
+ private:
+ hier_block2(const std::string name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+
+ public:
+ ~hier_block2 ();
+
+ void connect(gr::basic_block_sptr block)
+ throw (std::invalid_argument);
+ void connect(gr::basic_block_sptr src, int src_port,
+ gr::basic_block_sptr dst, int dst_port)
+ throw (std::invalid_argument);
+ void msg_connect(gr::basic_block_sptr src, pmt::pmt_t srcport,
+ gr::basic_block_sptr dst, pmt::pmt_t dstport)
+ throw (std::runtime_error);
+ void msg_connect(gr::basic_block_sptr src, std::string srcport,
+ gr::basic_block_sptr dst, std::string dstport)
+ throw (std::runtime_error);
+ void msg_disconnect(gr::basic_block_sptr src, pmt::pmt_t srcport,
+ gr::basic_block_sptr dst, pmt::pmt_t dstport)
+ throw (std::runtime_error);
+ void msg_disconnect(gr::basic_block_sptr src, std::string srcport,
+ gr::basic_block_sptr dst, std::string dstport)
+ throw (std::runtime_error);
+
+ void disconnect(gr::basic_block_sptr block)
+ throw (std::invalid_argument);
+ void disconnect(gr::basic_block_sptr src, int src_port,
+ gr::basic_block_sptr dst, int dst_port)
+ throw (std::invalid_argument);
+ void disconnect_all();
+ void lock();
+ void unlock();
+
+ void message_port_register_hier_in(pmt::pmt_t port_id);
+ void message_port_register_hier_out(pmt::pmt_t port_id);
+
+ gr::hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
+ };
+}
diff --git a/gnuradio-runtime/swig/io_signature.i b/gnuradio-runtime/swig/io_signature.i
new file mode 100644
index 0000000000..53cde17bff
--- /dev/null
+++ b/gnuradio-runtime/swig/io_signature.i
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2005,2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+namespace gr {
+
+ class GR_RUNTIME_API io_signature
+ {
+ io_signature(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items);
+
+ public:
+ typedef boost::shared_ptr<io_signature> sptr;
+
+ // Avoids a swig warning, otherwise we could just
+ // #include <gnuradio/io_signature.h> instead of redoing this
+ // #entire class
+ //static const int IO_INFINITE = -1;
+
+ ~io_signature();
+
+
+ static sptr make(int min_streams, int max_streams,
+ int sizeof_stream_item);
+ static sptr make2(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2);
+ static sptr make3(int min_streams, int max_streams,
+ int sizeof_stream_item1,
+ int sizeof_stream_item2,
+ int sizeof_stream_item3);
+ static sptr makev(int min_streams, int max_streams,
+ const std::vector<int> &sizeof_stream_items);
+
+ int min_streams() const { return d_min_streams; }
+ int max_streams() const { return d_max_streams; }
+ int sizeof_stream_item(int index) const;
+ std::vector<int> sizeof_stream_items() const;
+ };
+
+} /* namespace gr */
+
+
+%template(io_signature_sptr) boost::shared_ptr<gr::io_signature>;
+%pythoncode %{
+io_signature_sptr.__repr__ = lambda self: "<io_signature: %d, %d>" % (self.min_streams(), self.max_streams())
+io_signaturev = io_signature.makev;
+io_signature3 = io_signature.make3;
+io_signature2 = io_signature.make2;
+io_signature = io_signature.make;
+%}
diff --git a/gnuradio-runtime/swig/message.i b/gnuradio-runtime/swig/message.i
new file mode 100644
index 0000000000..ac13c40641
--- /dev/null
+++ b/gnuradio-runtime/swig/message.i
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+namespace gr {
+
+ /*!
+ * \brief Message.
+ *
+ * The ideas and method names for adjustable message length were
+ * lifted from the click modular router "Packet" class.
+ */
+ class message
+ {
+ public:
+ typedef boost::shared_ptr<message> sptr;
+
+ private:
+ message(long type, double arg1, double arg2, size_t length);
+
+ unsigned char *buf_data() const;
+ size_t buf_len() const;
+
+ public:
+ static sptr make(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
+
+ static sptr make_from_string(const std::string s, long type = 0,
+ double arg1 = 0, double arg2 = 0);
+
+ ~message();
+
+ long type() const;
+ double arg1() const;
+ double arg2() const;
+
+ void set_type(long type);
+ void set_arg1(double arg1);
+ void set_arg2(double arg2);
+
+ size_t length() const;
+ std::string to_string() const;
+ };
+
+ %rename(message_ncurrently_allocated) message_ncurrently_allocated;
+ long message_ncurrently_allocated();
+}
+
+%template(message_sptr) boost::shared_ptr<gr::message>;
+%pythoncode %{
+message_from_string = message.make_from_string
+message = message.make
+%}
diff --git a/gnuradio-runtime/swig/msg_handler.i b/gnuradio-runtime/swig/msg_handler.i
new file mode 100644
index 0000000000..6869152889
--- /dev/null
+++ b/gnuradio-runtime/swig/msg_handler.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*!
+ * \brief abstract class of message handlers
+ */
+class gr::msg_handler
+{
+public:
+ virtual ~msg_handler () = 0;
+
+ //! handle \p msg
+ virtual void handle(gr::message::sptr msg) = 0;
+};
diff --git a/gnuradio-runtime/swig/msg_queue.i b/gnuradio-runtime/swig/msg_queue.i
new file mode 100644
index 0000000000..59dff158ce
--- /dev/null
+++ b/gnuradio-runtime/swig/msg_queue.i
@@ -0,0 +1,108 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2009-2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+namespace gr {
+ /*!
+ * \brief thread-safe message queue
+ */
+ class msg_queue : public gr::msg_handler
+ {
+ public:
+ typedef boost::shared_ptr<msg_queue> sptr;
+
+ static sptr make(unsigned int limit=0);
+
+ msg_queue(unsigned int limit);
+ ~msg_queue();
+
+ //! Generic msg_handler method: insert the message.
+ //void handle(gr::message::sptr msg) { insert_tail (msg); }
+
+ /*!
+ * \brief Insert message at tail of queue.
+ * \param msg message
+ *
+ * Block if queue if full.
+ */
+ //void insert_tail(gr::message::sptr msg);
+
+ /*!
+ * \brief Delete message from head of queue and return it.
+ * Block if no message is available.
+ */
+ //gr::message::sptr delete_head();
+
+ /*!
+ * \brief If there's a message in the q, delete it and return it.
+ * If no message is available, return 0.
+ */
+ gr::message::sptr delete_head_nowait();
+
+ //! is the queue empty?
+ bool empty_p() const;
+
+ //! is the queue full?
+ bool full_p() const;
+
+ //! return number of messages in queue
+ unsigned int count() const;
+
+ //! Delete all messages from the queue
+ void flush();
+ };
+}
+
+/*
+ * The following kludge-o-rama releases the Python global interpreter
+ * lock around these potentially blocking calls. We don't want
+ * libgnuradio-core to be dependent on Python, thus we create these
+ * functions that serve as replacements for the normal C++ delete_head
+ * and insert_tail methods. The %pythoncode smashes these new C++
+ * functions into the gr.msg_queue wrapper class, so that everything
+ * appears normal. (An evil laugh is heard in the distance...)
+ */
+#ifdef SWIGPYTHON
+%inline %{
+ gr::message::sptr py_msg_queue__delete_head(gr::msg_queue::sptr q) {
+ gr::message::sptr msg;
+ GR_PYTHON_BLOCKING_CODE(
+ msg = q->delete_head();
+ )
+ return msg;
+ }
+
+ void py_msg_queue__insert_tail(gr::msg_queue::sptr q, gr::message::sptr msg) {
+ GR_PYTHON_BLOCKING_CODE(
+ q->insert_tail(msg);
+ )
+ }
+%}
+
+// smash in new python delete_head and insert_tail methods...
+%template(msg_queue_sptr) boost::shared_ptr<gr::msg_queue>;
+%pythoncode %{
+msg_queue_sptr.delete_head = py_msg_queue__delete_head
+msg_queue_sptr.insert_tail = py_msg_queue__insert_tail
+msg_queue_sptr.handle = py_msg_queue__insert_tail
+msg_queue = msg_queue.make
+%}
+#endif // SWIGPYTHON
diff --git a/gnuradio-runtime/swig/prefs.i b/gnuradio-runtime/swig/prefs.i
new file mode 100644
index 0000000000..f56c7910ee
--- /dev/null
+++ b/gnuradio-runtime/swig/prefs.i
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::prefs
+{
+public:
+ static gr::prefs *singleton();
+ static void set_singleton(gr::prefs *p);
+
+ virtual ~prefs();
+
+ std::string to_string();
+
+ void save();
+
+ virtual bool has_section(const std::string §ion);
+ virtual bool has_option(const std::string §ion, const std::string &option);
+
+ virtual const std::string get_string(const std::string §ion,
+ const std::string &option,
+ const std::string &default_val);
+ virtual void set_string(const std::string §ion,
+ const std::string &option,
+ const std::string &val);
+ virtual bool get_bool(const std::string §ion,
+ const std::string &option,
+ bool default_val);
+ virtual void set_bool(const std::string §ion,
+ const std::string &option,
+ bool val);
+ virtual long get_long(const std::string §ion,
+ const std::string &option,
+ long default_val);
+ virtual void set_long(const std::string §ion,
+ const std::string &option,
+ long val);
+ virtual double get_double(const std::string §ion,
+ const std::string &option,
+ double default_val);
+ virtual void set_double(const std::string §ion,
+ const std::string &option,
+ double val);
+};
+
diff --git a/gnuradio-runtime/swig/realtime.i b/gnuradio-runtime/swig/realtime.i
new file mode 100644
index 0000000000..d408249a19
--- /dev/null
+++ b/gnuradio-runtime/swig/realtime.i
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%rename(enable_realtime_scheduling) gr::enable_realtime_scheduling;
+
+// NOTE: This is duplicated from gnuradio-runtime/include/realtime.h,
+// and must be kept in sync with it. This is the least evil workaround
+// for allowing 3rd party code builds to work when GNU Radio is
+// installed from binary packages into the standard system directories.
+// Otherwise, they can't find #include <realtime.h>, since
+// pkg-config strips -I/usr/include from the --cflags path.
+
+namespace gr {
+ namespace impl {
+
+ typedef enum {
+ RT_OK = 0,
+ RT_NOT_IMPLEMENTED,
+ RT_NO_PRIVS,
+ RT_OTHER_ERROR
+ } rt_status_t;
+ }
+}
+
+typedef gr::rt_status_t rt_status_t;
+rt_status_t gr::enable_realtime_scheduling();
diff --git a/gnuradio-runtime/swig/runtime_block_gateway.i b/gnuradio-runtime/swig/runtime_block_gateway.i
deleted file mode 100644
index 52d4194dee..0000000000
--- a/gnuradio-runtime/swig/runtime_block_gateway.i
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2011-2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-////////////////////////////////////////////////////////////////////////
-// standard includes
-////////////////////////////////////////////////////////////////////////
-%include <gnuradio.i>
-%include <gr_tags.i>
-%include <gr_feval.i>
-
-%template(void_start_vector_t) std::vector<void *>;
-
-////////////////////////////////////////////////////////////////////////
-// block headers
-////////////////////////////////////////////////////////////////////////
-%{
-#include <runtime_block_gateway.h>
-%}
-
-////////////////////////////////////////////////////////////////////////
-// block magic
-////////////////////////////////////////////////////////////////////////
-GR_SWIG_BLOCK_MAGIC(runtime, block_gateway);
-%include <runtime_block_gateway.h>
diff --git a/gnuradio-runtime/swig/runtime_swig.i b/gnuradio-runtime/swig/runtime_swig.i
index ae3d1d7dcb..163d4748ec 100644
--- a/gnuradio-runtime/swig/runtime_swig.i
+++ b/gnuradio-runtime/swig/runtime_swig.i
@@ -33,29 +33,34 @@
%include "gnuradio.i" // the common stuff
%{
-#include <gr_endianness.h>
-#include <gr_block.h>
-#include <gr_block_detail.h>
-#include <gr_buffer.h>
-#include <gr_constants.h>
-#include <gr_dispatcher.h>
-#include <gr_error_handler.h>
-#include <gr_feval.h>
-#include <gr_hier_block2.h>
-#include <gr_io_signature.h>
-#include <gr_message.h>
-#include <gr_msg_handler.h>
-#include <gr_msg_queue.h>
-#include <gr_prefs.h>
-#include <gr_realtime.h>
-#include <gr_runtime_types.h>
-#include <gr_single_threaded_scheduler.h>
-#include <gr_sync_block.h>
-#include <gr_sync_decimator.h>
-#include <gr_sync_interpolator.h>
-#include <gr_tagged_stream_block.h>
-#include <gr_tags.h>
-#include <gr_top_block.h>
+#include <gnuradio/runtime_types.h>
+%}
+
+%include <gnuradio/runtime_types.h>
+
+%{
+#include <gnuradio/block.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/constants.h>
+#include <gnuradio/dispatcher.h>
+#include <gnuradio/endianness.h>
+#include <gnuradio/error_handler.h>
+#include <gnuradio/feval.h>
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/message.h>
+#include <gnuradio/msg_handler.h>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/prefs.h>
+#include <gnuradio/realtime.h>
+#include <gnuradio/single_threaded_scheduler.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/sync_decimator.h>
+#include <gnuradio/sync_interpolator.h>
+#include <gnuradio/tags.h>
+#include <gnuradio/tagged_stream_block.h>
+#include <gnuradio/top_block.h>
%}
%constant int sizeof_char = sizeof(char);
@@ -65,30 +70,30 @@
%constant int sizeof_double = sizeof(double);
%constant int sizeof_gr_complex = sizeof(gr_complex);
-%include <gr_endianness.h>
-%include <gr_basic_block.i>
-%include <gr_block.i>
-%include <gr_block_detail.i>
-%include <gr_buffer.i>
-%include <gr_constants.i>
-%include <gr_dispatcher.i>
-%include <gr_error_handler.i>
-%include <gr_feval.i>
-%include <gr_hier_block2.i>
-%include <gr_io_signature.i>
-%include <gr_message.i>
-%include <gr_msg_handler.i>
-%include <gr_msg_queue.i>
-%include <gr_prefs.i>
-%include <gr_realtime.i>
-%include <gr_single_threaded_scheduler.i>
-%include <gr_swig_block_magic.i>
-%include <gr_sync_block.i>
-%include <gr_sync_decimator.i>
-%include <gr_sync_interpolator.i>
-%include <gr_tagged_stream_block.i>
-%include <gr_tags.i>
-%include <gr_top_block.i>
-%include <runtime_block_gateway.i>
+%include <gnuradio/endianness.h>
+%include <basic_block.i>
+%include <block.i>
+%include <block_detail.i>
+%include <buffer.i>
+%include <constants.i>
+%include <dispatcher.i>
+%include <feval.i>
+%include <error_handler.i>
+%include <hier_block2.i>
+%include <io_signature.i>
+%include <message.i>
+%include <msg_handler.i>
+%include <msg_queue.i>
+%include <prefs.i>
+%include <realtime.i>
+%include <single_threaded_scheduler.i>
+%include <sync_block.i>
+%include <sync_decimator.i>
+%include <sync_interpolator.i>
+%include <tagged_stream_block.i>
+%include <tags.i>
+%include <top_block.i>
+%include <block_gateway.i>
+%include <gr_swig_block_magic.i>
%include <gr_ctrlport.i>
diff --git a/gnuradio-runtime/swig/single_threaded_scheduler.i b/gnuradio-runtime/swig/single_threaded_scheduler.i
new file mode 100644
index 0000000000..f4fbed075c
--- /dev/null
+++ b/gnuradio-runtime/swig/single_threaded_scheduler.i
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gnuradio/runtime.h>
+
+class gr::single_threaded_scheduler;
+typedef boost::shared_ptr<gr::single_threaded_scheduler> gr::single_threaded_scheduler_sptr;
+%template(single_threaded_scheduler_sptr) boost::shared_ptr<gr::single_threaded_scheduler>;
+%rename(single_threaded_scheduler) gr::make_single_threaded_scheduler;
+%ignore gr::single_threaded_scheduler;
+
+gr::single_threaded_scheduler_sptr
+gr::make_single_threaded_scheduler(const std::vector<gr::block_sptr> &modules);
+
+class gr::single_threaded_scheduler {
+ public:
+ ~single_threaded_scheduler ();
+
+ // void run ();
+ void stop ();
+
+ private:
+ single_threaded_scheduler (const std::vector<block_sptr> &modules);
+};
+
+#ifdef SWIGPYTHON
+%inline %{
+ void sts_pyrun (gr::single_threaded_scheduler_sptr s) {
+ Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
+ s->run ();
+ Py_END_ALLOW_THREADS; // acquire global interpreter lock
+ }
+%}
+#endif
+
diff --git a/gnuradio-runtime/swig/sync_block.i b/gnuradio-runtime/swig/sync_block.i
new file mode 100644
index 0000000000..892e58e4a0
--- /dev/null
+++ b/gnuradio-runtime/swig/sync_block.i
@@ -0,0 +1,30 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::sync_block : public gr::block
+{
+ protected:
+
+ sync_block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature);
+};
diff --git a/gnuradio-runtime/swig/sync_decimator.i b/gnuradio-runtime/swig/sync_decimator.i
new file mode 100644
index 0000000000..9c0506bd54
--- /dev/null
+++ b/gnuradio-runtime/swig/sync_decimator.i
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::sync_decimator : public gr::sync_block
+{
+ protected:
+
+ sync_decimator(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ unsigned decimation);
+};
diff --git a/gnuradio-runtime/swig/sync_interpolator.i b/gnuradio-runtime/swig/sync_interpolator.i
new file mode 100644
index 0000000000..9ebbb460dd
--- /dev/null
+++ b/gnuradio-runtime/swig/sync_interpolator.i
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::sync_interpolator : public gr::sync_block
+{
+ protected:
+
+ sync_interpolator(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ unsigned interpolation);
+};
diff --git a/gnuradio-runtime/swig/tagged_stream_block.i b/gnuradio-runtime/swig/tagged_stream_block.i
new file mode 100644
index 0000000000..10943f58de
--- /dev/null
+++ b/gnuradio-runtime/swig/tagged_stream_block.i
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr::tagged_stream_block : public gr::block
+{
+ protected:
+ tagged_stream_block(const std::string &name,
+ gr::io_signature::sptr input_signature,
+ gr::io_signature::sptr output_signature,
+ const std::string &length_tag_key);
+};
+
diff --git a/gnuradio-runtime/swig/tags.i b/gnuradio-runtime/swig/tags.i
new file mode 100644
index 0000000000..f466e9f60b
--- /dev/null
+++ b/gnuradio-runtime/swig/tags.i
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%{
+#include <gnuradio/tags.h>
+%}
+
+%include <pmt_swig.i> //for pmt support
+
+%include <gnuradio/tags.h>
+
+//gives support for a vector of tags (get tags in range)
+%include "std_vector.i"
+%template(tags_vector_t) std::vector<gr::tag_t>;
diff --git a/gnuradio-runtime/swig/top_block.i b/gnuradio-runtime/swig/top_block.i
new file mode 100644
index 0000000000..7639403393
--- /dev/null
+++ b/gnuradio-runtime/swig/top_block.i
@@ -0,0 +1,74 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%template(top_block_sptr) boost::shared_ptr<gr::top_block>;
+
+namespace gr {
+ // Hack to have a Python shim implementation of gr.top_block
+ // that instantiates one of these and passes through calls
+ %rename(top_block_swig) make_top_block;
+ gr::top_block_sptr make_top_block(const std::string name)
+ throw (std::logic_error);
+
+ class top_block : public gr::hier_block2
+ {
+ private:
+ top_block(const std::string &name);
+
+ public:
+ ~top_block();
+
+ void start(int max_noutput_items=100000000) throw (std::runtime_error);
+ void stop();
+ //void wait();
+ //void run() throw (std::runtime_error);
+ void lock();
+ void unlock() throw (std::runtime_error);
+ std::string edge_list();
+ void dump();
+
+ int max_noutput_items();
+ void set_max_noutput_items(int nmax);
+
+ gr::top_block_sptr to_top_block(); // Needed for Python type coercion
+ };
+}
+
+#ifdef SWIGPYTHON
+
+%inline %{
+void top_block_run_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+{
+ Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
+ r->run();
+ Py_END_ALLOW_THREADS; // acquire global interpreter lock
+}
+
+void top_block_wait_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+{
+ Py_BEGIN_ALLOW_THREADS; // release global interpreter lock
+ r->wait();
+ Py_END_ALLOW_THREADS; // acquire global interpreter lock
+}
+%}
+
+#endif
diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/analog/agc.h
index ae3af7091d..088ce9869b 100644
--- a/gr-analog/include/analog/agc.h
+++ b/gr-analog/include/analog/agc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_AGC_H
#include <analog/api.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <math.h>
namespace gr {
diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/analog/agc2.h
index 1e1f695fe9..b035e8e222 100644
--- a/gr-analog/include/analog/agc2.h
+++ b/gr-analog/include/analog/agc2.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_AGC2_H
#include <analog/api.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <math.h>
namespace gr {
diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/analog/agc2_cc.h
index 82efe914d8..bc848e603d 100644
--- a/gr-analog/include/analog/agc2_cc.h
+++ b/gr-analog/include/analog/agc2_cc.h
@@ -25,7 +25,7 @@
#include <analog/api.h>
#include <analog/agc2.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -38,7 +38,7 @@ namespace gr {
* \details
* For Power the absolute value of the complex number is used.
*/
- class ANALOG_API agc2_cc : virtual public gr_sync_block
+ class ANALOG_API agc2_cc : virtual public sync_block
{
public:
// gr::analog::agc2_cc::sptr
diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/analog/agc2_ff.h
index dd2507e33d..3e18999899 100644
--- a/gr-analog/include/analog/agc2_ff.h
+++ b/gr-analog/include/analog/agc2_ff.h
@@ -25,7 +25,7 @@
#include <analog/api.h>
#include <analog/agc2.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -38,7 +38,7 @@ namespace gr {
* \details
* Power is approximated by absolute value
*/
- class ANALOG_API agc2_ff : virtual public gr_sync_block
+ class ANALOG_API agc2_ff : virtual public sync_block
{
public:
// gr::analog::agc2_ff::sptr
diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/analog/agc_cc.h
index 0c2e831b0c..1b790f4a88 100644
--- a/gr-analog/include/analog/agc_cc.h
+++ b/gr-analog/include/analog/agc_cc.h
@@ -25,7 +25,7 @@
#include <analog/api.h>
#include <analog/agc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
* \details
* For Power the absolute value of the complex number is used.
*/
- class ANALOG_API agc_cc : virtual public gr_sync_block
+ class ANALOG_API agc_cc : virtual public sync_block
{
public:
// gr::analog::agc_cc::sptr
diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/analog/agc_ff.h
index ffcafaa642..cebc766738 100644
--- a/gr-analog/include/analog/agc_ff.h
+++ b/gr-analog/include/analog/agc_ff.h
@@ -25,7 +25,7 @@
#include <analog/api.h>
#include <analog/agc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
* \details
* Power is approximated by absolute value
*/
- class ANALOG_API agc_ff : virtual public gr_sync_block
+ class ANALOG_API agc_ff : virtual public sync_block
{
public:
// gr::analog::agc_ff::sptr
diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/analog/api.h
index 2459ace614..01107345e6 100644
--- a/gr-analog/include/analog/api.h
+++ b/gr-analog/include/analog/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_ANALOG_API_H
#define INCLUDED_ANALOG_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_analog_EXPORTS
# define ANALOG_API __GR_ATTR_EXPORT
diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/analog/cpfsk_bc.h
index 8150e0d08f..e42df907cf 100644
--- a/gr-analog/include/analog/cpfsk_bc.h
+++ b/gr-analog/include/analog/cpfsk_bc.h
@@ -22,7 +22,7 @@
#define INCLUDED_ANALOG_CPFSK_BC_H
#include <analog/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace analog {
@@ -32,7 +32,7 @@ namespace gr {
* on an input stream of unpacked bits.
* \ingroup modulators_blk
*/
- class ANALOG_API cpfsk_bc : virtual public gr_sync_interpolator
+ class ANALOG_API cpfsk_bc : virtual public sync_interpolator
{
public:
// gr::analog::cpfsk_bc::sptr
diff --git a/gr-analog/include/analog/ctcss_squelch_ff.h b/gr-analog/include/analog/ctcss_squelch_ff.h
index f8c551d291..dfa886bcc4 100644
--- a/gr-analog/include/analog/ctcss_squelch_ff.h
+++ b/gr-analog/include/analog/ctcss_squelch_ff.h
@@ -25,7 +25,7 @@
#include <analog/api.h>
#include <analog/squelch_base_ff.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace analog {
@@ -35,7 +35,7 @@ namespace gr {
* \ingroup level_controllers_blk
*/
class ANALOG_API ctcss_squelch_ff :
- public squelch_base_ff, virtual public gr_block
+ public squelch_base_ff, virtual public block
{
protected:
virtual void update_state(const float &in) = 0;
diff --git a/gr-analog/include/analog/dpll_bb.h b/gr-analog/include/analog/dpll_bb.h
index f25e860b2c..a8a29a99fc 100644
--- a/gr-analog/include/analog/dpll_bb.h
+++ b/gr-analog/include/analog/dpll_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_DPLL_BB_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
* If a peak is detected, this block outputs a 1,
* or it outputs 0's.
*/
- class ANALOG_API dpll_bb : virtual public gr_sync_block
+ class ANALOG_API dpll_bb : virtual public sync_block
{
public:
// gr::analog::dpll_bb::sptr
diff --git a/gr-analog/include/analog/fastnoise_source_X.h.t b/gr-analog/include/analog/fastnoise_source_X.h.t
index e1c606692c..611dea3ea4 100644
--- a/gr-analog/include/analog/fastnoise_source_X.h.t
+++ b/gr-analog/include/analog/fastnoise_source_X.h.t
@@ -27,7 +27,7 @@
#include <analog/api.h>
#include <analog/noise_type.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -40,7 +40,7 @@ namespace gr {
* Generate random values from different distributions.
* Currently, only Gaussian and uniform are enabled.
*/
- class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block
+ class ANALOG_API @BASE_NAME@ : virtual public sync_block
{
public:
// gr::analog::@BASE_NAME@::sptr
diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/analog/feedforward_agc_cc.h
index 0a688ccdde..5ad92f53f5 100644
--- a/gr-analog/include/analog/feedforward_agc_cc.h
+++ b/gr-analog/include/analog/feedforward_agc_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -34,7 +34,7 @@ namespace gr {
* absolute value over nsamples
* \ingroup level_controllers_blk
*/
- class ANALOG_API feedforward_agc_cc : virtual public gr_sync_block
+ class ANALOG_API feedforward_agc_cc : virtual public sync_block
{
public:
// gr::analog::feedforward_agc_cc::sptr
diff --git a/gr-analog/include/analog/fmdet_cf.h b/gr-analog/include/analog/fmdet_cf.h
index bd26e39226..d020bf2b67 100644
--- a/gr-analog/include/analog/fmdet_cf.h
+++ b/gr-analog/include/analog/fmdet_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_FMDET_CF_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -38,7 +38,7 @@ namespace gr {
* This implements a limiting slope detector. The limiter is in
* the normalization by the magnitude of the sample
*/
- class ANALOG_API fmdet_cf : virtual public gr_sync_block
+ class ANALOG_API fmdet_cf : virtual public sync_block
{
public:
// gr::analog::fmdet_cf::sptr
diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/analog/frequency_modulator_fc.h
index a0d4404729..a740144efa 100644
--- a/gr-analog/include/analog/frequency_modulator_fc.h
+++ b/gr-analog/include/analog/frequency_modulator_fc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -36,7 +36,7 @@ namespace gr {
* \details
* float input; complex baseband output
*/
- class ANALOG_API frequency_modulator_fc : virtual public gr_sync_block
+ class ANALOG_API frequency_modulator_fc : virtual public sync_block
{
public:
// gr::analog::frequency_modulator_fc::sptr
diff --git a/gr-analog/include/analog/noise_source_X.h.t b/gr-analog/include/analog/noise_source_X.h.t
index 1a9630dfdf..4a44f683f9 100644
--- a/gr-analog/include/analog/noise_source_X.h.t
+++ b/gr-analog/include/analog/noise_source_X.h.t
@@ -27,8 +27,7 @@
#include <analog/api.h>
#include <analog/noise_type.h>
-#include <gr_sync_block.h>
-#include <gr_random.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -41,7 +40,7 @@ namespace gr {
* Generate random values from different distributions.
* Currently, only Gaussian and uniform are enabled.
*/
- class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block
+ class ANALOG_API @BASE_NAME@ : virtual public sync_block
{
public:
// gr::analog::@BASE_NAME@::sptr
diff --git a/gr-analog/include/analog/phase_modulator_fc.h b/gr-analog/include/analog/phase_modulator_fc.h
index 2ec7c1a3c4..82385fb010 100644
--- a/gr-analog/include/analog/phase_modulator_fc.h
+++ b/gr-analog/include/analog/phase_modulator_fc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_PHASE_MODULATOR_FC_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -39,7 +39,7 @@ namespace gr {
* Input stream 0: floats
* Ouput stream 0: complex
*/
- class ANALOG_API phase_modulator_fc : virtual public gr_sync_block
+ class ANALOG_API phase_modulator_fc : virtual public sync_block
{
public:
// gr::analog::phase_modulator_fc::sptr
diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/analog/pll_carriertracking_cc.h
index 520a2f57da..8e09703aaf 100644
--- a/gr-analog/include/analog/pll_carriertracking_cc.h
+++ b/gr-analog/include/analog/pll_carriertracking_cc.h
@@ -24,8 +24,8 @@
#define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H
#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -48,7 +48,7 @@ namespace gr {
* pll_freqdet_cf, pll_carriertracking_cc
*/
class ANALOG_API pll_carriertracking_cc
- : virtual public gr_sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/analog/pll_freqdet_cf.h
index b33fb909ba..b9e8d04541 100644
--- a/gr-analog/include/analog/pll_freqdet_cf.h
+++ b/gr-analog/include/analog/pll_freqdet_cf.h
@@ -24,8 +24,8 @@
#define INCLUDED_ANALOG_PLL_FREQDET_CF_H
#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -47,7 +47,7 @@ namespace gr {
* \sa pll_refout_cc, pll_carriertracking_cc
*/
class ANALOG_API pll_freqdet_cf
- : virtual public gr_sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/analog/pll_refout_cc.h
index 9c713749c7..bc5221df9d 100644
--- a/gr-analog/include/analog/pll_refout_cc.h
+++ b/gr-analog/include/analog/pll_refout_cc.h
@@ -24,8 +24,8 @@
#define INCLUDED_ANALOG_PLL_REFOUT_CC_H
#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -48,7 +48,7 @@ namespace gr {
* pll_freqdet_cf, pll_carriertracking_cc
*/
class ANALOG_API pll_refout_cc
- : virtual public gr_sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/analog/probe_avg_mag_sqrd_c.h
index 2fed4fff0b..f6d9171a38 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h
+++ b/gr-analog/include/analog/probe_avg_mag_sqrd_c.h
@@ -23,7 +23,7 @@
#define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -40,7 +40,7 @@ namespace gr {
* threshold can be retrieved with the level and unmuted
* accessors.
*/
- class ANALOG_API probe_avg_mag_sqrd_c : virtual public gr_sync_block
+ class ANALOG_API probe_avg_mag_sqrd_c : virtual public sync_block
{
public:
// gr::analog::probe_avg_mag_sqrd_c::sptr
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h
index 303670adee..fe19f629c9 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h
+++ b/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -42,7 +42,7 @@ namespace gr {
* threshold can be retrieved with the level and unmuted
* accessors.
*/
- class ANALOG_API probe_avg_mag_sqrd_cf : virtual public gr_sync_block
+ class ANALOG_API probe_avg_mag_sqrd_cf : virtual public sync_block
{
public:
// gr::analog::probe_avg_mag_sqrd_cf::sptr
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/analog/probe_avg_mag_sqrd_f.h
index 2300f8bca1..4604f8db51 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h
+++ b/gr-analog/include/analog/probe_avg_mag_sqrd_f.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -41,7 +41,7 @@ namespace gr {
* threshold can be retrieved with the level and unmuted
* accessors.
*/
- class ANALOG_API probe_avg_mag_sqrd_f : virtual public gr_sync_block
+ class ANALOG_API probe_avg_mag_sqrd_f : virtual public sync_block
{
public:
// gr::analog::probe_avg_mag_sqrd_f::sptr
diff --git a/gr-analog/include/analog/pwr_squelch_cc.h b/gr-analog/include/analog/pwr_squelch_cc.h
index 73b89f0db6..13280cb945 100644
--- a/gr-analog/include/analog/pwr_squelch_cc.h
+++ b/gr-analog/include/analog/pwr_squelch_cc.h
@@ -35,7 +35,7 @@ namespace gr {
* \ingroup level_controllers_blk
*/
class ANALOG_API pwr_squelch_cc :
- public squelch_base_cc, virtual public gr_block
+ public squelch_base_cc, virtual public block
{
protected:
virtual void update_state(const gr_complex &in) = 0;
diff --git a/gr-analog/include/analog/pwr_squelch_ff.h b/gr-analog/include/analog/pwr_squelch_ff.h
index 5490827390..83bc578583 100644
--- a/gr-analog/include/analog/pwr_squelch_ff.h
+++ b/gr-analog/include/analog/pwr_squelch_ff.h
@@ -35,7 +35,7 @@ namespace gr {
* \ingroup level_controllers_blk
*/
class ANALOG_API pwr_squelch_ff :
- public squelch_base_ff, virtual public gr_block
+ public squelch_base_ff, virtual public block
{
protected:
virtual void update_state(const float &in) = 0;
diff --git a/gr-analog/include/analog/quadrature_demod_cf.h b/gr-analog/include/analog/quadrature_demod_cf.h
index c7682649b8..6a1e60edb5 100644
--- a/gr-analog/include/analog/quadrature_demod_cf.h
+++ b/gr-analog/include/analog/quadrature_demod_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
* This can be used to demod FM, FSK, GMSK, etc.
* The input is complex baseband.
*/
- class ANALOG_API quadrature_demod_cf : virtual public gr_sync_block
+ class ANALOG_API quadrature_demod_cf : virtual public sync_block
{
public:
// gr::analog::quadrature_demod_cf::sptr
diff --git a/gr-analog/include/analog/rail_ff.h b/gr-analog/include/analog/rail_ff.h
index 2018017935..77bc2e1187 100644
--- a/gr-analog/include/analog/rail_ff.h
+++ b/gr-analog/include/analog/rail_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_RAIL_FF_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
* \brief clips input values to min, max
* \ingroup level_controllers_blk
*/
- class ANALOG_API rail_ff : virtual public gr_sync_block
+ class ANALOG_API rail_ff : virtual public sync_block
{
public:
// gr::analog::rail_ff::sptr
diff --git a/gr-analog/include/analog/sig_source_X.h.t b/gr-analog/include/analog/sig_source_X.h.t
index 752fe4cd29..a6cb517fce 100644
--- a/gr-analog/include/analog/sig_source_X.h.t
+++ b/gr-analog/include/analog/sig_source_X.h.t
@@ -27,7 +27,7 @@
#include <analog/api.h>
#include <analog/sig_source_waveform.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -36,7 +36,7 @@ namespace gr {
* \brief signal generator with @TYPE@ output.
* \ingroup waveform_generators_blk
*/
- class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block
+ class ANALOG_API @BASE_NAME@ : virtual public sync_block
{
public:
// gr::analog::@BASE_NAME@::sptr
diff --git a/gr-analog/include/analog/simple_squelch_cc.h b/gr-analog/include/analog/simple_squelch_cc.h
index bf949e3d2e..0ae937e7b4 100644
--- a/gr-analog/include/analog/simple_squelch_cc.h
+++ b/gr-analog/include/analog/simple_squelch_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H
#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
* \brief simple squelch block based on average signal power and threshold in dB.
* \ingroup level_controllers_blk
*/
- class ANALOG_API simple_squelch_cc : virtual public gr_sync_block
+ class ANALOG_API simple_squelch_cc : virtual public sync_block
{
public:
// gr::analog::simple_squelch_cc::sptr
diff --git a/gr-analog/include/analog/squelch_base_cc.h b/gr-analog/include/analog/squelch_base_cc.h
index 11476e7e88..41dbb4766d 100644
--- a/gr-analog/include/analog/squelch_base_cc.h
+++ b/gr-analog/include/analog/squelch_base_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_SQUELCH_BASE_CC_H
#include <analog/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
* \brief basic squelch block; to be subclassed for other squelches.
* \ingroup level_blk
*/
- class ANALOG_API squelch_base_cc : virtual public gr_block
+ class ANALOG_API squelch_base_cc : virtual public block
{
protected:
virtual void update_state(const gr_complex &sample) = 0;
diff --git a/gr-analog/include/analog/squelch_base_ff.h b/gr-analog/include/analog/squelch_base_ff.h
index 2ce1f1a65a..85228a3605 100644
--- a/gr-analog/include/analog/squelch_base_ff.h
+++ b/gr-analog/include/analog/squelch_base_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_ANALOG_SQUELCH_BASE_FF_H
#include <analog/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
* \brief basic squelch block; to be subclassed for other squelches.
* \ingroup level_blk
*/
- class ANALOG_API squelch_base_ff : virtual public gr_block
+ class ANALOG_API squelch_base_ff : virtual public block
{
protected:
virtual void update_state(const float &sample) = 0;
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 5719eac7a5..ce10422487 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -158,6 +158,7 @@ ENDIF(MSVC)
list(APPEND analog_libs
volk
gnuradio-runtime
+ gnuradio-blocks
gnuradio-filter
${Boost_LIBRARIES}
)
diff --git a/gr-analog/lib/agc2_cc_impl.cc b/gr-analog/lib/agc2_cc_impl.cc
index 2ef18e5ab8..fbca18777b 100644
--- a/gr-analog/lib/agc2_cc_impl.cc
+++ b/gr-analog/lib/agc2_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "agc2_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
@@ -43,9 +43,9 @@ namespace gr {
agc2_cc_impl::agc2_cc_impl(float attack_rate, float decay_rate,
float reference,
float gain, float max_gain)
- : gr_sync_block("agc2_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("agc2_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
kernel::agc2_cc(attack_rate, decay_rate,
reference, gain, max_gain)
{
diff --git a/gr-analog/lib/agc2_ff_impl.cc b/gr-analog/lib/agc2_ff_impl.cc
index e0cdd6c44b..93a404c6df 100644
--- a/gr-analog/lib/agc2_ff_impl.cc
+++ b/gr-analog/lib/agc2_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "agc2_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
@@ -48,9 +48,9 @@ namespace gr {
agc2_ff_impl::agc2_ff_impl(float attack_rate, float decay_rate,
float reference,
float gain, float max_gain)
- : gr_sync_block("agc2_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float)))
+ : sync_block("agc2_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float)))
, kernel::agc2_ff(attack_rate, decay_rate,
reference, gain, max_gain)
{
diff --git a/gr-analog/lib/agc_cc_impl.cc b/gr-analog/lib/agc_cc_impl.cc
index 81e1f67f8d..04d70d5421 100644
--- a/gr-analog/lib/agc_cc_impl.cc
+++ b/gr-analog/lib/agc_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "agc_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
@@ -40,9 +40,9 @@ namespace gr {
agc_cc_impl::agc_cc_impl(float rate, float reference,
float gain, float max_gain)
- : gr_sync_block("agc_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("agc_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
kernel::agc_cc(rate, reference, gain, max_gain)
{
}
diff --git a/gr-analog/lib/agc_ff_impl.cc b/gr-analog/lib/agc_ff_impl.cc
index a80b90c12d..1c29934361 100644
--- a/gr-analog/lib/agc_ff_impl.cc
+++ b/gr-analog/lib/agc_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "agc_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
@@ -38,9 +38,9 @@ namespace gr {
}
agc_ff_impl::agc_ff_impl(float rate, float reference, float gain, float max_gain)
- : gr_sync_block("agc_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("agc_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
kernel::agc_ff(rate, reference, gain, max_gain)
{
}
diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc
index 1b7f25f6cf..d529936608 100644
--- a/gr-analog/lib/cpfsk_bc_impl.cc
+++ b/gr-analog/lib/cpfsk_bc_impl.cc
@@ -23,8 +23,8 @@
#endif
#include "cpfsk_bc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
namespace gr {
namespace analog {
@@ -39,9 +39,9 @@ namespace gr {
}
cpfsk_bc_impl::cpfsk_bc_impl(float k, float ampl, int samples_per_sym)
- : gr_sync_interpolator("cpfsk_bc",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_interpolator("cpfsk_bc",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
samples_per_sym)
{
d_samples_per_sym = samples_per_sym;
diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc
index 60cd94fdb5..9a6f301ba0 100644
--- a/gr-analog/lib/ctcss_squelch_ff_impl.cc
+++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc
@@ -57,9 +57,9 @@ namespace gr {
ctcss_squelch_ff_impl::ctcss_squelch_ff_impl(int rate, float freq, float level,
int len, int ramp, bool gate)
- : gr_block("ctcss_squelch_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("ctcss_squelch_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
squelch_base_ff_impl("ctcss_squelch_ff", ramp, gate)
{
d_freq = freq;
diff --git a/gr-analog/lib/dpll_bb_impl.cc b/gr-analog/lib/dpll_bb_impl.cc
index a199b66b4e..4ed0ce6925 100644
--- a/gr-analog/lib/dpll_bb_impl.cc
+++ b/gr-analog/lib/dpll_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "dpll_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
dpll_bb_impl::dpll_bb_impl(float period, float gain)
- : gr_sync_block("dpll_bb",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("dpll_bb",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(char))),
d_restart(0), d_pulse_phase(0)
{
d_pulse_frequency = 1.0/period;
diff --git a/gr-analog/lib/fastnoise_source_X_impl.cc.t b/gr-analog/lib/fastnoise_source_X_impl.cc.t
index 706ddbbf84..e6c7f13f34 100644
--- a/gr-analog/lib/fastnoise_source_X_impl.cc.t
+++ b/gr-analog/lib/fastnoise_source_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@IMPL_NAME@::@IMPL_NAME@(noise_type_t type, float ampl, long seed, long samples)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(@TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(@TYPE@))),
d_type(type),
d_ampl(ampl),
d_rng(seed)
diff --git a/gr-analog/lib/fastnoise_source_X_impl.h.t b/gr-analog/lib/fastnoise_source_X_impl.h.t
index 3c5dc106a2..abfe3c0371 100644
--- a/gr-analog/lib/fastnoise_source_X_impl.h.t
+++ b/gr-analog/lib/fastnoise_source_X_impl.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <analog/@BASE_NAME@.h>
-#include <gr_random.h>
+#include <gnuradio/random.h>
namespace gr {
namespace analog {
@@ -36,7 +36,7 @@ namespace gr {
private:
noise_type_t d_type;
float d_ampl;
- gr_random d_rng;
+ gr::random d_rng;
std::vector<@TYPE@> d_samples;
public:
diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc
index 4796fdfc5b..94894d9bf1 100644
--- a/gr-analog/lib/feedforward_agc_cc_impl.cc
+++ b/gr-analog/lib/feedforward_agc_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "feedforward_agc_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
feedforward_agc_cc_impl::feedforward_agc_cc_impl(int nsamples, float reference)
- : gr_sync_block("feedforward_agc_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("feedforward_agc_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_nsamples(nsamples), d_reference(reference)
{
if(nsamples < 1)
diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc
index c92ea28896..2c48ff07e2 100644
--- a/gr-analog/lib/fmdet_cf_impl.cc
+++ b/gr-analog/lib/fmdet_cf_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "fmdet_cf_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -43,9 +43,9 @@ namespace gr {
fmdet_cf_impl::fmdet_cf_impl(float samplerate, float freq_low,
float freq_high, float scl)
- : gr_sync_block("fmdet_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("fmdet_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float))),
d_S1(0.1), d_S2(0.1),
d_S3(0.1), d_S4(0.1)
{
diff --git a/gr-analog/lib/fmdet_cf_impl.h b/gr-analog/lib/fmdet_cf_impl.h
index 01fce09dd2..1a7698b57a 100644
--- a/gr-analog/lib/fmdet_cf_impl.h
+++ b/gr-analog/lib/fmdet_cf_impl.h
@@ -25,7 +25,7 @@
#include <analog/fmdet_cf.h>
//#include <filter/fir_filter.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace analog {
diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc
index 2da7ee15f1..9fb741690b 100644
--- a/gr-analog/lib/frequency_modulator_fc_impl.cc
+++ b/gr-analog/lib/frequency_modulator_fc_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "frequency_modulator_fc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_fxpt.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/fxpt.h>
#include <math.h>
#include <boost/math/special_functions/trunc.hpp>
@@ -41,9 +41,9 @@ namespace gr {
}
frequency_modulator_fc_impl::frequency_modulator_fc_impl(double sensitivity)
- : gr_sync_block("frequency_modulator_fc",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("frequency_modulator_fc",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_sensitivity(sensitivity), d_phase(0)
{
}
@@ -70,8 +70,8 @@ namespace gr {
float oi, oq;
- gr_int32 angle = gr_fxpt::float_to_fixed (d_phase);
- gr_fxpt::sincos(angle, &oq, &oi);
+ gr_int32 angle = gr::fxpt::float_to_fixed (d_phase);
+ gr::fxpt::sincos(angle, &oq, &oi);
out[i] = gr_complex(oi, oq);
}
diff --git a/gr-analog/lib/noise_source_X_impl.cc.t b/gr-analog/lib/noise_source_X_impl.cc.t
index 7f371b2cfd..5d09647848 100644
--- a/gr-analog/lib/noise_source_X_impl.cc.t
+++ b/gr-analog/lib/noise_source_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@IMPL_NAME@::@IMPL_NAME@(noise_type_t type, float ampl, long seed)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(@TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(@TYPE@))),
d_type(type),
d_ampl(ampl),
d_rng(seed)
diff --git a/gr-analog/lib/noise_source_X_impl.h.t b/gr-analog/lib/noise_source_X_impl.h.t
index 3a0e8d6d7c..a25280f9ec 100644
--- a/gr-analog/lib/noise_source_X_impl.h.t
+++ b/gr-analog/lib/noise_source_X_impl.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <analog/@BASE_NAME@.h>
-#include <gr_random.h>
+#include <gnuradio/random.h>
namespace gr {
namespace analog {
@@ -35,7 +35,7 @@ namespace gr {
{
noise_type_t d_type;
float d_ampl;
- gr_random d_rng;
+ gr::random d_rng;
public:
@IMPL_NAME@(noise_type_t type, float ampl, long seed = 0);
diff --git a/gr-analog/lib/phase_modulator_fc_impl.cc b/gr-analog/lib/phase_modulator_fc_impl.cc
index 9e9e73f8ce..9dc010dd5b 100644
--- a/gr-analog/lib/phase_modulator_fc_impl.cc
+++ b/gr-analog/lib/phase_modulator_fc_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "phase_modulator_fc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_sincos.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/sincos.h>
#include <math.h>
namespace gr {
@@ -40,9 +40,9 @@ namespace gr {
}
phase_modulator_fc_impl::phase_modulator_fc_impl(double sensitivity)
- : gr_sync_block("phase_modulator_fc",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("phase_modulator_fc",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_sensitivity(sensitivity), d_phase(0)
{
}
@@ -62,7 +62,7 @@ namespace gr {
for(int i = 0; i < noutput_items; i++) {
d_phase = d_sensitivity * in[i];
float oi, oq;
- gr_sincosf(d_phase, &oq, &oi);
+ gr::sincosf(d_phase, &oq, &oi);
out[i] = gr_complex(oi, oq);
}
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc
index 9213a5e681..0cc3f8b8ec 100644
--- a/gr-analog/lib/pll_carriertracking_cc_impl.cc
+++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc
@@ -25,10 +25,10 @@
#endif
#include "pll_carriertracking_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_sincos.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/sincos.h>
#include <math.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -47,9 +47,9 @@ namespace gr {
pll_carriertracking_cc_impl::pll_carriertracking_cc_impl(float loop_bw,
float max_freq,
float min_freq)
- : gr_sync_block("pll_carriertracking_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("pll_carriertracking_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
blocks::control_loop(loop_bw, max_freq, min_freq),
d_locksig(0), d_lock_threshold(0), d_squelch_enable(false)
{
@@ -75,7 +75,7 @@ namespace gr {
{
float sample_phase;
// sample_phase = atan2(sample.imag(),sample.real());
- sample_phase = gr_fast_atan2f(sample.imag(),sample.real());
+ sample_phase = gr::fast_atan2f(sample.imag(),sample.real());
return mod_2pi(sample_phase-ref_phase);
}
@@ -109,7 +109,7 @@ namespace gr {
float t_imag, t_real;
for(int i = 0; i < noutput_items; i++) {
- gr_sincosf(d_phase, &t_imag, &t_real);
+ gr::sincosf(d_phase, &t_imag, &t_real);
optr[i] = iptr[i] * gr_complex(t_real, -t_imag);
error = phase_detector(iptr[i], d_phase);
diff --git a/gr-analog/lib/pll_freqdet_cf_impl.cc b/gr-analog/lib/pll_freqdet_cf_impl.cc
index 9e55d9bedb..42caa0bfd5 100644
--- a/gr-analog/lib/pll_freqdet_cf_impl.cc
+++ b/gr-analog/lib/pll_freqdet_cf_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "pll_freqdet_cf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -44,9 +44,9 @@ namespace gr {
}
pll_freqdet_cf_impl::pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq)
- : gr_sync_block("pll_freqdet_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("pll_freqdet_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float))),
blocks::control_loop(loop_bw, max_freq, min_freq)
{
}
@@ -70,7 +70,7 @@ namespace gr {
pll_freqdet_cf_impl::phase_detector(gr_complex sample, float ref_phase)
{
float sample_phase;
- sample_phase = gr_fast_atan2f(sample.imag(), sample.real());
+ sample_phase = gr::fast_atan2f(sample.imag(), sample.real());
return mod_2pi(sample_phase - ref_phase);
}
diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc
index 3f0ccc7df5..157961318a 100644
--- a/gr-analog/lib/pll_refout_cc_impl.cc
+++ b/gr-analog/lib/pll_refout_cc_impl.cc
@@ -25,10 +25,10 @@
#endif
#include "pll_refout_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_sincos.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/sincos.h>
#include <math.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -45,9 +45,9 @@ namespace gr {
}
pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq)
- : gr_sync_block("pll_refout_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("pll_refout_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
blocks::control_loop(loop_bw, max_freq, min_freq)
{
}
@@ -71,7 +71,7 @@ namespace gr {
pll_refout_cc_impl::phase_detector(gr_complex sample,float ref_phase)
{
float sample_phase;
- sample_phase = gr_fast_atan2f(sample.imag(),sample.real());
+ sample_phase = gr::fast_atan2f(sample.imag(),sample.real());
return mod_2pi(sample_phase-ref_phase);
}
@@ -88,7 +88,7 @@ namespace gr {
int size = noutput_items;
while(size-- > 0) {
- gr_sincosf(d_phase,&t_imag,&t_real);
+ gr::sincosf(d_phase,&t_imag,&t_real);
*optr++ = gr_complex(t_real,t_imag);
error = phase_detector(*iptr++,d_phase);
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
index 291809bb24..78e0c842ed 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "probe_avg_mag_sqrd_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
probe_avg_mag_sqrd_c_impl::probe_avg_mag_sqrd_c_impl(double threshold_db, double alpha)
- : gr_sync_block("probe_avg_mag_sqrd_c",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("probe_avg_mag_sqrd_c",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_unmuted(false), d_level(0), d_iir(alpha)
{
set_threshold(threshold_db);
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
index ceaf5dbf01..76d54880d4 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "probe_avg_mag_sqrd_cf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
probe_avg_mag_sqrd_cf_impl::probe_avg_mag_sqrd_cf_impl(double threshold_db, double alpha)
- : gr_sync_block("probe_avg_mag_sqrd_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("probe_avg_mag_sqrd_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float))),
d_unmuted(false), d_level(0), d_iir(alpha)
{
set_threshold(threshold_db);
diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
index 4ac7ef06bd..505a24a5e9 100644
--- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
+++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "probe_avg_mag_sqrd_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
probe_avg_mag_sqrd_f_impl::probe_avg_mag_sqrd_f_impl(double threshold_db, double alpha)
- : gr_sync_block("probe_avg_mag_sqrd_f",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("probe_avg_mag_sqrd_f",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_unmuted(false), d_level(0), d_iir(alpha)
{
set_threshold(threshold_db);
diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc
index 1bfba6846f..44fd5dc668 100644
--- a/gr-analog/lib/pwr_squelch_cc_impl.cc
+++ b/gr-analog/lib/pwr_squelch_cc_impl.cc
@@ -39,9 +39,9 @@ namespace gr {
pwr_squelch_cc_impl::pwr_squelch_cc_impl(double threshold, double alpha,
int ramp, bool gate)
- : gr_block("pwr_squelch_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : block("pwr_squelch_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
squelch_base_cc_impl("pwr_squelch_cc", ramp, gate),
d_iir(alpha)
{
diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc
index c6bb6af903..812011bbb5 100644
--- a/gr-analog/lib/pwr_squelch_ff_impl.cc
+++ b/gr-analog/lib/pwr_squelch_ff_impl.cc
@@ -39,9 +39,9 @@ namespace gr {
pwr_squelch_ff_impl::pwr_squelch_ff_impl(double threshold, double alpha,
int ramp, bool gate)
- : gr_block("pwr_squelch_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("pwr_squelch_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
squelch_base_ff_impl("pwr_squelch_ff", ramp, gate),
d_iir(alpha)
{
diff --git a/gr-analog/lib/qa_analog.h b/gr-analog/lib/qa_analog.h
index b66b62b5fe..cdb5c78b94 100644
--- a/gr-analog/lib/qa_analog.h
+++ b/gr-analog/lib/qa_analog.h
@@ -23,7 +23,7 @@
#ifndef _QA_GR_ANALOG_H_
#define _QA_GR_ANALOG_H_
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the gr-analog directory
diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc
index 9490ba6bed..583de4dba4 100644
--- a/gr-analog/lib/quadrature_demod_cf_impl.cc
+++ b/gr-analog/lib/quadrature_demod_cf_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "quadrature_demod_cf_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -39,9 +39,9 @@ namespace gr {
}
quadrature_demod_cf_impl::quadrature_demod_cf_impl(float gain)
- : gr_sync_block("quadrature_demod_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("quadrature_demod_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float))),
d_gain(gain)
{
set_history(2); // we need to look at the previous value
@@ -62,7 +62,7 @@ namespace gr {
for(int i = 0; i < noutput_items; i++) {
gr_complex product = in[i] * conj(in[i-1]);
- out[i] = d_gain * gr_fast_atan2f(imag(product), real(product));
+ out[i] = d_gain * gr::fast_atan2f(imag(product), real(product));
}
return noutput_items;
diff --git a/gr-analog/lib/rail_ff_impl.cc b/gr-analog/lib/rail_ff_impl.cc
index 106c6353ae..a0e4f7cccd 100644
--- a/gr-analog/lib/rail_ff_impl.cc
+++ b/gr-analog/lib/rail_ff_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "rail_ff_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace analog {
@@ -39,9 +39,9 @@ namespace gr {
}
rail_ff_impl::rail_ff_impl(float lo, float hi)
- : gr_sync_block("rail_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("rail_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_lo(lo), d_hi(hi)
{
set_clipping();
@@ -81,7 +81,7 @@ namespace gr {
float *out = (float*)output_items[0];
for(int i = 0; i < noutput_items; i++) {
- out[i] = d_mid + gr_branchless_clip(in[i] - d_mid, d_clip);
+ out[i] = d_mid + gr::branchless_clip(in[i] - d_mid, d_clip);
}
return noutput_items;
diff --git a/gr-analog/lib/sig_source_X_impl.cc.t b/gr-analog/lib/sig_source_X_impl.cc.t
index ad8b7e4b0c..c9e99f015a 100644
--- a/gr-analog/lib/sig_source_X_impl.cc.t
+++ b/gr-analog/lib/sig_source_X_impl.cc.t
@@ -28,10 +28,10 @@
#include "@IMPL_NAME@.h"
#include <algorithm>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <algorithm>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace analog {
@@ -46,9 +46,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(double sampling_freq, gr_waveform_t waveform,
double frequency, double ampl, @TYPE@ offset)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(@TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(@TYPE@))),
d_sampling_freq(sampling_freq), d_waveform(waveform),
d_frequency(frequency), d_ampl(ampl), d_offset(offset)
{
diff --git a/gr-analog/lib/sig_source_X_impl.h.t b/gr-analog/lib/sig_source_X_impl.h.t
index 50f1791270..d80c3b8933 100644
--- a/gr-analog/lib/sig_source_X_impl.h.t
+++ b/gr-analog/lib/sig_source_X_impl.h.t
@@ -26,8 +26,8 @@
#define @GUARD_NAME@
#include <analog/@BASE_NAME@.h>
-#include <gr_sync_block.h>
-#include <gr_fxpt_nco.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/fxpt_nco.h>
namespace gr {
namespace analog {
@@ -40,7 +40,7 @@ namespace gr {
double d_frequency;
double d_ampl;
@TYPE@ d_offset;
- gr_fxpt_nco d_nco;
+ gr::fxpt_nco d_nco;
public:
@IMPL_NAME@(double sampling_freq, gr_waveform_t waveform,
diff --git a/gr-analog/lib/simple_squelch_cc_impl.cc b/gr-analog/lib/simple_squelch_cc_impl.cc
index 02ccc535da..edaf8de9ce 100644
--- a/gr-analog/lib/simple_squelch_cc_impl.cc
+++ b/gr-analog/lib/simple_squelch_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "simple_squelch_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
simple_squelch_cc_impl::simple_squelch_cc_impl(double threshold_db, double alpha)
- : gr_sync_block("simple_squelch_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("simple_squelch_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_unmuted(false), d_iir(alpha)
{
set_threshold(threshold_db);
diff --git a/gr-analog/lib/squelch_base_cc_impl.cc b/gr-analog/lib/squelch_base_cc_impl.cc
index cba7b30dba..73be18349d 100644
--- a/gr-analog/lib/squelch_base_cc_impl.cc
+++ b/gr-analog/lib/squelch_base_cc_impl.cc
@@ -25,15 +25,15 @@
#endif
#include "squelch_base_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
squelch_base_cc_impl::squelch_base_cc_impl(const char *name, int ramp, bool gate)
- : gr_block(name,
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float)))
+ : block(name,
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float)))
{
set_ramp(ramp);
set_gate(gate);
diff --git a/gr-analog/lib/squelch_base_ff_impl.cc b/gr-analog/lib/squelch_base_ff_impl.cc
index f9f07d36da..2fb0e64301 100644
--- a/gr-analog/lib/squelch_base_ff_impl.cc
+++ b/gr-analog/lib/squelch_base_ff_impl.cc
@@ -25,15 +25,15 @@
#endif
#include "squelch_base_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace analog {
squelch_base_ff_impl::squelch_base_ff_impl(const char *name, int ramp, bool gate)
- : gr_block(name,
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float)))
+ : block(name,
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float)))
{
set_ramp(ramp);
set_gate(gate);
diff --git a/gr-analog/lib/test_gr_analog.cc b/gr-analog/lib/test_gr_analog.cc
index 95ee3aa8cb..e621f9d395 100644
--- a/gr-analog/lib/test_gr_analog.cc
+++ b/gr-analog/lib/test_gr_analog.cc
@@ -27,7 +27,7 @@
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include "qa_analog.h"
#include <iostream>
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
index 9ae019ad8e..9dd42e31ec 100644
--- a/gr-analog/swig/analog_swig.i
+++ b/gr-analog/swig/analog_swig.i
@@ -29,9 +29,9 @@
%include "analog_swig_doc.i"
%{
-#include <blocks/control_loop.h>
+#include <gnuradio/blocks/control_loop.h>
%}
-%include <blocks/control_loop.h>
+%include <gnuradio/blocks/control_loop.h>
%{
#include "analog/cpm.h"
diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h b/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
index 1bedbb39ec..af4b69aa29 100644
--- a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
+++ b/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
@@ -23,7 +23,7 @@
#ifndef _GRATSCBITTIMINGLOOP_H_
#define _GRATSCBITTIMINGLOOP_H_
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
#include <VrSigProc.h>
#include <VrHistoryProc.h>
#include <VrDecimatingSigProc.h>
diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h b/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
index 64d25da01e..3a53cbc7cd 100644
--- a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
+++ b/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
@@ -23,7 +23,7 @@
#ifndef _GRATSCBITTIMINGLOOP2_H_
#define _GRATSCBITTIMINGLOOP2_H_
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
#include <VrSigProc.h>
#include <VrHistoryProc.h>
#include <VrDecimatingSigProc.h>
diff --git a/gr-atsc/include/atsc/GrAtscFPLL.h b/gr-atsc/include/atsc/GrAtscFPLL.h
index c1e3302a17..dbc20b6025 100644
--- a/gr-atsc/include/atsc/GrAtscFPLL.h
+++ b/gr-atsc/include/atsc/GrAtscFPLL.h
@@ -24,7 +24,7 @@
#ifndef _GRATSCFPLL_H_
#define _GRATSCFPLL_H_
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
#include <filter/iir.h>
#include <filter/single_pole_iir.h>
#include <analog/agc.h>
diff --git a/gr-atsc/include/atsc/GrAtscSymbolMapper.h b/gr-atsc/include/atsc/GrAtscSymbolMapper.h
index c4e4083aa3..aa2cce0c76 100644
--- a/gr-atsc/include/atsc/GrAtscSymbolMapper.h
+++ b/gr-atsc/include/atsc/GrAtscSymbolMapper.h
@@ -26,7 +26,7 @@
#include <VrInterpolatingSigProcNoWork.h>
#include <atsc/types.h>
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
/*!
* \brief take atsc_data_segments and map them to symbols.
diff --git a/gr-atsc/include/atsc/api.h b/gr-atsc/include/atsc/api.h
index 9516892e02..1c1f257059 100644
--- a/gr-atsc/include/atsc/api.h
+++ b/gr-atsc/include/atsc/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_ATSC_API_H
#define INCLUDED_ATSC_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_atsc_EXPORTS
# define ATSC_API __GR_ATTR_EXPORT
diff --git a/gr-atsc/include/atsc/bit_timing_loop.h b/gr-atsc/include/atsc/bit_timing_loop.h
index eee2b2f73b..a130c86e5a 100644
--- a/gr-atsc/include/atsc/bit_timing_loop.h
+++ b/gr-atsc/include/atsc/bit_timing_loop.h
@@ -25,7 +25,7 @@
#include <atsc/api.h>
#include <cstdio>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <atsc/diag_output_impl.h>
#include <atsc/sssr_impl.h>
#include <atsc/syminfo_impl.h>
@@ -42,7 +42,7 @@ ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
* This class accepts a single real input and produces two outputs,
* the raw symbol (float) and the tag (atsc_syminfo)
*/
-class ATSC_API atsc_bit_timing_loop : public gr_block
+class ATSC_API atsc_bit_timing_loop : public gr::block
{
friend ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
diff --git a/gr-atsc/include/atsc/deinterleaver.h b/gr-atsc/include/atsc/deinterleaver.h
index 7864526cfd..35711a5d0e 100644
--- a/gr-atsc/include/atsc/deinterleaver.h
+++ b/gr-atsc/include/atsc/deinterleaver.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_DEINTERLEAVER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/data_interleaver_impl.h>
class atsc_deinterleaver;
@@ -38,7 +38,7 @@ ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
*
* input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
*/
-class ATSC_API atsc_deinterleaver : public gr_sync_block
+class ATSC_API atsc_deinterleaver : public gr::sync_block
{
friend ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
diff --git a/gr-atsc/include/atsc/depad.h b/gr-atsc/include/atsc/depad.h
index ffced87a39..26ea705e66 100644
--- a/gr-atsc/include/atsc/depad.h
+++ b/gr-atsc/include/atsc/depad.h
@@ -23,7 +23,7 @@
#define INCLUDED_ATSC_DEPAD_H
#include <atsc/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
class atsc_depad;
typedef boost::shared_ptr<atsc_depad> atsc_depad_sptr;
@@ -36,7 +36,7 @@ ATSC_API atsc_depad_sptr atsc_make_depad();
*
* input: atsc_mpeg_packet; output: unsigned char
*/
-class ATSC_API atsc_depad : public gr_sync_interpolator
+class ATSC_API atsc_depad : public gr::sync_interpolator
{
friend ATSC_API atsc_depad_sptr atsc_make_depad();
diff --git a/gr-atsc/include/atsc/derandomizer.h b/gr-atsc/include/atsc/derandomizer.h
index 4def872aa6..7824d5860c 100644
--- a/gr-atsc/include/atsc/derandomizer.h
+++ b/gr-atsc/include/atsc/derandomizer.h
@@ -23,7 +23,7 @@
#define INCLUDED_ATSC_DERANDOMIZER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/randomizer_impl.h>
class atsc_derandomizer;
@@ -37,7 +37,7 @@ ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
*
* input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet;
*/
-class ATSC_API atsc_derandomizer : public gr_sync_block
+class ATSC_API atsc_derandomizer : public gr::sync_block
{
friend ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
diff --git a/gr-atsc/include/atsc/ds_to_softds.h b/gr-atsc/include/atsc/ds_to_softds.h
index 6356506663..82717829d5 100644
--- a/gr-atsc/include/atsc/ds_to_softds.h
+++ b/gr-atsc/include/atsc/ds_to_softds.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_DS_TO_SOFTDS_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/types.h>
class atsc_ds_to_softds;
@@ -38,7 +38,7 @@ ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
*
* input: atsc_data_segment; output: atsc_soft_data_segment
*/
-class ATSC_API atsc_ds_to_softds : public gr_sync_block
+class ATSC_API atsc_ds_to_softds : public gr::sync_block
{
friend ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
diff --git a/gr-atsc/include/atsc/equalizer.h b/gr-atsc/include/atsc/equalizer.h
index a910ab7562..caac2974c8 100644
--- a/gr-atsc/include/atsc/equalizer.h
+++ b/gr-atsc/include/atsc/equalizer.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_EQUALIZER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/equalizer_impl.h>
#include <vector>
@@ -40,7 +40,7 @@ atsc_equalizer_sptr ATSC_API atsc_make_equalizer();
* first inputs are data samples, second inputs are tags.
* first outputs are equalized data samples, second outputs are tags.
*/
-class ATSC_API atsc_equalizer : public gr_sync_block
+class ATSC_API atsc_equalizer : public gr::sync_block
{
friend ATSC_API atsc_equalizer_sptr atsc_make_equalizer();
diff --git a/gr-atsc/include/atsc/field_sync_demux.h b/gr-atsc/include/atsc/field_sync_demux.h
index bec3590096..0bc3d1dd0f 100644
--- a/gr-atsc/include/atsc/field_sync_demux.h
+++ b/gr-atsc/include/atsc/field_sync_demux.h
@@ -23,7 +23,7 @@
#define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
#include <atsc/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <atsc/types.h>
class atsc_field_sync_demux;
@@ -38,7 +38,7 @@ ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
* \ingroup atsc
*
*/
-class ATSC_API atsc_field_sync_demux : public gr_block
+class ATSC_API atsc_field_sync_demux : public gr::block
{
friend ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
diff --git a/gr-atsc/include/atsc/field_sync_mux.h b/gr-atsc/include/atsc/field_sync_mux.h
index 21a2f0fdab..d6a78f4de7 100644
--- a/gr-atsc/include/atsc/field_sync_mux.h
+++ b/gr-atsc/include/atsc/field_sync_mux.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_FIELD_SYNC_MUX_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/types.h>
class atsc_field_sync_mux;
@@ -38,7 +38,7 @@ ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
*
* input: atsc_data_segment; output: atsc_data_segment
*/
-class ATSC_API atsc_field_sync_mux : public gr_sync_block
+class ATSC_API atsc_field_sync_mux : public gr::sync_block
{
friend ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
diff --git a/gr-atsc/include/atsc/fpll.h b/gr-atsc/include/atsc/fpll.h
index 2bffc327eb..e7feee6a63 100644
--- a/gr-atsc/include/atsc/fpll.h
+++ b/gr-atsc/include/atsc/fpll.h
@@ -24,8 +24,8 @@
#define INCLUDED_ATSC_FPLL_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <gr_nco.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/nco.h>
#include <filter/single_pole_iir.h>
#include <analog/agc.h>
#include <stdio.h>
@@ -49,7 +49,7 @@ ATSC_API atsc_fpll_sptr atsc_make_fpll();
* This class accepts a single real input and produces a single real output
*/
-class ATSC_API atsc_fpll : public gr_sync_block
+class ATSC_API atsc_fpll : public gr::sync_block
{
friend ATSC_API atsc_fpll_sptr atsc_make_fpll();
@@ -70,7 +70,7 @@ public:
double initial_freq;
double initial_phase;
bool debug_no_update;
- gr_nco<float,float> nco;
+ gr::nco<float,float> nco;
analog::kernel::agc_ff agc; // automatic gain control
filter::single_pole_iir<float,float,float> afci;
filter::single_pole_iir<float,float,float> afcq;
diff --git a/gr-atsc/include/atsc/fs_checker.h b/gr-atsc/include/atsc/fs_checker.h
index 1bd304090f..0ece079f76 100644
--- a/gr-atsc/include/atsc/fs_checker.h
+++ b/gr-atsc/include/atsc/fs_checker.h
@@ -25,7 +25,7 @@
#include <atsc/api.h>
#include <atsc/fs_checker_impl.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
class atsc_fs_checker;
typedef boost::shared_ptr<atsc_fs_checker> atsc_fs_checker_sptr;
@@ -40,7 +40,7 @@ ATSC_API atsc_fs_checker_sptr atsc_make_fs_checker();
* second output is set of tags, one-for-one with first output.
*/
-class ATSC_API atsc_fs_checker : public gr_sync_block
+class ATSC_API atsc_fs_checker : public gr::sync_block
{
friend ATSC_API atsc_fs_checker_sptr atsc_make_fs_checker();
diff --git a/gr-atsc/include/atsc/interleaver.h b/gr-atsc/include/atsc/interleaver.h
index f426381add..9031e13c50 100644
--- a/gr-atsc/include/atsc/interleaver.h
+++ b/gr-atsc/include/atsc/interleaver.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_INTERLEAVER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/data_interleaver_impl.h>
class atsc_interleaver;
@@ -37,7 +37,7 @@ ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
*
* input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
*/
-class ATSC_API atsc_interleaver : public gr_sync_block
+class ATSC_API atsc_interleaver : public gr::sync_block
{
friend ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
diff --git a/gr-atsc/include/atsc/pad.h b/gr-atsc/include/atsc/pad.h
index b48d17f7b7..0871776d03 100644
--- a/gr-atsc/include/atsc/pad.h
+++ b/gr-atsc/include/atsc/pad.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_PAD_H
#include <atsc/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
class atsc_pad;
typedef boost::shared_ptr<atsc_pad> atsc_pad_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_pad_sptr atsc_make_pad();
*
* input: unsigned char; output: atsc_mpeg_packet
*/
-class ATSC_API atsc_pad : public gr_sync_decimator
+class ATSC_API atsc_pad : public gr::sync_decimator
{
friend ATSC_API atsc_pad_sptr atsc_make_pad();
diff --git a/gr-atsc/include/atsc/randomizer.h b/gr-atsc/include/atsc/randomizer.h
index 8825062bbc..b5e7237031 100644
--- a/gr-atsc/include/atsc/randomizer.h
+++ b/gr-atsc/include/atsc/randomizer.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_RANDOMIZER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/randomizer_impl.h>
class atsc_randomizer;
@@ -38,7 +38,7 @@ ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
*
* input: atsc_mpeg_packet; output: atsc_mpeg_packet_no_sync
*/
-class ATSC_API atsc_randomizer : public gr_sync_block
+class ATSC_API atsc_randomizer : public gr::sync_block
{
friend ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
diff --git a/gr-atsc/include/atsc/rs_decoder.h b/gr-atsc/include/atsc/rs_decoder.h
index 308fb46432..6b8a7f4560 100644
--- a/gr-atsc/include/atsc/rs_decoder.h
+++ b/gr-atsc/include/atsc/rs_decoder.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_RS_DECODER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/reed_solomon_impl.h>
class atsc_rs_decoder;
@@ -38,7 +38,7 @@ ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
*
* input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_no_sync
*/
-class ATSC_API atsc_rs_decoder : public gr_sync_block
+class ATSC_API atsc_rs_decoder : public gr::sync_block
{
friend ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
diff --git a/gr-atsc/include/atsc/rs_encoder.h b/gr-atsc/include/atsc/rs_encoder.h
index ace2806da3..43ee112499 100644
--- a/gr-atsc/include/atsc/rs_encoder.h
+++ b/gr-atsc/include/atsc/rs_encoder.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_RS_ENCODER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/reed_solomon_impl.h>
class atsc_rs_encoder;
@@ -38,7 +38,7 @@ ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
*
* input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet_rs_encoded
*/
-class ATSC_API atsc_rs_encoder : public gr_sync_block
+class ATSC_API atsc_rs_encoder : public gr::sync_block
{
friend ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
diff --git a/gr-atsc/include/atsc/trellis_encoder.h b/gr-atsc/include/atsc/trellis_encoder.h
index 243dd7c2ce..7833d0beda 100644
--- a/gr-atsc/include/atsc/trellis_encoder.h
+++ b/gr-atsc/include/atsc/trellis_encoder.h
@@ -23,7 +23,7 @@
#define INCLUDED_ATSC_TRELLIS_ENCODER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/trellis_encoder_impl.h>
class atsc_trellis_encoder;
@@ -37,7 +37,7 @@ ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
*
* input: atsc_mpeg_packet_rs_encoded; output: atsc_data_segment
*/
-class ATSC_API atsc_trellis_encoder : public gr_sync_block
+class ATSC_API atsc_trellis_encoder : public gr::sync_block
{
friend ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
diff --git a/gr-atsc/include/atsc/viterbi_decoder.h b/gr-atsc/include/atsc/viterbi_decoder.h
index e119337553..8ba60e90cb 100644
--- a/gr-atsc/include/atsc/viterbi_decoder.h
+++ b/gr-atsc/include/atsc/viterbi_decoder.h
@@ -24,7 +24,7 @@
#define INCLUDED_ATSC_VITERBI_DECODER_H
#include <atsc/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <atsc/viterbi_decoder_impl.h>
class atsc_viterbi_decoder;
@@ -38,7 +38,7 @@ ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
*
* input: atsc_soft_data_segment; output: atsc_mpeg_packet_rs_encoded
*/
-class ATSC_API atsc_viterbi_decoder : public gr_sync_block
+class ATSC_API atsc_viterbi_decoder : public gr::sync_block
{
friend ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
diff --git a/gr-atsc/lib/atsc_bit_timing_loop.cc b/gr-atsc/lib/atsc_bit_timing_loop.cc
index 7287eee19f..0eaa53ccfa 100644
--- a/gr-atsc/lib/atsc_bit_timing_loop.cc
+++ b/gr-atsc/lib/atsc_bit_timing_loop.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/bit_timing_loop.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <string.h>
@@ -42,12 +42,12 @@ atsc_make_bit_timing_loop()
atsc_bit_timing_loop::atsc_bit_timing_loop()
- : gr_block("atsc_bit_timing_loop",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature3(2, 3, sizeof(float), sizeof(float), sizeof(float))),
- d_interp(ratio_of_rx_clock_to_symbol_freq), d_next_input(0),
- d_rx_clock_to_symbol_freq (ratio_of_rx_clock_to_symbol_freq),
- d_si(0)
+ : gr::block("atsc_bit_timing_loop",
+ gr::io_signature::make(1, 1, sizeof(float)),
+ gr::io_signature::make3(2, 3, sizeof(float), sizeof(float), sizeof(float))),
+ d_interp(ratio_of_rx_clock_to_symbol_freq), d_next_input(0),
+ d_rx_clock_to_symbol_freq (ratio_of_rx_clock_to_symbol_freq),
+ d_si(0)
{
reset();
}
diff --git a/gr-atsc/lib/atsc_deinterleaver.cc b/gr-atsc/lib/atsc_deinterleaver.cc
index bc6d742bf6..27728d8b07 100644
--- a/gr-atsc/lib/atsc_deinterleaver.cc
+++ b/gr-atsc/lib/atsc_deinterleaver.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/deinterleaver.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_deinterleaver()
}
atsc_deinterleaver::atsc_deinterleaver()
- : gr_sync_block("atsc_deinterleaver",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
+ : gr::sync_block("atsc_deinterleaver",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_depad.cc b/gr-atsc/lib/atsc_depad.cc
index 7dd6ba1c68..626638bf63 100644
--- a/gr-atsc/lib/atsc_depad.cc
+++ b/gr-atsc/lib/atsc_depad.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/depad.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/types.h>
atsc_depad_sptr
@@ -35,10 +35,10 @@ atsc_make_depad()
}
atsc_depad::atsc_depad()
- : gr_sync_interpolator("atsc_depad",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- ATSC_MPEG_PKT_LENGTH)
+ : gr::sync_interpolator("atsc_depad",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)),
+ gr::io_signature::make(1, 1, sizeof(unsigned char)),
+ ATSC_MPEG_PKT_LENGTH)
{
reset();
}
diff --git a/gr-atsc/lib/atsc_derandomizer.cc b/gr-atsc/lib/atsc_derandomizer.cc
index 79b3612af4..f0051a6090 100644
--- a/gr-atsc/lib/atsc_derandomizer.cc
+++ b/gr-atsc/lib/atsc_derandomizer.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/derandomizer.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_derandomizer()
}
atsc_derandomizer::atsc_derandomizer()
- : gr_sync_block("atsc_derandomizer",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)))
+ : gr::sync_block("atsc_derandomizer",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_ds_to_softds.cc b/gr-atsc/lib/atsc_ds_to_softds.cc
index 06ea9686c0..b1061b83fc 100644
--- a/gr-atsc/lib/atsc_ds_to_softds.cc
+++ b/gr-atsc/lib/atsc_ds_to_softds.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/ds_to_softds.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_ds_to_softds()
}
atsc_ds_to_softds::atsc_ds_to_softds()
- : gr_sync_block("atsc_ds_to_softds",
- gr_make_io_signature(1, 1, sizeof(atsc_data_segment)),
- gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment)))
+ : gr::sync_block("atsc_ds_to_softds",
+ gr::io_signature::make(1, 1, sizeof(atsc_data_segment)),
+ gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_equalizer.cc b/gr-atsc/lib/atsc_equalizer.cc
index 6838cc1547..6b76b37387 100644
--- a/gr-atsc/lib/atsc_equalizer.cc
+++ b/gr-atsc/lib/atsc_equalizer.cc
@@ -26,7 +26,7 @@
#include <atsc/equalizer.h>
#include <atsc/create_atsci_equalizer.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <atsc/syminfo_impl.h>
@@ -39,9 +39,9 @@ atsc_make_equalizer()
// had atsc_equalizer(atsci_equalizer *equalizer)
atsc_equalizer::atsc_equalizer()
- : gr_sync_block("atsc_equalizer",
- gr_make_io_signature(2, 2, sizeof(float)),
- gr_make_io_signature(2, 2, sizeof(float)))
+ : gr::sync_block("atsc_equalizer",
+ gr::io_signature::make(2, 2, sizeof(float)),
+ gr::io_signature::make(2, 2, sizeof(float)))
{
d_equalizer = create_atsci_equalizer_lms();
}
diff --git a/gr-atsc/lib/atsc_field_sync_demux.cc b/gr-atsc/lib/atsc_field_sync_demux.cc
index 7697a02c6a..dc5c011353 100644
--- a/gr-atsc/lib/atsc_field_sync_demux.cc
+++ b/gr-atsc/lib/atsc_field_sync_demux.cc
@@ -26,7 +26,7 @@
#include <cmath>
#include <atsc/field_sync_demux.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/types.h>
#include <atsc/consts.h>
#include <atsc/syminfo_impl.h>
@@ -38,7 +38,7 @@ using std::cerr;
using std::endl;
-static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor
+static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor
atsc_field_sync_demux_sptr
@@ -48,12 +48,12 @@ atsc_make_field_sync_demux()
}
atsc_field_sync_demux::atsc_field_sync_demux()
- : gr_block("atsc_field_sync_demux",
- gr_make_io_signature(2, 2, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment))),
- d_locked(false), d_in_field2(true), d_segment_number(0),
- d_next_input(0), d_lost_index(0), d_inputs0_index(0),
- d_inputs0_size(0), d_consume(0)
+ : gr::block("atsc_field_sync_demux",
+ gr::io_signature::make(2, 2, sizeof(float)),
+ gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment))),
+ d_locked(false), d_in_field2(true), d_segment_number(0),
+ d_next_input(0), d_lost_index(0), d_inputs0_index(0),
+ d_inputs0_size(0), d_consume(0)
{
reset();
}
diff --git a/gr-atsc/lib/atsc_field_sync_mux.cc b/gr-atsc/lib/atsc_field_sync_mux.cc
index 578af9eff1..82bb0d8692 100644
--- a/gr-atsc/lib/atsc_field_sync_mux.cc
+++ b/gr-atsc/lib/atsc_field_sync_mux.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/field_sync_mux.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <atsc/pnXXX_impl.h>
@@ -37,9 +37,9 @@ atsc_make_field_sync_mux()
}
atsc_field_sync_mux::atsc_field_sync_mux()
- : gr_sync_block("atsc_field_sync_mux",
- gr_make_io_signature(1, 1, sizeof(atsc_data_segment)),
- gr_make_io_signature(1, 1, sizeof(atsc_data_segment)))
+ : gr::sync_block("atsc_field_sync_mux",
+ gr::io_signature::make(1, 1, sizeof(atsc_data_segment)),
+ gr::io_signature::make(1, 1, sizeof(atsc_data_segment)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_fpll.cc b/gr-atsc/lib/atsc_fpll.cc
index 999a326bee..323f1681c9 100644
--- a/gr-atsc/lib/atsc_fpll.cc
+++ b/gr-atsc/lib/atsc_fpll.cc
@@ -25,11 +25,11 @@
#endif
#include <atsc/fpll.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <algorithm>
#include "fpll_btloop_coupling.h"
-#include <gr_math.h>
+#include <gnuradio/math.h>
atsc_fpll_sptr
atsc_make_fpll()
@@ -51,9 +51,9 @@ static const float FPLL_AGC_RATE = 0.25e-6;
atsc_fpll::atsc_fpll()
- : gr_sync_block("atsc_fpll",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : gr::sync_block("atsc_fpll",
+ gr::io_signature::make(1, 1, sizeof(float)),
+ gr::io_signature::make(1, 1, sizeof(float))),
initial_phase(0)
{
initial_freq = 5.75e6 - 3e6 + 0.31e6 + 5e3; // a_initial_freq;
@@ -107,7 +107,7 @@ atsc_fpll::work (int noutput_items,
// phase detector
// float x = atan2 (filtered_Q, filtered_I);
- float x = gr_fast_atan2f(filtered_Q, filtered_I);
+ float x = gr::fast_atan2f(filtered_Q, filtered_I);
// avoid slamming filter with big transitions
diff --git a/gr-atsc/lib/atsc_fs_checker.cc b/gr-atsc/lib/atsc_fs_checker.cc
index 41d16d20be..f8727d7584 100644
--- a/gr-atsc/lib/atsc_fs_checker.cc
+++ b/gr-atsc/lib/atsc_fs_checker.cc
@@ -27,7 +27,7 @@
#include <atsc/fs_checker.h>
#include <atsc/create_atsci_fs_checker.h>
#include <atsc/fs_checker_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <atsc/syminfo_impl.h>
@@ -39,9 +39,9 @@ atsc_make_fs_checker()
}
atsc_fs_checker::atsc_fs_checker()
- : gr_sync_block("atsc_fs_checker",
- gr_make_io_signature(2, 2, sizeof(float)),
- gr_make_io_signature(2, 2, sizeof(float)))
+ : gr::sync_block("atsc_fs_checker",
+ gr::io_signature::make(2, 2, sizeof(float)),
+ gr::io_signature::make(2, 2, sizeof(float)))
{
d_fsc = create_atsci_fs_checker();
}
diff --git a/gr-atsc/lib/atsc_interleaver.cc b/gr-atsc/lib/atsc_interleaver.cc
index e7c22316b5..24b335a4af 100644
--- a/gr-atsc/lib/atsc_interleaver.cc
+++ b/gr-atsc/lib/atsc_interleaver.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/interleaver.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_interleaver()
}
atsc_interleaver::atsc_interleaver()
- : gr_sync_block("atsc_interleaver",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
+ : gr::sync_block("atsc_interleaver",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_pad.cc b/gr-atsc/lib/atsc_pad.cc
index 9b181a8b78..1d341bacf3 100644
--- a/gr-atsc/lib/atsc_pad.cc
+++ b/gr-atsc/lib/atsc_pad.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/pad.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/types.h>
static const int INTR = ATSC_MPEG_PKT_LENGTH;
@@ -37,10 +37,10 @@ atsc_make_pad()
}
atsc_pad::atsc_pad()
- : gr_sync_decimator("atsc_pad",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)),
- INTR)
+ : gr::sync_decimator("atsc_pad",
+ gr::io_signature::make(1, 1, sizeof(unsigned char)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)),
+ INTR)
{
reset();
}
diff --git a/gr-atsc/lib/atsc_randomizer.cc b/gr-atsc/lib/atsc_randomizer.cc
index 8f88c51a26..54cb3c3084 100644
--- a/gr-atsc/lib/atsc_randomizer.cc
+++ b/gr-atsc/lib/atsc_randomizer.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/randomizer.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_randomizer()
}
atsc_randomizer::atsc_randomizer()
- : gr_sync_block("atsc_randomizer",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)))
+ : gr::sync_block("atsc_randomizer",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_rs_decoder.cc b/gr-atsc/lib/atsc_rs_decoder.cc
index 80ff41c2be..f707a98073 100644
--- a/gr-atsc/lib/atsc_rs_decoder.cc
+++ b/gr-atsc/lib/atsc_rs_decoder.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/rs_decoder.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_rs_decoder()
}
atsc_rs_decoder::atsc_rs_decoder()
- : gr_sync_block("atsc_rs_decoder",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)))
+ : gr::sync_block("atsc_rs_decoder",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_rs_encoder.cc b/gr-atsc/lib/atsc_rs_encoder.cc
index 9773f94489..702ad07e72 100644
--- a/gr-atsc/lib/atsc_rs_encoder.cc
+++ b/gr-atsc/lib/atsc_rs_encoder.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/rs_encoder.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_rs_encoder()
}
atsc_rs_encoder::atsc_rs_encoder()
- : gr_sync_block("atsc_rs_encoder",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
+ : gr::sync_block("atsc_rs_encoder",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)))
{
reset();
}
diff --git a/gr-atsc/lib/atsc_trellis_encoder.cc b/gr-atsc/lib/atsc_trellis_encoder.cc
index 615864d971..8cb3c6fcba 100644
--- a/gr-atsc/lib/atsc_trellis_encoder.cc
+++ b/gr-atsc/lib/atsc_trellis_encoder.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/trellis_encoder.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
@@ -36,9 +36,9 @@ atsc_make_trellis_encoder()
}
atsc_trellis_encoder::atsc_trellis_encoder()
- : gr_sync_block("atsc_trellis_encoder",
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
- gr_make_io_signature(1, 1, sizeof(atsc_data_segment)))
+ : gr::sync_block("atsc_trellis_encoder",
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)),
+ gr::io_signature::make(1, 1, sizeof(atsc_data_segment)))
{
set_output_multiple(atsci_trellis_encoder::NCODERS);
reset();
diff --git a/gr-atsc/lib/atsc_viterbi_decoder.cc b/gr-atsc/lib/atsc_viterbi_decoder.cc
index ca32c6d998..7ea2c8ca43 100644
--- a/gr-atsc/lib/atsc_viterbi_decoder.cc
+++ b/gr-atsc/lib/atsc_viterbi_decoder.cc
@@ -25,7 +25,7 @@
#endif
#include <atsc/viterbi_decoder.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <atsc/consts.h>
#include <iostream>
@@ -39,9 +39,9 @@ atsc_make_viterbi_decoder()
}
atsc_viterbi_decoder::atsc_viterbi_decoder()
- : gr_sync_block("atsc_viterbi_decoder",
- gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment)),
- gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))),
+ : gr::sync_block("atsc_viterbi_decoder",
+ gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment)),
+ gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))),
last_start(-1)
{
set_output_multiple(atsci_viterbi_decoder::NCODERS);
diff --git a/gr-atsc/lib/atsci_equalizer_lms2.cc b/gr-atsc/lib/atsci_equalizer_lms2.cc
index 2fad19b748..7bcaad12a0 100644
--- a/gr-atsc/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/lib/atsci_equalizer_lms2.cc
@@ -26,7 +26,7 @@
#include <atsc/pnXXX_impl.h>
#include <cmath>
#include <stdlib.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
#include <stdio.h>
#include <boost/math/special_functions/fpclassify.hpp>
diff --git a/gr-atsc/lib/atsci_sssr.cc b/gr-atsc/lib/atsci_sssr.cc
index 5deeda86ce..1a33411570 100644
--- a/gr-atsc/lib/atsci_sssr.cc
+++ b/gr-atsc/lib/atsci_sssr.cc
@@ -26,7 +26,7 @@
#include <cstdio>
#include <assert.h>
#include <atsc/diag_output_impl.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
#include <stdio.h>
#include <boost/math/special_functions/sign.hpp>
#include <iostream>
diff --git a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
index 88e2fdb929..35f81543de 100644
--- a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
+++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <atsc/fake_single_viterbi_impl.h>
#include "qa_atsci_fake_single_viterbi.h"
-#include <random.h>
+#include <gnuradio/random.h>
#include <string.h>
diff --git a/gr-atsc/lib/qa_atsci_fs_correlator.cc b/gr-atsc/lib/qa_atsci_fs_correlator.cc
index a00731ab4d..51865c6a5a 100644
--- a/gr-atsc/lib/qa_atsci_fs_correlator.cc
+++ b/gr-atsc/lib/qa_atsci_fs_correlator.cc
@@ -34,7 +34,7 @@
#include <atsc/types.h>
#include <cppunit/TestAssert.h>
#include <assert.h>
-#include <random.h>
+#include <gnuradio/random.h>
static float
diff --git a/gr-atsc/lib/qa_atsci_single_viterbi.cc b/gr-atsc/lib/qa_atsci_single_viterbi.cc
index be5187dc25..71b123813b 100644
--- a/gr-atsc/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/lib/qa_atsci_single_viterbi.cc
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <atsc/single_viterbi_impl.h>
#include "qa_atsci_single_viterbi.h"
-#include <random.h>
+#include <gnuradio/random.h>
#include <string.h>
diff --git a/gr-atsc/lib/test_atsci.cc b/gr-atsc/lib/test_atsci.cc
index a3703d4d31..acea17a7ab 100644
--- a/gr-atsc/lib/test_atsci.cc
+++ b/gr-atsc/lib/test_atsci.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
#include "qa_atsci.h"
diff --git a/gr-atsc/python/qa_atsc.py b/gr-atsc/python/qa_atsc.py
index d17a200cf6..dc54051b77 100755
--- a/gr-atsc/python/qa_atsc.py
+++ b/gr-atsc/python/qa_atsc.py
@@ -136,12 +136,16 @@ class qa_atsc(gr_unittest.TestCase):
rand = atsc.randomizer()
derand = atsc.derandomizer()
dst = vector_sink_ts()
- self.tb.connect(src, rand, derand, dst)
- self.tb.run ()
+
+ self.tb.connect(src, rand)
+ self.tb.connect(rand, derand)
+ self.tb.connect(derand, dst)
+ self.tb.run()
+
result_data = dst.data ()
self.assertEqual (expected_result, result_data)
- def test_loopback_001(self):
+ def est_loopback_001(self):
"""
Loopback randomizer/rs_encoder to rs_decoder/derandomizer
"""
@@ -159,7 +163,7 @@ class qa_atsc(gr_unittest.TestCase):
result_data = dst.data ()
self.assertEqual (expected_result, result_data)
- def test_loopback_002(self):
+ def est_loopback_002(self):
"""
Loopback randomizer/rs_encoder/interleaver to
deinterleaver/rs_decoder/derandomizer
@@ -183,7 +187,7 @@ class qa_atsc(gr_unittest.TestCase):
self.assertEqual (expected_result, result_data)
- def test_loopback_003(self):
+ def est_loopback_003(self):
"""
Loopback randomizer/rs_encoder/interleaver/trellis_encoder
via ds_to_softds to
diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt
index d383008011..a61c089c3e 100644
--- a/gr-audio/examples/c++/CMakeLists.txt
+++ b/gr-audio/examples/c++/CMakeLists.txt
@@ -25,7 +25,8 @@ include_directories(
)
add_executable(dial_tone dial_tone.cc)
-target_link_libraries(dial_tone gnuradio-audio gnuradio-analog)
+target_link_libraries(dial_tone
+ gnuradio-runtime gnuradio-audio gnuradio-analog)
INSTALL(TARGETS
dial_tone
diff --git a/gr-audio/examples/c++/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc
index f866edfdee..0547d36edc 100644
--- a/gr-audio/examples/c++/dial_tone.cc
+++ b/gr-audio/examples/c++/dial_tone.cc
@@ -37,7 +37,7 @@
*/
// Include header files for each block used in flowgraph
-#include <gr_top_block.h>
+#include <gnuradio/top_block.h>
#include <analog/sig_source_f.h>
#include <audio/sink.h>
@@ -49,9 +49,9 @@ int main(int argc, char **argv)
float ampl = 0.1; // Don't exceed 0.5 or clipping will occur
// Construct a top block that will contain flowgraph blocks. Alternatively,
- // one may create a derived class from gr_top_block and hold instantiated blocks
+ // one may create a derived class from top_block and hold instantiated blocks
// as member data for later manipulation.
- gr_top_block_sptr tb = gr_make_top_block("dial_tone");
+ top_block_sptr tb = make_top_block("dial_tone");
// Construct a real-valued signal source for each tone, at given sample rate
analog::sig_source_f::sptr src0 = analog::sig_source_f::make(rate, analog::GR_SIN_WAVE, 350, ampl);
diff --git a/gr-audio/include/audio/api.h b/gr-audio/include/audio/api.h
index 1c113c92ba..224cdfc01a 100644
--- a/gr-audio/include/audio/api.h
+++ b/gr-audio/include/audio/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_GR_AUDIO_API_H
#define INCLUDED_GR_AUDIO_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_audio_EXPORTS
# define GR_AUDIO_API __GR_ATTR_EXPORT
diff --git a/gr-audio/include/audio/sink.h b/gr-audio/include/audio/sink.h
index d53ff6f6f1..164e25e43f 100644
--- a/gr-audio/include/audio/sink.h
+++ b/gr-audio/include/audio/sink.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_AUDIO_SINK_H
#include <audio/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace audio {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Creates a sink from an audio device.
* \ingroup audio_blk
*/
- class GR_AUDIO_API sink : virtual public gr_sync_block
+ class GR_AUDIO_API sink : virtual public sync_block
{
public:
typedef boost::shared_ptr<sink> sptr;
diff --git a/gr-audio/include/audio/source.h b/gr-audio/include/audio/source.h
index f8e21f1567..ffecd2cb0b 100644
--- a/gr-audio/include/audio/source.h
+++ b/gr-audio/include/audio/source.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_AUDIO_SOURCE_H
#include <audio/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace audio {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Creates a source from an audio device.
* \ingroup audio_blk
*/
- class GR_AUDIO_API source : virtual public gr_sync_block
+ class GR_AUDIO_API source : virtual public sync_block
{
public:
typedef boost::shared_ptr<source> sptr;
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index 4af57105a9..fa77933669 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <alsa_sink.h>
#include <alsa_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
@@ -57,21 +57,21 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0");
+ return prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0");
}
static double
default_period_time()
{
return std::max(0.001,
- gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
+ prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
}
static int
default_nperiods()
{
return std::max(2L,
- gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
+ prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
}
// ----------------------------------------------------------------
@@ -79,9 +79,9 @@ namespace gr {
alsa_sink::alsa_sink(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_alsa_sink",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_alsa_sink",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_pcm_handle(0),
@@ -94,7 +94,7 @@ namespace gr {
d_worker(0), d_special_case_mono_to_stereo(false),
d_nunderuns(0), d_nsuspends(0), d_ok_to_block(ok_to_block)
{
- CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false);
+ CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false);
int error;
int dir;
@@ -131,7 +131,7 @@ namespace gr {
min_chan = 1;
d_special_case_mono_to_stereo = true;
}
- set_input_signature(gr_make_io_signature(min_chan, max_chan,
+ set_input_signature(io_signature::make(min_chan, max_chan,
sizeof(float)));
// fill in portions of the d_hw_params that we know now...
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 838da60af3..0f265e75b4 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <alsa_source.h>
#include <alsa_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
@@ -57,7 +57,7 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string("audio_alsa",
+ return prefs::singleton()->get_string("audio_alsa",
"default_input_device",
"hw:0,0");
}
@@ -66,14 +66,14 @@ namespace gr {
default_period_time()
{
return std::max(0.001,
- gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
+ prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
}
static int
default_nperiods()
{
return std::max(2L,
- gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
+ prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
}
// ----------------------------------------------------------------
@@ -81,9 +81,9 @@ namespace gr {
alsa_source::alsa_source(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_alsa_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_alsa_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_pcm_handle(0),
@@ -97,7 +97,7 @@ namespace gr {
d_special_case_stereo_to_mono(false),
d_noverruns(0), d_nsuspends(0)
{
- CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false);
+ CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false);
int error;
int dir;
@@ -134,7 +134,7 @@ namespace gr {
d_special_case_stereo_to_mono = true;
}
- set_output_signature(gr_make_io_signature(min_chan, max_chan,
+ set_output_signature(io_signature::make(min_chan, max_chan,
sizeof(float)));
// fill in portions of the d_hw_params that we know now...
diff --git a/gr-audio/lib/audio_registry.cc b/gr-audio/lib/audio_registry.cc
index 71f9099a63..98848a0f89 100644
--- a/gr-audio/lib/audio_registry.cc
+++ b/gr-audio/lib/audio_registry.cc
@@ -21,7 +21,7 @@
#include "audio_registry.h"
#include <boost/foreach.hpp>
-#include <gr_prefs.h>
+#include <gnuradio/prefs.h>
#include <stdexcept>
#include <vector>
#include <iostream>
@@ -89,7 +89,7 @@ namespace gr {
**********************************************************************/
static std::string default_arch_name(void)
{
- return gr_prefs::singleton()->get_string("audio", "audio_module", "auto");
+ return prefs::singleton()->get_string("audio", "audio_module", "auto");
}
static void do_arch_warning(const std::string &arch)
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index 9e9d1e34db..c47c37a301 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <jack_sink.h>
#include <jack_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
@@ -57,7 +57,7 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_jack", "default_output_device", "gr_sink");
}
@@ -98,9 +98,9 @@ namespace gr {
jack_sink::jack_sink(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_jack_sink",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_jack_sink",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_ok_to_block(ok_to_block),
@@ -150,7 +150,7 @@ namespace gr {
bail("jack_ringbuffer_create failed", 0);
assert(sizeof(float)==sizeof(sample_t));
- set_input_signature(gr_make_io_signature(1, 1, sizeof(sample_t)));
+ set_input_signature(io_signature::make(1, 1, sizeof(sample_t)));
jack_nframes_t sample_rate = jack_get_sample_rate(d_jack_client);
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index e5a46e3416..a897785b0e 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <jack_source.h>
#include <jack_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
@@ -57,7 +57,7 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_jack", "default_input_device", "gr_source");
}
@@ -99,9 +99,9 @@ namespace gr {
jack_source::jack_source(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_jack_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_jack_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_ok_to_block(ok_to_block),
@@ -149,7 +149,7 @@ namespace gr {
bail("jack_ringbuffer_create failed", 0);
assert(sizeof(float)==sizeof(sample_t));
- set_output_signature(gr_make_io_signature(1, 1, sizeof(sample_t)));
+ set_output_signature(io_signature::make(1, 1, sizeof(sample_t)));
jack_nframes_t sample_rate = jack_get_sample_rate(d_jack_client);
diff --git a/gr-audio/lib/oss/oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc
index 129e771fd6..75372b0b43 100644
--- a/gr-audio/lib/oss/oss_sink.cc
+++ b/gr-audio/lib/oss/oss_sink.cc
@@ -26,8 +26,8 @@
#include "audio_registry.h"
#include <oss_sink.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <sys/soundcard.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -52,16 +52,16 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_oss", "default_output_device", "/dev/dsp");
}
oss_sink::oss_sink(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_oss_sink",
- gr_make_io_signature(1, 2, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_oss_sink",
+ io_signature::make(1, 2, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_fd(-1), d_buffer(0), d_chunk_size(0)
@@ -74,7 +74,7 @@ namespace gr {
double CHUNK_TIME =
std::max(0.001,
- gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005));
+ prefs::singleton()->get_double("audio_oss", "latency", 0.005));
d_chunk_size = (int)(d_sampling_rate * CHUNK_TIME);
set_output_multiple(d_chunk_size);
diff --git a/gr-audio/lib/oss/oss_source.cc b/gr-audio/lib/oss/oss_source.cc
index 6d6bafceb8..0d27f74fa8 100644
--- a/gr-audio/lib/oss/oss_source.cc
+++ b/gr-audio/lib/oss/oss_source.cc
@@ -26,8 +26,8 @@
#include "audio_registry.h"
#include <oss_source.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <sys/soundcard.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -52,16 +52,16 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_oss", "default_input_device", "/dev/dsp");
}
oss_source::oss_source(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_oss_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 2, sizeof(float))),
+ : sync_block("audio_oss_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 2, sizeof(float))),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_fd(-1), d_buffer(0), d_chunk_size(0)
@@ -73,7 +73,7 @@ namespace gr {
}
double CHUNK_TIME =
- std::max(0.001, gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005));
+ std::max(0.001, prefs::singleton()->get_double("audio_oss", "latency", 0.005));
d_chunk_size = (int)(d_sampling_rate * CHUNK_TIME);
set_output_multiple(d_chunk_size);
diff --git a/gr-audio/lib/osx/circular_buffer.h b/gr-audio/lib/osx/circular_buffer.h
index 7abbeaeb0c..fee9eeafbc 100644
--- a/gr-audio/lib/osx/circular_buffer.h
+++ b/gr-audio/lib/osx/circular_buffer.h
@@ -23,7 +23,7 @@
#ifndef _CIRCULAR_BUFFER_H_
#define _CIRCULAR_BUFFER_H_
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <iostream>
#include <stdexcept>
diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc
index b7fe4e9d11..7c5be43d76 100644
--- a/gr-audio/lib/osx/osx_sink.cc
+++ b/gr-audio/lib/osx/osx_sink.cc
@@ -27,7 +27,7 @@
#include "audio_registry.h"
#include <osx_sink.h>
#include <osx_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -48,9 +48,9 @@ namespace gr {
bool do_block,
int channel_config,
int max_sample_count)
- : gr_sync_block("audio_osx_sink",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_osx_sink",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sample_rate(0.0), d_channel_config(0), d_n_channels(0),
d_queueSampleCount(0), d_max_sample_count(0),
d_do_block(do_block), d_internal(0), d_cond_data(0),
@@ -84,7 +84,7 @@ namespace gr {
// set the input signature
- set_input_signature(gr_make_io_signature(1, d_n_channels, sizeof(float)));
+ set_input_signature(io_signature::make(1, d_n_channels, sizeof(float)));
// check that the max # of samples to store is valid
diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc
index c666bb7ad8..3e2dcef4fe 100644
--- a/gr-audio/lib/osx/osx_source.cc
+++ b/gr-audio/lib/osx/osx_source.cc
@@ -27,7 +27,7 @@
#include "audio_registry.h"
#include <osx_source.h>
#include <osx_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -71,9 +71,9 @@ namespace gr {
bool do_block,
int channel_config,
int max_sample_count)
- : gr_sync_block("audio_osx_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_osx_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_deviceSampleRate(0.0), d_outputSampleRate(0.0),
d_channel_config(0),
d_inputBufferSizeFrames(0), d_inputBufferSizeBytes(0),
@@ -310,7 +310,7 @@ namespace gr {
// create the output io signature;
// no input siganture to set (source is hardware)
- set_output_signature(gr_make_io_signature(1,
+ set_output_signature(io_signature::make(1,
d_n_max_channels,
sizeof(float)));
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index 746894e494..089dedc33e 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <portaudio_sink.h>
#include <portaudio_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <unistd.h>
@@ -58,7 +58,7 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_portaudio", "default_output_device", "");
}
@@ -73,8 +73,8 @@ namespace gr {
}
// FYI, the buffer indicies are in units of samples.
- d_writer = gr_make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t));
- d_reader = gr_buffer_add_reader(d_writer, 0);
+ d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t));
+ d_reader = gr::buffer_add_reader(d_writer, 0);
}
/*
@@ -137,13 +137,13 @@ namespace gr {
portaudio_sink::portaudio_sink(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_portaudio_sink",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_portaudio_sink",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_ok_to_block(ok_to_block),
- d_verbose(gr_prefs::singleton()->get_bool("audio_portaudio", "verbose", false)),
+ d_verbose(prefs::singleton()->get_bool("audio_portaudio", "verbose", false)),
d_portaudio_buffer_size_frames(0),
d_stream(0),
d_ringbuffer_mutex(),
@@ -226,7 +226,7 @@ namespace gr {
// supported by the h/w, we can compute a reasonable input
// signature. The portaudio specs say that they'll accept any
// number of channels from 1 to max.
- set_input_signature(gr_make_io_signature(1, deviceInfo->maxOutputChannels,
+ set_input_signature(io_signature::make(1, deviceInfo->maxOutputChannels,
sizeof(sample_t)));
}
diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h
index e69f96b252..33144dbe60 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.h
+++ b/gr-audio/lib/portaudio/portaudio_sink.h
@@ -23,8 +23,8 @@
#define INCLUDED_AUDIO_PORTAUDIO_SINK_H
#include <audio/sink.h>
-#include <gr_buffer.h>
-#include <thread/thread.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/thread/thread.h>
#include <string>
#include <portaudio.h>
#include <stdexcept>
@@ -55,8 +55,8 @@ namespace gr {
PaStream *d_stream;
PaStreamParameters d_output_parameters;
- gr_buffer_sptr d_writer; // buffer used between work and callback
- gr_buffer_reader_sptr d_reader;
+ gr::buffer_sptr d_writer; // buffer used between work and callback
+ gr::buffer_reader_sptr d_reader;
gr::thread::mutex d_ringbuffer_mutex;
gr::thread::condition_variable d_ringbuffer_cond;
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index 500d3109e5..5d081f63e2 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -27,8 +27,8 @@
#include "audio_registry.h"
#include <portaudio_source.h>
#include <portaudio_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
#include <stdio.h>
#include <iostream>
#include <unistd.h>
@@ -58,7 +58,7 @@ namespace gr {
static std::string
default_device_name()
{
- return gr_prefs::singleton()->get_string
+ return prefs::singleton()->get_string
("audio_portaudio", "default_input_device", "");
}
@@ -73,8 +73,8 @@ namespace gr {
}
// FYI, the buffer indicies are in units of samples.
- d_writer = gr_make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t));
- d_reader = gr_buffer_add_reader(d_writer, 0);
+ d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t));
+ d_reader = gr::buffer_add_reader(d_writer, 0);
}
/*
@@ -136,13 +136,13 @@ namespace gr {
portaudio_source::portaudio_source(int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : gr_sync_block("audio_portaudio_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_portaudio_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_ok_to_block(ok_to_block),
- d_verbose(gr_prefs::singleton()->get_bool("audio_portaudio", "verbose", false)),
+ d_verbose(prefs::singleton()->get_bool("audio_portaudio", "verbose", false)),
d_portaudio_buffer_size_frames(0),
d_stream(0),
d_ringbuffer_mutex(),
@@ -221,7 +221,7 @@ namespace gr {
// supported by the h/w, we can compute a reasonable output
// signature. The portaudio specs say that they'll accept any
// number of channels from 1 to max.
- set_output_signature(gr_make_io_signature(1, deviceInfo->maxInputChannels,
+ set_output_signature(io_signature::make(1, deviceInfo->maxInputChannels,
sizeof (sample_t)));
}
diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h
index 6a3419b613..f7c851fc8d 100644
--- a/gr-audio/lib/portaudio/portaudio_source.h
+++ b/gr-audio/lib/portaudio/portaudio_source.h
@@ -24,8 +24,8 @@
#define INCLUDED_AUDIO_PORTAUDIO_SOURCE_H
#include <audio/source.h>
-#include <gr_buffer.h>
-#include <thread/thread.h>
+#include <gnuradio/buffer.h>
+#include <gnuradio/thread/thread.h>
#include <string>
#include <portaudio.h>
#include <stdexcept>
@@ -55,8 +55,8 @@ namespace gr {
PaStream *d_stream;
PaStreamParameters d_input_parameters;
- gr_buffer_sptr d_writer; // buffer used between work and callback
- gr_buffer_reader_sptr d_reader;
+ gr::buffer_sptr d_writer; // buffer used between work and callback
+ gr::buffer_reader_sptr d_reader;
gr::thread::mutex d_ringbuffer_mutex;
gr::thread::condition_variable d_ringbuffer_cond;
diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc
index f372bd0e75..4241a5c16b 100644
--- a/gr-audio/lib/windows/windows_sink.cc
+++ b/gr-audio/lib/windows/windows_sink.cc
@@ -26,7 +26,7 @@
#include "audio_registry.h"
#include <windows_sink.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -59,9 +59,9 @@ namespace gr {
}
windows_sink::windows_sink(int sampling_freq, const std::string device_name)
- : gr_sync_block("audio_windows_sink",
- gr_make_io_signature(1, 2, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_windows_sink",
+ io_signature::make(1, 2, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_sampling_freq(sampling_freq),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_fd(-1), d_buffer(0), d_chunk_size(0)
diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc
index 89371cfa84..5180868f2e 100644
--- a/gr-audio/lib/windows/windows_source.cc
+++ b/gr-audio/lib/windows/windows_source.cc
@@ -26,7 +26,7 @@
#include "audio_registry.h"
#include <windows_source.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
//include <sys/soundcard.h>
//include <sys/ioctl.h>
#include <sys/types.h>
@@ -60,9 +60,9 @@ namespace gr {
windows_source::windows_source(int sampling_freq,
const std::string device_name)
- : gr_sync_block("audio_windows_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 2, sizeof(float))),
+ : sync_block("audio_windows_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 2, sizeof(float))),
d_sampling_freq(sampling_freq),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_fd(-1), d_buffer(0), d_chunk_size(0)
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 10e779fc20..6014f871bd 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -80,7 +80,7 @@ CPACK_COMPONENT("blocks_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/blocks)
+add_subdirectory(include/gnuradio/blocks)
add_subdirectory(lib)
#if(ENABLE_TESTING)
# add_subdirectory(tests)
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
deleted file mode 100644
index 14346f9c15..0000000000
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 2013 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# generate helper scripts to expand templated files
-########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
-#!${PYTHON_EXECUTABLE}
-
-import sys, os, re
-sys.path.append('${GR_RUNTIME_PYTHONPATH}')
-os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
-os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
-
-if __name__ == '__main__':
- import build_utils
- root, inp = sys.argv[1:3]
- for sig in sys.argv[3:]:
- name = re.sub ('X+', sig, root)
- d = build_utils.standard_dict(name, sig, 'blocks')
- build_utils.expand_template(d, inp)
-
-")
-
-macro(expand_h root)
- #make a list of all the generated files
- unset(expanded_files_h)
- foreach(sig ${ARGN})
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
- COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}.h.t ${ARGN}
- )
-
- #install rules for the generated h files
- list(APPEND generated_includes ${expanded_files_h})
-endmacro(expand_h)
-
-########################################################################
-# Invoke macro to generate various sources
-########################################################################
-expand_h(add_XX ss ii cc)
-expand_h(add_const_XX bb ss ii ff cc)
-expand_h(add_const_vXX bb ss ii ff cc)
-expand_h(and_XX bb ss ii)
-expand_h(and_const_XX bb ss ii)
-expand_h(argmax_XX fs is ss)
-expand_h(divide_XX ss ii ff cc)
-expand_h(integrate_XX ss ii ff cc)
-expand_h(max_XX ff ii ss)
-expand_h(moving_average_XX ss ii ff cc)
-expand_h(multiply_XX ss ii)
-expand_h(multiply_const_XX ss ii)
-expand_h(multiply_const_vXX ss ii ff cc)
-expand_h(mute_XX ss ii ff cc)
-expand_h(not_XX bb ss ii)
-expand_h(or_XX bb ss ii)
-expand_h(peak_detector_XX fb ib sb)
-expand_h(probe_signal_X b s i f c)
-expand_h(probe_signal_vX b s i f c)
-expand_h(sample_and_hold_XX bb ss ii ff)
-expand_h(sub_XX ss ii ff cc)
-expand_h(xor_XX bb ss ii)
-expand_h(packed_to_unpacked_XX bb ss ii)
-expand_h(unpacked_to_packed_XX bb ss ii)
-expand_h(vector_insert_X b s i f c)
-expand_h(vector_sink_X b s i f c)
-expand_h(vector_source_X b s i f c)
-
-add_custom_target(blocks_generated_includes DEPENDS
- ${generated_includes}
-)
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- ${generated_includes}
- api.h
- control_loop.h
- count_bits.h
- file_sink_base.h
- lfsr_15_1_0.h
- lfsr_32k.h
- log2_const.h
- rotator.h
- wavfile.h
- add_ff.h
- annotator_1to1.h
- annotator_alltoall.h
- annotator_raw.h
- bin_statistics_f.h
- burst_tagger.h
- char_to_float.h
- char_to_short.h
- check_lfsr_32k_s.h
- complex_to_interleaved_short.h
- complex_to_float.h
- complex_to_imag.h
- complex_to_real.h
- complex_to_mag.h
- complex_to_mag_squared.h
- complex_to_arg.h
- conjugate_cc.h
- copy.h
- deinterleave.h
- delay.h
- endian_swap.h
- file_descriptor_sink.h
- file_descriptor_source.h
- file_sink.h
- file_source.h
- file_meta_sink.h
- file_meta_source.h
- float_to_char.h
- float_to_complex.h
- float_to_int.h
- float_to_short.h
- float_to_uchar.h
- head.h
- int_to_float.h
- interleave.h
- interleaved_short_to_complex.h
- keep_m_in_n.h
- keep_one_in_n.h
- lfsr_32k_source_s.h
- message_debug.h
- message_sink.h
- message_source.h
- message_strobe.h
- message_burst_source.h
- multiply_cc.h
- multiply_ff.h
- multiply_conjugate_cc.h
- multiply_const_cc.h
- multiply_const_ff.h
- nlog10_ff.h
- nop.h
- null_sink.h
- null_source.h
- pack_k_bits_bb.h
- patterned_interleaver.h
- pdu.h
- pdu_to_tagged_stream.h
- peak_detector2_fb.h
- random_pdu.h
- plateau_detector_fb.h
- probe_rate.h
- regenerate_bb.h
- repack_bits_bb.h
- repeat.h
- rms_cf.h
- rms_ff.h
- short_to_char.h
- short_to_float.h
- skiphead.h
- socket_pdu.h
- stream_mux.h
- stream_to_streams.h
- stream_to_vector.h
- streams_to_stream.h
- streams_to_vector.h
- stretch_ff.h
- tag_debug.h
- tagged_file_sink.h
- tagged_stream_mux.h
- tagged_stream_to_pdu.h
- threshold_ff.h
- throttle.h
- transcendental.h
- tuntap_pdu.h
- uchar_to_float.h
- udp_sink.h
- udp_source.h
- unpack_k_bits_bb.h
- vco_f.h
- vector_map.h
- vector_to_stream.h
- vector_to_streams.h
- wavfile_sink.h
- wavfile_source.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
- COMPONENT "blocks_devel"
-)
-
-if(ENABLE_GR_CTRLPORT)
-install(FILES
- ctrlport_probe_c.h
- ctrlport_probe2_c.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
- COMPONENT "blocks_devel"
-)
-endif(ENABLE_GR_CTRLPORT)
diff --git a/gr-blocks/include/blocks/add_XX.h.t b/gr-blocks/include/blocks/add_XX.h.t
deleted file mode 100644
index ffe08f683b..0000000000
--- a/gr-blocks/include/blocks/add_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = sum (input_0, input_1, ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Add across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/add_const_XX.h.t b/gr-blocks/include/blocks/add_const_XX.h.t
deleted file mode 100644
index 3a99978b6b..0000000000
--- a/gr-blocks/include/blocks/add_const_XX.h.t
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input + constant
- * \ingroup math_operators_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * \brief Create an instance of @NAME@
- * \param k additive constant
- */
- static sptr make(@O_TYPE@ k);
-
- /*!
- * \brief Return additive constant
- */
- virtual @O_TYPE@ k() const = 0;
-
- /*!
- * \brief Set additive constant
- */
- virtual void set_k(@O_TYPE@ k) = 0;
- };
-
- }
-}
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/add_const_vXX.h.t b/gr-blocks/include/blocks/add_const_vXX.h.t
deleted file mode 100644
index 33a50a42ca..0000000000
--- a/gr-blocks/include/blocks/add_const_vXX.h.t
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input + constant vector
- * \ingroup math_operators_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * \brief Create an instance of @NAME@
- * \param k additive constant vector
- */
- static sptr make(std::vector<@O_TYPE@> k);
-
- /*!
- * \brief Return additive constant vector
- */
- virtual std::vector<@O_TYPE@> k() const = 0;
-
- /*!
- * \brief Set additive constant vector
- */
- virtual void set_k(std::vector<@O_TYPE@> k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/add_ff.h b/gr-blocks/include/blocks/add_ff.h
deleted file mode 100644
index 6a9bbfbded..0000000000
--- a/gr-blocks/include/blocks/add_ff.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_ADD_FF_H
-#define INCLUDED_BLOCKS_ADD_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = sum (input_0, input_1, ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Add across all input streams.
- */
- class BLOCKS_API add_ff : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::add_ff::sptr
- typedef boost::shared_ptr<add_ff> sptr;
-
- /*!
- * \brief Add streams of float values
- * \param vlen Vector length
- * \ingroup math_blk
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_ADD_FF_H */
diff --git a/gr-blocks/include/blocks/and_XX.h.t b/gr-blocks/include/blocks/and_XX.h.t
deleted file mode 100644
index 048e1bea57..0000000000
--- a/gr-blocks/include/blocks/and_XX.h.t
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input_0 & input_1 & , ... & input_N)
- * \ingroup boolean_operators_blk
- *
- * bitwise boolean and across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/and_const_XX.h.t b/gr-blocks/include/blocks/and_const_XX.h.t
deleted file mode 100644
index 9e478819cb..0000000000
--- a/gr-blocks/include/blocks/and_const_XX.h.t
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output_N = input_N & value
- * \ingroup boolean_operators_blk
- *
- * bitwise boolean and of const to the data stream.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * \brief Create an instance of @NAME@
- * \param k AND constant
- */
- static sptr make(@O_TYPE@ k);
-
- /*!
- * \brief Return AND constant
- */
- virtual @O_TYPE@ k() const = 0;
-
- /*!
- * \brief Set AND constant
- */
- virtual void set_k(@O_TYPE@ k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/annotator_1to1.h b/gr-blocks/include/blocks/annotator_1to1.h
deleted file mode 100644
index 1c5ab038fc..0000000000
--- a/gr-blocks/include/blocks/annotator_1to1.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_ANNOTATOR_1TO1_H
-#define INCLUDED_GR_ANNOTATOR_1TO1_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief 1-to-1 stream annotator testing block. FOR TESTING PURPOSES ONLY.
- *
- * \details
- * This block creates tags to be sent downstream every 10,000
- * items it sees. The tags contain the name and ID of the
- * instantiated block, use "seq" as a key, and have a counter that
- * increments by 1 for every tag produced that is used as the
- * tag's value. The tags are propagated using the 1-to-1 policy.
- *
- * It also stores a copy of all tags it sees flow past it. These
- * tags can be recalled externally with the data() member.
- *
- * This block is only meant for testing and showing how to use the tags.
- */
- class BLOCKS_API annotator_1to1 : virtual public gr_sync_block
- {
- public:
- // gr::blocks::annotator_1to1::sptr
- typedef boost::shared_ptr<annotator_1to1> sptr;
-
- static sptr make(int when, size_t sizeof_stream_item);
-
- virtual std::vector<gr_tag_t> data() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_ANNOTATOR_1TO1_H */
diff --git a/gr-blocks/include/blocks/annotator_alltoall.h b/gr-blocks/include/blocks/annotator_alltoall.h
deleted file mode 100644
index 7bad73b291..0000000000
--- a/gr-blocks/include/blocks/annotator_alltoall.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_H
-#define INCLUDED_GR_ANNOTATOR_ALLTOALL_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief All-to-all stream annotator testing block. FOR TESTING PURPOSES ONLY.
- *
- * \details
- * This block creates tags to be sent downstream every 10,000
- * items it sees. The tags contain the name and ID of the
- * instantiated block, use "seq" as a key, and have a counter that
- * increments by 1 for every tag produced that is used as the
- * tag's value. The tags are propagated using the all-to-all
- * policy.
- *
- * It also stores a copy of all tags it sees flow past it. These
- * tags can be recalled externally with the data() member.
- *
- * This block is only meant for testing and showing how to use the tags.
- */
- class BLOCKS_API annotator_alltoall : virtual public gr_sync_block
- {
- public:
- // gr::blocks::annotator_alltoall::sptr
- typedef boost::shared_ptr<annotator_alltoall> sptr;
-
- static sptr make(int when, size_t sizeof_stream_item);
-
- virtual std::vector<gr_tag_t> data() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_ANNOTATOR_ALLTOALL_H */
diff --git a/gr-blocks/include/blocks/annotator_raw.h b/gr-blocks/include/blocks/annotator_raw.h
deleted file mode 100644
index 703c42516a..0000000000
--- a/gr-blocks/include/blocks/annotator_raw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_ANNOTATOR_RAW_H
-#define INCLUDED_GR_ANNOTATOR_RAW_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_tags.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief raw stream annotator testing block.
- *
- * \details
- * This block creates arbitrary tags to be sent downstream blocks
- * to be sent are set manually via accessor methods and are sent
- * only once.
- *
- * This block is intended for testing of tag related blocks
- */
- class BLOCKS_API annotator_raw : virtual public gr_sync_block
- {
- public:
- // gr::blocks::annotator_raw::sptr
- typedef boost::shared_ptr<annotator_raw> sptr;
-
- static sptr make(size_t sizeof_stream_item);
-
- // insert a tag to be added
- virtual void add_tag(uint64_t offset, pmt::pmt_t key, pmt::pmt_t val) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_ANNOTATOR_RAW_H */
diff --git a/gr-blocks/include/blocks/api.h b/gr-blocks/include/blocks/api.h
deleted file mode 100644
index d77bdbdd5b..0000000000
--- a/gr-blocks/include/blocks/api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_API_H
-#define INCLUDED_BLOCKS_API_H
-
-#include <attributes.h>
-
-#ifdef gnuradio_blocks_EXPORTS
-# define BLOCKS_API __GR_ATTR_EXPORT
-#else
-# define BLOCKS_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_BLOCKS_API_H */
diff --git a/gr-blocks/include/blocks/argmax_XX.h.t b/gr-blocks/include/blocks/argmax_XX.h.t
deleted file mode 100644
index 93aa367260..0000000000
--- a/gr-blocks/include/blocks/argmax_XX.h.t
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Compares vectors from multiple streams and determines
- * the index in the vector and stream number where the maximum
- * value occurred.
- * \ingroup math_operators_blk
- *
- * \details
- * Data is passed in as a vector of length \p vlen from multiple
- * input sources. It will look through these streams of \p vlen
- * data items and output two streams.
- * Stream 0 will contain the index value in the vector where
- * the maximum value occurred.
- * Stream 1 will contain the number of the input stream that
- * held the maximum value.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/bin_statistics_f.h b/gr-blocks/include/blocks/bin_statistics_f.h
deleted file mode 100644
index a73afc82d6..0000000000
--- a/gr-blocks/include/blocks/bin_statistics_f.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BIN_STATISTICS_F_H
-#define INCLUDED_GR_BIN_STATISTICS_F_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-#include <gr_feval.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief control scanning and record frequency domain statistics
- * \ingroup sink_blk
- */
- class BLOCKS_API bin_statistics_f : virtual public gr_sync_block
- {
- protected:
- std::vector<float> d_max; // per bin maxima
-
- virtual size_t vlen() const = 0;
- virtual double center_freq() const = 0;
- virtual gr_msg_queue_sptr msgq() const = 0;
-
- virtual void reset_stats() = 0;
- virtual void accrue_stats(const float *input) = 0;
- virtual void send_stats() = 0;
-
- public:
- // gr::blocks::bin_statistics_f::sptr
- typedef boost::shared_ptr<bin_statistics_f> sptr;
-
- /*!
- * Build a bin statistics block. See qa_bin_statistics.py and
- * gr-uhd/examples/python/usrp_spectrum_sense.py for examples of
- * its use, specifically how to use the callback function.
- *
- * \param vlen vector length
- * \param msgq message queue
- * \param tune a gr_feval_dd callback function
- * \param tune_delay number of samples for the tune delay
- * \param dwell_delay number of samples for the dwell delay
- */
- static sptr make(unsigned int vlen, // vector length
- gr_msg_queue_sptr msgq,
- gr_feval_dd *tune, // callback
- size_t tune_delay, // samples
- size_t dwell_delay); // samples
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_BIN_STATISTICS_F_H */
diff --git a/gr-blocks/include/blocks/burst_tagger.h b/gr-blocks/include/blocks/burst_tagger.h
deleted file mode 100644
index 312fb2ffbd..0000000000
--- a/gr-blocks/include/blocks/burst_tagger.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_BURST_TAGGER_H
-#define INCLUDED_GR_BURST_TAGGER_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Sets a burst on/off tag based on the value of the trigger input.
- * \ingroup peak_detectors_blk
- * \ingroup stream_tag_tools_blk
- *
- * \details
- * This block takes two inputs, a signal stream on the input
- * stream 0 and a trigger stream of shorts on input stream 1. If
- * the trigger stream goes above 0, a tag with the key "burst"
- * will be transmitted as a pmt::PMT_T. When the trigger signal
- * falls below 0, the "burst" tag will be transmitted as
- * pmt::PMT_F.
- *
- * The signal on stream 0 is retransmitted to output stream 0.
- */
- class BLOCKS_API burst_tagger : virtual public gr_sync_block
- {
- public:
- // gr::blocks::burst_tagger::sptr
- typedef boost::shared_ptr<burst_tagger> sptr;
-
- /*!
- * Build a burst tagger blocks.
- *
- * \param itemsize itemsize of the signal stream on input 0.
- */
- static sptr make(size_t itemsize);
-
- /*!
- * For the true burst tag, change the key name to \p key and a
- * new value of \p value.
- */
- virtual void set_true_tag(const std::string &key, bool value) = 0;
-
- /*!
- * For the false burst tag, change the key name to \p key and a
- * new value of \p value.
- */
- virtual void set_false_tag(const std::string &key, bool value) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_BURST_TAGGER_H */
diff --git a/gr-blocks/include/blocks/char_to_float.h b/gr-blocks/include/blocks/char_to_float.h
deleted file mode 100644
index 0002ceb30b..0000000000
--- a/gr-blocks/include/blocks/char_to_float.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
-#define INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of chars to a stream of float
- * \ingroup type_converters_blk
- */
- class BLOCKS_API char_to_float : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::char_to_float_ff::sptr
- typedef boost::shared_ptr<char_to_float> sptr;
-
- /*!
- * Build a chars to float stream converter block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar divider to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar divider value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar divider value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_CHAR_TO_FLOAT_H */
diff --git a/gr-blocks/include/blocks/char_to_short.h b/gr-blocks/include/blocks/char_to_short.h
deleted file mode 100644
index fc9d3b4b52..0000000000
--- a/gr-blocks/include/blocks/char_to_short.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_CHAR_TO_SHORT_H
-#define INCLUDED_BLOCKS_CHAR_TO_SHORT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of chars to a stream of short
- * \ingroup type_converters_blk
- */
- class BLOCKS_API char_to_short : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::char_to_short_ff::sptr
- typedef boost::shared_ptr<char_to_short> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_CHAR_TO_SHORT_H */
diff --git a/gr-blocks/include/blocks/check_lfsr_32k_s.h b/gr-blocks/include/blocks/check_lfsr_32k_s.h
deleted file mode 100644
index 6eddd607b6..0000000000
--- a/gr-blocks/include/blocks/check_lfsr_32k_s.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H
-#define INCLUDED_GR_CHECK_LFSR_32K_S_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief sink that checks if its input stream consists of a lfsr_32k sequence.
- * \ingroup sink_blk
- *
- * \details
- * This sink is typically used along with
- * gr::blocks::lfsr_32k_source_s to test the USRP using its
- * digital loopback mode.
- */
- class BLOCKS_API check_lfsr_32k_s : virtual public gr_sync_block
- {
- public:
- // gr::blocks::check_lfsr_32k_s::sptr
- typedef boost::shared_ptr<check_lfsr_32k_s> sptr;
-
- static sptr make();
-
- virtual long ntotal () const = 0;
- virtual long nright () const = 0;
- virtual long runlength () const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_CHECK_LFSR_32K_S_H */
diff --git a/gr-blocks/include/blocks/complex_to_arg.h b/gr-blocks/include/blocks/complex_to_arg.h
deleted file mode 100644
index 178f846704..0000000000
--- a/gr-blocks/include/blocks/complex_to_arg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief complex in, arg out (float)
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_arg : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_arg_ff::sptr
- typedef boost::shared_ptr<complex_to_arg> sptr;
-
- /*!
- * Build a complex to arg block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_ARG_H */
diff --git a/gr-blocks/include/blocks/complex_to_float.h b/gr-blocks/include/blocks/complex_to_float.h
deleted file mode 100644
index 7648648d6c..0000000000
--- a/gr-blocks/include/blocks/complex_to_float.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief convert a stream of gr_complex to 1 or 2 streams of float
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_float : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_float_ff::sptr
- typedef boost::shared_ptr<complex_to_float> sptr;
-
- /*!
- * Build a complex to float block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H */
diff --git a/gr-blocks/include/blocks/complex_to_imag.h b/gr-blocks/include/blocks/complex_to_imag.h
deleted file mode 100644
index cb1d32fec6..0000000000
--- a/gr-blocks/include/blocks/complex_to_imag.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief complex in, imag out (float)
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_imag : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_imag_ff::sptr
- typedef boost::shared_ptr<complex_to_imag> sptr;
-
- /*!
- * Build a complex to imaginary part block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H */
diff --git a/gr-blocks/include/blocks/complex_to_interleaved_short.h b/gr-blocks/include/blocks/complex_to_interleaved_short.h
deleted file mode 100644
index c7304787a9..0000000000
--- a/gr-blocks/include/blocks/complex_to_interleaved_short.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of complex to a stream of interleaved shorts
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_interleaved_short : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::complex_to_interleaved_short::sptr
- typedef boost::shared_ptr<complex_to_interleaved_short> sptr;
-
- /*!
- * Build a complex to interleaved shorts block.
- */
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H */
diff --git a/gr-blocks/include/blocks/complex_to_mag.h b/gr-blocks/include/blocks/complex_to_mag.h
deleted file mode 100644
index b1758fd3eb..0000000000
--- a/gr-blocks/include/blocks/complex_to_mag.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief complex in, magnitude out (float)
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_mag : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_mag_ff::sptr
- typedef boost::shared_ptr<complex_to_mag> sptr;
-
- /*!
- * Build a complex to magnitude block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_MAG_H */
diff --git a/gr-blocks/include/blocks/complex_to_mag_squared.h b/gr-blocks/include/blocks/complex_to_mag_squared.h
deleted file mode 100644
index a7c464fbb0..0000000000
--- a/gr-blocks/include/blocks/complex_to_mag_squared.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief complex in, magnitude squared out (float)
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_mag_squared : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_mag_squared_ff::sptr
- typedef boost::shared_ptr<complex_to_mag_squared> sptr;
-
- /*!
- * Build a complex to magnitude squared block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H */
diff --git a/gr-blocks/include/blocks/complex_to_real.h b/gr-blocks/include/blocks/complex_to_real.h
deleted file mode 100644
index 908ca9fc94..0000000000
--- a/gr-blocks/include/blocks/complex_to_real.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
-#define INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief complex in, real out (float)
- * \ingroup type_converters_blk
- */
- class BLOCKS_API complex_to_real : virtual public gr_sync_block
- {
- public:
- // gr::blocks::complex_to_real_ff::sptr
- typedef boost::shared_ptr<complex_to_real> sptr;
-
- /*!
- * Build a complex to real part block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_COMPLEX_TO_REAL_H */
diff --git a/gr-blocks/include/blocks/conjugate_cc.h b/gr-blocks/include/blocks/conjugate_cc.h
deleted file mode 100644
index 92096eea31..0000000000
--- a/gr-blocks/include/blocks/conjugate_cc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_CONJUGATE_CC_H
-#define INCLUDED_BLOCKS_CONJUGATE_CC_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = complex conjugate of input
- * \ingroup math_operators_blk
- */
- class BLOCKS_API conjugate_cc : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::conjugate_cc_ff::sptr
- typedef boost::shared_ptr<conjugate_cc> sptr;
-
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_CONJUGATE_CC_H */
diff --git a/gr-blocks/include/blocks/control_loop.h b/gr-blocks/include/blocks/control_loop.h
deleted file mode 100644
index 7c09f5915b..0000000000
--- a/gr-blocks/include/blocks/control_loop.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2011,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef GR_BLOCKS_CONTROL_LOOP
-#define GR_BLOCKS_CONTROL_LOOP
-
-#include <blocks/api.h>
-
-namespace gr {
- namespace blocks {
-
- class BLOCKS_API control_loop
- {
- protected:
- float d_phase, d_freq;
- float d_max_freq, d_min_freq;
- float d_damping, d_loop_bw;
- float d_alpha, d_beta;
-
- public:
- control_loop(void) {}
- control_loop(float loop_bw, float max_freq, float min_freq);
- virtual ~control_loop();
-
- /*! \brief update the system gains from the loop bandwidth and damping factor
- *
- * This function updates the system gains based on the loop
- * bandwidth and damping factor of the system. These two
- * factors can be set separately through their own set
- * functions.
- */
- void update_gains();
-
- /*! \brief Advance the control loop based on the current gain
- * settings and the inputted error signal.
- */
- void advance_loop(float error);
-
- /*! \brief Keep the phase between -2pi and 2pi
- *
- * This function keeps the phase between -2pi and 2pi. If the
- * phase is greater than 2pi by d, it wraps around to be -2pi+d;
- * similarly if it is less than -2pi by d, it wraps around to
- * 2pi-d.
- *
- * This function should be called after advance_loop to keep the
- * phase in a good operating region. It is set as a separate
- * method in case another way is desired as this is fairly
- * heavy-handed.
- */
- void phase_wrap();
-
- /*! \brief Keep the frequency between d_min_freq and d_max_freq
- *
- * This function keeps the frequency between d_min_freq and
- * d_max_freq. If the frequency is greater than d_max_freq, it
- * is set to d_max_freq. If the frequency is less than
- * d_min_freq, it is set to d_min_freq.
- *
- * This function should be called after advance_loop to keep the
- * frequency in the specified region. It is set as a separate
- * method in case another way is desired as this is fairly
- * heavy-handed.
- */
- void frequency_limit();
-
- /*******************************************************************
- * SET FUNCTIONS
- *******************************************************************/
-
- /*!
- * \brief Set the loop bandwidth
- *
- * Set the loop filter's bandwidth to \p bw. This should be
- * between 2*pi/200 and 2*pi/100 (in rads/samp). It must also be
- * a positive number.
- *
- * When a new damping factor is set, the gains, alpha and beta,
- * of the loop are recalculated by a call to update_gains().
- *
- * \param bw (float) new bandwidth
- */
- virtual void set_loop_bandwidth(float bw);
-
- /*!
- * \brief Set the loop damping factor
- *
- * Set the loop filter's damping factor to \p df. The damping
- * factor should be sqrt(2)/2.0 for critically damped systems.
- * Set it to anything else only if you know what you are
- * doing. It must be a number between 0 and 1.
- *
- * When a new damping factor is set, the gains, alpha and beta,
- * of the loop are recalculated by a call to update_gains().
- *
- * \param df (float) new damping factor
- */
- void set_damping_factor(float df);
-
- /*!
- * \brief Set the loop gain alpha
- *
- * Set's the loop filter's alpha gain parameter.
- *
- * This value should really only be set by adjusting the loop
- * bandwidth and damping factor.
- *
- * \param alpha (float) new alpha gain
- *
- */
- void set_alpha(float alpha);
-
- /*!
- * \brief Set the loop gain beta
- *
- * Set's the loop filter's beta gain parameter.
- *
- * This value should really only be set by adjusting the loop
- * bandwidth and damping factor.
- *
- * \param beta (float) new beta gain
- */
- void set_beta(float beta);
-
- /*!
- * \brief Set the control loop's frequency.
- *
- * Set's the control loop's frequency. While this is normally
- * updated by the inner loop of the algorithm, it could be
- * useful to manually initialize, set, or reset this under
- * certain circumstances.
- *
- * \param freq (float) new frequency
- */
- void set_frequency(float freq);
-
- /*!
- * \brief Set the control loop's phase.
- *
- * Set's the control loop's phase. While this is normally
- * updated by the inner loop of the algorithm, it could be
- * useful to manually initialize, set, or reset this under
- * certain circumstances.
- *
- * \param phase (float) new phase
- */
- void set_phase(float phase);
-
- /*!
- * \brief Set the control loop's maximum frequency.
- *
- * Set the maximum frequency the control loop can track.
- *
- * \param freq (float) new max frequency
- */
- void set_max_freq(float freq);
-
- /*!
- * \brief Set the control loop's minimum frequency.
- *
- * Set the minimum frequency the control loop can track.
- *
- * \param freq (float) new min frequency
- */
- void set_min_freq(float freq);
-
- /*******************************************************************
- * GET FUNCTIONS
- *******************************************************************/
-
- /*!
- * \brief Returns the loop bandwidth
- */
- float get_loop_bandwidth() const;
-
- /*!
- * \brief Returns the loop damping factor
- */
- float get_damping_factor() const;
-
- /*!
- * \brief Returns the loop gain alpha
- */
- float get_alpha() const;
-
- /*!
- * \brief Returns the loop gain beta
- */
- float get_beta() const;
-
- /*!
- * \brief Get the control loop's frequency estimate
- */
- float get_frequency() const;
-
- /*!
- * \brief Get the control loop's phase estimate
- */
- float get_phase() const;
-
- /*!
- * \brief Get the control loop's maximum frequency.
- */
- float get_max_freq() const;
-
- /*!
- * \brief Get the control loop's minimum frequency.
- */
- float get_min_freq() const;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* GR_BLOCKS_CONTROL_LOOP */
diff --git a/gr-blocks/include/blocks/copy.h b/gr-blocks/include/blocks/copy.h
deleted file mode 100644
index a243a54917..0000000000
--- a/gr-blocks/include/blocks/copy.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_COPY_H
-#define INCLUDED_GR_COPY_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output[i] = input[i]
- * \ingroup misc_blk
- *
- * \details
- * When enabled (default), this block copies its input to its
- * output. When disabled, this block drops its input on the floor.
- */
- class BLOCKS_API copy : virtual public gr_block
- {
- public:
- // gr::blocks::copy::sptr
- typedef boost::shared_ptr<copy> sptr;
-
- static sptr make(size_t itemsize);
-
- virtual void set_enabled(bool enable) = 0;
- virtual bool enabled() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_COPY_H */
diff --git a/gr-blocks/include/blocks/count_bits.h b/gr-blocks/include/blocks/count_bits.h
deleted file mode 100644
index ceb882f67b..0000000000
--- a/gr-blocks/include/blocks/count_bits.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_COUNT_BITS_H_
-#define _GR_COUNT_BITS_H_
-
-#include <blocks/api.h>
-
-namespace gr {
- namespace blocks {
-
- //! return number of set bits in the low 8 bits of x
- BLOCKS_API unsigned int count_bits8(unsigned int x);
-
- //! return number of set bits in the low 16 bits of x
- BLOCKS_API unsigned int count_bits16(unsigned int x);
-
- //! return number of set bits in the low 32 bits of x
- BLOCKS_API unsigned int count_bits32(unsigned int x);
-
- //! return number of set bits in a 64-bit word
- BLOCKS_API unsigned int count_bits64(unsigned long long int x);
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* _GR_COUNT_BITS_H_ */
diff --git a/gr-blocks/include/blocks/ctrlport_probe2_c.h b/gr-blocks/include/blocks/ctrlport_probe2_c.h
deleted file mode 100644
index 736c23e4e7..0000000000
--- a/gr-blocks/include/blocks/ctrlport_probe2_c.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_CTRLPORT_PROBE2_C_H
-#define INCLUDED_CTRLPORT_PROBE2_C_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief A ControlPort probe to export vectors of signals.
- * \ingroup measurement_tools_blk
- * \ingroup controlport_blk
- *
- * \details
- * This block acts as a sink in the flowgraph but also exports
- * vectors of complex samples over ControlPort. This block holds
- * the latest \p len number of complex samples so that every query
- * by a ControlPort client will get the same length vector.
- */
- class BLOCKS_API ctrlport_probe2_c : virtual public gr_sync_block
- {
- public:
- // gr::blocks::ctrlport_probe2_c::sptr
- typedef boost::shared_ptr<ctrlport_probe2_c> sptr;
-
- /*!
- * \brief Make a ControlPort probe block.
- * \param id A string ID to name the probe over ControlPort.
- * \param desc A string describing the probe.
- * \param len Number of samples to transmit.
- */
- static sptr make(const std::string &id, const std::string &desc, int len);
-
- virtual std::vector<gr_complex> get() = 0;
-
- virtual void set_length(int len) = 0;
- virtual int length() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_CTRLPORT_PROBE2_C_H */
-
diff --git a/gr-blocks/include/blocks/ctrlport_probe_c.h b/gr-blocks/include/blocks/ctrlport_probe_c.h
deleted file mode 100644
index 579621c680..0000000000
--- a/gr-blocks/include/blocks/ctrlport_probe_c.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_CTRLPORT_PROBE_C_H
-#define INCLUDED_CTRLPORT_PROBE_C_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <rpcregisterhelpers.h>
-#include <boost/thread/shared_mutex.hpp>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief A ControlPort probe to export vectors of signals.
- * \ingroup measurement_tools_blk
- * \ingroup controlport_blk
- *
- * \details
- * This block acts as a sink in the flowgraph but also exports
- * vectors of complex samples over ControlPort. This block simply
- * sends the current vector held in the work function when the
- * queried by a ControlPort client.
- */
- class BLOCKS_API ctrlport_probe_c : virtual public gr_sync_block
- {
- public:
- // gr::blocks::ctrlport_probe_c::sptr
- typedef boost::shared_ptr<ctrlport_probe_c> sptr;
-
- /*!
- * \brief Make a ControlPort probe block.
- * \param id A string ID to name the probe over ControlPort.
- * \param desc A string describing the probe.
- */
- static sptr make(const std::string &id, const std::string &desc);
-
- virtual std::vector<gr_complex> get() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_CTRLPORT_GR_CTRLPORT_PROBE_C_H */
-
diff --git a/gr-blocks/include/blocks/deinterleave.h b/gr-blocks/include/blocks/deinterleave.h
deleted file mode 100644
index bb6ad59a22..0000000000
--- a/gr-blocks/include/blocks/deinterleave.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_DEINTERLEAVE_H
-#define INCLUDED_BLOCKS_DEINTERLEAVE_H
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief deinterleave a single input into N outputs
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API deinterleave : virtual public gr_sync_decimator
- {
- public:
- // gr::blocks::deinterleave::sptr
- typedef boost::shared_ptr<deinterleave> sptr;
-
- /*!
- * Make a deinterleave block.
- *
- * \param itemsize stream itemsize
- */
- static sptr make(size_t itemsize);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_DEINTERLEAVE_H */
diff --git a/gr-blocks/include/blocks/delay.h b/gr-blocks/include/blocks/delay.h
deleted file mode 100644
index 2a59fa0fca..0000000000
--- a/gr-blocks/include/blocks/delay.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_DELAY_H
-#define INCLUDED_BLOCKS_DELAY_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief delay the input by a certain number of samples
- * \ingroup misc_blk
- */
- class BLOCKS_API delay : virtual public gr_block
- {
- public:
- // gr::blocks::delay::sptr
- typedef boost::shared_ptr<delay> sptr;
-
- /*!
- * \brief Make a delay block.
- * \param itemsize size of the data items.
- * \param delay number of samples to delay stream.
- */
- static sptr make(size_t itemsize, int delay);
-
- virtual int dly() const = 0;
- virtual void set_dly(int d) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_DELAY_H */
-
diff --git a/gr-blocks/include/blocks/divide_XX.h.t b/gr-blocks/include/blocks/divide_XX.h.t
deleted file mode 100644
index 821a458ec4..0000000000
--- a/gr-blocks/include/blocks/divide_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input_0 / input_1 / input_x ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Divide across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/endian_swap.h b/gr-blocks/include/blocks/endian_swap.h
deleted file mode 100644
index c26a1d2aa4..0000000000
--- a/gr-blocks/include/blocks/endian_swap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_ENDIAN_SWAP_H
-#define INCLUDED_GR_ENDIAN_SWAP_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of items into thier byte swapped version
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API endian_swap : virtual public gr_sync_block
- {
- public:
- // gr::blocks::endian_swap::sptr
- typedef boost::shared_ptr<endian_swap> sptr;
-
- /*!
- * Make an endian swap block.
- *
- * \param item_size_bytes number of bytes per item, 1=no-op,
- * 2=uint16_t, 4=uint32_t, 8=uint64_t
- */
- static sptr make(size_t item_size_bytes=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_ENDIAN_SWAP_H */
diff --git a/gr-blocks/include/blocks/file_descriptor_sink.h b/gr-blocks/include/blocks/file_descriptor_sink.h
deleted file mode 100644
index e98f918c14..0000000000
--- a/gr-blocks/include/blocks/file_descriptor_sink.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
-#define INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Write stream to file descriptor.
- * \ingroup file_operators_blk
- */
- class BLOCKS_API file_descriptor_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::file_descriptor_sink::sptr
- typedef boost::shared_ptr<file_descriptor_sink> sptr;
-
- /*!
- * Build a file descriptor sink block.
- *
- * \param itemsize item size of the incoming data stream.
- * \param fd file descriptor (as an integer).
- */
- static sptr make(size_t itemsize, int fd);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_FILE_DESCRIPTOR_SINK_H */
diff --git a/gr-blocks/include/blocks/file_descriptor_source.h b/gr-blocks/include/blocks/file_descriptor_source.h
deleted file mode 100644
index ac827800cd..0000000000
--- a/gr-blocks/include/blocks/file_descriptor_source.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
-#define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Read stream from file descriptor.
- * \ingroup file_operators_blk
- */
- class BLOCKS_API file_descriptor_source : virtual public gr_sync_block
- {
- protected:
- virtual int read_items(char *buf, int nitems) = 0;
- virtual int handle_residue(char *buf, int nbytes_read) = 0;
- virtual void flush_residue() = 0;
-
- public:
- // gr::blocks::file_descriptor_source::sptr
- typedef boost::shared_ptr<file_descriptor_source> sptr;
-
- /*!
- * Build a file descriptor source block.
- *
- * \param itemsize item size of the incoming data stream.
- * \param fd file descriptor (as an integer).
- * \param repeat repeat the data stream continuously.
- */
- static sptr make(size_t itemsize, int fd, bool repeat);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H */
diff --git a/gr-blocks/include/blocks/file_meta_sink.h b/gr-blocks/include/blocks/file_meta_sink.h
deleted file mode 100644
index 763e0a2da0..0000000000
--- a/gr-blocks/include/blocks/file_meta_sink.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FILE_META_SINK_H
-#define INCLUDED_BLOCKS_FILE_META_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- const char METADATA_VERSION = 0;
- const size_t METADATA_HEADER_SIZE = 149;
-
- enum gr_file_types {
- GR_FILE_BYTE=0,
- GR_FILE_CHAR=0,
- GR_FILE_SHORT=1,
- GR_FILE_INT,
- GR_FILE_LONG,
- GR_FILE_LONG_LONG,
- GR_FILE_FLOAT,
- GR_FILE_DOUBLE,
- };
-
- /*!
- * \brief Write stream to file with meta-data headers.
- * \ingroup file_operators_blk
- *
- * \details
- * These files represent data as binary information in between
- * meta-data headers. The headers contain information about the
- * type of data and properties of the data in the next segment of
- * samples. The information includes:
- *
- * rx_rate (double): sample rate of data.
- * rx_time (uint64_t, double): time stamp of first sample in segment.
- * size (uint32_t): item size in bytes.
- * type (gr_file_types as int32_t): data type.
- * cplx (bool): Is data complex?
- * strt (uint64_t): Starting byte of data in this segment.
- * bytes (uint64_t): Size in bytes of data in this segment.
- *
- * Tags can be sent to the file to update the information, which
- * will create a new header. Headers are found by searching from
- * the first header (at position 0 in the file) and reading where
- * the data segment starts plus the data segment size. Following
- * will either be a new header or EOF.
- */
- class BLOCKS_API file_meta_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::file_meta_sink::sptr
- typedef boost::shared_ptr<file_meta_sink> sptr;
-
- /*!
- * \brief Create a meta-data file sink.
- *
- * \param itemsize (size_t): Size of data type.
- * \param filename (string): Name of file to write data to.
- * \param samp_rate (double): Sample rate of data. If sample rate will be
- * set by a tag, such as rx_tag from a UHD source, this is
- * basically ignored.
- * \param relative_rate (double): Rate chance from source of sample
- * rate tag to sink.
- * \param type (gr_file_types): Data type (int, float, etc.)
- * \param complex (bool): If data stream is complex
- * \param max_segment_size (size_t): Length of a single segment
- * before the header is repeated (in items).
- * \param extra_dict (string): a serialized PMT dictionary of extra
- * information. Currently not supported.
- * \param detached_header (bool): Set to true to store the header
- * info in a separate file (named filename.hdr)
- */
- static sptr make(size_t itemsize, const std::string &filename,
- double samp_rate=1, double relative_rate=1,
- gr_file_types type=GR_FILE_FLOAT, bool complex=true,
- size_t max_segment_size=1000000,
- const std::string &extra_dict="",
- bool detached_header=false);
-
- virtual bool open(const std::string &filename) = 0;
- virtual void close() = 0;
- virtual void do_update() = 0;
-
- virtual void set_unbuffered(bool unbuffered) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FILE_META_SINK_H */
diff --git a/gr-blocks/include/blocks/file_meta_source.h b/gr-blocks/include/blocks/file_meta_source.h
deleted file mode 100644
index 83997fc9b5..0000000000
--- a/gr-blocks/include/blocks/file_meta_source.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_H
-#define INCLUDED_BLOCKS_FILE_META_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Reads stream from file with meta-data headers. Headers
- * are parsed into tags.
- * \ingroup file_operators_blk
- *
- * \details
- * The information in the metadata headers includes:
- *
- * rx_rate (double): sample rate of data.
- * rx_time (uint64_t, double): time stamp of first sample in segment.
- * size (uint32_t): item size in bytes.
- * type (gr_file_types as int32_t): data type.
- * cplx (bool): Is data complex?
- * strt (uint64_t): Starting byte of data in this segment.
- * bytes (uint64_t): Size in bytes of data in this segment.
- *
- * Any item inside of the extra header dictionary is ready out and
- * made into a stream tag.
- */
- class BLOCKS_API file_meta_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::file_meta_source::sptr
- typedef boost::shared_ptr<file_meta_source> sptr;
-
- /*!
- * \brief Create a meta-data file source.
- *
- * \param filename (string): Name of file to write data to.
- * \param repeat (bool): Repeats file when EOF is found.
- * \param detached_header (bool): Set to true if header
- * info is stored in a separate file (usually named filename.hdr)
- * \param hdr_filename (string): Name of detached header file if used.
- * Defaults to 'filename.hdr' if detached_header is true but this
- * field is an empty string.
- */
- static sptr make(const std::string &filename,
- bool repeat=false,
- bool detached_header=false,
- const std::string &hdr_filename="");
-
- virtual bool open(const std::string &filename,
- const std::string &hdr_filename="") = 0;
- virtual void close() = 0;
- virtual void do_update() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FILE_META_SOURCE_H */
diff --git a/gr-blocks/include/blocks/file_sink.h b/gr-blocks/include/blocks/file_sink.h
deleted file mode 100644
index c894defd78..0000000000
--- a/gr-blocks/include/blocks/file_sink.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FILE_SINK_H
-#define INCLUDED_GR_FILE_SINK_H
-
-#include <blocks/api.h>
-#include <blocks/file_sink_base.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Write stream to file.
- * \ingroup file_operators_blk
- */
- class BLOCKS_API file_sink : virtual public gr_sync_block,
- virtual public file_sink_base
- {
- public:
- // gr::blocks::file_sink::sptr
- typedef boost::shared_ptr<file_sink> sptr;
-
- /*!
- * \brief Make a file sink.
- * \param itemsize size of the input data items.
- * \param filename name of the file to open and write output to.
- */
- static sptr make(size_t itemsize, const char *filename);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_FILE_SINK_H */
diff --git a/gr-blocks/include/blocks/file_sink_base.h b/gr-blocks/include/blocks/file_sink_base.h
deleted file mode 100644
index 3eeb0e63da..0000000000
--- a/gr-blocks/include/blocks/file_sink_base.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007,2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_FILE_SINK_BASE_H
-#define INCLUDED_GR_FILE_SINK_BASE_H
-
-#include <blocks/api.h>
-#include <boost/thread.hpp>
-#include <cstdio>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Common base class for file sinks
- */
- class BLOCKS_API file_sink_base
- {
- protected:
- FILE *d_fp; // current FILE pointer
- FILE *d_new_fp; // new FILE pointer
- bool d_updated; // is there a new FILE pointer?
- bool d_is_binary;
- boost::mutex d_mutex;
- bool d_unbuffered;
-
- protected:
- file_sink_base(const char *filename, bool is_binary);
-
- public:
- file_sink_base() {}
- ~file_sink_base();
-
- /*!
- * \brief Open filename and begin output to it.
- */
- bool open(const char *filename);
-
- /*!
- * \brief Close current output file.
- *
- * Closes current output file and ignores any output until
- * open is called to connect to another file.
- */
- void close();
-
- /*!
- * \brief if we've had an update, do it now.
- */
- void do_update();
-
- /*!
- * \brief turn on unbuffered writes for slower outputs
- */
- void set_unbuffered(bool unbuffered);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_FILE_SINK_BASE_H */
diff --git a/gr-blocks/include/blocks/file_source.h b/gr-blocks/include/blocks/file_source.h
deleted file mode 100644
index 6f1bc49ea1..0000000000
--- a/gr-blocks/include/blocks/file_source.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FILE_SOURCE_H
-#define INCLUDED_BLOCKS_FILE_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Read stream from file
- * \ingroup file_operators_blk
- */
- class BLOCKS_API file_source : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::file_source::sptr
- typedef boost::shared_ptr<file_source> sptr;
-
- /*!
- * \brief Create a file source.
- *
- * Opens \p filename as a source of items into a flowgraph. The
- * data is expected to be in binary format, item after item. The
- * \p itemsize of the block determines the conversion from bits
- * to items.
- *
- * If \p repeat is turned on, the file will repeat the file after
- * it's reached the end.
- *
- * \param itemsize the size of each item in the file, in bytes
- * \param filename name of the file to source from
- * \param repeat repeat file from start
- */
- static sptr make(size_t itemsize, const char *filename, bool repeat = false);
-
- /*!
- * \brief seek file to \p seek_point relative to \p whence
- *
- * \param seek_point sample offset in file
- * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek)
- */
- virtual bool seek(long seek_point, int whence) = 0;
-
- /*!
- * \brief Opens a new file.
- *
- * \param filename name of the file to source from
- * \param repeat repeat file from start
- */
- virtual void open(const char *filename, bool repeat) = 0;
-
- /*!
- * \brief Close the file handle.
- */
- virtual void close() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FILE_SOURCE_H */
diff --git a/gr-blocks/include/blocks/float_to_char.h b/gr-blocks/include/blocks/float_to_char.h
deleted file mode 100644
index c0193da573..0000000000
--- a/gr-blocks/include/blocks/float_to_char.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
-#define INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of floats to a stream of char
- * \ingroup type_converters_blk
- */
- class BLOCKS_API float_to_char : virtual public gr_sync_block
- {
- public:
- // gr::blocks::float_to_char_ff::sptr
- typedef boost::shared_ptr<float_to_char> sptr;
-
- /*!
- * Build a float to char block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar multiplier to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar multiplier value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar multiplier value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FLOAT_TO_CHAR_H */
diff --git a/gr-blocks/include/blocks/float_to_complex.h b/gr-blocks/include/blocks/float_to_complex.h
deleted file mode 100644
index aba9aed8c4..0000000000
--- a/gr-blocks/include/blocks/float_to_complex.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
-#define INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief one or two floats in, complex out
- * \ingroup type_converters_blk
- */
- class BLOCKS_API float_to_complex : virtual public gr_sync_block
- {
- public:
- // gr::blocks::float_to_complex_ff::sptr
- typedef boost::shared_ptr<float_to_complex> sptr;
-
- /*!
- * Build a float to complex block.
- *
- * \param vlen vector len (default 1)
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H */
diff --git a/gr-blocks/include/blocks/float_to_int.h b/gr-blocks/include/blocks/float_to_int.h
deleted file mode 100644
index 3c8e7ad5ab..0000000000
--- a/gr-blocks/include/blocks/float_to_int.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FLOAT_TO_INT_H
-#define INCLUDED_BLOCKS_FLOAT_TO_INT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of floats to a stream of ints.
- * \ingroup type_converters_blk
- */
- class BLOCKS_API float_to_int : virtual public gr_sync_block
- {
- public:
- // gr::blocks::float_to_int_ff::sptr
- typedef boost::shared_ptr<float_to_int> sptr;
-
- /*!
- * Build a float to int block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar multiplier to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar multiplier value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar multiplier value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FLOAT_TO_INT_H */
diff --git a/gr-blocks/include/blocks/float_to_short.h b/gr-blocks/include/blocks/float_to_short.h
deleted file mode 100644
index 8f5f60e55b..0000000000
--- a/gr-blocks/include/blocks/float_to_short.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
-#define INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of floats to a stream of shorts
- * \ingroup type_converters_blk
- */
- class BLOCKS_API float_to_short : virtual public gr_sync_block
- {
- public:
- // gr::blocks::float_to_short_ff::sptr
- typedef boost::shared_ptr<float_to_short> sptr;
-
- /*!
- * Build a float to short block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar multiplier to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar multiplier value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar multiplier value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FLOAT_TO_SHORT_H */
diff --git a/gr-blocks/include/blocks/float_to_uchar.h b/gr-blocks/include/blocks/float_to_uchar.h
deleted file mode 100644
index 9bfaaa65aa..0000000000
--- a/gr-blocks/include/blocks/float_to_uchar.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
-#define INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of floats to a stream of unsigned chars
- * \ingroup type_converters_blk
- */
- class BLOCKS_API float_to_uchar : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::float_to_uchar_ff::sptr
- typedef boost::shared_ptr<float_to_uchar> sptr;
-
- /*!
- * Build a float to uchar block.
- */
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H */
diff --git a/gr-blocks/include/blocks/head.h b/gr-blocks/include/blocks/head.h
deleted file mode 100644
index 4693f988b8..0000000000
--- a/gr-blocks/include/blocks/head.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_HEAD_H
-#define INCLUDED_GR_HEAD_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <stddef.h> // size_t
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief copies the first N items to the output then signals done
- * \ingroup misc_blk
- *
- * \details
- * Useful for building test cases
- */
- class BLOCKS_API head : virtual public gr_sync_block
- {
- public:
- // gr::blocks::head::sptr
- typedef boost::shared_ptr<head> sptr;
-
- static sptr make(size_t sizeof_stream_item,
- uint64_t nitems);
-
- virtual void reset() = 0;
- virtual void set_length(int nitems) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_HEAD_H */
diff --git a/gr-blocks/include/blocks/int_to_float.h b/gr-blocks/include/blocks/int_to_float.h
deleted file mode 100644
index 179667e4df..0000000000
--- a/gr-blocks/include/blocks/int_to_float.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_INT_TO_FLOAT_H
-#define INCLUDED_BLOCKS_INT_TO_FLOAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of ints to a stream of floats.
- * \ingroup type_converters_blk
- */
- class BLOCKS_API int_to_float : virtual public gr_sync_block
- {
- public:
- // gr::blocks::int_to_float_ff::sptr
- typedef boost::shared_ptr<int_to_float> sptr;
-
- /*!
- * Build an int to float block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar divider to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar divider value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar divider value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_INT_TO_FLOAT_H */
diff --git a/gr-blocks/include/blocks/integrate_XX.h.t b/gr-blocks/include/blocks/integrate_XX.h.t
deleted file mode 100644
index 45a49def0c..0000000000
--- a/gr-blocks/include/blocks/integrate_XX.h.t
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Integrate successive samples and decimate
- * \ingroup math_operators_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_decimator
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(int decim);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/interleave.h b/gr-blocks/include/blocks/interleave.h
deleted file mode 100644
index 043ad6d27b..0000000000
--- a/gr-blocks/include/blocks/interleave.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_INTERLEAVE_H
-#define INCLUDED_BLOCKS_INTERLEAVE_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief interleave N inputs into a single output
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API interleave : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::interleave::sptr
- typedef boost::shared_ptr<interleave> sptr;
-
- /*!
- * Make a stream interleave block.
- *
- * \param itemsize stream itemsize
- */
- static sptr make(size_t itemsize);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_INTERLEAVE_H */
diff --git a/gr-blocks/include/blocks/interleaved_short_to_complex.h b/gr-blocks/include/blocks/interleaved_short_to_complex.h
deleted file mode 100644
index 961ce59a66..0000000000
--- a/gr-blocks/include/blocks/interleaved_short_to_complex.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
-#define INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of interleaved shorts to a stream of complex
- * \ingroup type_converters_blk
- */
- class BLOCKS_API interleaved_short_to_complex : virtual public gr_sync_decimator
- {
- public:
- // gr::blocks::interleaved_short_to_complex::sptr
- typedef boost::shared_ptr<interleaved_short_to_complex> sptr;
-
- /*!
- * Build an interleaved short to complex block.
- */
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H */
diff --git a/gr-blocks/include/blocks/keep_m_in_n.h b/gr-blocks/include/blocks/keep_m_in_n.h
deleted file mode 100644
index 88d94fab85..0000000000
--- a/gr-blocks/include/blocks/keep_m_in_n.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_KEEP_M_IN_N_H
-#define INCLUDED_BLOCKS_KEEP_M_IN_N_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief decimate a stream, keeping \p m items out of every \p n.
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API keep_m_in_n : virtual public gr_block
- {
- public:
-
- // gr::blocks::keep_m_in_n::sptr
- typedef boost::shared_ptr<keep_m_in_n> sptr;
-
- /*!
- * Make a keep m in n block.
- *
- * \param itemsize stream itemsize
- * \param m number of items to take in block of \p n items
- * \param n block size in items
- * \param offset initial item offset into the stream
- */
- static sptr make(size_t itemsize, int m, int n, int offset);
-
- virtual void set_m(int m) = 0;
- virtual void set_n(int n) = 0;
- virtual void set_offset(int offset) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_KEEP_M_IN_N_H */
diff --git a/gr-blocks/include/blocks/keep_one_in_n.h b/gr-blocks/include/blocks/keep_one_in_n.h
deleted file mode 100644
index 9cce1e93ed..0000000000
--- a/gr-blocks/include/blocks/keep_one_in_n.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
-#define INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief decimate a stream, keeping one item out of every \p n.
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API keep_one_in_n : virtual public gr_block
- {
- public:
-
- // gr::blocks::keep_one_in_n::sptr
- typedef boost::shared_ptr<keep_one_in_n> sptr;
-
- /*!
- * Make a keep one in n block.
- *
- * \param itemsize stream itemsize
- * \param n block size in items
- */
- static sptr make(size_t itemsize, int n);
-
- virtual void set_n(int n) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_KEEP_ONE_IN_N_H */
diff --git a/gr-blocks/include/blocks/lfsr_15_1_0.h b/gr-blocks/include/blocks/lfsr_15_1_0.h
deleted file mode 100644
index b906844585..0000000000
--- a/gr-blocks/include/blocks/lfsr_15_1_0.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GRI_LFSR_15_1_0_H
-#define INCLUDED_GRI_LFSR_15_1_0_H
-
-#include <blocks/api.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Linear Feedback Shift Register using primitive polynomial x^15 + x + 1
- * \ingroup misc
- *
- * \details
- * Generates a maximal length pseudo-random sequence of length
- * 2^15 - 1 bits.
- */
- class BLOCKS_API lfsr_15_1_0
- {
- private:
- unsigned long d_sr; // shift register
-
- public:
- lfsr_15_1_0() { reset(); }
-
- void reset() { d_sr = 0x7fff; }
-
- int next_bit()
- {
- d_sr = ((((d_sr >> 1) ^ d_sr) & 0x1) << 14) | (d_sr >> 1);
- return d_sr & 0x1;
- }
-
- int next_byte ()
- {
- int v = 0;
- for(int i = 0; i < 8; i++) {
- v >>= 1;
- if(next_bit ())
- v |= 0x80;
- }
- return v;
- }
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GRI_LFSR_15_1_0_H */
diff --git a/gr-blocks/include/blocks/lfsr_32k.h b/gr-blocks/include/blocks/lfsr_32k.h
deleted file mode 100644
index 23954139d8..0000000000
--- a/gr-blocks/include/blocks/lfsr_32k.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GRI_LFSR_32k_H
-#define INCLUDED_GRI_LFSR_32k_H
-
-#include <blocks/api.h>
-#include <blocks/lfsr_15_1_0.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief generate pseudo-random sequence of length 32768 bits.
- * \ingroup misc
- *
- * \details
- * This is based on gri_lfsr_15_1_0 with an extra 0 added at the
- * end of the sequence.
- */
- class BLOCKS_API lfsr_32k
- {
- private:
- lfsr_15_1_0 d_lfsr;
- unsigned int d_count;
-
- public:
- lfsr_32k() { reset (); }
-
- void reset()
- {
- d_lfsr.reset();
- d_count = 0;
- }
-
- int next_bit()
- {
- if(d_count == 32767) {
- d_count = 0;
- return 0;
- }
- d_count++;
- return d_lfsr.next_bit();
- }
-
- int next_byte()
- {
- int v = 0;
- for(int i = 0; i < 8; i++) {
- v >>= 1;
- if(next_bit ())
- v |= 0x80;
- }
- return v;
- }
-
- int next_short()
- {
- int v = 0;
- for(int i = 0; i < 16; i++) {
- v >>= 1;
- if(next_bit ())
- v |= 0x8000;
- }
- return v;
- }
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GRI_LFSR_32k_H */
diff --git a/gr-blocks/include/blocks/lfsr_32k_source_s.h b/gr-blocks/include/blocks/lfsr_32k_source_s.h
deleted file mode 100644
index 9cc32fc2c9..0000000000
--- a/gr-blocks/include/blocks/lfsr_32k_source_s.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H
-#define INCLUDED_GR_LFSR_32K_SOURCE_S_H
-
-#include <blocks/api.h>
-#include <blocks/lfsr_32k.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts)
- * \ingroup source_blk
- *
- * \details
- * This source is typically used along with gr::blocks::check_lfsr_32k_s to
- * test the USRP using its digital loopback mode.
- */
- class BLOCKS_API lfsr_32k_source_s : virtual public gr_sync_block
- {
- public:
- // gr::blocks::lfsr_32k_source_s::sptr
- typedef boost::shared_ptr<lfsr_32k_source_s> sptr;
-
- /*!
- * \brief Make a LFSR 32k source block.
- */
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_LFSR_32K_SOURCE_S_H */
diff --git a/gr-blocks/include/blocks/log2_const.h b/gr-blocks/include/blocks/log2_const.h
deleted file mode 100644
index 67d63810fc..0000000000
--- a/gr-blocks/include/blocks/log2_const.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-/*
- * a bit of template hackery...
- */
-#ifndef INCLUDED_BLOCKS_LOG2_CONST_H
-#define INCLUDED_BLOCKS_LOG2_CONST_H
-
-#include <blocks/api.h>
-#include <assert.h>
-
-namespace gr {
- namespace blocks {
-
- template<unsigned int k> static inline int log2_const() { assert(0); return 0; }
-
- template<> inline int log2_const<1>() { return 0; }
- template<> inline int log2_const<2>() { return 1; }
- template<> inline int log2_const<4>() { return 2; }
- template<> inline int log2_const<8>() { return 3; }
- template<> inline int log2_const<16>() { return 4; }
- template<> inline int log2_const<32>() { return 5; }
- template<> inline int log2_const<64>() { return 6; }
- template<> inline int log2_const<128>() { return 7; }
- template<> inline int log2_const<256>() { return 8; }
- template<> inline int log2_const<512>() { return 9; }
- template<> inline int log2_const<1024>(){ return 10; }
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_LOG2_CONST_H */
diff --git a/gr-blocks/include/blocks/max_XX.h.t b/gr-blocks/include/blocks/max_XX.h.t
deleted file mode 100644
index 738d7bb938..0000000000
--- a/gr-blocks/include/blocks/max_XX.h.t
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Compares vectors from multiple streams and determines
- * the maximum value from each vector over all streams.
- * \ingroup math_operators_blk
- *
- * \details
- * Data is passed in as a vector of length \p vlen from multiple
- * input sources. It will look through these streams of \p vlen
- * data items and output two streams.
- * Stream 0 will contain the index value in the vector where
- * the maximum value occurred.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
-
diff --git a/gr-blocks/include/blocks/message_burst_source.h b/gr-blocks/include/blocks/message_burst_source.h
deleted file mode 100644
index 72997abf2c..0000000000
--- a/gr-blocks/include/blocks/message_burst_source.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_H
-#define INCLUDED_GR_MESSAGE_BURST_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Turn received messages into a stream and tag them for UHD to send.
- * \ingroup message_tools_blk
- */
- class BLOCKS_API message_burst_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::message_source::sptr
- typedef boost::shared_ptr<message_burst_source> sptr;
-
- static sptr make(size_t itemsize, int msgq_limit);
- static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
-
- virtual gr_msg_queue_sptr msgq() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_MESSAGE_BURST_SOURCE_H */
diff --git a/gr-blocks/include/blocks/message_debug.h b/gr-blocks/include/blocks/message_debug.h
deleted file mode 100644
index 59a778ba49..0000000000
--- a/gr-blocks/include/blocks/message_debug.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MESSAGE_DEBUG_H
-#define INCLUDED_GR_MESSAGE_DEBUG_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Debug block for the message passing system.
- * \ingroup message_tools_blk
- * \ingroup measurement_tools_blk
- * \ingroup debug_tools_blk
- *
- * \details
- * The message debug block is used to capture and print or store
- * messages as they are received. Any block that generates a
- * message may connect that message port to one or more of the
- * three message input ports of this debug block. The message
- * ports are:
- *
- * \li print: prints the message directly to standard out.
- * \li store: stores the message in an internal vector. May be
- * access using the get_message function.
- * \li print_pdu: specifically designed to handle formatted PDUs
- * (see pdu.h).
- */
- class BLOCKS_API message_debug : virtual public gr_block
- {
- public:
- // gr::blocks::message_debug::sptr
- typedef boost::shared_ptr<message_debug> sptr;
-
- /*!
- * \brief Build the message debug block. It takes no parameters
- * and has three message ports: print, store, and
- * print_pdu.
- */
- static sptr make();
-
- /*!
- * \brief Reports the number of messages received by this block.
- */
- virtual int num_messages() = 0;
-
- /*!
- * \brief Get a message (as a PMT) from the message vector at index \p i.
- *
- * Messages passed to the 'store' port will be stored in a
- * vector. This function retrieves those messages by index. They
- * are index in order of when they were received (all messages
- * are just pushed onto the back of a vector). This is mostly
- * useful in debugging message passing graphs and in QA code.
- *
- * \param i The index in the vector for the message to retrieve.
- *
- * \return a message at index \p i as a pmt_t.
- */
- virtual pmt::pmt_t get_message(int i) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_MESSAGE_DEBUG_H */
diff --git a/gr-blocks/include/blocks/message_sink.h b/gr-blocks/include/blocks/message_sink.h
deleted file mode 100644
index aec636e3cf..0000000000
--- a/gr-blocks/include/blocks/message_sink.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MESSAGE_SINK_H
-#define INCLUDED_GR_MESSAGE_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Gather received items into messages and insert into msgq
- * \ingroup message_tools_blk
- */
- class BLOCKS_API message_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::message_sink::sptr
- typedef boost::shared_ptr<message_sink> sptr;
-
- static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block);
- static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block,
- const std::string& lengthtagname);
-
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_MESSAGE_SINK_H */
diff --git a/gr-blocks/include/blocks/message_source.h b/gr-blocks/include/blocks/message_source.h
deleted file mode 100644
index 2aa3ddaa35..0000000000
--- a/gr-blocks/include/blocks/message_source.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MESSAGE_SOURCE_H
-#define INCLUDED_GR_MESSAGE_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Turn received messages into a stream
- * \ingroup message_tools_blk
- */
- class BLOCKS_API message_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::message_source::sptr
- typedef boost::shared_ptr<message_source> sptr;
-
- static sptr make(size_t itemsize, int msgq_limit=0);
- static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
- static sptr make(size_t itemsize, gr_msg_queue_sptr msgq,
- const std::string& lengthtagname);
-
- virtual gr_msg_queue_sptr msgq() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_MESSAGE_SOURCE_H */
diff --git a/gr-blocks/include/blocks/message_strobe.h b/gr-blocks/include/blocks/message_strobe.h
deleted file mode 100644
index abd9b73596..0000000000
--- a/gr-blocks/include/blocks/message_strobe.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MESSAGE_STROBE_H
-#define INCLUDED_GR_MESSAGE_STROBE_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Send message at defined interval
- * \ingroup message_tools_blk
- *
- * \details
- * Takes a PMT message and sends it out every \p period_ms
- * milliseconds. Useful for testing/debugging the message system.
- */
- class BLOCKS_API message_strobe : virtual public gr_block
- {
- public:
- // gr::blocks::message_strobe::sptr
- typedef boost::shared_ptr<message_strobe> sptr;
-
- /*!
- * Make a message stobe block to send message \p msg every \p
- * period_ms milliseconds.
- *
- * \param msg The message to send as a PMT.
- * \param period_ms the time period in milliseconds in which to
- * send \p msg.
- */
- static sptr make(pmt::pmt_t msg, float period_ms);
-
- /*!
- * Reset the message being sent.
- * \param msg The message to send as a PMT.
- */
- virtual void set_msg(pmt::pmt_t msg) = 0;
-
- /*!
- * Get the value of the message being sent.
- */
- virtual pmt::pmt_t msg() const = 0;
-
- /*!
- * Reset the sending interval.
- * \param period_ms the time period in milliseconds.
- */
- virtual void set_period(float period_ms) = 0;
-
- /*!
- * Get the time interval of the strobe.
- */
- virtual float period() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_MESSAGE_STROBE_H */
diff --git a/gr-blocks/include/blocks/moving_average_XX.h.t b/gr-blocks/include/blocks/moving_average_XX.h.t
deleted file mode 100644
index 5b996bd4d5..0000000000
--- a/gr-blocks/include/blocks/moving_average_XX.h.t
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output is the moving sum of the last N samples, scaled by the scale factor
- * \ingroup level_controllers_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * Create a moving average block.
- *
- * \param length Number of samples to use in the average.
- * \param scale scale factor for the result.
- * \param max_iter limits how long we go without flushing the accumulator
- * This is necessary to avoid numerical instability for float and complex.
- */
- static sptr make(int length, @O_TYPE@ scale,
- int max_iter = 4096);
-
- /*!
- * Get the length used in the avaraging calculation.
- */
- virtual int length() const = 0;
-
- /*!
- * Get the scale factor being used.
- */
- virtual @O_TYPE@ scale() const = 0;
-
- /*!
- * Set both the length and the scale factor together.
- */
- virtual void set_length_and_scale(int length, @O_TYPE@ scale) = 0;
-
- /*!
- * Set the length.
- */
- virtual void set_length(int length) = 0;
-
- /*!
- * Set the scale factor.
- */
- virtual void set_scale(@O_TYPE@ scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/multiply_XX.h.t b/gr-blocks/include/blocks/multiply_XX.h.t
deleted file mode 100644
index 4ad25d35e9..0000000000
--- a/gr-blocks/include/blocks/multiply_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004, 2009, 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = prod (input_0, input_1, ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Multiply across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/multiply_cc.h b/gr-blocks/include/blocks/multiply_cc.h
deleted file mode 100644
index 79533c2dc6..0000000000
--- a/gr-blocks/include/blocks/multiply_cc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MULTIPLY_CC_H
-#define INCLUDED_GR_MULTIPLY_CC_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = prod (input_0, input_1, ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Multiply across all input streams.
- */
- class BLOCKS_API multiply_cc : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::multiply_cc::sptr
- typedef boost::shared_ptr<multiply_cc> sptr;
-
- /*!
- * \brief Multiply streams of complex values
- * \param vlen Vector length
- * \ingroup math_blk
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_MULTIPLY_CC_H */
diff --git a/gr-blocks/include/blocks/multiply_conjugate_cc.h b/gr-blocks/include/blocks/multiply_conjugate_cc.h
deleted file mode 100644
index 7fa46f891e..0000000000
--- a/gr-blocks/include/blocks/multiply_conjugate_cc.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
-#define INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Multiplies stream 0 by the complex conjugate of stream 1.
- * \ingroup math_operators_blk
- */
- class BLOCKS_API multiply_conjugate_cc : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::multiply_conjugate_cc::sptr
- typedef boost::shared_ptr<multiply_conjugate_cc> sptr;
-
- /*!
- * \brief Multiplies a streams by the conjugate of a second stream
- * \param vlen Vector length
- * \ingroup math_blk
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_H */
diff --git a/gr-blocks/include/blocks/multiply_const_XX.h.t b/gr-blocks/include/blocks/multiply_const_XX.h.t
deleted file mode 100644
index 4f5ac5c5a6..0000000000
--- a/gr-blocks/include/blocks/multiply_const_XX.h.t
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input * constant
- * \ingroup math_operators_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * \brief Create an instance of @NAME@
- * \param k multiplicative constant
- */
- static sptr make(@O_TYPE@ k);
-
- /*!
- * \brief Return multiplicative constant
- */
- virtual @O_TYPE@ k() const = 0;
-
- /*!
- * \brief Set multiplicative constant
- */
- virtual void set_k(@O_TYPE@ k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME */
diff --git a/gr-blocks/include/blocks/multiply_const_cc.h b/gr-blocks/include/blocks/multiply_const_cc.h
deleted file mode 100644
index 3469b4df17..0000000000
--- a/gr-blocks/include/blocks/multiply_const_cc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef INCLUDED_MULTIPLY_CONST_CC_H
-#define INCLUDED_MULTIPLY_CONST_CC_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input * complex constant
- * \ingroup math_operators_blk
- */
- class BLOCKS_API multiply_const_cc : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::multiply_const_cc::sptr
- typedef boost::shared_ptr<multiply_const_cc> sptr;
-
- /*!
- * \brief Create an instance of multiply_const_cc
- * \param k complex multiplicative constant
- * \param vlen Vector length of incoming stream
- */
- static sptr make(gr_complex k, size_t vlen=1);
-
- /*!
- * \brief Return complex multiplicative constant
- */
- virtual gr_complex k() const = 0;
-
- /*!
- * \brief Set complex multiplicative constant
- */
- virtual void set_k(gr_complex k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_MULTIPLY_CONST_CC_H */
diff --git a/gr-blocks/include/blocks/multiply_const_ff.h b/gr-blocks/include/blocks/multiply_const_ff.h
deleted file mode 100644
index 627e0c39a6..0000000000
--- a/gr-blocks/include/blocks/multiply_const_ff.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef INCLUDED_MULTIPLY_CONST_FF_H
-#define INCLUDED_MULTIPLY_CONST_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input * real constant
- * \ingroup math_operators_blk
- */
- class BLOCKS_API multiply_const_ff : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::multiply_const_ff::sptr
- typedef boost::shared_ptr<multiply_const_ff> sptr;
-
- /*!
- * \brief Create an instance of multiply_const_ff
- * \param k real multiplicative constant
- * \param vlen Vector length of incoming stream
- */
- static sptr make(float k, size_t vlen=1);
-
- /*!
- * \brief Return real multiplicative constant
- */
- virtual float k() const = 0;
-
- /*!
- * \brief Set real multiplicative constant
- */
- virtual void set_k(float k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_MULTIPLY_CONST_FF_H */
diff --git a/gr-blocks/include/blocks/multiply_const_vXX.h.t b/gr-blocks/include/blocks/multiply_const_vXX.h.t
deleted file mode 100644
index 4cd479f009..0000000000
--- a/gr-blocks/include/blocks/multiply_const_vXX.h.t
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input * constant vector (element-wise)
- * \ingroup math_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
-
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * \brief Create an instance of @NAME@
- * \param k multiplicative constant vector
- */
- static sptr make(std::vector<@O_TYPE@> k);
-
- /*!
- * \brief Return multiplicative constant vector
- */
- virtual std::vector<@O_TYPE@> k() const = 0;
-
- /*!
- * \brief Set multiplicative constant vector
- */
- virtual void set_k(std::vector<@O_TYPE@> k) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/multiply_ff.h b/gr-blocks/include/blocks/multiply_ff.h
deleted file mode 100644
index ef3f5109bd..0000000000
--- a/gr-blocks/include/blocks/multiply_ff.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_MULTIPLY_FF_H
-#define INCLUDED_GR_MULTIPLY_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = prod (input_0, input_1, ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Multiply across all input streams.
- */
- class BLOCKS_API multiply_ff : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::multiply_ff::sptr
- typedef boost::shared_ptr<multiply_ff> sptr;
-
- /*!
- * \brief Multiply streams of float values
- * \param vlen Vector length
- * \ingroup math_blk
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_MULTIPLY_FF_H */
diff --git a/gr-blocks/include/blocks/mute_XX.h.t b/gr-blocks/include/blocks/mute_XX.h.t
deleted file mode 100644
index b9a394df2f..0000000000
--- a/gr-blocks/include/blocks/mute_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input or zero if muted.
- * \ingroup level_controllers_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(bool mute=false);
-
- virtual bool mute() const = 0;
- virtual void set_mute(bool mute=false) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
-
diff --git a/gr-blocks/include/blocks/nlog10_ff.h b/gr-blocks/include/blocks/nlog10_ff.h
deleted file mode 100644
index 7c4dfd8962..0000000000
--- a/gr-blocks/include/blocks/nlog10_ff.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_NLOG10_FF_H
-#define INCLUDED_BLOCKS_NLOG10_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = n*log10(input) + k
- * \ingroup math_operators_blk
- */
- class BLOCKS_API nlog10_ff : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::nlog10_ff::sptr
- typedef boost::shared_ptr<nlog10_ff> sptr;
-
- /*!
- * \brief Make an instance of an nlog10_ff block.
- * \param n Scalar multiplicative constant
- * \param vlen Input vector length
- * \param k Scalar additive constant
- */
- static sptr make(float n=1.0, size_t vlen=1, float k=0.0);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_NLOG10_FF_H */
diff --git a/gr-blocks/include/blocks/nop.h b/gr-blocks/include/blocks/nop.h
deleted file mode 100644
index a75adad621..0000000000
--- a/gr-blocks/include/blocks/nop.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_NOP_H
-#define INCLUDED_GR_NOP_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <stddef.h> // size_t
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Does nothing. Used for testing only.
- * \ingroup misc_blk
- */
- class BLOCKS_API nop : virtual public gr_block
- {
- public:
- // gr::blocks::nop::sptr
- typedef boost::shared_ptr<nop> sptr;
-
- /*!
- * Build a nop block.
- *
- * \param sizeof_stream_item size of the stream items in bytes.
- */
- static sptr make(size_t sizeof_stream_item);
-
- virtual int nmsgs_received() const = 0;
-
- virtual int ctrlport_test() const = 0;
- virtual void set_ctrlport_test(int x) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_NOP_H */
diff --git a/gr-blocks/include/blocks/not_XX.h.t b/gr-blocks/include/blocks/not_XX.h.t
deleted file mode 100644
index fc06327722..0000000000
--- a/gr-blocks/include/blocks/not_XX.h.t
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = ~input
- * \ingroup boolean_operators_blk
- *
- * bitwise boolean not of input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/null_sink.h b/gr-blocks/include/blocks/null_sink.h
deleted file mode 100644
index 8e772ab61f..0000000000
--- a/gr-blocks/include/blocks/null_sink.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_NULL_SINK_H
-#define INCLUDED_GR_NULL_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <stddef.h> // size_t
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Bit bucket. Use as a termination point when a sink is
- * required and we don't want to do anything real.
- * \ingroup misc_blk
- */
- class BLOCKS_API null_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::null_sink::sptr
- typedef boost::shared_ptr<null_sink> sptr;
-
- /*!
- * Build a null sink block.
- *
- * \param sizeof_stream_item size of the stream items in bytes.
- */
- static sptr make(size_t sizeof_stream_item);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_NULL_SINK_H */
diff --git a/gr-blocks/include/blocks/null_source.h b/gr-blocks/include/blocks/null_source.h
deleted file mode 100644
index fc782c1cb5..0000000000
--- a/gr-blocks/include/blocks/null_source.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_NULL_SOURCE_H
-#define INCLUDED_GR_NULL_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief A source of zeros used mainly for testing.
- * \ingroup misc_blk
- */
- class BLOCKS_API null_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::null_source::sptr
- typedef boost::shared_ptr<null_source> sptr;
-
- /*!
- * Build a null source block.
- *
- * \param sizeof_stream_item size of the stream items in bytes.
- */
- static sptr make(size_t sizeof_stream_item);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_NULL_SOURCE_H */
diff --git a/gr-blocks/include/blocks/or_XX.h.t b/gr-blocks/include/blocks/or_XX.h.t
deleted file mode 100644
index 67afe54ea9..0000000000
--- a/gr-blocks/include/blocks/or_XX.h.t
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input_0 | input_1 | , ... | input_N)
- * \ingroup boolean_operators_blk
- *
- * Bitwise boolean or across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/pack_k_bits_bb.h b/gr-blocks/include/blocks/pack_k_bits_bb.h
deleted file mode 100644
index 41ae4bc418..0000000000
--- a/gr-blocks/include/blocks/pack_k_bits_bb.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_PACK_K_BITS_BB_H
-#define INCLUDED_GR_PACK_K_BITS_BB_H
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Converts a stream of bytes with 1 bit in the LSB to a
- * byte with k relevent bits.
- * \ingroup byte_operators_blk
- */
- class BLOCKS_API pack_k_bits_bb : virtual public gr_sync_decimator
- {
- public:
- // gr::blocks::pack_k_bits_bb::sptr
- typedef boost::shared_ptr<pack_k_bits_bb> sptr;
-
- /*!
- * \brief Make a pack_k_bits block.
- * \param k number of bits to be packed.
- */
- static sptr make(unsigned k);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_PACK_K_BITS_BB_H */
diff --git a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
deleted file mode 100644
index d8edba2297..0000000000
--- a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <gr_endianness.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts.
- * \ingroup byte_operators_blk
- *
- * \details
- * input: stream of @I_TYPE@; output: stream of @O_TYPE@
- *
- * This is the inverse of gr::blocks::unpacked_to_packed_XX.
- *
- * The bits in the bytes or shorts input stream are grouped into
- * chunks of \p bits_per_chunk bits and each resulting chunk is
- * written right- justified to the output stream of bytes or
- * shorts. All b or 16 bits of the each input bytes or short are
- * processed. The right thing is done if bits_per_chunk is not a
- * power of two.
- *
- * The combination of gr::blocks::packed_to_unpacked_XX_ followed by
- * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
- * general case of mapping from a stream of bytes or shorts into
- * arbitrary float or complex symbols.
- *
- * \sa gr::blocks::packed_to_unpacked_bb, gr::blocks::unpacked_to_packed_bb,
- * \sa gr::blocks::packed_to_unpacked_ss, gr::blocks::unpacked_to_packed_ss,
- * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
- * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
- */
- class BLOCKS_API @NAME@ : virtual public gr_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(unsigned int bits_per_chunk,
- gr_endianness_t endianness);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/patterned_interleaver.h b/gr-blocks/include/blocks/patterned_interleaver.h
deleted file mode 100644
index 01e9a0d58f..0000000000
--- a/gr-blocks/include/blocks/patterned_interleaver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
-#define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Interleave items based on the provided vector \p pattern.
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API patterned_interleaver : virtual public gr_block
- {
- public:
- typedef boost::shared_ptr<patterned_interleaver> sptr;
-
- /*!
- * Make a patterned interleaver block.
- *
- * \param itemsize stream itemsize
- * \param pattern vector that represents the interleaving pattern
- */
- static sptr make(size_t itemsize, std::vector<int> pattern);
- };
-
- }
-}
-
-#endif /* INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H */
-
diff --git a/gr-blocks/include/blocks/pdu.h b/gr-blocks/include/blocks/pdu.h
deleted file mode 100644
index 8890c5cb17..0000000000
--- a/gr-blocks/include/blocks/pdu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_PDU_H
-#define INCLUDED_BLOCKS_PDU_H
-
-#include <blocks/api.h>
-#include <gr_complex.h>
-#include <pmt/pmt.h>
-
-#define PDU_PORT_ID pmt::mp("pdus")
-#define PDU_LENGTH_TAG pmt::mp("pdu_length")
-
-namespace gr {
- namespace blocks {
- namespace pdu {
-
- enum vector_type { byte_t, float_t, complex_t };
-
- BLOCKS_API size_t itemsize(vector_type type);
- BLOCKS_API bool type_matches(vector_type type, pmt::pmt_t v);
- BLOCKS_API pmt::pmt_t make_pdu_vector(vector_type type, const uint8_t* buf, size_t items);
- BLOCKS_API vector_type type_from_pmt(pmt::pmt_t vector);
-
- } /* namespace pdu */
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_PDU_H */
diff --git a/gr-blocks/include/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/blocks/pdu_to_tagged_stream.h
deleted file mode 100644
index 6a26673149..0000000000
--- a/gr-blocks/include/blocks/pdu_to_tagged_stream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
-#define INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
-
-#include <blocks/api.h>
-#include <blocks/pdu.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Turns received PDUs into a tagged stream of items
- * \ingroup message_tools_blk
- */
- class BLOCKS_API pdu_to_tagged_stream : virtual public gr_sync_block
- {
- public:
- // gr::blocks::pdu_to_tagged_stream::sptr
- typedef boost::shared_ptr<pdu_to_tagged_stream> sptr;
-
- /*!
- * \brief Construct a pdu_to_tagged_stream block
- * \param type PDU type of pdu::vector_type
- */
- static sptr make(pdu::vector_type type);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H */
diff --git a/gr-blocks/include/blocks/peak_detector2_fb.h b/gr-blocks/include/blocks/peak_detector2_fb.h
deleted file mode 100644
index aa30d46a04..0000000000
--- a/gr-blocks/include/blocks/peak_detector2_fb.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_H
-#define INCLUDED_GR_PEAK_DETECTOR2_FB_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Detect the peak of a signal
- * \ingroup peak_detectors_blk
- *
- * \details
- * If a peak is detected, this block outputs a 1, or it outputs
- * 0's. A separate debug output may be connected, to view the
- * internal EWMA described below.
- */
- class BLOCKS_API peak_detector2_fb : virtual public gr_sync_block
- {
- public:
- // gr::blocks::peak_detector2_fb::sptr
- typedef boost::shared_ptr<peak_detector2_fb> sptr;
-
- /*!
- * Build a peak detector block with float in, byte out.
- *
- * \param threshold_factor_rise The threshold factor determins
- * when a peak is present. An EWMA average of the signal is
- * calculated and when the value of the signal goes over
- * threshold_factor_rise*average, we call the peak.
- * \param look_ahead The look-ahead value is used when the
- * threshold is found to locate the peak within this range.
- * \param alpha The gain value of a single-pole moving average filter.
- */
- static sptr make(float threshold_factor_rise=7,
- int look_ahead=1000, float alpha=0.001);
-
- /*! \brief Set the threshold factor value for the rise time
- * \param thr new threshold factor
- */
- virtual void set_threshold_factor_rise(float thr) = 0;
-
- /*! \brief Set the look-ahead factor
- * \param look new look-ahead factor
- */
- virtual void set_look_ahead(int look) = 0;
-
- /*! \brief Set the running average alpha
- * \param alpha new alpha for running average
- */
- virtual void set_alpha(int alpha) = 0;
-
- /*! \brief Get the threshold factor value for the rise time
- * \return threshold factor
- */
- virtual float threshold_factor_rise() = 0;
-
- /*! \brief Get the look-ahead factor value
- * \return look-ahead factor
- */
- virtual int look_ahead() = 0;
-
- /*! \brief Get the alpha value of the running average
- * \return alpha
- */
- virtual float alpha() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_PEAK_DETECTOR2_FB_H */
diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/blocks/peak_detector_XX.h.t
deleted file mode 100644
index 8d42f42ea8..0000000000
--- a/gr-blocks/include/blocks/peak_detector_XX.h.t
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Detect the peak of a signal
- * \ingroup peak_detectors_blk
- *
- * \details
- * If a peak is detected, this block outputs a 1,
- * or it outputs 0's.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * Make a peak detector block.
- *
- * \param threshold_factor_rise The threshold factor determins
- * when a peak has started. An average of the signal is
- * calculated and when the value of the signal goes over
- * threshold_factor_rise*average, we start looking for a
- * peak.
- * \param threshold_factor_fall The threshold factor determins
- * when a peak has ended. An average of the signal is
- * calculated and when the value of the signal goes
- * bellow threshold_factor_fall*average, we stop looking
- * for a peak.
- * \param look_ahead The look-ahead value is used when the
- * threshold is found to look if there another peak
- * within this step range. If there is a larger value,
- * we set that as the peak and look ahead again. This is
- * continued until the highest point is found with This
- * look-ahead range.
- * \param alpha The gain value of a moving average filter
- */
- static sptr make(float threshold_factor_rise = 0.25,
- float threshold_factor_fall = 0.40,
- int look_ahead = 10,
- float alpha = 0.001);
-
- /*! \brief Set the threshold factor value for the rise time
- * \param thr new threshold factor
- */
- virtual void set_threshold_factor_rise(float thr) = 0;
-
- /*! \brief Set the threshold factor value for the fall time
- * \param thr new threshold factor
- */
- virtual void set_threshold_factor_fall(float thr) = 0;
-
- /*! \brief Set the look-ahead factor
- * \param look new look-ahead factor
- */
- virtual void set_look_ahead(int look) = 0;
-
- /*! \brief Set the running average alpha
- * \param alpha new alpha for running average
- */
- virtual void set_alpha(int alpha) = 0;
-
- /*! \brief Get the threshold factor value for the rise time
- * \return threshold factor
- */
- virtual float threshold_factor_rise() = 0;
-
- /*! \brief Get the threshold factor value for the fall time
- * \return threshold factor
- */
- virtual float threshold_factor_fall() = 0;
-
- /*! \brief Get the look-ahead factor value
- * \return look-ahead factor
- */
- virtual int look_ahead() = 0;
-
- /*! \brief Get the alpha value of the running average
- * \return alpha
- */
- virtual float alpha() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/plateau_detector_fb.h b/gr-blocks/include/blocks/plateau_detector_fb.h
deleted file mode 100644
index 119262d396..0000000000
--- a/gr-blocks/include/blocks/plateau_detector_fb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
-#define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Detects a plateau and marks the middle.
- * \ingroup peak_detectors_blk
- *
- * \details
- * Detect a plateau of a-priori known height. Input is a stream of floats,
- * the output is a stream of bytes. Whenever a plateau is detected, the
- * middle of that plateau is marked with a '1' on the output stream (all
- * other samples are left at zero).
- *
- * You can use this in a Schmidl & Cox synchronisation algorithm to interpret
- * the output of the normalized correlator. Just pass the length of the cyclic
- * prefix (in samples) as the max_len parameter).
- *
- * Unlike the peak detectors, you must the now the absolute height of the plateau.
- * Whenever the amplitude exceeds the given threshold, it starts assuming the
- * presence of a plateau.
- *
- * An implicit hysteresis is provided by the fact that after detecting one plateau,
- * it waits at least max_len samples before the next plateau can be detected.
- */
- class BLOCKS_API plateau_detector_fb : virtual public gr_sync_block
- {
- public:
- typedef boost::shared_ptr<plateau_detector_fb> sptr;
-
- /*!
- * \param max_len Maximum length of the plateau
- * \param threshold Anything above this value is considered a plateau
- */
- static sptr make(int max_len, float threshold=0.9);
- };
-
- } // namespace blocks
-} // namespace gr
-
-#endif /* INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H */
-
diff --git a/gr-blocks/include/blocks/probe_rate.h b/gr-blocks/include/blocks/probe_rate.h
deleted file mode 100644
index fc0b9f29d4..0000000000
--- a/gr-blocks/include/blocks/probe_rate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_PROBE_RATE_H
-#define INCLUDED_BLOCKS_PROBE_RATE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief throughput measurement
- * \ingroup measurement_tools_blk
- */
- class BLOCKS_API probe_rate : virtual public gr_sync_block
- {
- public:
- // gr::blocks::probe_rate::sptr
- typedef boost::shared_ptr<probe_rate> sptr;
-
- /*!
- * \brief Make a throughput measurement block
- * \param itemsize size of each stream item
- * \param update_rate_ms minimum update time in milliseconds
- * \param alpha gain for running average filter
- */
- static sptr make(size_t itemsize, double update_rate_ms = 500.0, double alpha = 0.0001);
-
- virtual void set_alpha(double alpha) = 0;
-
- virtual double rate() = 0;
-
- virtual bool start() = 0;
- virtual bool stop() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_PROBE_RATE_H */
diff --git a/gr-blocks/include/blocks/probe_signal_X.h.t b/gr-blocks/include/blocks/probe_signal_X.h.t
deleted file mode 100644
index fb0d84bb41..0000000000
--- a/gr-blocks/include/blocks/probe_signal_X.h.t
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Sink that allows a sample to be grabbed from Python.
- * \ingroup measurement_tools_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make();
-
- virtual @TYPE@ level() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/probe_signal_vX.h.t b/gr-blocks/include/blocks/probe_signal_vX.h.t
deleted file mode 100644
index 77462dc658..0000000000
--- a/gr-blocks/include/blocks/probe_signal_vX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <vector>
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Sink that allows a vector of samples to be grabbed from Python.
- * \ingroup sink_blk
- * \ingroup measurement_tools_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t size);
-
- virtual std::vector<@TYPE@> level() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/random_pdu.h b/gr-blocks/include/blocks/random_pdu.h
deleted file mode 100644
index 6cc7afaae3..0000000000
--- a/gr-blocks/include/blocks/random_pdu.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_RANDOM_PDU_H
-#define INCLUDED_BLOCKS_RANDOM_PDU_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Sends a random PDU at intervals
- * \ingroup message_tools_blk
- * \ingroup debug_tools_blk
- */
- class BLOCKS_API random_pdu : virtual public gr_block
- {
- public:
- // gr::blocks::random_pdu::sptr
- typedef boost::shared_ptr<random_pdu> sptr;
-
- /*!
- * \brief Construct a random PDU generator
- */
- static sptr make(int mintime, int maxtime);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_RANDOM_PDU_H */
diff --git a/gr-blocks/include/blocks/regenerate_bb.h b/gr-blocks/include/blocks/regenerate_bb.h
deleted file mode 100644
index a2cc76737e..0000000000
--- a/gr-blocks/include/blocks/regenerate_bb.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_REGENERATE_BB_H
-#define INCLUDED_GR_REGENERATE_BB_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Detect the peak of a signal and repeat every period samples
- * \ingroup stream_operators_blk
- *
- * \details
- * If a peak is detected, this block outputs a 1 repeated every
- * period samples until reset by detection of another 1 on the
- * input or stopped after max_regen regenerations have occurred.
- *
- * Note that if max_regen=(-1)/ULONG_MAX then the regeneration
- * will run forever.
- */
- class BLOCKS_API regenerate_bb : virtual public gr_sync_block
- {
- public:
- // gr::blocks::regenerate_bb::sptr
- typedef boost::shared_ptr<regenerate_bb> sptr;
-
- /*!
- * \brief Make a regenerate block
- * \param period The number of samples between regenerations
- * \param max_regen The maximum number of regenerations to
- * perform; if set to ULONG_MAX, it will regenerate
- * continuously.
- */
- static sptr make(int period, unsigned int max_regen=500);
-
- /*! \brief Reset the maximum regeneration count; this will reset
- the current regen.
- */
- virtual void set_max_regen(unsigned int regen) = 0;
-
- /*! \brief Reset the period of regenerations; this will reset
- the current regen.
- */
- virtual void set_period(int period) = 0;
-
- /*! \brief return the maximum regeneration count.
- */
- virtual unsigned int max_regen() const = 0;
-
- /*! \brief return the regeneration period.
- */
- virtual int period() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_REGENERATE_BB_H */
diff --git a/gr-blocks/include/blocks/repack_bits_bb.h b/gr-blocks/include/blocks/repack_bits_bb.h
deleted file mode 100644
index 268e4eefc5..0000000000
--- a/gr-blocks/include/blocks/repack_bits_bb.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_H
-#define INCLUDED_BLOCKS_REPACK_BITS_BB_H
-
-#include <blocks/api.h>
-#include <gr_tagged_stream_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Pack \p k bits from the input stream onto \p k bits of the output stream.
- * \ingroup byte_operators_blk
- *
- * \details
- * No bits are lost here; any value for k and l (within [1, 8]) is allowed.
- * On every fresh input byte, it starts reading on the LSB, and starts copying
- * to the LSB as well.
- *
- * If a packet length tag is given, this block assumes a tagged stream.
- * In this case, the tag with the packet length is updated accordingly.
- * Also, the number of input bits is padded with zeros if the number of input
- * bits is not an integer multiple of \p l, or bits are truncated from the input
- * if \p align_output is set to true.
- */
- class BLOCKS_API repack_bits_bb : virtual public gr_tagged_stream_block
- {
- public:
- typedef boost::shared_ptr<repack_bits_bb> sptr;
-
- /*!
- * \param k Number of relevant bits on the input stream
- * \param l Number of relevant bits on the output stream
- * \param len_tag_key If not empty, this is the key for the length tag.
- * \param align_output If len_tag_key is given, this controls if the input
- * or the output is aligned.
- */
- static sptr make(int k, int l=8, const std::string &len_tag_key="", bool align_output=false);
- };
-
- } // namespace blocks
-} // namespace gr
-
-#endif /* INCLUDED_BLOCKS_REPACK_BITS_BB_H */
-
diff --git a/gr-blocks/include/blocks/repeat.h b/gr-blocks/include/blocks/repeat.h
deleted file mode 100644
index b353205541..0000000000
--- a/gr-blocks/include/blocks/repeat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_REPEAT_H
-#define INCLUDED_BLOCKS_REPEAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief repeat each input \p repeat times
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API repeat : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::repeat::sptr
- typedef boost::shared_ptr<repeat> sptr;
-
- /*!
- * Make a repeat block.
- *
- * \param itemsize stream itemsize
- * \param repeat number of times to repeat the input
- */
- static sptr make(size_t itemsize, int repeat);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_REPEAT_H */
diff --git a/gr-blocks/include/blocks/rms_cf.h b/gr-blocks/include/blocks/rms_cf.h
deleted file mode 100644
index 94a17f7a67..0000000000
--- a/gr-blocks/include/blocks/rms_cf.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_RMS_CF_H
-#define INCLUDED_BLOCKS_RMS_CF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief RMS average power
- * \ingroup math_operators_blk
- */
- class BLOCKS_API rms_cf : virtual public gr_sync_block
- {
- public:
- // gr::blocks::rms_cf::sptr
- typedef boost::shared_ptr<rms_cf> sptr;
-
- /*!
- * \brief Make an RMS calc. block.
- * \param alpha gain for running average filter.
- */
- static sptr make(double alpha = 0.0001);
-
- virtual void set_alpha(double alpha) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_RMS_CF_H */
diff --git a/gr-blocks/include/blocks/rms_ff.h b/gr-blocks/include/blocks/rms_ff.h
deleted file mode 100644
index e202d79f2c..0000000000
--- a/gr-blocks/include/blocks/rms_ff.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_RMS_FF_H
-#define INCLUDED_BLOCKS_RMS_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief RMS average power
- * \ingroup math_operators_blk
- */
- class BLOCKS_API rms_ff : virtual public gr_sync_block
- {
- public:
- // gr::blocks::rms_ff::sptr
- typedef boost::shared_ptr<rms_ff> sptr;
-
- /*!
- * \brief Make an RMS calc. block.
- * \param alpha gain for running average filter.
- */
- static sptr make(double alpha = 0.0001);
-
- virtual void set_alpha(double alpha) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_RMS_FF_H */
diff --git a/gr-blocks/include/blocks/rotator.h b/gr-blocks/include/blocks/rotator.h
deleted file mode 100644
index 918e86edd2..0000000000
--- a/gr-blocks/include/blocks/rotator.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GR_ROTATOR_H_
-#define _GR_ROTATOR_H_
-
-#include <blocks/api.h>
-#include <gr_complex.h>
-
-namespace gr {
- namespace blocks {
-
- class rotator
- {
- private:
- gr_complex d_phase;
- gr_complex d_phase_incr;
- unsigned int d_counter;
-
- public:
- rotator() : d_phase(1), d_phase_incr(1), d_counter(0)
- { }
-
- void set_phase(gr_complex phase) { d_phase = phase / abs(phase); }
- void set_phase_incr(gr_complex incr) { d_phase_incr = incr / abs(incr); }
-
- gr_complex rotate(gr_complex in)
- {
- d_counter++;
-
- gr_complex z = in * d_phase; // rotate in by phase
- d_phase *= d_phase_incr; // incr our phase (complex mult == add phases)
-
- if((d_counter % 512) == 0)
- d_phase /= abs(d_phase); // Normalize to ensure multiplication is rotation
-
- return z;
- }
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* _GR_ROTATOR_H_ */
diff --git a/gr-blocks/include/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/blocks/sample_and_hold_XX.h.t
deleted file mode 100644
index 0d2ecdc5d7..0000000000
--- a/gr-blocks/include/blocks/sample_and_hold_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief sample and hold circuit
- * \ingroup level_controllers_blk
- *
- * \details
- * Samples the data stream (input stream 0) and holds the value if
- * the control signal is 1 (intput stream 1).
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/short_to_char.h b/gr-blocks/include/blocks/short_to_char.h
deleted file mode 100644
index 09e784f101..0000000000
--- a/gr-blocks/include/blocks/short_to_char.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_SHORT_TO_CHAR_H
-#define INCLUDED_BLOCKS_SHORT_TO_CHAR_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of shorts to a stream of chars.
- * \ingroup type_converters_blk
- */
- class BLOCKS_API short_to_char : virtual public gr_sync_block
- {
- public:
- // gr::blocks::short_to_char_ff::sptr
- typedef boost::shared_ptr<short_to_char> sptr;
-
- /*!
- * Build a short to char block.
- *
- * \param vlen vector length of data streams.
- */
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_SHORT_TO_CHAR_H */
diff --git a/gr-blocks/include/blocks/short_to_float.h b/gr-blocks/include/blocks/short_to_float.h
deleted file mode 100644
index ec85e892ed..0000000000
--- a/gr-blocks/include/blocks/short_to_float.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
-#define INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of shorts to a stream of floats
- * \ingroup type_converters_blk
- */
- class BLOCKS_API short_to_float : virtual public gr_sync_block
- {
- public:
- // gr::blocks::short_to_float_ff::sptr
- typedef boost::shared_ptr<short_to_float> sptr;
-
- /*!
- * Build a short to float block.
- *
- * \param vlen vector length of data streams.
- * \param scale a scalar divider to change the output signal scale.
- */
- static sptr make(size_t vlen=1, float scale=1.0);
-
- /*!
- * Get the scalar divider value.
- */
- virtual float scale() const = 0;
-
- /*!
- * Set the scalar divider value.
- */
- virtual void set_scale(float scale) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_SHORT_TO_FLOAT_H */
diff --git a/gr-blocks/include/blocks/skiphead.h b/gr-blocks/include/blocks/skiphead.h
deleted file mode 100644
index 27a8afea92..0000000000
--- a/gr-blocks/include/blocks/skiphead.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_SKIPHEAD_H
-#define INCLUDED_GR_SKIPHEAD_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <stddef.h> // size_t
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief skips the first N items, from then on copies items to the output
- * \ingroup misc_blk
- *
- * \details
- * Useful for building test cases and sources which have metadata
- * or junk at the start
- */
- class BLOCKS_API skiphead : virtual public gr_block
- {
- public:
- // gr::blocks::skiphead::sptr
- typedef boost::shared_ptr<skiphead> sptr;
-
- static sptr make(size_t itemsize,
- uint64_t nitems_to_skip);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_SKIPHEAD_H */
diff --git a/gr-blocks/include/blocks/socket_pdu.h b/gr-blocks/include/blocks/socket_pdu.h
deleted file mode 100644
index f72d303c75..0000000000
--- a/gr-blocks/include/blocks/socket_pdu.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_SOCKET_PDU_H
-#define INCLUDED_BLOCKS_SOCKET_PDU_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Creates socket interface and translates traffic to PDUs
- * \ingroup networking_tools_blk
- */
- class BLOCKS_API socket_pdu : virtual public gr_block
- {
- public:
- // gr::blocks::socket_pdu::sptr
- typedef boost::shared_ptr<socket_pdu> sptr;
-
- /*!
- * \brief Construct a SOCKET PDU interface
- * \param type "TCP_SERVER", "TCP_CLIENT", "UDP_SERVER", or "UDP_CLIENT"
- * \param addr network address to use
- * \param port network port to use
- * \param MTU maximum transmission unit
- */
- static sptr make(std::string type, std::string addr, std::string port, int MTU=10000);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_SOCKET_PDU_H */
diff --git a/gr-blocks/include/blocks/stream_mux.h b/gr-blocks/include/blocks/stream_mux.h
deleted file mode 100644
index 0e29aab364..0000000000
--- a/gr-blocks/include/blocks/stream_mux.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_STREAM_MUX_H
-#define INCLUDED_BLOCKS_STREAM_MUX_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <vector>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Stream muxing block to multiplex many streams into
- * one with a specified format.
- * \ingroup stream_operators_blk
- *
- * \details
- * Muxes N streams together producing an output stream that
- * contains N0 items from the first stream, N1 items from the second,
- * etc. and repeats:
- *
- * [N0, N1, N2, ..., Nm, N0, N1, ...]
- */
- class BLOCKS_API stream_mux : virtual public gr_block
- {
- public:
-
- // gr::blocks::stream_mux::sptr
- typedef boost::shared_ptr<stream_mux> sptr;
-
- /*!
- * \brief Creates a stream muxing block to multiplex many streams into
- * one with a specified format.
- *
- * \param itemsize the item size of the stream
- * \param lengths a vector (list/tuple) specifying the number of
- * items from each stream the mux together.
- * Warning: this requires that at least as many items
- * per stream are available or the system will wait
- * indefinitely for the items.
- *
- */
- static sptr make(size_t itemsize, const std::vector<int> &lengths);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_STREAM_MUX_H */
diff --git a/gr-blocks/include/blocks/stream_to_streams.h b/gr-blocks/include/blocks/stream_to_streams.h
deleted file mode 100644
index e9b257575f..0000000000
--- a/gr-blocks/include/blocks/stream_to_streams.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
-#define INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief convert a stream of items into a N streams of items
- * \ingroup stream_operators_blk
- *
- * \details
- * Converts a stream of N items into N streams of 1 item.
- * Repeat ad infinitum.
- */
- class BLOCKS_API stream_to_streams : virtual public gr_sync_decimator
- {
- public:
- // gr::blocks::stream_to_streams::sptr
- typedef boost::shared_ptr<stream_to_streams> sptr;
-
- /*!
- * Make a stream-to-streams block.
- *
- * \param itemsize the item size of the stream
- * \param nstreams number of streams to split input into
- */
- static sptr make(size_t itemsize, size_t nstreams);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_STREAM_TO_STREAMS_H */
diff --git a/gr-blocks/include/blocks/stream_to_vector.h b/gr-blocks/include/blocks/stream_to_vector.h
deleted file mode 100644
index 98325500b1..0000000000
--- a/gr-blocks/include/blocks/stream_to_vector.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
-#define INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
-
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief convert a stream of items into a stream of blocks containing nitems_per_block
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API stream_to_vector : virtual public gr_sync_decimator
- {
- public:
- // gr::blocks::stream_to_vector::sptr
- typedef boost::shared_ptr<stream_to_vector> sptr;
-
- /*!
- * Make a stream-to-vector block.
- *
- * \param itemsize the item size of the stream
- * \param nitems_per_block number of items to but into each vector (vector size)
- */
- static sptr make(size_t itemsize, size_t nitems_per_block);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_STREAM_TO_VECTOR_H */
diff --git a/gr-blocks/include/blocks/streams_to_stream.h b/gr-blocks/include/blocks/streams_to_stream.h
deleted file mode 100644
index e677a18e2a..0000000000
--- a/gr-blocks/include/blocks/streams_to_stream.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
-#define INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert N streams of 1 item into a 1 stream of N items
- * \ingroup stream_operators_blk
- *
- * \details
- * Convert N streams of 1 item into 1 stream of N items.
- * Repeat ad infinitum.
- */
- class BLOCKS_API streams_to_stream : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::streams_to_stream::sptr
- typedef boost::shared_ptr<streams_to_stream> sptr;
-
- /*!
- * Make a streams-to-stream block.
- *
- * \param itemsize the item size of the stream
- * \param nstreams number of streams to combine
- */
- static sptr make(size_t itemsize, size_t nstreams);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_STREAMS_TO_STREAM_H */
diff --git a/gr-blocks/include/blocks/streams_to_vector.h b/gr-blocks/include/blocks/streams_to_vector.h
deleted file mode 100644
index f4df16c9f4..0000000000
--- a/gr-blocks/include/blocks/streams_to_vector.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
-#define INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief convert N streams of items to 1 stream of vector length N
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API streams_to_vector : virtual public gr_sync_block
- {
- public:
- // gr::blocks::streams_to_vector::sptr
- typedef boost::shared_ptr<streams_to_vector> sptr;
-
- /*!
- * Make a stream-to-vector block.
- *
- * \param itemsize the item size of the stream
- * \param nstreams number of streams to combine into a vector (vector size)
- */
- static sptr make(size_t itemsize, size_t nstreams);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H */
diff --git a/gr-blocks/include/blocks/stretch_ff.h b/gr-blocks/include/blocks/stretch_ff.h
deleted file mode 100644
index 47bcb9ee87..0000000000
--- a/gr-blocks/include/blocks/stretch_ff.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_STRETCH_FF_H
-#define INCLUDED_GR_STRETCH_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief adjust y-range of an input vector by mapping to range
- * (max-of-input, stipulated-min). Primarily for spectral
- * signature matching by normalizing spectrum dynamic ranges.
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API stretch_ff : virtual public gr_sync_block
- {
- public:
- // gr::blocks::stretch_ff::sptr
- typedef boost::shared_ptr<stretch_ff> sptr;
-
- /*!
- * \brief Make a stretch block.
- *
- * \param lo Set low value for range.
- * \param vlen vector length of input stream.
- */
- static sptr make(float lo, size_t vlen=1);
-
- virtual float lo() const = 0;
- virtual void set_lo(float lo) = 0;
- virtual size_t vlen() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_STRETCH_FF_H */
diff --git a/gr-blocks/include/blocks/sub_XX.h.t b/gr-blocks/include/blocks/sub_XX.h.t
deleted file mode 100644
index db854346f6..0000000000
--- a/gr-blocks/include/blocks/sub_XX.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input_0 - input_1 - ...)
- * \ingroup math_operators_blk
- *
- * \details
- * Subtract across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/tag_debug.h b/gr-blocks/include/blocks/tag_debug.h
deleted file mode 100644
index 8093a6152f..0000000000
--- a/gr-blocks/include/blocks/tag_debug.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TAG_DEBUG_H
-#define INCLUDED_GR_TAG_DEBUG_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Bit bucket that prints out any tag received.
- * \ingroup measurement_tools_blk
- * \ingroup stream_tag_tools_blk
- * \ingroup debug_tools_blk
- *
- * \details
- * This block collects all tags sent to it on all input ports and
- * displays them to stdout in a formatted way. The \p name
- * parameter is used to identify which debug sink generated the
- * tag, so when connecting a block to this debug sink, an
- * appropriate name is something that identifies the input block.
- *
- * This block otherwise acts as a NULL sink in that items from the
- * input stream are ignored. It is designed to be able to attach
- * to any block and watch all tags streaming out of that block for
- * debugging purposes.
- *
- * The tags from the last call to this work function are stored
- * and can be retrieved using the function 'current_tags'.
- */
- class BLOCKS_API tag_debug : virtual public gr_sync_block
- {
- public:
- // gr::blocks::tag_debug::sptr
- typedef boost::shared_ptr<tag_debug> sptr;
-
- /*!
- * Build a tag debug block
- *
- * \param sizeof_stream_item size of the items in the incoming stream.
- * \param name name to identify which debug sink generated the info.
- */
- static sptr make(size_t sizeof_stream_item,
- const std::string &name);
-
- /*!
- * \brief Returns a vector of gr_tag_t items as of the last call to
- * work.
- */
- virtual std::vector<gr_tag_t> current_tags() = 0;
-
- /*!
- * \brief Set the display of tags to stdout on/off.
- */
- virtual void set_display(bool d) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_TAG_DEBUG_H */
diff --git a/gr-blocks/include/blocks/tagged_file_sink.h b/gr-blocks/include/blocks/tagged_file_sink.h
deleted file mode 100644
index 2014b66964..0000000000
--- a/gr-blocks/include/blocks/tagged_file_sink.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TAGGED_FILE_SINK_H
-#define INCLUDED_GR_TAGGED_FILE_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief A file sink that uses tags to save files.
- * \ingroup file_operators_blk
- * \ingroup stream_tag_tools_blk
- *
- * \details
- * The sink uses a tag with the key 'burst' to trigger the saving
- * of the burst data to a new file. If the value of this tag is
- * True, it will open a new file and start writing all incoming
- * data to it. If the tag is False, it will close the file (if
- * already opened). The file names are based on the time when the
- * burst tag was seen. If there is an 'rx_time' tag (standard with
- * UHD sources), that is used as the time. If no 'rx_time' tag is
- * found, the new time is calculated based off the sample rate of
- * the block.
- */
- class BLOCKS_API tagged_file_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::tagged_file_sink::sptr
- typedef boost::shared_ptr<tagged_file_sink> sptr;
-
- /*!
- * \brief Build a tagged_file_sink block.
- *
- * \param itemsize The item size of the input data stream.
- * \param samp_rate The sample rate used to determine the time
- * difference between bursts
- */
- static sptr make(size_t itemsize, double samp_rate);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_TAGGED_FILE_SINK_H */
diff --git a/gr-blocks/include/blocks/tagged_stream_mux.h b/gr-blocks/include/blocks/tagged_stream_mux.h
deleted file mode 100644
index 2fa9b3f01d..0000000000
--- a/gr-blocks/include/blocks/tagged_stream_mux.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/* Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_TAGGED_STREAM_MUX_H
-#define INCLUDED_TAGGED_STREAM_MUX_H
-
-#include <blocks/api.h>
-#include <gr_tagged_stream_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Combines tagged streams.
- * \ingroup stream_operators_blk
- *
- * \details
- * Takes N streams as input. Each stream is tagged with packet lengths.
- * Packets are output sequentially from each input stream.
- *
- * The output signal has a new length tag, which is the sum of all
- * individual length tags. The old length tags are discarded.
- *
- * All other tags are propagated as expected, i.e. they stay associated
- * with the same input item.
- */
- class BLOCKS_API tagged_stream_mux : virtual public gr_tagged_stream_block
- {
- public:
- typedef boost::shared_ptr<tagged_stream_mux> sptr;
-
- /*!
- * Make a tagged stream mux block.
- *
- * \param itemsize Items size (number of bytes per item)
- * \param lengthtagname Length tag key
- */
- static sptr make(size_t itemsize, const std::string &lengthtagname);
- };
-
- } // namespace blocks
-} // namespace gr
-
-#endif /* INCLUDED_TAGGED_STREAM_MUX_H */
-
diff --git a/gr-blocks/include/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/blocks/tagged_stream_to_pdu.h
deleted file mode 100644
index b990c44ab1..0000000000
--- a/gr-blocks/include/blocks/tagged_stream_to_pdu.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
-#define INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
-
-#include <blocks/api.h>
-#include <blocks/pdu.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Turns received stream data and tags into PDUs
- * \ingroup message_tools_blk
- */
- class BLOCKS_API tagged_stream_to_pdu : virtual public gr_sync_block
- {
- public:
- // gr::blocks::tagged_stream_to_pdu::sptr
- typedef boost::shared_ptr<tagged_stream_to_pdu> sptr;
-
- /*!
- * \brief Construct a tagged_stream_to_pdu block
- * \param type PDU type of pdu::vector_type
- */
- static sptr make(pdu::vector_type type);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H */
diff --git a/gr-blocks/include/blocks/threshold_ff.h b/gr-blocks/include/blocks/threshold_ff.h
deleted file mode 100644
index 6a20e7ed43..0000000000
--- a/gr-blocks/include/blocks/threshold_ff.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_THRESHOLD_FF_H
-#define INCLUDED_GR_THRESHOLD_FF_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Output a 1 or zero based on a threshold value.
- * \ingroup level_controllers_blk
- *
- * \details
- * Test the incoming signal against a threshold. If the signal
- * excedes the \p hi value, it will output a 1 until the signal
- * falls below the \p lo value.
- */
- class BLOCKS_API threshold_ff : virtual public gr_sync_block
- {
- public:
- // gr::blocks::threshold_ff::sptr
- typedef boost::shared_ptr<threshold_ff> sptr;
-
- /* \brief Create a threadshold block.
- * \param lo Threshold input signal needs to drop below to
- * change state to 0.
- * \param hi Threshold input signal needs to rise above to
- * change state to 1.
- * \param initial_state Initial state of the block (0 or 1).
- */
- static sptr make(float lo, float hi, float initial_state=0);
-
- virtual float lo () const = 0;
- virtual void set_lo (float lo) = 0;
- virtual float hi () const = 0;
- virtual void set_hi (float hi) = 0;
- virtual float last_state () const = 0;
- virtual void set_last_state (float last_state) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_THRESHOLD_FF_H */
diff --git a/gr-blocks/include/blocks/throttle.h b/gr-blocks/include/blocks/throttle.h
deleted file mode 100644
index d9d9f311c4..0000000000
--- a/gr-blocks/include/blocks/throttle.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005-2011,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_THROTTLE_H
-#define INCLUDED_GR_THROTTLE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief throttle flow of samples such that the average rate does
- * not exceed samples_per_sec.
- * \ingroup misc_blk
- *
- * \details
- * input: one stream of itemsize; output: one stream of itemsize
- *
- * N.B. this should only be used in GUI apps where there is no
- * other rate limiting block. It is not intended nor effective at
- * precisely controlling the rate of samples. That should be
- * controlled by a source or sink tied to sample clock. E.g., a
- * USRP or audio card.
- */
- class BLOCKS_API throttle : virtual public gr_sync_block
- {
- public:
- typedef boost::shared_ptr<throttle> sptr;
-
- static sptr make(size_t itemsize, double samples_per_sec);
-
- //! Sets the sample rate in samples per second.
- virtual void set_sample_rate(double rate) = 0;
-
- //! Get the sample rate in samples per second.
- virtual double sample_rate() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_THROTTLE_H */
diff --git a/gr-blocks/include/blocks/transcendental.h b/gr-blocks/include/blocks/transcendental.h
deleted file mode 100644
index a3a483e8f3..0000000000
--- a/gr-blocks/include/blocks/transcendental.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2011,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TRANSCENDENTAL_H
-#define INCLUDED_GR_TRANSCENDENTAL_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <string>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief A block that performs various transcendental math operations.
- * \ingroup math_operators_blk
- *
- * \details
- * Possible function names can be found in the cmath library. IO
- * may be either complex or real, double or single precision.
- *
- * Possible type strings: float, double, complex_float, complex_double
- *
- * output[i] = trans_fcn(input[i])
- */
- class BLOCKS_API transcendental : virtual public gr_sync_block
- {
- public:
- // gr::blocks::transcendental::sptr
- typedef boost::shared_ptr<transcendental> sptr;
-
- static sptr make(const std::string &name,
- const std::string &type="float");
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_TRANSCENDENTAL_H */
diff --git a/gr-blocks/include/blocks/tuntap_pdu.h b/gr-blocks/include/blocks/tuntap_pdu.h
deleted file mode 100644
index afa03cfb82..0000000000
--- a/gr-blocks/include/blocks/tuntap_pdu.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_TUNTAP_PDU_H
-#define INCLUDED_BLOCKS_TUNTAP_PDU_H
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Creates TUNTAP interface and translates traffic to PDUs
- * \ingroup networking_tools_blk
- */
- class BLOCKS_API tuntap_pdu : virtual public gr_block
- {
- public:
- // gr::blocks::tuntap_pdu::sptr
- typedef boost::shared_ptr<tuntap_pdu> sptr;
-
- /*!
- * \brief Construct a TUNTAP PDU interface
- * \param dev Device name to create
- * \param MTU Maximum Transmission Unit size
- */
- static sptr make(std::string dev, int MTU=10000);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_TUNTAP_PDU_H */
diff --git a/gr-blocks/include/blocks/uchar_to_float.h b/gr-blocks/include/blocks/uchar_to_float.h
deleted file mode 100644
index 725c4e5021..0000000000
--- a/gr-blocks/include/blocks/uchar_to_float.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
-#define INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert stream of unsigned chars to a stream of floats
- * \ingroup type_converters_blk
- */
- class BLOCKS_API uchar_to_float : virtual public gr_sync_block
- {
- public:
- // gr::blocks::uchar_to_float_ff::sptr
- typedef boost::shared_ptr<uchar_to_float> sptr;
-
- /*!
- * Build a uchar to float block.
- */
- static sptr make();
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H */
diff --git a/gr-blocks/include/blocks/udp_sink.h b/gr-blocks/include/blocks/udp_sink.h
deleted file mode 100644
index 9530217515..0000000000
--- a/gr-blocks/include/blocks/udp_sink.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007-2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_UDP_SINK_H
-#define INCLUDED_GR_UDP_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Write stream to an UDP socket.
- * \ingroup networking_tools_blk
- */
- class BLOCKS_API udp_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::udp_sink::sptr
- typedef boost::shared_ptr<udp_sink> sptr;
-
- /*!
- * \brief UDP Sink Constructor
- *
- * \param itemsize The size (in bytes) of the item datatype
- * \param host The name or IP address of the receiving host; use
- * NULL or None for no connection
- * \param port Destination port to connect to on receiving host
- * \param payload_size UDP payload size by default set to
- * 1472 = (1500 MTU - (8 byte UDP header) - (20 byte IP header))
- * \param eof Send zero-length packet on disconnect
- */
- static sptr make(size_t itemsize,
- const std::string &host, int port,
- int payload_size=1472, bool eof=true);
-
- /*! \brief return the PAYLOAD_SIZE of the socket */
- virtual int payload_size() = 0;
-
- /*! \brief Change the connection to a new destination
- *
- * \param host The name or IP address of the receiving host; use
- * NULL or None to break the connection without closing
- * \param port Destination port to connect to on receiving host
- *
- * Calls disconnect() to terminate any current connection first.
- */
- virtual void connect(const std::string &host, int port) = 0;
-
- /*! \brief Send zero-length packet (if eof is requested) then stop sending
- *
- * Zero-byte packets can be interpreted as EOF by gr_udp_source.
- * Note that disconnect occurs automatically when the sink is
- * destroyed, but not when its top_block stops.*/
- virtual void disconnect() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_UDP_SINK_H */
diff --git a/gr-blocks/include/blocks/udp_source.h b/gr-blocks/include/blocks/udp_source.h
deleted file mode 100644
index 4681b0b54a..0000000000
--- a/gr-blocks/include/blocks/udp_source.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007-2010,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_UDP_SOURCE_H
-#define INCLUDED_GR_UDP_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Read stream from an UDP socket.
- * \ingroup networking_tools_blk
- */
- class BLOCKS_API udp_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::udp_source::sptr
- typedef boost::shared_ptr<udp_source> sptr;
-
- /*!
- * \brief UDP Source Constructor
- *
- * \param itemsize The size (in bytes) of the item datatype
- * \param host The name or IP address of the receiving host; can be
- * NULL, None, or "0.0.0.0" to allow reading from any
- * interface on the host
- * \param port The port number on which to receive data; use 0 to
- * have the system assign an unused port number
- * \param payload_size UDP payload size by default set to 1472 =
- * (1500 MTU - (8 byte UDP header) - (20 byte IP header))
- * \param eof Interpret zero-length packet as EOF (default: true)
- */
- static sptr make(size_t itemsize,
- const std::string &host, int port,
- int payload_size=1472,
- bool eof=true);
-
- /*! \brief Change the connection to a new destination
- *
- * \param host The name or IP address of the receiving host; use
- * NULL or None to break the connection without closing
- * \param port Destination port to connect to on receiving host
- *
- * Calls disconnect() to terminate any current connection first.
- */
- virtual void connect(const std::string &host, int port) = 0;
-
- /*! \brief Cut the connection if we have one set up.
- */
- virtual void disconnect() = 0;
-
- /*! \brief return the PAYLOAD_SIZE of the socket */
- virtual int payload_size() = 0;
-
- /*! \brief return the port number of the socket */
- virtual int get_port() = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_UDP_SOURCE_H */
diff --git a/gr-blocks/include/blocks/unpack_k_bits_bb.h b/gr-blocks/include/blocks/unpack_k_bits_bb.h
deleted file mode 100644
index a36cfb50e4..0000000000
--- a/gr-blocks/include/blocks/unpack_k_bits_bb.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H
-#define INCLUDED_GR_UNPACK_K_BITS_BB_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
- * \ingroup byte_operators_blk
- */
- class BLOCKS_API unpack_k_bits_bb : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::unpack_k_bits_bb::sptr
- typedef boost::shared_ptr<unpack_k_bits_bb> sptr;
-
- /*!
- * \brief Make an unpack_k_bits block.
- * \param k number of bits to unpack.
- */
- static sptr make(unsigned k);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_UNPACK_K_BITS_BB_H */
diff --git a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
deleted file mode 100644
index 649b9082fb..0000000000
--- a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <gr_endianness.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts.
- * \ingroup byte_operators_blk
- *
- * \details
- * input: stream of @I_TYPE@; output: stream of @O_TYPE@
- *
- * This is the inverse of gr::blocks::packed_to_unpacked_XX.
- *
- * The low \p bits_per_chunk bits are extracted from each input
- * byte or short. These bits are then packed densely into the
- * output bytes or shorts, such that all 8 or 16 bits of the
- * output bytes or shorts are filled with valid input bits. The
- * right thing is done if bits_per_chunk is not a power of two.
- *
- * The combination of gr::blocks::packed_to_unpacked_XX followed by
- * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
- * general case of mapping from a stream of bytes or shorts into
- * arbitrary float or complex symbols.
- *
- * \sa gr::blocks::packed_to_unpacked_bb, gr::blocks::unpacked_to_packed_bb,
- * \sa gr::blocks::packed_to_unpacked_ss, gr::blocks::unpacked_to_packed_ss,
- * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
- * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
- */
- class BLOCKS_API @NAME@ : virtual public gr_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(unsigned int bits_per_chunk,
- gr_endianness_t endianness);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/vco_f.h b/gr-blocks/include/blocks/vco_f.h
deleted file mode 100644
index 7245f4c96b..0000000000
--- a/gr-blocks/include/blocks/vco_f.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_VCO_F_H
-#define INCLUDED_GR_VCO_F_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief VCO - Voltage controlled oscillator
- * \ingroup modulators_blk
- * \ingroup waveform_generators_blk
- *
- * \details
- * input: float stream of control voltages; output: float oscillator output
- */
- class BLOCKS_API vco_f : virtual public gr_sync_block
- {
- public:
- // gr::blocks::vco_f::sptr
- typedef boost::shared_ptr<vco_f> sptr;
-
- /*!
- * \brief VCO - Voltage controlled oscillator
- *
- * \param sampling_rate sampling rate (Hz)
- * \param sensitivity units are radians/sec/volt
- * \param amplitude output amplitude
- */
- static sptr make(double sampling_rate, double sensitivity, double amplitude);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_VCO_F_H */
diff --git a/gr-blocks/include/blocks/vector_insert_X.h.t b/gr-blocks/include/blocks/vector_insert_X.h.t
deleted file mode 100644
index c45e5152fa..0000000000
--- a/gr-blocks/include/blocks/vector_insert_X.h.t
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief source of @TYPE@'s that gets its data from a vector
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- /*!
- * Make vector insert block.
- *
- * \param data vector of data to insert
- * \param periodicity number of samples between when to send \p data
- * \param offset initial item offset of first insert
- */
- static sptr make(const std::vector<@TYPE@> &data,
- int periodicity, int offset=0);
-
- virtual void rewind() = 0;
- virtual void set_data(const std::vector<@TYPE@> &data) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/vector_map.h b/gr-blocks/include/blocks/vector_map.h
deleted file mode 100644
index 77a7fc1865..0000000000
--- a/gr-blocks/include/blocks/vector_map.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_VECTOR_MAP_H
-#define INCLUDED_GR_VECTOR_MAP_H
-
-#include <blocks/api.h>
-#include <vector>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Maps elements from a set of input vectors to a set of output vectors.
- * \ingroup slicedice_blk
- *
- * \details
- * If in[i] is the input vector in the i'th stream then the output
- * vector in the j'th stream is:
- *
- * out[j][k] = in[mapping[j][k][0]][mapping[j][k][1]]
- *
- * That is mapping is of the form (out_stream1_mapping,
- * out_stream2_mapping, ...) and out_stream1_mapping is of the
- * form (element1_mapping, element2_mapping, ...) and
- * element1_mapping is of the form (in_stream, in_element).
- */
- class BLOCKS_API vector_map : virtual public gr_sync_block
- {
- public:
- // gr::blocks::vector_map::sptr
- typedef boost::shared_ptr<vector_map> sptr;
-
- /*!
- * Build a vector map block.
- *
- * \param item_size (integer) size of vector elements
- * \param in_vlens (vector of integers) number of elements in each
- * input vector
- * \param mapping (vector of vectors of vectors of integers) how to
- * map elements from input to output vectors
- */
- static sptr make(size_t item_size, std::vector<size_t> in_vlens,
- std::vector< std::vector< std::vector<size_t> > > mapping);
-
- virtual void set_mapping(std::vector< std::vector< std::vector<size_t> > > mapping) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_VECTOR_MAP_H */
diff --git a/gr-blocks/include/blocks/vector_sink_X.h.t b/gr-blocks/include/blocks/vector_sink_X.h.t
deleted file mode 100644
index 1d17700f5f..0000000000
--- a/gr-blocks/include/blocks/vector_sink_X.h.t
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief @TYPE@ sink that writes to a vector
- * \ingroup debug_tools_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(int vlen = 1);
-
- virtual void reset() = 0;
- virtual std::vector<@TYPE@> data() const = 0;
- virtual std::vector<gr_tag_t> tags() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/vector_source_X.h.t b/gr-blocks/include/blocks/vector_source_X.h.t
deleted file mode 100644
index 8d3693f3ee..0000000000
--- a/gr-blocks/include/blocks/vector_source_X.h.t
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief source of @TYPE@'s that gets its data from a vector
- * \ingroup misc_blk
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(const std::vector<@TYPE@> &data,
- bool repeat=false, int vlen=1,
- const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>());
-
- virtual void rewind() = 0;
- virtual void set_data(const std::vector<@TYPE@> &data,
- const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>()) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/vector_to_stream.h b/gr-blocks/include/blocks/vector_to_stream.h
deleted file mode 100644
index 2a02704287..0000000000
--- a/gr-blocks/include/blocks/vector_to_stream.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
-#define INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
-
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief convert a stream of blocks of nitems_per_block items into a stream of items
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API vector_to_stream : virtual public gr_sync_interpolator
- {
- public:
- // gr::blocks::vector_to_stream::sptr
- typedef boost::shared_ptr<vector_to_stream> sptr;
-
- /*!
- * Make vector-to-stream block
- *
- * \param itemsize the item size of the stream
- * \param nitems_per_block number of items per vector (vector size)
- */
- static sptr make(size_t itemsize, size_t nitems_per_block);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_VECTOR_TO_STREAM_H */
diff --git a/gr-blocks/include/blocks/vector_to_streams.h b/gr-blocks/include/blocks/vector_to_streams.h
deleted file mode 100644
index 364bc9afbd..0000000000
--- a/gr-blocks/include/blocks/vector_to_streams.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
-#define INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Convert 1 stream of vectors of length N to N streams of items
- * \ingroup stream_operators_blk
- */
- class BLOCKS_API vector_to_streams : virtual public gr_sync_block
- {
- public:
- // gr::blocks::vector_to_streams::sptr
- typedef boost::shared_ptr<vector_to_streams> sptr;
-
- /*!
- * Make vector-to-streams block
- *
- * \param itemsize the item size of the stream
- * \param nstreams number of items per vector (vector size and
- * number of streams produced)
- */
- static sptr make(size_t itemsize, size_t nstreams);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H */
diff --git a/gr-blocks/include/blocks/wavfile.h b/gr-blocks/include/blocks/wavfile.h
deleted file mode 100644
index 719ef92253..0000000000
--- a/gr-blocks/include/blocks/wavfile.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// This file stores all the RIFF file type knowledge for the wavfile_*
-// blocks.
-
-#include <blocks/api.h>
-#include <cstdio>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Read signal information from a given WAV file.
- *
- * \param[in] fp File pointer to an opened, empty file.
- * \param[out] sample_rate Stores the sample rate [S/s]
- * \param[out] nchans Number of channels
- * \param[out] bytes_per_sample Bytes per sample, can either be 1 or 2 (corresponding o
- * 8 or 16 bit samples, respectively)
- * \param[out] first_sample_pos Number of the first byte containing a sample. Use this
- * with fseek() to jump from the end of the file to the
- * first sample when in repeat mode.
- * \param[out] samples_per_chan Number of samples per channel
- * \return True on a successful read, false if the file could not be read or is
- * not a valid WAV file.
- */
- bool
- wavheader_parse(FILE *fp,
- unsigned int &sample_rate,
- int &nchans,
- int &bytes_per_sample,
- int &first_sample_pos,
- unsigned int &samples_per_chan);
-
- /*!
- * \brief Read one sample from an open WAV file at the current position.
- *
- * \details
- * Takes care of endianness.
- */
- short int
- wav_read_sample(FILE *fp, int bytes_per_sample);
-
-
- /*!
- * \brief Write a valid RIFF file header
- *
- * Note: Some header values are kept blank because they're usually
- * not known a-priori (file and chunk lengths). Use
- * gri_wavheader_complete() to fill these in.
- */
- bool
- wavheader_write(FILE *fp,
- unsigned int sample_rate,
- int nchans,
- int bytes_per_sample);
-
- /*!
- * \brief Write one sample to an open WAV file at the current position.
- *
- * \details
- * Takes care of endianness.
- */
- void
- wav_write_sample(FILE *fp, short int sample, int bytes_per_sample);
-
-
- /*!
- * \brief Complete a WAV header
- *
- * \details
- * Note: The stream position is changed during this function. If
- * anything needs to be written to the WAV file after calling this
- * function (which shouldn't happen), you need to fseek() to the
- * end of the file (or whereever).
- *
- * \param[in] fp File pointer to an open WAV file with a blank header
- * \param[in] byte_count Length of all samples written to the file in bytes.
- */
- bool
- wavheader_complete(FILE *fp, unsigned int byte_count);
-
- } /* namespace blocks */
-} /* namespace gr */
diff --git a/gr-blocks/include/blocks/wavfile_sink.h b/gr-blocks/include/blocks/wavfile_sink.h
deleted file mode 100644
index f380e055a2..0000000000
--- a/gr-blocks/include/blocks/wavfile_sink.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_WAVFILE_SINK_H
-#define INCLUDED_GR_WAVFILE_SINK_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Write stream to a Microsoft PCM (.wav) file.
- * \ingroup audio_blk
- *
- * \details
- * Values must be floats within [-1;1].
- * Check gr_make_wavfile_sink() for extra info.
- */
- class BLOCKS_API wavfile_sink : virtual public gr_sync_block
- {
- public:
- // gr::blocks::wavfile_sink::sptr
- typedef boost::shared_ptr<wavfile_sink> sptr;
-
- /*
- * \param filename The .wav file to be opened
- * \param n_channels Number of channels (2 = stereo or I/Q output)
- * \param sample_rate Sample rate [S/s]
- * \param bits_per_sample 16 or 8 bit, default is 16
- */
- static sptr make(const char *filename,
- int n_channels,
- unsigned int sample_rate,
- int bits_per_sample = 16);
-
- /*!
- * \brief Opens a new file and writes a WAV header. Thread-safe.
- */
- virtual bool open(const char* filename) = 0;
-
- /*!
- * \brief Closes the currently active file and completes the WAV
- * header. Thread-safe.
- */
- virtual void close() = 0;
-
- /*!
- * \brief Set the sample rate. This will not affect the WAV file
- * currently opened. Any following open() calls will use this new
- * sample rate.
- */
- virtual void set_sample_rate(unsigned int sample_rate) = 0;
-
- /*!
- * \brief Set bits per sample. This will not affect the WAV file
- * currently opened (see set_sample_rate()). If the value is
- * neither 8 nor 16, the call is ignored and the current value
- * is kept.
- */
- virtual void set_bits_per_sample(int bits_per_sample) = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_WAVFILE_SINK_H */
diff --git a/gr-blocks/include/blocks/wavfile_source.h b/gr-blocks/include/blocks/wavfile_source.h
deleted file mode 100644
index 5332a0c20e..0000000000
--- a/gr-blocks/include/blocks/wavfile_source.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_WAVFILE_SOURCE_H
-#define INCLUDED_GR_WAVFILE_SOURCE_H
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief Read stream from a Microsoft PCM (.wav) file, output floats
- * \ingroup audio_blk
- *
- * \details
- * Unless otherwise called, values are within [-1;1].
- * Check gr_make_wavfile_source() for extra info.
- */
- class BLOCKS_API wavfile_source : virtual public gr_sync_block
- {
- public:
- // gr::blocks::wavfile_source::sptr
- typedef boost::shared_ptr<wavfile_source> sptr;
-
- static sptr make(const char *filename, bool repeat = false);
-
- /*!
- * \brief Read the sample rate as specified in the wav file header
- */
- virtual unsigned int sample_rate() const = 0;
-
- /*!
- * \brief Return the number of bits per sample as specified in
- * the wav file header. Only 8 or 16 bit are supported here.
- */
- virtual int bits_per_sample() const = 0;
-
- /*!
- * \brief Return the number of channels in the wav file as
- * specified in the wav file header. This is also the max number
- * of outputs you can have.
- */
- virtual int channels() const = 0;
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* INCLUDED_GR_WAVFILE_SOURCE_H */
diff --git a/gr-blocks/include/blocks/xor_XX.h.t b/gr-blocks/include/blocks/xor_XX.h.t
deleted file mode 100644
index a890dbaf89..0000000000
--- a/gr-blocks/include/blocks/xor_XX.h.t
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-// @WARNING@
-
-#ifndef @GUARD_NAME@
-#define @GUARD_NAME@
-
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
- namespace blocks {
-
- /*!
- * \brief output = input_0 ^ input_1 ^ , ... ^ input_N)
- * \ingroup boolean_operators_blk
- *
- * Bitwise boolean xor across all input streams.
- */
- class BLOCKS_API @NAME@ : virtual public gr_sync_block
- {
- public:
-
- // gr::blocks::@NAME@::sptr
- typedef boost::shared_ptr<@NAME@> sptr;
-
- static sptr make(size_t vlen=1);
- };
-
- } /* namespace blocks */
-} /* namespace gr */
-
-#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
new file mode 100644
index 0000000000..14346f9c15
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
@@ -0,0 +1,218 @@
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# generate helper scripts to expand templated files
+########################################################################
+include(GrPython)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+ import build_utils
+ root, inp = sys.argv[1:3]
+ for sig in sys.argv[3:]:
+ name = re.sub ('X+', sig, root)
+ d = build_utils.standard_dict(name, sig, 'blocks')
+ build_utils.expand_template(d, inp)
+
+")
+
+macro(expand_h root)
+ #make a list of all the generated files
+ unset(expanded_files_h)
+ foreach(sig ${ARGN})
+ string(REGEX REPLACE "X+" ${sig} name ${root})
+ list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
+ endforeach(sig)
+
+ #create a command to generate the files
+ add_custom_command(
+ OUTPUT ${expanded_files_h}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
+ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+ ${root} ${root}.h.t ${ARGN}
+ )
+
+ #install rules for the generated h files
+ list(APPEND generated_includes ${expanded_files_h})
+endmacro(expand_h)
+
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+expand_h(add_XX ss ii cc)
+expand_h(add_const_XX bb ss ii ff cc)
+expand_h(add_const_vXX bb ss ii ff cc)
+expand_h(and_XX bb ss ii)
+expand_h(and_const_XX bb ss ii)
+expand_h(argmax_XX fs is ss)
+expand_h(divide_XX ss ii ff cc)
+expand_h(integrate_XX ss ii ff cc)
+expand_h(max_XX ff ii ss)
+expand_h(moving_average_XX ss ii ff cc)
+expand_h(multiply_XX ss ii)
+expand_h(multiply_const_XX ss ii)
+expand_h(multiply_const_vXX ss ii ff cc)
+expand_h(mute_XX ss ii ff cc)
+expand_h(not_XX bb ss ii)
+expand_h(or_XX bb ss ii)
+expand_h(peak_detector_XX fb ib sb)
+expand_h(probe_signal_X b s i f c)
+expand_h(probe_signal_vX b s i f c)
+expand_h(sample_and_hold_XX bb ss ii ff)
+expand_h(sub_XX ss ii ff cc)
+expand_h(xor_XX bb ss ii)
+expand_h(packed_to_unpacked_XX bb ss ii)
+expand_h(unpacked_to_packed_XX bb ss ii)
+expand_h(vector_insert_X b s i f c)
+expand_h(vector_sink_X b s i f c)
+expand_h(vector_source_X b s i f c)
+
+add_custom_target(blocks_generated_includes DEPENDS
+ ${generated_includes}
+)
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+ ${generated_includes}
+ api.h
+ control_loop.h
+ count_bits.h
+ file_sink_base.h
+ lfsr_15_1_0.h
+ lfsr_32k.h
+ log2_const.h
+ rotator.h
+ wavfile.h
+ add_ff.h
+ annotator_1to1.h
+ annotator_alltoall.h
+ annotator_raw.h
+ bin_statistics_f.h
+ burst_tagger.h
+ char_to_float.h
+ char_to_short.h
+ check_lfsr_32k_s.h
+ complex_to_interleaved_short.h
+ complex_to_float.h
+ complex_to_imag.h
+ complex_to_real.h
+ complex_to_mag.h
+ complex_to_mag_squared.h
+ complex_to_arg.h
+ conjugate_cc.h
+ copy.h
+ deinterleave.h
+ delay.h
+ endian_swap.h
+ file_descriptor_sink.h
+ file_descriptor_source.h
+ file_sink.h
+ file_source.h
+ file_meta_sink.h
+ file_meta_source.h
+ float_to_char.h
+ float_to_complex.h
+ float_to_int.h
+ float_to_short.h
+ float_to_uchar.h
+ head.h
+ int_to_float.h
+ interleave.h
+ interleaved_short_to_complex.h
+ keep_m_in_n.h
+ keep_one_in_n.h
+ lfsr_32k_source_s.h
+ message_debug.h
+ message_sink.h
+ message_source.h
+ message_strobe.h
+ message_burst_source.h
+ multiply_cc.h
+ multiply_ff.h
+ multiply_conjugate_cc.h
+ multiply_const_cc.h
+ multiply_const_ff.h
+ nlog10_ff.h
+ nop.h
+ null_sink.h
+ null_source.h
+ pack_k_bits_bb.h
+ patterned_interleaver.h
+ pdu.h
+ pdu_to_tagged_stream.h
+ peak_detector2_fb.h
+ random_pdu.h
+ plateau_detector_fb.h
+ probe_rate.h
+ regenerate_bb.h
+ repack_bits_bb.h
+ repeat.h
+ rms_cf.h
+ rms_ff.h
+ short_to_char.h
+ short_to_float.h
+ skiphead.h
+ socket_pdu.h
+ stream_mux.h
+ stream_to_streams.h
+ stream_to_vector.h
+ streams_to_stream.h
+ streams_to_vector.h
+ stretch_ff.h
+ tag_debug.h
+ tagged_file_sink.h
+ tagged_stream_mux.h
+ tagged_stream_to_pdu.h
+ threshold_ff.h
+ throttle.h
+ transcendental.h
+ tuntap_pdu.h
+ uchar_to_float.h
+ udp_sink.h
+ udp_source.h
+ unpack_k_bits_bb.h
+ vco_f.h
+ vector_map.h
+ vector_to_stream.h
+ vector_to_streams.h
+ wavfile_sink.h
+ wavfile_source.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
+ COMPONENT "blocks_devel"
+)
+
+if(ENABLE_GR_CTRLPORT)
+install(FILES
+ ctrlport_probe_c.h
+ ctrlport_probe2_c.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
+ COMPONENT "blocks_devel"
+)
+endif(ENABLE_GR_CTRLPORT)
diff --git a/gr-blocks/include/gnuradio/blocks/add_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_XX.h.t
new file mode 100644
index 0000000000..08e9646af6
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/add_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = sum (input_0, input_1, ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Add across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t
new file mode 100644
index 0000000000..3e783213a8
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input + constant
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * \brief Create an instance of @NAME@
+ * \param k additive constant
+ */
+ static sptr make(@O_TYPE@ k);
+
+ /*!
+ * \brief Return additive constant
+ */
+ virtual @O_TYPE@ k() const = 0;
+
+ /*!
+ * \brief Set additive constant
+ */
+ virtual void set_k(@O_TYPE@ k) = 0;
+ };
+
+ }
+}
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t
new file mode 100644
index 0000000000..ea6c35695e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input + constant vector
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * \brief Create an instance of @NAME@
+ * \param k additive constant vector
+ */
+ static sptr make(std::vector<@O_TYPE@> k);
+
+ /*!
+ * \brief Return additive constant vector
+ */
+ virtual std::vector<@O_TYPE@> k() const = 0;
+
+ /*!
+ * \brief Set additive constant vector
+ */
+ virtual void set_k(std::vector<@O_TYPE@> k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/add_ff.h b/gr-blocks/include/gnuradio/blocks/add_ff.h
new file mode 100644
index 0000000000..fd2420ce09
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/add_ff.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_ADD_FF_H
+#define INCLUDED_BLOCKS_ADD_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = sum (input_0, input_1, ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Add across all input streams.
+ */
+ class BLOCKS_API add_ff : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::add_ff::sptr
+ typedef boost::shared_ptr<add_ff> sptr;
+
+ /*!
+ * \brief Add streams of float values
+ * \param vlen Vector length
+ * \ingroup math_blk
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_ADD_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/and_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_XX.h.t
new file mode 100644
index 0000000000..820daefdbf
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/and_XX.h.t
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input_0 & input_1 & , ... & input_N)
+ * \ingroup boolean_operators_blk
+ *
+ * bitwise boolean and across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t
new file mode 100644
index 0000000000..a4c83a4eab
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output_N = input_N & value
+ * \ingroup boolean_operators_blk
+ *
+ * bitwise boolean and of const to the data stream.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * \brief Create an instance of @NAME@
+ * \param k AND constant
+ */
+ static sptr make(@O_TYPE@ k);
+
+ /*!
+ * \brief Return AND constant
+ */
+ virtual @O_TYPE@ k() const = 0;
+
+ /*!
+ * \brief Set AND constant
+ */
+ virtual void set_k(@O_TYPE@ k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/annotator_1to1.h b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h
new file mode 100644
index 0000000000..82c7bc0485
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ANNOTATOR_1TO1_H
+#define INCLUDED_GR_ANNOTATOR_1TO1_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief 1-to-1 stream annotator testing block. FOR TESTING PURPOSES ONLY.
+ *
+ * \details
+ * This block creates tags to be sent downstream every 10,000
+ * items it sees. The tags contain the name and ID of the
+ * instantiated block, use "seq" as a key, and have a counter that
+ * increments by 1 for every tag produced that is used as the
+ * tag's value. The tags are propagated using the 1-to-1 policy.
+ *
+ * It also stores a copy of all tags it sees flow past it. These
+ * tags can be recalled externally with the data() member.
+ *
+ * This block is only meant for testing and showing how to use the tags.
+ */
+ class BLOCKS_API annotator_1to1 : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::annotator_1to1::sptr
+ typedef boost::shared_ptr<annotator_1to1> sptr;
+
+ static sptr make(int when, size_t sizeof_stream_item);
+
+ virtual std::vector<tag_t> data() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ANNOTATOR_1TO1_H */
diff --git a/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h
new file mode 100644
index 0000000000..2585f1c018
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_H
+#define INCLUDED_GR_ANNOTATOR_ALLTOALL_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief All-to-all stream annotator testing block. FOR TESTING PURPOSES ONLY.
+ *
+ * \details
+ * This block creates tags to be sent downstream every 10,000
+ * items it sees. The tags contain the name and ID of the
+ * instantiated block, use "seq" as a key, and have a counter that
+ * increments by 1 for every tag produced that is used as the
+ * tag's value. The tags are propagated using the all-to-all
+ * policy.
+ *
+ * It also stores a copy of all tags it sees flow past it. These
+ * tags can be recalled externally with the data() member.
+ *
+ * This block is only meant for testing and showing how to use the tags.
+ */
+ class BLOCKS_API annotator_alltoall : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::annotator_alltoall::sptr
+ typedef boost::shared_ptr<annotator_alltoall> sptr;
+
+ static sptr make(int when, size_t sizeof_stream_item);
+
+ virtual std::vector<tag_t> data() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ANNOTATOR_ALLTOALL_H */
diff --git a/gr-blocks/include/gnuradio/blocks/annotator_raw.h b/gr-blocks/include/gnuradio/blocks/annotator_raw.h
new file mode 100644
index 0000000000..0797f97928
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/annotator_raw.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ANNOTATOR_RAW_H
+#define INCLUDED_GR_ANNOTATOR_RAW_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/tags.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief raw stream annotator testing block.
+ *
+ * \details
+ * This block creates arbitrary tags to be sent downstream gnuradio/blocks
+ * to be sent are set manually via accessor methods and are sent
+ * only once.
+ *
+ * This block is intended for testing of tag related gnuradio/blocks
+ */
+ class BLOCKS_API annotator_raw : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::annotator_raw::sptr
+ typedef boost::shared_ptr<annotator_raw> sptr;
+
+ static sptr make(size_t sizeof_stream_item);
+
+ // insert a tag to be added
+ virtual void add_tag(uint64_t offset, pmt::pmt_t key, pmt::pmt_t val) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ANNOTATOR_RAW_H */
diff --git a/gr-blocks/include/gnuradio/blocks/api.h b/gr-blocks/include/gnuradio/blocks/api.h
new file mode 100644
index 0000000000..fd4e605b56
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_API_H
+#define INCLUDED_BLOCKS_API_H
+
+#include <gnuradio/attributes.h>
+
+#ifdef gnuradio_blocks_EXPORTS
+# define BLOCKS_API __GR_ATTR_EXPORT
+#else
+# define BLOCKS_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_BLOCKS_API_H */
diff --git a/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t
new file mode 100644
index 0000000000..71468726ec
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Compares vectors from multiple streams and determines
+ * the index in the vector and stream number where the maximum
+ * value occurred.
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Data is passed in as a vector of length \p vlen from multiple
+ * input sources. It will look through these streams of \p vlen
+ * data items and output two streams.
+ * Stream 0 will contain the index value in the vector where
+ * the maximum value occurred.
+ * Stream 1 will contain the number of the input stream that
+ * held the maximum value.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
new file mode 100644
index 0000000000..47abaefec9
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
@@ -0,0 +1,76 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_BIN_STATISTICS_F_H
+#define INCLUDED_GR_BIN_STATISTICS_F_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/feval.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief control scanning and record frequency domain statistics
+ * \ingroup sink_blk
+ */
+ class BLOCKS_API bin_statistics_f : virtual public sync_block
+ {
+ protected:
+ std::vector<float> d_max; // per bin maxima
+
+ virtual size_t vlen() const = 0;
+ virtual double center_freq() const = 0;
+ virtual gr::msg_queue::sptr msgq() const = 0;
+
+ virtual void reset_stats() = 0;
+ virtual void accrue_stats(const float *input) = 0;
+ virtual void send_stats() = 0;
+
+ public:
+ // gr::gnuradio/blocks::bin_statistics_f::sptr
+ typedef boost::shared_ptr<bin_statistics_f> sptr;
+
+ /*!
+ * Build a bin statistics block. See qa_bin_statistics.py and
+ * gr-uhd/examples/python/usrp_spectrum_sense.py for examples of
+ * its use, specifically how to use the callback function.
+ *
+ * \param vlen vector length
+ * \param msgq message queue
+ * \param tune a feval_dd callback function
+ * \param tune_delay number of samples for the tune delay
+ * \param dwell_delay number of samples for the dwell delay
+ */
+ static sptr make(unsigned int vlen, // vector length
+ gr::msg_queue::sptr msgq,
+ feval_dd *tune, // callback
+ size_t tune_delay, // samples
+ size_t dwell_delay); // samples
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_BIN_STATISTICS_F_H */
diff --git a/gr-blocks/include/gnuradio/blocks/burst_tagger.h b/gr-blocks/include/gnuradio/blocks/burst_tagger.h
new file mode 100644
index 0000000000..e10938980e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/burst_tagger.h
@@ -0,0 +1,76 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_BURST_TAGGER_H
+#define INCLUDED_GR_BURST_TAGGER_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Sets a burst on/off tag based on the value of the trigger input.
+ * \ingroup peak_detectors_blk
+ * \ingroup stream_tag_tools_blk
+ *
+ * \details
+ * This block takes two inputs, a signal stream on the input
+ * stream 0 and a trigger stream of shorts on input stream 1. If
+ * the trigger stream goes above 0, a tag with the key "burst"
+ * will be transmitted as a pmt::PMT_T. When the trigger signal
+ * falls below 0, the "burst" tag will be transmitted as
+ * pmt::PMT_F.
+ *
+ * The signal on stream 0 is retransmitted to output stream 0.
+ */
+ class BLOCKS_API burst_tagger : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::burst_tagger::sptr
+ typedef boost::shared_ptr<burst_tagger> sptr;
+
+ /*!
+ * Build a burst tagger gnuradio/blocks.
+ *
+ * \param itemsize itemsize of the signal stream on input 0.
+ */
+ static sptr make(size_t itemsize);
+
+ /*!
+ * For the true burst tag, change the key name to \p key and a
+ * new value of \p value.
+ */
+ virtual void set_true_tag(const std::string &key, bool value) = 0;
+
+ /*!
+ * For the false burst tag, change the key name to \p key and a
+ * new value of \p value.
+ */
+ virtual void set_false_tag(const std::string &key, bool value) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_BURST_TAGGER_H */
diff --git a/gr-blocks/include/gnuradio/blocks/char_to_float.h b/gr-blocks/include/gnuradio/blocks/char_to_float.h
new file mode 100644
index 0000000000..71861adf16
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/char_to_float.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
+#define INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of chars to a stream of float
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API char_to_float : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::char_to_float_ff::sptr
+ typedef boost::shared_ptr<char_to_float> sptr;
+
+ /*!
+ * Build a chars to float stream converter block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar divider value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar divider value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_CHAR_TO_FLOAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/char_to_short.h b/gr-blocks/include/gnuradio/blocks/char_to_short.h
new file mode 100644
index 0000000000..62800b216a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/char_to_short.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_CHAR_TO_SHORT_H
+#define INCLUDED_BLOCKS_CHAR_TO_SHORT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of chars to a stream of short
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API char_to_short : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::char_to_short_ff::sptr
+ typedef boost::shared_ptr<char_to_short> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_CHAR_TO_SHORT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h
new file mode 100644
index 0000000000..132e263624
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H
+#define INCLUDED_GR_CHECK_LFSR_32K_S_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief sink that checks if its input stream consists of a lfsr_32k sequence.
+ * \ingroup sink_blk
+ *
+ * \details
+ * This sink is typically used along with
+ * gr::gnuradio/blocks::lfsr_32k_source_s to test the USRP using its
+ * digital loopback mode.
+ */
+ class BLOCKS_API check_lfsr_32k_s : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::check_lfsr_32k_s::sptr
+ typedef boost::shared_ptr<check_lfsr_32k_s> sptr;
+
+ static sptr make();
+
+ virtual long ntotal () const = 0;
+ virtual long nright () const = 0;
+ virtual long runlength () const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_CHECK_LFSR_32K_S_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_arg.h b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h
new file mode 100644
index 0000000000..63e2a37cb9
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief complex in, arg out (float)
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_arg : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_arg_ff::sptr
+ typedef boost::shared_ptr<complex_to_arg> sptr;
+
+ /*!
+ * Build a complex to arg block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_ARG_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_float.h b/gr-blocks/include/gnuradio/blocks/complex_to_float.h
new file mode 100644
index 0000000000..341d2e2d9e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_float.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief convert a stream of gr_complex to 1 or 2 streams of float
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_float : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_float_ff::sptr
+ typedef boost::shared_ptr<complex_to_float> sptr;
+
+ /*!
+ * Build a complex to float block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_imag.h b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h
new file mode 100644
index 0000000000..7a8d200639
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief complex in, imag out (float)
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_imag : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_imag_ff::sptr
+ typedef boost::shared_ptr<complex_to_imag> sptr;
+
+ /*!
+ * Build a complex to imaginary part block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h
new file mode 100644
index 0000000000..8be4f86622
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of complex to a stream of interleaved shorts
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_interleaved_short : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_interleaved_short::sptr
+ typedef boost::shared_ptr<complex_to_interleaved_short> sptr;
+
+ /*!
+ * Build a complex to interleaved shorts block.
+ */
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_mag.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h
new file mode 100644
index 0000000000..fcb1fe66ca
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief complex in, magnitude out (float)
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_mag : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_mag_ff::sptr
+ typedef boost::shared_ptr<complex_to_mag> sptr;
+
+ /*!
+ * Build a complex to magnitude block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_MAG_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h
new file mode 100644
index 0000000000..662505039c
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief complex in, magnitude squared out (float)
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_mag_squared : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_mag_squared_ff::sptr
+ typedef boost::shared_ptr<complex_to_mag_squared> sptr;
+
+ /*!
+ * Build a complex to magnitude squared block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H */
diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_real.h b/gr-blocks/include/gnuradio/blocks/complex_to_real.h
new file mode 100644
index 0000000000..7efefcddd3
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_real.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
+#define INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief complex in, real out (float)
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API complex_to_real : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::complex_to_real_ff::sptr
+ typedef boost::shared_ptr<complex_to_real> sptr;
+
+ /*!
+ * Build a complex to real part block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_COMPLEX_TO_REAL_H */
diff --git a/gr-blocks/include/gnuradio/blocks/conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h
new file mode 100644
index 0000000000..7e4440c713
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_CONJUGATE_CC_H
+#define INCLUDED_BLOCKS_CONJUGATE_CC_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = complex conjugate of input
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API conjugate_cc : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::conjugate_cc_ff::sptr
+ typedef boost::shared_ptr<conjugate_cc> sptr;
+
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_CONJUGATE_CC_H */
diff --git a/gr-blocks/include/gnuradio/blocks/control_loop.h b/gr-blocks/include/gnuradio/blocks/control_loop.h
new file mode 100644
index 0000000000..d53c81cbac
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/control_loop.h
@@ -0,0 +1,234 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GR_BLOCKS_CONTROL_LOOP
+#define GR_BLOCKS_CONTROL_LOOP
+
+#include <gnuradio/blocks/api.h>
+
+namespace gr {
+ namespace blocks {
+
+ class BLOCKS_API control_loop
+ {
+ protected:
+ float d_phase, d_freq;
+ float d_max_freq, d_min_freq;
+ float d_damping, d_loop_bw;
+ float d_alpha, d_beta;
+
+ public:
+ control_loop(void) {}
+ control_loop(float loop_bw, float max_freq, float min_freq);
+ virtual ~control_loop();
+
+ /*! \brief update the system gains from the loop bandwidth and damping factor
+ *
+ * This function updates the system gains based on the loop
+ * bandwidth and damping factor of the system. These two
+ * factors can be set separately through their own set
+ * functions.
+ */
+ void update_gains();
+
+ /*! \brief Advance the control loop based on the current gain
+ * settings and the inputted error signal.
+ */
+ void advance_loop(float error);
+
+ /*! \brief Keep the phase between -2pi and 2pi
+ *
+ * This function keeps the phase between -2pi and 2pi. If the
+ * phase is greater than 2pi by d, it wraps around to be -2pi+d;
+ * similarly if it is less than -2pi by d, it wraps around to
+ * 2pi-d.
+ *
+ * This function should be called after advance_loop to keep the
+ * phase in a good operating region. It is set as a separate
+ * method in case another way is desired as this is fairly
+ * heavy-handed.
+ */
+ void phase_wrap();
+
+ /*! \brief Keep the frequency between d_min_freq and d_max_freq
+ *
+ * This function keeps the frequency between d_min_freq and
+ * d_max_freq. If the frequency is greater than d_max_freq, it
+ * is set to d_max_freq. If the frequency is less than
+ * d_min_freq, it is set to d_min_freq.
+ *
+ * This function should be called after advance_loop to keep the
+ * frequency in the specified region. It is set as a separate
+ * method in case another way is desired as this is fairly
+ * heavy-handed.
+ */
+ void frequency_limit();
+
+ /*******************************************************************
+ * SET FUNCTIONS
+ *******************************************************************/
+
+ /*!
+ * \brief Set the loop bandwidth
+ *
+ * Set the loop filter's bandwidth to \p bw. This should be
+ * between 2*pi/200 and 2*pi/100 (in rads/samp). It must also be
+ * a positive number.
+ *
+ * When a new damping factor is set, the gains, alpha and beta,
+ * of the loop are recalculated by a call to update_gains().
+ *
+ * \param bw (float) new bandwidth
+ */
+ virtual void set_loop_bandwidth(float bw);
+
+ /*!
+ * \brief Set the loop damping factor
+ *
+ * Set the loop filter's damping factor to \p df. The damping
+ * factor should be sqrt(2)/2.0 for critically damped systems.
+ * Set it to anything else only if you know what you are
+ * doing. It must be a number between 0 and 1.
+ *
+ * When a new damping factor is set, the gains, alpha and beta,
+ * of the loop are recalculated by a call to update_gains().
+ *
+ * \param df (float) new damping factor
+ */
+ void set_damping_factor(float df);
+
+ /*!
+ * \brief Set the loop gain alpha
+ *
+ * Set's the loop filter's alpha gain parameter.
+ *
+ * This value should really only be set by adjusting the loop
+ * bandwidth and damping factor.
+ *
+ * \param alpha (float) new alpha gain
+ *
+ */
+ void set_alpha(float alpha);
+
+ /*!
+ * \brief Set the loop gain beta
+ *
+ * Set's the loop filter's beta gain parameter.
+ *
+ * This value should really only be set by adjusting the loop
+ * bandwidth and damping factor.
+ *
+ * \param beta (float) new beta gain
+ */
+ void set_beta(float beta);
+
+ /*!
+ * \brief Set the control loop's frequency.
+ *
+ * Set's the control loop's frequency. While this is normally
+ * updated by the inner loop of the algorithm, it could be
+ * useful to manually initialize, set, or reset this under
+ * certain circumstances.
+ *
+ * \param freq (float) new frequency
+ */
+ void set_frequency(float freq);
+
+ /*!
+ * \brief Set the control loop's phase.
+ *
+ * Set's the control loop's phase. While this is normally
+ * updated by the inner loop of the algorithm, it could be
+ * useful to manually initialize, set, or reset this under
+ * certain circumstances.
+ *
+ * \param phase (float) new phase
+ */
+ void set_phase(float phase);
+
+ /*!
+ * \brief Set the control loop's maximum frequency.
+ *
+ * Set the maximum frequency the control loop can track.
+ *
+ * \param freq (float) new max frequency
+ */
+ void set_max_freq(float freq);
+
+ /*!
+ * \brief Set the control loop's minimum frequency.
+ *
+ * Set the minimum frequency the control loop can track.
+ *
+ * \param freq (float) new min frequency
+ */
+ void set_min_freq(float freq);
+
+ /*******************************************************************
+ * GET FUNCTIONS
+ *******************************************************************/
+
+ /*!
+ * \brief Returns the loop bandwidth
+ */
+ float get_loop_bandwidth() const;
+
+ /*!
+ * \brief Returns the loop damping factor
+ */
+ float get_damping_factor() const;
+
+ /*!
+ * \brief Returns the loop gain alpha
+ */
+ float get_alpha() const;
+
+ /*!
+ * \brief Returns the loop gain beta
+ */
+ float get_beta() const;
+
+ /*!
+ * \brief Get the control loop's frequency estimate
+ */
+ float get_frequency() const;
+
+ /*!
+ * \brief Get the control loop's phase estimate
+ */
+ float get_phase() const;
+
+ /*!
+ * \brief Get the control loop's maximum frequency.
+ */
+ float get_max_freq() const;
+
+ /*!
+ * \brief Get the control loop's minimum frequency.
+ */
+ float get_min_freq() const;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* GR_BLOCKS_CONTROL_LOOP */
diff --git a/gr-blocks/include/gnuradio/blocks/copy.h b/gr-blocks/include/gnuradio/blocks/copy.h
new file mode 100644
index 0000000000..f960d4fba7
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/copy.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_COPY_H
+#define INCLUDED_GR_COPY_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output[i] = input[i]
+ * \ingroup misc_blk
+ *
+ * \details
+ * When enabled (default), this block copies its input to its
+ * output. When disabled, this block drops its input on the floor.
+ */
+ class BLOCKS_API copy : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::copy::sptr
+ typedef boost::shared_ptr<copy> sptr;
+
+ static sptr make(size_t itemsize);
+
+ virtual void set_enabled(bool enable) = 0;
+ virtual bool enabled() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_COPY_H */
diff --git a/gr-blocks/include/gnuradio/blocks/count_bits.h b/gr-blocks/include/gnuradio/blocks/count_bits.h
new file mode 100644
index 0000000000..88f56f7221
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/count_bits.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GR_COUNT_BITS_H_
+#define _GR_COUNT_BITS_H_
+
+#include <gnuradio/blocks/api.h>
+
+namespace gr {
+ namespace blocks {
+
+ //! return number of set bits in the low 8 bits of x
+ BLOCKS_API unsigned int count_bits8(unsigned int x);
+
+ //! return number of set bits in the low 16 bits of x
+ BLOCKS_API unsigned int count_bits16(unsigned int x);
+
+ //! return number of set bits in the low 32 bits of x
+ BLOCKS_API unsigned int count_bits32(unsigned int x);
+
+ //! return number of set bits in a 64-bit word
+ BLOCKS_API unsigned int count_bits64(unsigned long long int x);
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* _GR_COUNT_BITS_H_ */
diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h
new file mode 100644
index 0000000000..c15635bc2c
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE2_C_H
+#define INCLUDED_CTRLPORT_PROBE2_C_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief A ControlPort probe to export vectors of signals.
+ * \ingroup measurement_tools_blk
+ * \ingroup controlport_blk
+ *
+ * \details
+ * This block acts as a sink in the flowgraph but also exports
+ * vectors of complex samples over ControlPort. This block holds
+ * the latest \p len number of complex samples so that every query
+ * by a ControlPort client will get the same length vector.
+ */
+ class BLOCKS_API ctrlport_probe2_c : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::ctrlport_probe2_c::sptr
+ typedef boost::shared_ptr<ctrlport_probe2_c> sptr;
+
+ /*!
+ * \brief Make a ControlPort probe block.
+ * \param id A string ID to name the probe over ControlPort.
+ * \param desc A string describing the probe.
+ * \param len Number of samples to transmit.
+ */
+ static sptr make(const std::string &id, const std::string &desc, int len);
+
+ virtual std::vector<gr_complex> get() = 0;
+
+ virtual void set_length(int len) = 0;
+ virtual int length() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_PROBE2_C_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
new file mode 100644
index 0000000000..88eed7e5d7
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE_C_H
+#define INCLUDED_CTRLPORT_PROBE_C_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief A ControlPort probe to export vectors of signals.
+ * \ingroup measurement_tools_blk
+ * \ingroup controlport_blk
+ *
+ * \details
+ * This block acts as a sink in the flowgraph but also exports
+ * vectors of complex samples over ControlPort. This block simply
+ * sends the current vector held in the work function when the
+ * queried by a ControlPort client.
+ */
+ class BLOCKS_API ctrlport_probe_c : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::ctrlport_probe_c::sptr
+ typedef boost::shared_ptr<ctrlport_probe_c> sptr;
+
+ /*!
+ * \brief Make a ControlPort probe block.
+ * \param id A string ID to name the probe over ControlPort.
+ * \param desc A string describing the probe.
+ */
+ static sptr make(const std::string &id, const std::string &desc);
+
+ virtual std::vector<gr_complex> get() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_GR_CTRLPORT_PROBE_C_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h
new file mode 100644
index 0000000000..e9e7ebd58a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_DEINTERLEAVE_H
+#define INCLUDED_BLOCKS_DEINTERLEAVE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief deinterleave a single input into N outputs
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API deinterleave : virtual public sync_decimator
+ {
+ public:
+ // gr::gnuradio/blocks::deinterleave::sptr
+ typedef boost::shared_ptr<deinterleave> sptr;
+
+ /*!
+ * Make a deinterleave block.
+ *
+ * \param itemsize stream itemsize
+ */
+ static sptr make(size_t itemsize);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_DEINTERLEAVE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/delay.h b/gr-blocks/include/gnuradio/blocks/delay.h
new file mode 100644
index 0000000000..8fc5bb3028
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/delay.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_DELAY_H
+#define INCLUDED_BLOCKS_DELAY_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief delay the input by a certain number of samples
+ * \ingroup misc_blk
+ */
+ class BLOCKS_API delay : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::delay::sptr
+ typedef boost::shared_ptr<delay> sptr;
+
+ /*!
+ * \brief Make a delay block.
+ * \param itemsize size of the data items.
+ * \param delay number of samples to delay stream.
+ */
+ static sptr make(size_t itemsize, int delay);
+
+ virtual int dly() const = 0;
+ virtual void set_dly(int d) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_DELAY_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/divide_XX.h.t b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t
new file mode 100644
index 0000000000..25e7941f72
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input_0 / input_1 / input_x ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Divide across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/endian_swap.h b/gr-blocks/include/gnuradio/blocks/endian_swap.h
new file mode 100644
index 0000000000..841fc3c4b8
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/endian_swap.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2012,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_ENDIAN_SWAP_H
+#define INCLUDED_GR_ENDIAN_SWAP_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of items into thier byte swapped version
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API endian_swap : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::endian_swap::sptr
+ typedef boost::shared_ptr<endian_swap> sptr;
+
+ /*!
+ * Make an endian swap block.
+ *
+ * \param item_size_bytes number of bytes per item, 1=no-op,
+ * 2=uint16_t, 4=uint32_t, 8=uint64_t
+ */
+ static sptr make(size_t item_size_bytes=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_ENDIAN_SWAP_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h
new file mode 100644
index 0000000000..9a3cf2edad
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
+#define INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Write stream to file descriptor.
+ * \ingroup file_operators_blk
+ */
+ class BLOCKS_API file_descriptor_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::file_descriptor_sink::sptr
+ typedef boost::shared_ptr<file_descriptor_sink> sptr;
+
+ /*!
+ * Build a file descriptor sink block.
+ *
+ * \param itemsize item size of the incoming data stream.
+ * \param fd file descriptor (as an integer).
+ */
+ static sptr make(size_t itemsize, int fd);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FILE_DESCRIPTOR_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h
new file mode 100644
index 0000000000..24e6028892
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
+#define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Read stream from file descriptor.
+ * \ingroup file_operators_blk
+ */
+ class BLOCKS_API file_descriptor_source : virtual public sync_block
+ {
+ protected:
+ virtual int read_items(char *buf, int nitems) = 0;
+ virtual int handle_residue(char *buf, int nbytes_read) = 0;
+ virtual void flush_residue() = 0;
+
+ public:
+ // gr::gnuradio/blocks::file_descriptor_source::sptr
+ typedef boost::shared_ptr<file_descriptor_source> sptr;
+
+ /*!
+ * Build a file descriptor source block.
+ *
+ * \param itemsize item size of the incoming data stream.
+ * \param fd file descriptor (as an integer).
+ * \param repeat repeat the data stream continuously.
+ */
+ static sptr make(size_t itemsize, int fd, bool repeat);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_meta_sink.h b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h
new file mode 100644
index 0000000000..10230008a3
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h
@@ -0,0 +1,112 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FILE_META_SINK_H
+#define INCLUDED_BLOCKS_FILE_META_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ const char METADATA_VERSION = 0;
+ const size_t METADATA_HEADER_SIZE = 149;
+
+ enum gr_file_types {
+ GR_FILE_BYTE=0,
+ GR_FILE_CHAR=0,
+ GR_FILE_SHORT=1,
+ GR_FILE_INT,
+ GR_FILE_LONG,
+ GR_FILE_LONG_LONG,
+ GR_FILE_FLOAT,
+ GR_FILE_DOUBLE,
+ };
+
+ /*!
+ * \brief Write stream to file with meta-data headers.
+ * \ingroup file_operators_blk
+ *
+ * \details
+ * These files represent data as binary information in between
+ * meta-data headers. The headers contain information about the
+ * type of data and properties of the data in the next segment of
+ * samples. The information includes:
+ *
+ * rx_rate (double): sample rate of data.
+ * rx_time (uint64_t, double): time stamp of first sample in segment.
+ * size (uint32_t): item size in bytes.
+ * type (gr_file_types as int32_t): data type.
+ * cplx (bool): Is data complex?
+ * strt (uint64_t): Starting byte of data in this segment.
+ * bytes (uint64_t): Size in bytes of data in this segment.
+ *
+ * Tags can be sent to the file to update the information, which
+ * will create a new header. Headers are found by searching from
+ * the first header (at position 0 in the file) and reading where
+ * the data segment starts plus the data segment size. Following
+ * will either be a new header or EOF.
+ */
+ class BLOCKS_API file_meta_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::file_meta_sink::sptr
+ typedef boost::shared_ptr<file_meta_sink> sptr;
+
+ /*!
+ * \brief Create a meta-data file sink.
+ *
+ * \param itemsize (size_t): Size of data type.
+ * \param filename (string): Name of file to write data to.
+ * \param samp_rate (double): Sample rate of data. If sample rate will be
+ * set by a tag, such as rx_tag from a UHD source, this is
+ * basically ignored.
+ * \param relative_rate (double): Rate chance from source of sample
+ * rate tag to sink.
+ * \param type (gr_file_types): Data type (int, float, etc.)
+ * \param complex (bool): If data stream is complex
+ * \param max_segment_size (size_t): Length of a single segment
+ * before the header is repeated (in items).
+ * \param extra_dict (string): a serialized PMT dictionary of extra
+ * information. Currently not supported.
+ * \param detached_header (bool): Set to true to store the header
+ * info in a separate file (named filename.hdr)
+ */
+ static sptr make(size_t itemsize, const std::string &filename,
+ double samp_rate=1, double relative_rate=1,
+ gr_file_types type=GR_FILE_FLOAT, bool complex=true,
+ size_t max_segment_size=1000000,
+ const std::string &extra_dict="",
+ bool detached_header=false);
+
+ virtual bool open(const std::string &filename) = 0;
+ virtual void close() = 0;
+ virtual void do_update() = 0;
+
+ virtual void set_unbuffered(bool unbuffered) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FILE_META_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_meta_source.h b/gr-blocks/include/gnuradio/blocks/file_meta_source.h
new file mode 100644
index 0000000000..38b6a43d86
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_meta_source.h
@@ -0,0 +1,82 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_H
+#define INCLUDED_BLOCKS_FILE_META_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Reads stream from file with meta-data headers. Headers
+ * are parsed into tags.
+ * \ingroup file_operators_blk
+ *
+ * \details
+ * The information in the metadata headers includes:
+ *
+ * rx_rate (double): sample rate of data.
+ * rx_time (uint64_t, double): time stamp of first sample in segment.
+ * size (uint32_t): item size in bytes.
+ * type (gr_file_types as int32_t): data type.
+ * cplx (bool): Is data complex?
+ * strt (uint64_t): Starting byte of data in this segment.
+ * bytes (uint64_t): Size in bytes of data in this segment.
+ *
+ * Any item inside of the extra header dictionary is ready out and
+ * made into a stream tag.
+ */
+ class BLOCKS_API file_meta_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::file_meta_source::sptr
+ typedef boost::shared_ptr<file_meta_source> sptr;
+
+ /*!
+ * \brief Create a meta-data file source.
+ *
+ * \param filename (string): Name of file to write data to.
+ * \param repeat (bool): Repeats file when EOF is found.
+ * \param detached_header (bool): Set to true if header
+ * info is stored in a separate file (usually named filename.hdr)
+ * \param hdr_filename (string): Name of detached header file if used.
+ * Defaults to 'filename.hdr' if detached_header is true but this
+ * field is an empty string.
+ */
+ static sptr make(const std::string &filename,
+ bool repeat=false,
+ bool detached_header=false,
+ const std::string &hdr_filename="");
+
+ virtual bool open(const std::string &filename,
+ const std::string &hdr_filename="") = 0;
+ virtual void close() = 0;
+ virtual void do_update() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FILE_META_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_sink.h b/gr-blocks/include/gnuradio/blocks/file_sink.h
new file mode 100644
index 0000000000..7ea2889835
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_sink.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FILE_SINK_H
+#define INCLUDED_GR_FILE_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/file_sink_base.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Write stream to file.
+ * \ingroup file_operators_blk
+ */
+ class BLOCKS_API file_sink : virtual public sync_block,
+ virtual public file_sink_base
+ {
+ public:
+ // gr::gnuradio/blocks::file_sink::sptr
+ typedef boost::shared_ptr<file_sink> sptr;
+
+ /*!
+ * \brief Make a file sink.
+ * \param itemsize size of the input data items.
+ * \param filename name of the file to open and write output to.
+ */
+ static sptr make(size_t itemsize, const char *filename);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FILE_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_sink_base.h b/gr-blocks/include/gnuradio/blocks/file_sink_base.h
new file mode 100644
index 0000000000..812da6dfae
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_sink_base.h
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FILE_SINK_BASE_H
+#define INCLUDED_GR_FILE_SINK_BASE_H
+
+#include <gnuradio/blocks/api.h>
+#include <boost/thread.hpp>
+#include <cstdio>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Common base class for file sinks
+ */
+ class BLOCKS_API file_sink_base
+ {
+ protected:
+ FILE *d_fp; // current FILE pointer
+ FILE *d_new_fp; // new FILE pointer
+ bool d_updated; // is there a new FILE pointer?
+ bool d_is_binary;
+ boost::mutex d_mutex;
+ bool d_unbuffered;
+
+ protected:
+ file_sink_base(const char *filename, bool is_binary);
+
+ public:
+ file_sink_base() {}
+ ~file_sink_base();
+
+ /*!
+ * \brief Open filename and begin output to it.
+ */
+ bool open(const char *filename);
+
+ /*!
+ * \brief Close current output file.
+ *
+ * Closes current output file and ignores any output until
+ * open is called to connect to another file.
+ */
+ void close();
+
+ /*!
+ * \brief if we've had an update, do it now.
+ */
+ void do_update();
+
+ /*!
+ * \brief turn on unbuffered writes for slower outputs
+ */
+ void set_unbuffered(bool unbuffered);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FILE_SINK_BASE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/file_source.h b/gr-blocks/include/gnuradio/blocks/file_source.h
new file mode 100644
index 0000000000..3ed2747c3e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/file_source.h
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FILE_SOURCE_H
+#define INCLUDED_BLOCKS_FILE_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Read stream from file
+ * \ingroup file_operators_blk
+ */
+ class BLOCKS_API file_source : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::file_source::sptr
+ typedef boost::shared_ptr<file_source> sptr;
+
+ /*!
+ * \brief Create a file source.
+ *
+ * Opens \p filename as a source of items into a flowgraph. The
+ * data is expected to be in binary format, item after item. The
+ * \p itemsize of the block determines the conversion from bits
+ * to items.
+ *
+ * If \p repeat is turned on, the file will repeat the file after
+ * it's reached the end.
+ *
+ * \param itemsize the size of each item in the file, in bytes
+ * \param filename name of the file to source from
+ * \param repeat repeat file from start
+ */
+ static sptr make(size_t itemsize, const char *filename, bool repeat = false);
+
+ /*!
+ * \brief seek file to \p seek_point relative to \p whence
+ *
+ * \param seek_point sample offset in file
+ * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek)
+ */
+ virtual bool seek(long seek_point, int whence) = 0;
+
+ /*!
+ * \brief Opens a new file.
+ *
+ * \param filename name of the file to source from
+ * \param repeat repeat file from start
+ */
+ virtual void open(const char *filename, bool repeat) = 0;
+
+ /*!
+ * \brief Close the file handle.
+ */
+ virtual void close() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FILE_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/float_to_char.h b/gr-blocks/include/gnuradio/blocks/float_to_char.h
new file mode 100644
index 0000000000..5933606088
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/float_to_char.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
+#define INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of floats to a stream of char
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API float_to_char : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::float_to_char_ff::sptr
+ typedef boost::shared_ptr<float_to_char> sptr;
+
+ /*!
+ * Build a float to char block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar multiplier value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar multiplier value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_CHAR_H */
diff --git a/gr-blocks/include/gnuradio/blocks/float_to_complex.h b/gr-blocks/include/gnuradio/blocks/float_to_complex.h
new file mode 100644
index 0000000000..c8a97f1fb7
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/float_to_complex.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
+#define INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief one or two floats in, complex out
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API float_to_complex : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::float_to_complex_ff::sptr
+ typedef boost::shared_ptr<float_to_complex> sptr;
+
+ /*!
+ * Build a float to complex block.
+ *
+ * \param vlen vector len (default 1)
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H */
diff --git a/gr-blocks/include/gnuradio/blocks/float_to_int.h b/gr-blocks/include/gnuradio/blocks/float_to_int.h
new file mode 100644
index 0000000000..0d82b7e5c5
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/float_to_int.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_INT_H
+#define INCLUDED_BLOCKS_FLOAT_TO_INT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of floats to a stream of ints.
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API float_to_int : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::float_to_int_ff::sptr
+ typedef boost::shared_ptr<float_to_int> sptr;
+
+ /*!
+ * Build a float to int block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar multiplier value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar multiplier value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_INT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/float_to_short.h b/gr-blocks/include/gnuradio/blocks/float_to_short.h
new file mode 100644
index 0000000000..ad62189dd2
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/float_to_short.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
+#define INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of floats to a stream of shorts
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API float_to_short : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::float_to_short_ff::sptr
+ typedef boost::shared_ptr<float_to_short> sptr;
+
+ /*!
+ * Build a float to short block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar multiplier value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar multiplier value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_SHORT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/float_to_uchar.h b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h
new file mode 100644
index 0000000000..3a34079bc1
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
+#define INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of floats to a stream of unsigned chars
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API float_to_uchar : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::float_to_uchar_ff::sptr
+ typedef boost::shared_ptr<float_to_uchar> sptr;
+
+ /*!
+ * Build a float to uchar block.
+ */
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H */
diff --git a/gr-blocks/include/gnuradio/blocks/head.h b/gr-blocks/include/gnuradio/blocks/head.h
new file mode 100644
index 0000000000..f4a870908a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/head.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_HEAD_H
+#define INCLUDED_GR_HEAD_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <stddef.h> // size_t
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief copies the first N items to the output then signals done
+ * \ingroup misc_blk
+ *
+ * \details
+ * Useful for building test cases
+ */
+ class BLOCKS_API head : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::head::sptr
+ typedef boost::shared_ptr<head> sptr;
+
+ static sptr make(size_t sizeof_stream_item,
+ uint64_t nitems);
+
+ virtual void reset() = 0;
+ virtual void set_length(int nitems) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_HEAD_H */
diff --git a/gr-blocks/include/gnuradio/blocks/int_to_float.h b/gr-blocks/include/gnuradio/blocks/int_to_float.h
new file mode 100644
index 0000000000..6813449a95
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/int_to_float.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_INT_TO_FLOAT_H
+#define INCLUDED_BLOCKS_INT_TO_FLOAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of ints to a stream of floats.
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API int_to_float : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::int_to_float_ff::sptr
+ typedef boost::shared_ptr<int_to_float> sptr;
+
+ /*!
+ * Build an int to float block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar divider value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar divider value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_INT_TO_FLOAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t
new file mode 100644
index 0000000000..343ab1ef6c
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Integrate successive samples and decimate
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_decimator
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(int decim);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h
new file mode 100644
index 0000000000..a2aa2fc6c2
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/interleave.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_INTERLEAVE_H
+#define INCLUDED_BLOCKS_INTERLEAVE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief interleave N inputs into a single output
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API interleave : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::interleave::sptr
+ typedef boost::shared_ptr<interleave> sptr;
+
+ /*!
+ * Make a stream interleave block.
+ *
+ * \param itemsize stream itemsize
+ */
+ static sptr make(size_t itemsize);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_INTERLEAVE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
new file mode 100644
index 0000000000..9fe0ec4147
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
+#define INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of interleaved shorts to a stream of complex
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API interleaved_short_to_complex : virtual public sync_decimator
+ {
+ public:
+ // gr::gnuradio/blocks::interleaved_short_to_complex::sptr
+ typedef boost::shared_ptr<interleaved_short_to_complex> sptr;
+
+ /*!
+ * Build an interleaved short to complex block.
+ */
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H */
diff --git a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
new file mode 100644
index 0000000000..4a1de48331
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_KEEP_M_IN_N_H
+#define INCLUDED_BLOCKS_KEEP_M_IN_N_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief decimate a stream, keeping \p m items out of every \p n.
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API keep_m_in_n : virtual public block
+ {
+ public:
+
+ // gr::gnuradio/blocks::keep_m_in_n::sptr
+ typedef boost::shared_ptr<keep_m_in_n> sptr;
+
+ /*!
+ * Make a keep m in n block.
+ *
+ * \param itemsize stream itemsize
+ * \param m number of items to take in block of \p n items
+ * \param n block size in items
+ * \param offset initial item offset into the stream
+ */
+ static sptr make(size_t itemsize, int m, int n, int offset);
+
+ virtual void set_m(int m) = 0;
+ virtual void set_n(int n) = 0;
+ virtual void set_offset(int offset) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_KEEP_M_IN_N_H */
diff --git a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
new file mode 100644
index 0000000000..bc63bf9383
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
+#define INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief decimate a stream, keeping one item out of every \p n.
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API keep_one_in_n : virtual public block
+ {
+ public:
+
+ // gr::gnuradio/blocks::keep_one_in_n::sptr
+ typedef boost::shared_ptr<keep_one_in_n> sptr;
+
+ /*!
+ * Make a keep one in n block.
+ *
+ * \param itemsize stream itemsize
+ * \param n block size in items
+ */
+ static sptr make(size_t itemsize, int n);
+
+ virtual void set_n(int n) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_KEEP_ONE_IN_N_H */
diff --git a/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h
new file mode 100644
index 0000000000..2ebfe08319
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GRI_LFSR_15_1_0_H
+#define INCLUDED_GRI_LFSR_15_1_0_H
+
+#include <gnuradio/blocks/api.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Linear Feedback Shift Register using primitive polynomial x^15 + x + 1
+ * \ingroup misc
+ *
+ * \details
+ * Generates a maximal length pseudo-random sequence of length
+ * 2^15 - 1 bits.
+ */
+ class BLOCKS_API lfsr_15_1_0
+ {
+ private:
+ unsigned long d_sr; // shift register
+
+ public:
+ lfsr_15_1_0() { reset(); }
+
+ void reset() { d_sr = 0x7fff; }
+
+ int next_bit()
+ {
+ d_sr = ((((d_sr >> 1) ^ d_sr) & 0x1) << 14) | (d_sr >> 1);
+ return d_sr & 0x1;
+ }
+
+ int next_byte ()
+ {
+ int v = 0;
+ for(int i = 0; i < 8; i++) {
+ v >>= 1;
+ if(next_bit ())
+ v |= 0x80;
+ }
+ return v;
+ }
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GRI_LFSR_15_1_0_H */
diff --git a/gr-blocks/include/gnuradio/blocks/lfsr_32k.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h
new file mode 100644
index 0000000000..502efebc5d
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h
@@ -0,0 +1,91 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GRI_LFSR_32k_H
+#define INCLUDED_GRI_LFSR_32k_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/lfsr_15_1_0.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief generate pseudo-random sequence of length 32768 bits.
+ * \ingroup misc
+ *
+ * \details
+ * This is based on gri_lfsr_15_1_0 with an extra 0 added at the
+ * end of the sequence.
+ */
+ class BLOCKS_API lfsr_32k
+ {
+ private:
+ lfsr_15_1_0 d_lfsr;
+ unsigned int d_count;
+
+ public:
+ lfsr_32k() { reset (); }
+
+ void reset()
+ {
+ d_lfsr.reset();
+ d_count = 0;
+ }
+
+ int next_bit()
+ {
+ if(d_count == 32767) {
+ d_count = 0;
+ return 0;
+ }
+ d_count++;
+ return d_lfsr.next_bit();
+ }
+
+ int next_byte()
+ {
+ int v = 0;
+ for(int i = 0; i < 8; i++) {
+ v >>= 1;
+ if(next_bit ())
+ v |= 0x80;
+ }
+ return v;
+ }
+
+ int next_short()
+ {
+ int v = 0;
+ for(int i = 0; i < 16; i++) {
+ v >>= 1;
+ if(next_bit ())
+ v |= 0x8000;
+ }
+ return v;
+ }
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GRI_LFSR_32k_H */
diff --git a/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h
new file mode 100644
index 0000000000..ac2338d85a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H
+#define INCLUDED_GR_LFSR_32K_SOURCE_S_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/lfsr_32k.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts)
+ * \ingroup source_blk
+ *
+ * \details
+ * This source is typically used along with gr::gnuradio/blocks::check_lfsr_32k_s to
+ * test the USRP using its digital loopback mode.
+ */
+ class BLOCKS_API lfsr_32k_source_s : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::lfsr_32k_source_s::sptr
+ typedef boost::shared_ptr<lfsr_32k_source_s> sptr;
+
+ /*!
+ * \brief Make a LFSR 32k source block.
+ */
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_LFSR_32K_SOURCE_S_H */
diff --git a/gr-blocks/include/gnuradio/blocks/log2_const.h b/gr-blocks/include/gnuradio/blocks/log2_const.h
new file mode 100644
index 0000000000..c2526e76ed
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/log2_const.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+/*
+ * a bit of template hackery...
+ */
+#ifndef INCLUDED_BLOCKS_LOG2_CONST_H
+#define INCLUDED_BLOCKS_LOG2_CONST_H
+
+#include <gnuradio/blocks/api.h>
+#include <assert.h>
+
+namespace gr {
+ namespace blocks {
+
+ template<unsigned int k> static inline int log2_const() { assert(0); return 0; }
+
+ template<> inline int log2_const<1>() { return 0; }
+ template<> inline int log2_const<2>() { return 1; }
+ template<> inline int log2_const<4>() { return 2; }
+ template<> inline int log2_const<8>() { return 3; }
+ template<> inline int log2_const<16>() { return 4; }
+ template<> inline int log2_const<32>() { return 5; }
+ template<> inline int log2_const<64>() { return 6; }
+ template<> inline int log2_const<128>() { return 7; }
+ template<> inline int log2_const<256>() { return 8; }
+ template<> inline int log2_const<512>() { return 9; }
+ template<> inline int log2_const<1024>(){ return 10; }
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_LOG2_CONST_H */
diff --git a/gr-blocks/include/gnuradio/blocks/max_XX.h.t b/gr-blocks/include/gnuradio/blocks/max_XX.h.t
new file mode 100644
index 0000000000..44b3ad4878
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/max_XX.h.t
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Compares vectors from multiple streams and determines
+ * the maximum value from each vector over all streams.
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Data is passed in as a vector of length \p vlen from multiple
+ * input sources. It will look through these streams of \p vlen
+ * data items and output two streams.
+ * Stream 0 will contain the index value in the vector where
+ * the maximum value occurred.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
+
diff --git a/gr-blocks/include/gnuradio/blocks/message_burst_source.h b/gr-blocks/include/gnuradio/blocks/message_burst_source.h
new file mode 100644
index 0000000000..0e7527cbe0
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/message_burst_source.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_H
+#define INCLUDED_GR_MESSAGE_BURST_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Turn received messages into a stream and tag them for UHD to send.
+ * \ingroup message_tools_blk
+ */
+ class BLOCKS_API message_burst_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::message_source::sptr
+ typedef boost::shared_ptr<message_burst_source> sptr;
+
+ static sptr make(size_t itemsize, int msgq_limit);
+ static sptr make(size_t itemsize, gr::msg_queue::sptr msgq);
+
+ virtual gr::msg_queue::sptr msgq() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_BURST_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h
new file mode 100644
index 0000000000..cc9612542c
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/message_debug.h
@@ -0,0 +1,88 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_DEBUG_H
+#define INCLUDED_GR_MESSAGE_DEBUG_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Debug block for the message passing system.
+ * \ingroup message_tools_blk
+ * \ingroup measurement_tools_blk
+ * \ingroup debug_tools_blk
+ *
+ * \details
+ * The message debug block is used to capture and print or store
+ * messages as they are received. Any block that generates a
+ * message may connect that message port to one or more of the
+ * three message input ports of this debug block. The message
+ * ports are:
+ *
+ * \li print: prints the message directly to standard out.
+ * \li store: stores the message in an internal vector. May be
+ * access using the get_message function.
+ * \li print_pdu: specifically designed to handle formatted PDUs
+ * (see pdu.h).
+ */
+ class BLOCKS_API message_debug : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::message_debug::sptr
+ typedef boost::shared_ptr<message_debug> sptr;
+
+ /*!
+ * \brief Build the message debug block. It takes no parameters
+ * and has three message ports: print, store, and
+ * print_pdu.
+ */
+ static sptr make();
+
+ /*!
+ * \brief Reports the number of messages received by this block.
+ */
+ virtual int num_messages() = 0;
+
+ /*!
+ * \brief Get a message (as a PMT) from the message vector at index \p i.
+ *
+ * Messages passed to the 'store' port will be stored in a
+ * vector. This function retrieves those messages by index. They
+ * are index in order of when they were received (all messages
+ * are just pushed onto the back of a vector). This is mostly
+ * useful in debugging message passing graphs and in QA code.
+ *
+ * \param i The index in the vector for the message to retrieve.
+ *
+ * \return a message at index \p i as a pmt_t.
+ */
+ virtual pmt::pmt_t get_message(int i) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_DEBUG_H */
diff --git a/gr-blocks/include/gnuradio/blocks/message_sink.h b/gr-blocks/include/gnuradio/blocks/message_sink.h
new file mode 100644
index 0000000000..60eaa84497
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/message_sink.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_SINK_H
+#define INCLUDED_GR_MESSAGE_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Gather received items into messages and insert into msgq
+ * \ingroup message_tools_blk
+ */
+ class BLOCKS_API message_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::message_sink::sptr
+ typedef boost::shared_ptr<message_sink> sptr;
+
+ static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block);
+ static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block,
+ const std::string& lengthtagname);
+
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/message_source.h b/gr-blocks/include/gnuradio/blocks/message_source.h
new file mode 100644
index 0000000000..af21d7333f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/message_source.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_SOURCE_H
+#define INCLUDED_GR_MESSAGE_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Turn received messages into a stream
+ * \ingroup message_tools_blk
+ */
+ class BLOCKS_API message_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::message_source::sptr
+ typedef boost::shared_ptr<message_source> sptr;
+
+ static sptr make(size_t itemsize, int msgq_limit=0);
+ static sptr make(size_t itemsize, gr::msg_queue::sptr msgq);
+ static sptr make(size_t itemsize, gr::msg_queue::sptr msgq,
+ const std::string& lengthtagname);
+
+ virtual gr::msg_queue::sptr msgq() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/message_strobe.h b/gr-blocks/include/gnuradio/blocks/message_strobe.h
new file mode 100644
index 0000000000..07b6833b43
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/message_strobe.h
@@ -0,0 +1,82 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MESSAGE_STROBE_H
+#define INCLUDED_GR_MESSAGE_STROBE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Send message at defined interval
+ * \ingroup message_tools_blk
+ *
+ * \details
+ * Takes a PMT message and sends it out every \p period_ms
+ * milliseconds. Useful for testing/debugging the message system.
+ */
+ class BLOCKS_API message_strobe : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::message_strobe::sptr
+ typedef boost::shared_ptr<message_strobe> sptr;
+
+ /*!
+ * Make a message stobe block to send message \p msg every \p
+ * period_ms milliseconds.
+ *
+ * \param msg The message to send as a PMT.
+ * \param period_ms the time period in milliseconds in which to
+ * send \p msg.
+ */
+ static sptr make(pmt::pmt_t msg, float period_ms);
+
+ /*!
+ * Reset the message being sent.
+ * \param msg The message to send as a PMT.
+ */
+ virtual void set_msg(pmt::pmt_t msg) = 0;
+
+ /*!
+ * Get the value of the message being sent.
+ */
+ virtual pmt::pmt_t msg() const = 0;
+
+ /*!
+ * Reset the sending interval.
+ * \param period_ms the time period in milliseconds.
+ */
+ virtual void set_period(float period_ms) = 0;
+
+ /*!
+ * Get the time interval of the strobe.
+ */
+ virtual float period() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_STROBE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t
new file mode 100644
index 0000000000..37472f70d7
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t
@@ -0,0 +1,84 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output is the moving sum of the last N samples, scaled by the scale factor
+ * \ingroup level_controllers_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * Create a moving average block.
+ *
+ * \param length Number of samples to use in the average.
+ * \param scale scale factor for the result.
+ * \param max_iter limits how long we go without flushing the accumulator
+ * This is necessary to avoid numerical instability for float and complex.
+ */
+ static sptr make(int length, @O_TYPE@ scale,
+ int max_iter = 4096);
+
+ /*!
+ * Get the length used in the avaraging calculation.
+ */
+ virtual int length() const = 0;
+
+ /*!
+ * Get the scale factor being used.
+ */
+ virtual @O_TYPE@ scale() const = 0;
+
+ /*!
+ * Set both the length and the scale factor together.
+ */
+ virtual void set_length_and_scale(int length, @O_TYPE@ scale) = 0;
+
+ /*!
+ * Set the length.
+ */
+ virtual void set_length(int length) = 0;
+
+ /*!
+ * Set the scale factor.
+ */
+ virtual void set_scale(@O_TYPE@ scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t
new file mode 100644
index 0000000000..1071b5b5c5
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004, 2009, 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = prod (input_0, input_1, ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Multiply across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_cc.h
new file mode 100644
index 0000000000..c6116b6452
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_cc.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MULTIPLY_CC_H
+#define INCLUDED_GR_MULTIPLY_CC_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = prod (input_0, input_1, ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Multiply across all input streams.
+ */
+ class BLOCKS_API multiply_cc : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::multiply_cc::sptr
+ typedef boost::shared_ptr<multiply_cc> sptr;
+
+ /*!
+ * \brief Multiply streams of complex values
+ * \param vlen Vector length
+ * \ingroup math_blk
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_MULTIPLY_CC_H */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h
new file mode 100644
index 0000000000..43101bf441
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
+#define INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Multiplies stream 0 by the complex conjugate of stream 1.
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API multiply_conjugate_cc : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::multiply_conjugate_cc::sptr
+ typedef boost::shared_ptr<multiply_conjugate_cc> sptr;
+
+ /*!
+ * \brief Multiplies a streams by the conjugate of a second stream
+ * \param vlen Vector length
+ * \ingroup math_blk
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_H */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t
new file mode 100644
index 0000000000..d1bc76c3b3
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input * constant
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * \brief Create an instance of @NAME@
+ * \param k multiplicative constant
+ */
+ static sptr make(@O_TYPE@ k);
+
+ /*!
+ * \brief Return multiplicative constant
+ */
+ virtual @O_TYPE@ k() const = 0;
+
+ /*!
+ * \brief Set multiplicative constant
+ */
+ virtual void set_k(@O_TYPE@ k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h
new file mode 100644
index 0000000000..d24c1135c3
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef INCLUDED_MULTIPLY_CONST_CC_H
+#define INCLUDED_MULTIPLY_CONST_CC_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input * complex constant
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API multiply_const_cc : virtual public sync_block
+ {
+
+ public:
+
+ // gr::gnuradio/blocks::multiply_const_cc::sptr
+ typedef boost::shared_ptr<multiply_const_cc> sptr;
+
+ /*!
+ * \brief Create an instance of multiply_const_cc
+ * \param k complex multiplicative constant
+ * \param vlen Vector length of incoming stream
+ */
+ static sptr make(gr_complex k, size_t vlen=1);
+
+ /*!
+ * \brief Return complex multiplicative constant
+ */
+ virtual gr_complex k() const = 0;
+
+ /*!
+ * \brief Set complex multiplicative constant
+ */
+ virtual void set_k(gr_complex k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_MULTIPLY_CONST_CC_H */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h
new file mode 100644
index 0000000000..0fc81dc38f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef INCLUDED_MULTIPLY_CONST_FF_H
+#define INCLUDED_MULTIPLY_CONST_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input * real constant
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API multiply_const_ff : virtual public sync_block
+ {
+
+ public:
+
+ // gr::gnuradio/blocks::multiply_const_ff::sptr
+ typedef boost::shared_ptr<multiply_const_ff> sptr;
+
+ /*!
+ * \brief Create an instance of multiply_const_ff
+ * \param k real multiplicative constant
+ * \param vlen Vector length of incoming stream
+ */
+ static sptr make(float k, size_t vlen=1);
+
+ /*!
+ * \brief Return real multiplicative constant
+ */
+ virtual float k() const = 0;
+
+ /*!
+ * \brief Set real multiplicative constant
+ */
+ virtual void set_k(float k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_MULTIPLY_CONST_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t
new file mode 100644
index 0000000000..40f0b06dd1
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2006,2010,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input * constant vector (element-wise)
+ * \ingroup math_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * \brief Create an instance of @NAME@
+ * \param k multiplicative constant vector
+ */
+ static sptr make(std::vector<@O_TYPE@> k);
+
+ /*!
+ * \brief Return multiplicative constant vector
+ */
+ virtual std::vector<@O_TYPE@> k() const = 0;
+
+ /*!
+ * \brief Set multiplicative constant vector
+ */
+ virtual void set_k(std::vector<@O_TYPE@> k) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_ff.h
new file mode 100644
index 0000000000..b7ee6ca430
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/multiply_ff.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_MULTIPLY_FF_H
+#define INCLUDED_GR_MULTIPLY_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = prod (input_0, input_1, ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Multiply across all input streams.
+ */
+ class BLOCKS_API multiply_ff : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::multiply_ff::sptr
+ typedef boost::shared_ptr<multiply_ff> sptr;
+
+ /*!
+ * \brief Multiply streams of float values
+ * \param vlen Vector length
+ * \ingroup math_blk
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_MULTIPLY_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/mute_XX.h.t b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t
new file mode 100644
index 0000000000..ab246c54b5
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input or zero if muted.
+ * \ingroup level_controllers_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(bool mute=false);
+
+ virtual bool mute() const = 0;
+ virtual void set_mute(bool mute=false) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
+
diff --git a/gr-blocks/include/gnuradio/blocks/nlog10_ff.h b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h
new file mode 100644
index 0000000000..642cf987bd
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_NLOG10_FF_H
+#define INCLUDED_BLOCKS_NLOG10_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = n*log10(input) + k
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API nlog10_ff : virtual public sync_block
+ {
+ public:
+
+ // gr::gnuradio/blocks::nlog10_ff::sptr
+ typedef boost::shared_ptr<nlog10_ff> sptr;
+
+ /*!
+ * \brief Make an instance of an nlog10_ff block.
+ * \param n Scalar multiplicative constant
+ * \param vlen Input vector length
+ * \param k Scalar additive constant
+ */
+ static sptr make(float n=1.0, size_t vlen=1, float k=0.0);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_NLOG10_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/nop.h b/gr-blocks/include/gnuradio/blocks/nop.h
new file mode 100644
index 0000000000..20ca0532a9
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/nop.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_NOP_H
+#define INCLUDED_GR_NOP_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <stddef.h> // size_t
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Does nothing. Used for testing only.
+ * \ingroup misc_blk
+ */
+ class BLOCKS_API nop : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::nop::sptr
+ typedef boost::shared_ptr<nop> sptr;
+
+ /*!
+ * Build a nop block.
+ *
+ * \param sizeof_stream_item size of the stream items in bytes.
+ */
+ static sptr make(size_t sizeof_stream_item);
+
+ virtual int nmsgs_received() const = 0;
+
+ virtual int ctrlport_test() const = 0;
+ virtual void set_ctrlport_test(int x) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_NOP_H */
diff --git a/gr-blocks/include/gnuradio/blocks/not_XX.h.t b/gr-blocks/include/gnuradio/blocks/not_XX.h.t
new file mode 100644
index 0000000000..2c32237ce5
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/not_XX.h.t
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = ~input
+ * \ingroup boolean_operators_blk
+ *
+ * bitwise boolean not of input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/null_sink.h b/gr-blocks/include/gnuradio/blocks/null_sink.h
new file mode 100644
index 0000000000..840d58aade
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/null_sink.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_NULL_SINK_H
+#define INCLUDED_GR_NULL_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <stddef.h> // size_t
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Bit bucket. Use as a termination point when a sink is
+ * required and we don't want to do anything real.
+ * \ingroup misc_blk
+ */
+ class BLOCKS_API null_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::null_sink::sptr
+ typedef boost::shared_ptr<null_sink> sptr;
+
+ /*!
+ * Build a null sink block.
+ *
+ * \param sizeof_stream_item size of the stream items in bytes.
+ */
+ static sptr make(size_t sizeof_stream_item);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_NULL_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/null_source.h b/gr-blocks/include/gnuradio/blocks/null_source.h
new file mode 100644
index 0000000000..387c649f45
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/null_source.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_NULL_SOURCE_H
+#define INCLUDED_GR_NULL_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief A source of zeros used mainly for testing.
+ * \ingroup misc_blk
+ */
+ class BLOCKS_API null_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::null_source::sptr
+ typedef boost::shared_ptr<null_source> sptr;
+
+ /*!
+ * Build a null source block.
+ *
+ * \param sizeof_stream_item size of the stream items in bytes.
+ */
+ static sptr make(size_t sizeof_stream_item);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_NULL_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/or_XX.h.t b/gr-blocks/include/gnuradio/blocks/or_XX.h.t
new file mode 100644
index 0000000000..d485f04962
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/or_XX.h.t
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input_0 | input_1 | , ... | input_N)
+ * \ingroup boolean_operators_blk
+ *
+ * Bitwise boolean or across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
new file mode 100644
index 0000000000..584ea6361e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_PACK_K_BITS_BB_H
+#define INCLUDED_GR_PACK_K_BITS_BB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Converts a stream of bytes with 1 bit in the LSB to a
+ * byte with k relevent bits.
+ * \ingroup byte_operators_blk
+ */
+ class BLOCKS_API pack_k_bits_bb : virtual public sync_decimator
+ {
+ public:
+ // gr::gnuradio/blocks::pack_k_bits_bb::sptr
+ typedef boost::shared_ptr<pack_k_bits_bb> sptr;
+
+ /*!
+ * \brief Make a pack_k_bits block.
+ * \param k number of bits to be packed.
+ */
+ static sptr make(unsigned k);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PACK_K_BITS_BB_H */
diff --git a/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t
new file mode 100644
index 0000000000..98b7df2658
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t
@@ -0,0 +1,74 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/endianness.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts.
+ * \ingroup byte_operators_blk
+ *
+ * \details
+ * input: stream of @I_TYPE@; output: stream of @O_TYPE@
+ *
+ * This is the inverse of gr::blocks::unpacked_to_packed_XX.
+ *
+ * The bits in the bytes or shorts input stream are grouped into
+ * chunks of \p bits_per_chunk bits and each resulting chunk is
+ * written right- justified to the output stream of bytes or
+ * shorts. All b or 16 bits of the each input bytes or short are
+ * processed. The right thing is done if bits_per_chunk is not a
+ * power of two.
+ *
+ * The combination of gr::blocks::packed_to_unpacked_XX_ followed by
+ * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
+ * general case of mapping from a stream of bytes or shorts into
+ * arbitrary float or complex symbols.
+ *
+ * \sa gr::blocks::packed_to_unpacked_bb, gr::blocks::unpacked_to_packed_bb,
+ * \sa gr::blocks::packed_to_unpacked_ss, gr::blocks::unpacked_to_packed_ss,
+ * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
+ * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
+ */
+ class BLOCKS_API @NAME@ : virtual public block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(unsigned int bits_per_chunk,
+ endianness_t endianness);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
new file mode 100644
index 0000000000..ad3d1e9c8e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
+#define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Interleave items based on the provided vector \p pattern.
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API patterned_interleaver : virtual public block
+ {
+ public:
+ typedef boost::shared_ptr<patterned_interleaver> sptr;
+
+ /*!
+ * Make a patterned interleaver block.
+ *
+ * \param itemsize stream itemsize
+ * \param pattern vector that represents the interleaving pattern
+ */
+ static sptr make(size_t itemsize, std::vector<int> pattern);
+ };
+
+ }
+}
+
+#endif /* INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/pdu.h b/gr-blocks/include/gnuradio/blocks/pdu.h
new file mode 100644
index 0000000000..decc5e17d0
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/pdu.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_PDU_H
+#define INCLUDED_BLOCKS_PDU_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/gr_complex.h>
+#include <pmt/pmt.h>
+
+#define PDU_PORT_ID pmt::mp("pdus")
+#define PDU_LENGTH_TAG pmt::mp("pdu_length")
+
+namespace gr {
+ namespace blocks {
+ namespace pdu {
+
+ enum vector_type { byte_t, float_t, complex_t };
+
+ BLOCKS_API size_t itemsize(vector_type type);
+ BLOCKS_API bool type_matches(vector_type type, pmt::pmt_t v);
+ BLOCKS_API pmt::pmt_t make_pdu_vector(vector_type type, const uint8_t* buf, size_t items);
+ BLOCKS_API vector_type type_from_pmt(pmt::pmt_t vector);
+
+ } /* namespace pdu */
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_PDU_H */
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h
new file mode 100644
index 0000000000..758d7412db
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
+#define INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Turns received PDUs into a tagged stream of items
+ * \ingroup message_tools_blk
+ */
+ class BLOCKS_API pdu_to_tagged_stream : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::pdu_to_tagged_stream::sptr
+ typedef boost::shared_ptr<pdu_to_tagged_stream> sptr;
+
+ /*!
+ * \brief Construct a pdu_to_tagged_stream block
+ * \param type PDU type of pdu::vector_type
+ */
+ static sptr make(pdu::vector_type type);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H */
diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h
new file mode 100644
index 0000000000..84b8a74a72
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h
@@ -0,0 +1,95 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_H
+#define INCLUDED_GR_PEAK_DETECTOR2_FB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Detect the peak of a signal
+ * \ingroup peak_detectors_blk
+ *
+ * \details
+ * If a peak is detected, this block outputs a 1, or it outputs
+ * 0's. A separate debug output may be connected, to view the
+ * internal EWMA described below.
+ */
+ class BLOCKS_API peak_detector2_fb : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::peak_detector2_fb::sptr
+ typedef boost::shared_ptr<peak_detector2_fb> sptr;
+
+ /*!
+ * Build a peak detector block with float in, byte out.
+ *
+ * \param threshold_factor_rise The threshold factor determins
+ * when a peak is present. An EWMA average of the signal is
+ * calculated and when the value of the signal goes over
+ * threshold_factor_rise*average, we call the peak.
+ * \param look_ahead The look-ahead value is used when the
+ * threshold is found to locate the peak within this range.
+ * \param alpha The gain value of a single-pole moving average filter.
+ */
+ static sptr make(float threshold_factor_rise=7,
+ int look_ahead=1000, float alpha=0.001);
+
+ /*! \brief Set the threshold factor value for the rise time
+ * \param thr new threshold factor
+ */
+ virtual void set_threshold_factor_rise(float thr) = 0;
+
+ /*! \brief Set the look-ahead factor
+ * \param look new look-ahead factor
+ */
+ virtual void set_look_ahead(int look) = 0;
+
+ /*! \brief Set the running average alpha
+ * \param alpha new alpha for running average
+ */
+ virtual void set_alpha(int alpha) = 0;
+
+ /*! \brief Get the threshold factor value for the rise time
+ * \return threshold factor
+ */
+ virtual float threshold_factor_rise() = 0;
+
+ /*! \brief Get the look-ahead factor value
+ * \return look-ahead factor
+ */
+ virtual int look_ahead() = 0;
+
+ /*! \brief Get the alpha value of the running average
+ * \return alpha
+ */
+ virtual float alpha() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PEAK_DETECTOR2_FB_H */
diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t
new file mode 100644
index 0000000000..6bf14320a0
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t
@@ -0,0 +1,118 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Detect the peak of a signal
+ * \ingroup peak_detectors_blk
+ *
+ * \details
+ * If a peak is detected, this block outputs a 1,
+ * or it outputs 0's.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * Make a peak detector block.
+ *
+ * \param threshold_factor_rise The threshold factor determins
+ * when a peak has started. An average of the signal is
+ * calculated and when the value of the signal goes over
+ * threshold_factor_rise*average, we start looking for a
+ * peak.
+ * \param threshold_factor_fall The threshold factor determins
+ * when a peak has ended. An average of the signal is
+ * calculated and when the value of the signal goes
+ * bellow threshold_factor_fall*average, we stop looking
+ * for a peak.
+ * \param look_ahead The look-ahead value is used when the
+ * threshold is found to look if there another peak
+ * within this step range. If there is a larger value,
+ * we set that as the peak and look ahead again. This is
+ * continued until the highest point is found with This
+ * look-ahead range.
+ * \param alpha The gain value of a moving average filter
+ */
+ static sptr make(float threshold_factor_rise = 0.25,
+ float threshold_factor_fall = 0.40,
+ int look_ahead = 10,
+ float alpha = 0.001);
+
+ /*! \brief Set the threshold factor value for the rise time
+ * \param thr new threshold factor
+ */
+ virtual void set_threshold_factor_rise(float thr) = 0;
+
+ /*! \brief Set the threshold factor value for the fall time
+ * \param thr new threshold factor
+ */
+ virtual void set_threshold_factor_fall(float thr) = 0;
+
+ /*! \brief Set the look-ahead factor
+ * \param look new look-ahead factor
+ */
+ virtual void set_look_ahead(int look) = 0;
+
+ /*! \brief Set the running average alpha
+ * \param alpha new alpha for running average
+ */
+ virtual void set_alpha(int alpha) = 0;
+
+ /*! \brief Get the threshold factor value for the rise time
+ * \return threshold factor
+ */
+ virtual float threshold_factor_rise() = 0;
+
+ /*! \brief Get the threshold factor value for the fall time
+ * \return threshold factor
+ */
+ virtual float threshold_factor_fall() = 0;
+
+ /*! \brief Get the look-ahead factor value
+ * \return look-ahead factor
+ */
+ virtual int look_ahead() = 0;
+
+ /*! \brief Get the alpha value of the running average
+ * \return alpha
+ */
+ virtual float alpha() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h
new file mode 100644
index 0000000000..3f5ea189e9
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
+#define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Detects a plateau and marks the middle.
+ * \ingroup peak_detectors_blk
+ *
+ * \details
+ * Detect a plateau of a-priori known height. Input is a stream of floats,
+ * the output is a stream of bytes. Whenever a plateau is detected, the
+ * middle of that plateau is marked with a '1' on the output stream (all
+ * other samples are left at zero).
+ *
+ * You can use this in a Schmidl & Cox synchronisation algorithm to interpret
+ * the output of the normalized correlator. Just pass the length of the cyclic
+ * prefix (in samples) as the max_len parameter).
+ *
+ * Unlike the peak detectors, you must the now the absolute height of the plateau.
+ * Whenever the amplitude exceeds the given threshold, it starts assuming the
+ * presence of a plateau.
+ *
+ * An implicit hysteresis is provided by the fact that after detecting one plateau,
+ * it waits at least max_len samples before the next plateau can be detected.
+ */
+ class BLOCKS_API plateau_detector_fb : virtual public sync_block
+ {
+ public:
+ typedef boost::shared_ptr<plateau_detector_fb> sptr;
+
+ /*!
+ * \param max_len Maximum length of the plateau
+ * \param threshold Anything above this value is considered a plateau
+ */
+ static sptr make(int max_len, float threshold=0.9);
+ };
+
+ } // namespace blocks
+} // namespace gr
+
+#endif /* INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/probe_rate.h b/gr-blocks/include/gnuradio/blocks/probe_rate.h
new file mode 100644
index 0000000000..7789de1925
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/probe_rate.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_PROBE_RATE_H
+#define INCLUDED_BLOCKS_PROBE_RATE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief throughput measurement
+ * \ingroup measurement_tools_blk
+ */
+ class BLOCKS_API probe_rate : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::probe_rate::sptr
+ typedef boost::shared_ptr<probe_rate> sptr;
+
+ /*!
+ * \brief Make a throughput measurement block
+ * \param itemsize size of each stream item
+ * \param update_rate_ms minimum update time in milliseconds
+ * \param alpha gain for running average filter
+ */
+ static sptr make(size_t itemsize, double update_rate_ms = 500.0, double alpha = 0.0001);
+
+ virtual void set_alpha(double alpha) = 0;
+
+ virtual double rate() = 0;
+
+ virtual bool start() = 0;
+ virtual bool stop() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_PROBE_RATE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t
new file mode 100644
index 0000000000..5398411a73
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Sink that allows a sample to be grabbed from Python.
+ * \ingroup measurement_tools_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make();
+
+ virtual @TYPE@ level() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t
new file mode 100644
index 0000000000..05e0137953
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <vector>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Sink that allows a vector of samples to be grabbed from Python.
+ * \ingroup sink_blk
+ * \ingroup measurement_tools_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t size);
+
+ virtual std::vector<@TYPE@> level() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/random_pdu.h b/gr-blocks/include/gnuradio/blocks/random_pdu.h
new file mode 100644
index 0000000000..6ffdd86a9e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/random_pdu.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_RANDOM_PDU_H
+#define INCLUDED_BLOCKS_RANDOM_PDU_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Sends a random PDU at intervals
+ * \ingroup message_tools_blk
+ * \ingroup debug_tools_blk
+ */
+ class BLOCKS_API random_pdu : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::random_pdu::sptr
+ typedef boost::shared_ptr<random_pdu> sptr;
+
+ /*!
+ * \brief Construct a random PDU generator
+ */
+ static sptr make(int mintime, int maxtime);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_RANDOM_PDU_H */
diff --git a/gr-blocks/include/gnuradio/blocks/regenerate_bb.h b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h
new file mode 100644
index 0000000000..0ff8b4c9d1
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_REGENERATE_BB_H
+#define INCLUDED_GR_REGENERATE_BB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Detect the peak of a signal and repeat every period samples
+ * \ingroup stream_operators_blk
+ *
+ * \details
+ * If a peak is detected, this block outputs a 1 repeated every
+ * period samples until reset by detection of another 1 on the
+ * input or stopped after max_regen regenerations have occurred.
+ *
+ * Note that if max_regen=(-1)/ULONG_MAX then the regeneration
+ * will run forever.
+ */
+ class BLOCKS_API regenerate_bb : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::regenerate_bb::sptr
+ typedef boost::shared_ptr<regenerate_bb> sptr;
+
+ /*!
+ * \brief Make a regenerate block
+ * \param period The number of samples between regenerations
+ * \param max_regen The maximum number of regenerations to
+ * perform; if set to ULONG_MAX, it will regenerate
+ * continuously.
+ */
+ static sptr make(int period, unsigned int max_regen=500);
+
+ /*! \brief Reset the maximum regeneration count; this will reset
+ the current regen.
+ */
+ virtual void set_max_regen(unsigned int regen) = 0;
+
+ /*! \brief Reset the period of regenerations; this will reset
+ the current regen.
+ */
+ virtual void set_period(int period) = 0;
+
+ /*! \brief return the maximum regeneration count.
+ */
+ virtual unsigned int max_regen() const = 0;
+
+ /*! \brief return the regeneration period.
+ */
+ virtual int period() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_REGENERATE_BB_H */
diff --git a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
new file mode 100644
index 0000000000..ed051a9744
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_H
+#define INCLUDED_BLOCKS_REPACK_BITS_BB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/tagged_stream_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Pack \p k bits from the input stream onto \p k bits of the output stream.
+ * \ingroup byte_operators_blk
+ *
+ * \details
+ * No bits are lost here; any value for k and l (within [1, 8]) is allowed.
+ * On every fresh input byte, it starts reading on the LSB, and starts copying
+ * to the LSB as well.
+ *
+ * If a packet length tag is given, this block assumes a tagged stream.
+ * In this case, the tag with the packet length is updated accordingly.
+ * Also, the number of input bits is padded with zeros if the number of input
+ * bits is not an integer multiple of \p l, or bits are truncated from the input
+ * if \p align_output is set to true.
+ */
+ class BLOCKS_API repack_bits_bb : virtual public tagged_stream_block
+ {
+ public:
+ typedef boost::shared_ptr<repack_bits_bb> sptr;
+
+ /*!
+ * \param k Number of relevant bits on the input stream
+ * \param l Number of relevant bits on the output stream
+ * \param len_tag_key If not empty, this is the key for the length tag.
+ * \param align_output If len_tag_key is given, this controls if the input
+ * or the output is aligned.
+ */
+ static sptr make(int k, int l=8, const std::string &len_tag_key="", bool align_output=false);
+ };
+
+ } // namespace blocks
+} // namespace gr
+
+#endif /* INCLUDED_BLOCKS_REPACK_BITS_BB_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/repeat.h b/gr-blocks/include/gnuradio/blocks/repeat.h
new file mode 100644
index 0000000000..50a3daf38f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/repeat.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_REPEAT_H
+#define INCLUDED_BLOCKS_REPEAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief repeat each input \p repeat times
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API repeat : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::repeat::sptr
+ typedef boost::shared_ptr<repeat> sptr;
+
+ /*!
+ * Make a repeat block.
+ *
+ * \param itemsize stream itemsize
+ * \param repeat number of times to repeat the input
+ */
+ static sptr make(size_t itemsize, int repeat);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_REPEAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/rms_cf.h b/gr-blocks/include/gnuradio/blocks/rms_cf.h
new file mode 100644
index 0000000000..f10a19521a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/rms_cf.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_RMS_CF_H
+#define INCLUDED_BLOCKS_RMS_CF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief RMS average power
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API rms_cf : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::rms_cf::sptr
+ typedef boost::shared_ptr<rms_cf> sptr;
+
+ /*!
+ * \brief Make an RMS calc. block.
+ * \param alpha gain for running average filter.
+ */
+ static sptr make(double alpha = 0.0001);
+
+ virtual void set_alpha(double alpha) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_RMS_CF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/rms_ff.h b/gr-blocks/include/gnuradio/blocks/rms_ff.h
new file mode 100644
index 0000000000..60b0c50f9d
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/rms_ff.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_RMS_FF_H
+#define INCLUDED_BLOCKS_RMS_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief RMS average power
+ * \ingroup math_operators_blk
+ */
+ class BLOCKS_API rms_ff : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::rms_ff::sptr
+ typedef boost::shared_ptr<rms_ff> sptr;
+
+ /*!
+ * \brief Make an RMS calc. block.
+ * \param alpha gain for running average filter.
+ */
+ static sptr make(double alpha = 0.0001);
+
+ virtual void set_alpha(double alpha) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_RMS_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/rotator.h b/gr-blocks/include/gnuradio/blocks/rotator.h
new file mode 100644
index 0000000000..975bfc62aa
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/rotator.h
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GR_ROTATOR_H_
+#define _GR_ROTATOR_H_
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/gr_complex.h>
+
+namespace gr {
+ namespace blocks {
+
+ class rotator
+ {
+ private:
+ gr_complex d_phase;
+ gr_complex d_phase_incr;
+ unsigned int d_counter;
+
+ public:
+ rotator() : d_phase(1), d_phase_incr(1), d_counter(0)
+ { }
+
+ void set_phase(gr_complex phase) { d_phase = phase / abs(phase); }
+ void set_phase_incr(gr_complex incr) { d_phase_incr = incr / abs(incr); }
+
+ gr_complex rotate(gr_complex in)
+ {
+ d_counter++;
+
+ gr_complex z = in * d_phase; // rotate in by phase
+ d_phase *= d_phase_incr; // incr our phase (complex mult == add phases)
+
+ if((d_counter % 512) == 0)
+ d_phase /= abs(d_phase); // Normalize to ensure multiplication is rotation
+
+ return z;
+ }
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* _GR_ROTATOR_H_ */
diff --git a/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t
new file mode 100644
index 0000000000..2f15b2490f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief sample and hold circuit
+ * \ingroup level_controllers_blk
+ *
+ * \details
+ * Samples the data stream (input stream 0) and holds the value if
+ * the control signal is 1 (intput stream 1).
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h
new file mode 100644
index 0000000000..f6073ea46f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_SHORT_TO_CHAR_H
+#define INCLUDED_BLOCKS_SHORT_TO_CHAR_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of shorts to a stream of chars.
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API short_to_char : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::short_to_char_ff::sptr
+ typedef boost::shared_ptr<short_to_char> sptr;
+
+ /*!
+ * Build a short to char block.
+ *
+ * \param vlen vector length of data streams.
+ */
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_SHORT_TO_CHAR_H */
diff --git a/gr-blocks/include/gnuradio/blocks/short_to_float.h b/gr-blocks/include/gnuradio/blocks/short_to_float.h
new file mode 100644
index 0000000000..7d5c2caac9
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/short_to_float.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
+#define INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of shorts to a stream of floats
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API short_to_float : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::short_to_float_ff::sptr
+ typedef boost::shared_ptr<short_to_float> sptr;
+
+ /*!
+ * Build a short to float block.
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
+ */
+ static sptr make(size_t vlen=1, float scale=1.0);
+
+ /*!
+ * Get the scalar divider value.
+ */
+ virtual float scale() const = 0;
+
+ /*!
+ * Set the scalar divider value.
+ */
+ virtual void set_scale(float scale) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_SHORT_TO_FLOAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/skiphead.h b/gr-blocks/include/gnuradio/blocks/skiphead.h
new file mode 100644
index 0000000000..1d3a019d72
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/skiphead.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_SKIPHEAD_H
+#define INCLUDED_GR_SKIPHEAD_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <stddef.h> // size_t
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief skips the first N items, from then on copies items to the output
+ * \ingroup misc_blk
+ *
+ * \details
+ * Useful for building test cases and sources which have metadata
+ * or junk at the start
+ */
+ class BLOCKS_API skiphead : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::skiphead::sptr
+ typedef boost::shared_ptr<skiphead> sptr;
+
+ static sptr make(size_t itemsize,
+ uint64_t nitems_to_skip);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_SKIPHEAD_H */
diff --git a/gr-blocks/include/gnuradio/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
new file mode 100644
index 0000000000..906d1aba0b
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_SOCKET_PDU_H
+#define INCLUDED_BLOCKS_SOCKET_PDU_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Creates socket interface and translates traffic to PDUs
+ * \ingroup networking_tools_blk
+ */
+ class BLOCKS_API socket_pdu : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::socket_pdu::sptr
+ typedef boost::shared_ptr<socket_pdu> sptr;
+
+ /*!
+ * \brief Construct a SOCKET PDU interface
+ * \param type "TCP_SERVER", "TCP_CLIENT", "UDP_SERVER", or "UDP_CLIENT"
+ * \param addr network address to use
+ * \param port network port to use
+ * \param MTU maximum transmission unit
+ */
+ static sptr make(std::string type, std::string addr, std::string port, int MTU=10000);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_SOCKET_PDU_H */
diff --git a/gr-blocks/include/gnuradio/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h
new file mode 100644
index 0000000000..67f5874c3a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_STREAM_MUX_H
+#define INCLUDED_BLOCKS_STREAM_MUX_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <vector>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Stream muxing block to multiplex many streams into
+ * one with a specified format.
+ * \ingroup stream_operators_blk
+ *
+ * \details
+ * Muxes N streams together producing an output stream that
+ * contains N0 items from the first stream, N1 items from the second,
+ * etc. and repeats:
+ *
+ * [N0, N1, N2, ..., Nm, N0, N1, ...]
+ */
+ class BLOCKS_API stream_mux : virtual public block
+ {
+ public:
+
+ // gr::gnuradio/blocks::stream_mux::sptr
+ typedef boost::shared_ptr<stream_mux> sptr;
+
+ /*!
+ * \brief Creates a stream muxing block to multiplex many streams into
+ * one with a specified format.
+ *
+ * \param itemsize the item size of the stream
+ * \param lengths a vector (list/tuple) specifying the number of
+ * items from each stream the mux together.
+ * Warning: this requires that at least as many items
+ * per stream are available or the system will wait
+ * indefinitely for the items.
+ *
+ */
+ static sptr make(size_t itemsize, const std::vector<int> &lengths);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_STREAM_MUX_H */
diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_streams.h b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h
new file mode 100644
index 0000000000..cef660c3ba
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
+#define INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief convert a stream of items into a N streams of items
+ * \ingroup stream_operators_blk
+ *
+ * \details
+ * Converts a stream of N items into N streams of 1 item.
+ * Repeat ad infinitum.
+ */
+ class BLOCKS_API stream_to_streams : virtual public sync_decimator
+ {
+ public:
+ // gr::gnuradio/blocks::stream_to_streams::sptr
+ typedef boost::shared_ptr<stream_to_streams> sptr;
+
+ /*!
+ * Make a stream-to-streams block.
+ *
+ * \param itemsize the item size of the stream
+ * \param nstreams number of streams to split input into
+ */
+ static sptr make(size_t itemsize, size_t nstreams);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_STREAM_TO_STREAMS_H */
diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
new file mode 100644
index 0000000000..d059693945
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
+#define INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief convert a stream of items into a stream of gnuradio/blocks containing nitems_per_block
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API stream_to_vector : virtual public sync_decimator
+ {
+ public:
+ // gr::gnuradio/blocks::stream_to_vector::sptr
+ typedef boost::shared_ptr<stream_to_vector> sptr;
+
+ /*!
+ * Make a stream-to-vector block.
+ *
+ * \param itemsize the item size of the stream
+ * \param nitems_per_block number of items to but into each vector (vector size)
+ */
+ static sptr make(size_t itemsize, size_t nitems_per_block);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_STREAM_TO_VECTOR_H */
diff --git a/gr-blocks/include/gnuradio/blocks/streams_to_stream.h b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h
new file mode 100644
index 0000000000..ba6d04a38e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
+#define INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert N streams of 1 item into a 1 stream of N items
+ * \ingroup stream_operators_blk
+ *
+ * \details
+ * Convert N streams of 1 item into 1 stream of N items.
+ * Repeat ad infinitum.
+ */
+ class BLOCKS_API streams_to_stream : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::streams_to_stream::sptr
+ typedef boost::shared_ptr<streams_to_stream> sptr;
+
+ /*!
+ * Make a streams-to-stream block.
+ *
+ * \param itemsize the item size of the stream
+ * \param nstreams number of streams to combine
+ */
+ static sptr make(size_t itemsize, size_t nstreams);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_STREAMS_TO_STREAM_H */
diff --git a/gr-blocks/include/gnuradio/blocks/streams_to_vector.h b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h
new file mode 100644
index 0000000000..5954bdf07f
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
+#define INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief convert N streams of items to 1 stream of vector length N
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API streams_to_vector : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::streams_to_vector::sptr
+ typedef boost::shared_ptr<streams_to_vector> sptr;
+
+ /*!
+ * Make a stream-to-vector block.
+ *
+ * \param itemsize the item size of the stream
+ * \param nstreams number of streams to combine into a vector (vector size)
+ */
+ static sptr make(size_t itemsize, size_t nstreams);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H */
diff --git a/gr-blocks/include/gnuradio/blocks/stretch_ff.h b/gr-blocks/include/gnuradio/blocks/stretch_ff.h
new file mode 100644
index 0000000000..86f366935e
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/stretch_ff.h
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_STRETCH_FF_H
+#define INCLUDED_GR_STRETCH_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief adjust y-range of an input vector by mapping to range
+ * (max-of-input, stipulated-min). Primarily for spectral
+ * signature matching by normalizing spectrum dynamic ranges.
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API stretch_ff : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::stretch_ff::sptr
+ typedef boost::shared_ptr<stretch_ff> sptr;
+
+ /*!
+ * \brief Make a stretch block.
+ *
+ * \param lo Set low value for range.
+ * \param vlen vector length of input stream.
+ */
+ static sptr make(float lo, size_t vlen=1);
+
+ virtual float lo() const = 0;
+ virtual void set_lo(float lo) = 0;
+ virtual size_t vlen() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_STRETCH_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/sub_XX.h.t b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t
new file mode 100644
index 0000000000..ecc55fc865
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input_0 - input_1 - ...)
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Subtract across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/tag_debug.h b/gr-blocks/include/gnuradio/blocks/tag_debug.h
new file mode 100644
index 0000000000..88dfb1b726
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tag_debug.h
@@ -0,0 +1,83 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TAG_DEBUG_H
+#define INCLUDED_GR_TAG_DEBUG_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Bit bucket that prints out any tag received.
+ * \ingroup measurement_tools_blk
+ * \ingroup stream_tag_tools_blk
+ * \ingroup debug_tools_blk
+ *
+ * \details
+ * This block collects all tags sent to it on all input ports and
+ * displays them to stdout in a formatted way. The \p name
+ * parameter is used to identify which debug sink generated the
+ * tag, so when connecting a block to this debug sink, an
+ * appropriate name is something that identifies the input block.
+ *
+ * This block otherwise acts as a NULL sink in that items from the
+ * input stream are ignored. It is designed to be able to attach
+ * to any block and watch all tags streaming out of that block for
+ * debugging purposes.
+ *
+ * The tags from the last call to this work function are stored
+ * and can be retrieved using the function 'current_tags'.
+ */
+ class BLOCKS_API tag_debug : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::tag_debug::sptr
+ typedef boost::shared_ptr<tag_debug> sptr;
+
+ /*!
+ * Build a tag debug block
+ *
+ * \param sizeof_stream_item size of the items in the incoming stream.
+ * \param name name to identify which debug sink generated the info.
+ */
+ static sptr make(size_t sizeof_stream_item,
+ const std::string &name);
+
+ /*!
+ * \brief Returns a vector of tag_t items as of the last call to
+ * work.
+ */
+ virtual std::vector<tag_t> current_tags() = 0;
+
+ /*!
+ * \brief Set the display of tags to stdout on/off.
+ */
+ virtual void set_display(bool d) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TAG_DEBUG_H */
diff --git a/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h
new file mode 100644
index 0000000000..287ecb8246
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TAGGED_FILE_SINK_H
+#define INCLUDED_GR_TAGGED_FILE_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief A file sink that uses tags to save files.
+ * \ingroup file_operators_blk
+ * \ingroup stream_tag_tools_blk
+ *
+ * \details
+ * The sink uses a tag with the key 'burst' to trigger the saving
+ * of the burst data to a new file. If the value of this tag is
+ * True, it will open a new file and start writing all incoming
+ * data to it. If the tag is False, it will close the file (if
+ * already opened). The file names are based on the time when the
+ * burst tag was seen. If there is an 'rx_time' tag (standard with
+ * UHD sources), that is used as the time. If no 'rx_time' tag is
+ * found, the new time is calculated based off the sample rate of
+ * the block.
+ */
+ class BLOCKS_API tagged_file_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::tagged_file_sink::sptr
+ typedef boost::shared_ptr<tagged_file_sink> sptr;
+
+ /*!
+ * \brief Build a tagged_file_sink block.
+ *
+ * \param itemsize The item size of the input data stream.
+ * \param samp_rate The sample rate used to determine the time
+ * difference between bursts
+ */
+ static sptr make(size_t itemsize, double samp_rate);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TAGGED_FILE_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h
new file mode 100644
index 0000000000..73a02f9e1d
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/* Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_TAGGED_STREAM_MUX_H
+#define INCLUDED_TAGGED_STREAM_MUX_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/tagged_stream_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Combines tagged streams.
+ * \ingroup stream_operators_blk
+ *
+ * \details
+ * Takes N streams as input. Each stream is tagged with packet lengths.
+ * Packets are output sequentially from each input stream.
+ *
+ * The output signal has a new length tag, which is the sum of all
+ * individual length tags. The old length tags are discarded.
+ *
+ * All other tags are propagated as expected, i.e. they stay associated
+ * with the same input item.
+ */
+ class BLOCKS_API tagged_stream_mux : virtual public tagged_stream_block
+ {
+ public:
+ typedef boost::shared_ptr<tagged_stream_mux> sptr;
+
+ /*!
+ * Make a tagged stream mux block.
+ *
+ * \param itemsize Items size (number of bytes per item)
+ * \param lengthtagname Length tag key
+ */
+ static sptr make(size_t itemsize, const std::string &lengthtagname);
+ };
+
+ } // namespace blocks
+} // namespace gr
+
+#endif /* INCLUDED_TAGGED_STREAM_MUX_H */
+
diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h
new file mode 100644
index 0000000000..9b0f24a535
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
+#define INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Turns received stream data and tags into PDUs
+ * \ingroup message_tools_blk
+ */
+ class BLOCKS_API tagged_stream_to_pdu : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::tagged_stream_to_pdu::sptr
+ typedef boost::shared_ptr<tagged_stream_to_pdu> sptr;
+
+ /*!
+ * \brief Construct a tagged_stream_to_pdu block
+ * \param type PDU type of pdu::vector_type
+ */
+ static sptr make(pdu::vector_type type);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H */
diff --git a/gr-blocks/include/gnuradio/blocks/threshold_ff.h b/gr-blocks/include/gnuradio/blocks/threshold_ff.h
new file mode 100644
index 0000000000..253041b83a
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/threshold_ff.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_THRESHOLD_FF_H
+#define INCLUDED_GR_THRESHOLD_FF_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Output a 1 or zero based on a threshold value.
+ * \ingroup level_controllers_blk
+ *
+ * \details
+ * Test the incoming signal against a threshold. If the signal
+ * excedes the \p hi value, it will output a 1 until the signal
+ * falls below the \p lo value.
+ */
+ class BLOCKS_API threshold_ff : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::threshold_ff::sptr
+ typedef boost::shared_ptr<threshold_ff> sptr;
+
+ /* \brief Create a threadshold block.
+ * \param lo Threshold input signal needs to drop below to
+ * change state to 0.
+ * \param hi Threshold input signal needs to rise above to
+ * change state to 1.
+ * \param initial_state Initial state of the block (0 or 1).
+ */
+ static sptr make(float lo, float hi, float initial_state=0);
+
+ virtual float lo () const = 0;
+ virtual void set_lo (float lo) = 0;
+ virtual float hi () const = 0;
+ virtual void set_hi (float hi) = 0;
+ virtual float last_state () const = 0;
+ virtual void set_last_state (float last_state) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_THRESHOLD_FF_H */
diff --git a/gr-blocks/include/gnuradio/blocks/throttle.h b/gr-blocks/include/gnuradio/blocks/throttle.h
new file mode 100644
index 0000000000..662582e0ba
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/throttle.h
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005-2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_THROTTLE_H
+#define INCLUDED_GR_THROTTLE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief throttle flow of samples such that the average rate does
+ * not exceed samples_per_sec.
+ * \ingroup misc_blk
+ *
+ * \details
+ * input: one stream of itemsize; output: one stream of itemsize
+ *
+ * N.B. this should only be used in GUI apps where there is no
+ * other rate limiting block. It is not intended nor effective at
+ * precisely controlling the rate of samples. That should be
+ * controlled by a source or sink tied to sample clock. E.g., a
+ * USRP or audio card.
+ */
+ class BLOCKS_API throttle : virtual public sync_block
+ {
+ public:
+ typedef boost::shared_ptr<throttle> sptr;
+
+ static sptr make(size_t itemsize, double samples_per_sec);
+
+ //! Sets the sample rate in samples per second.
+ virtual void set_sample_rate(double rate) = 0;
+
+ //! Get the sample rate in samples per second.
+ virtual double sample_rate() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_THROTTLE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/transcendental.h b/gr-blocks/include/gnuradio/blocks/transcendental.h
new file mode 100644
index 0000000000..9d7a1e70e2
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/transcendental.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_TRANSCENDENTAL_H
+#define INCLUDED_GR_TRANSCENDENTAL_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <string>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief A block that performs various transcendental math operations.
+ * \ingroup math_operators_blk
+ *
+ * \details
+ * Possible function names can be found in the cmath library. IO
+ * may be either complex or real, double or single precision.
+ *
+ * Possible type strings: float, double, complex_float, complex_double
+ *
+ * output[i] = trans_fcn(input[i])
+ */
+ class BLOCKS_API transcendental : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::transcendental::sptr
+ typedef boost::shared_ptr<transcendental> sptr;
+
+ static sptr make(const std::string &name,
+ const std::string &type="float");
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TRANSCENDENTAL_H */
diff --git a/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
new file mode 100644
index 0000000000..53d9371bc4
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_TUNTAP_PDU_H
+#define INCLUDED_BLOCKS_TUNTAP_PDU_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Creates TUNTAP interface and translates traffic to PDUs
+ * \ingroup networking_tools_blk
+ */
+ class BLOCKS_API tuntap_pdu : virtual public block
+ {
+ public:
+ // gr::gnuradio/blocks::tuntap_pdu::sptr
+ typedef boost::shared_ptr<tuntap_pdu> sptr;
+
+ /*!
+ * \brief Construct a TUNTAP PDU interface
+ * \param dev Device name to create
+ * \param MTU Maximum Transmission Unit size
+ */
+ static sptr make(std::string dev, int MTU=10000);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_TUNTAP_PDU_H */
diff --git a/gr-blocks/include/gnuradio/blocks/uchar_to_float.h b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h
new file mode 100644
index 0000000000..a978a76958
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
+#define INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert stream of unsigned chars to a stream of floats
+ * \ingroup type_converters_blk
+ */
+ class BLOCKS_API uchar_to_float : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::uchar_to_float_ff::sptr
+ typedef boost::shared_ptr<uchar_to_float> sptr;
+
+ /*!
+ * Build a uchar to float block.
+ */
+ static sptr make();
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H */
diff --git a/gr-blocks/include/gnuradio/blocks/udp_sink.h b/gr-blocks/include/gnuradio/blocks/udp_sink.h
new file mode 100644
index 0000000000..d9360938e2
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/udp_sink.h
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007-2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_UDP_SINK_H
+#define INCLUDED_GR_UDP_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Write stream to an UDP socket.
+ * \ingroup networking_tools_blk
+ */
+ class BLOCKS_API udp_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::udp_sink::sptr
+ typedef boost::shared_ptr<udp_sink> sptr;
+
+ /*!
+ * \brief UDP Sink Constructor
+ *
+ * \param itemsize The size (in bytes) of the item datatype
+ * \param host The name or IP address of the receiving host; use
+ * NULL or None for no connection
+ * \param port Destination port to connect to on receiving host
+ * \param payload_size UDP payload size by default set to
+ * 1472 = (1500 MTU - (8 byte UDP header) - (20 byte IP header))
+ * \param eof Send zero-length packet on disconnect
+ */
+ static sptr make(size_t itemsize,
+ const std::string &host, int port,
+ int payload_size=1472, bool eof=true);
+
+ /*! \brief return the PAYLOAD_SIZE of the socket */
+ virtual int payload_size() = 0;
+
+ /*! \brief Change the connection to a new destination
+ *
+ * \param host The name or IP address of the receiving host; use
+ * NULL or None to break the connection without closing
+ * \param port Destination port to connect to on receiving host
+ *
+ * Calls disconnect() to terminate any current connection first.
+ */
+ virtual void connect(const std::string &host, int port) = 0;
+
+ /*! \brief Send zero-length packet (if eof is requested) then stop sending
+ *
+ * Zero-byte packets can be interpreted as EOF by gr_udp_source.
+ * Note that disconnect occurs automatically when the sink is
+ * destroyed, but not when its top_block stops.*/
+ virtual void disconnect() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_UDP_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/udp_source.h b/gr-blocks/include/gnuradio/blocks/udp_source.h
new file mode 100644
index 0000000000..e5534bc328
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/udp_source.h
@@ -0,0 +1,84 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007-2010,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_UDP_SOURCE_H
+#define INCLUDED_GR_UDP_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Read stream from an UDP socket.
+ * \ingroup networking_tools_blk
+ */
+ class BLOCKS_API udp_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::udp_source::sptr
+ typedef boost::shared_ptr<udp_source> sptr;
+
+ /*!
+ * \brief UDP Source Constructor
+ *
+ * \param itemsize The size (in bytes) of the item datatype
+ * \param host The name or IP address of the receiving host; can be
+ * NULL, None, or "0.0.0.0" to allow reading from any
+ * interface on the host
+ * \param port The port number on which to receive data; use 0 to
+ * have the system assign an unused port number
+ * \param payload_size UDP payload size by default set to 1472 =
+ * (1500 MTU - (8 byte UDP header) - (20 byte IP header))
+ * \param eof Interpret zero-length packet as EOF (default: true)
+ */
+ static sptr make(size_t itemsize,
+ const std::string &host, int port,
+ int payload_size=1472,
+ bool eof=true);
+
+ /*! \brief Change the connection to a new destination
+ *
+ * \param host The name or IP address of the receiving host; use
+ * NULL or None to break the connection without closing
+ * \param port Destination port to connect to on receiving host
+ *
+ * Calls disconnect() to terminate any current connection first.
+ */
+ virtual void connect(const std::string &host, int port) = 0;
+
+ /*! \brief Cut the connection if we have one set up.
+ */
+ virtual void disconnect() = 0;
+
+ /*! \brief return the PAYLOAD_SIZE of the socket */
+ virtual int payload_size() = 0;
+
+ /*! \brief return the port number of the socket */
+ virtual int get_port() = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_UDP_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
new file mode 100644
index 0000000000..942973f60d
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H
+#define INCLUDED_GR_UNPACK_K_BITS_BB_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+ * \ingroup byte_operators_blk
+ */
+ class BLOCKS_API unpack_k_bits_bb : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::unpack_k_bits_bb::sptr
+ typedef boost::shared_ptr<unpack_k_bits_bb> sptr;
+
+ /*!
+ * \brief Make an unpack_k_bits block.
+ * \param k number of bits to unpack.
+ */
+ static sptr make(unsigned k);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_UNPACK_K_BITS_BB_H */
diff --git a/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t
new file mode 100644
index 0000000000..194d79e0d2
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t
@@ -0,0 +1,73 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/endianness.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts.
+ * \ingroup byte_operators_blk
+ *
+ * \details
+ * input: stream of @I_TYPE@; output: stream of @O_TYPE@
+ *
+ * This is the inverse of gr::blocks::packed_to_unpacked_XX.
+ *
+ * The low \p bits_per_chunk bits are extracted from each input
+ * byte or short. These bits are then packed densely into the
+ * output bytes or shorts, such that all 8 or 16 bits of the
+ * output bytes or shorts are filled with valid input bits. The
+ * right thing is done if bits_per_chunk is not a power of two.
+ *
+ * The combination of gr::blocks::packed_to_unpacked_XX followed by
+ * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
+ * general case of mapping from a stream of bytes or shorts into
+ * arbitrary float or complex symbols.
+ *
+ * \sa gr::blocks::packed_to_unpacked_bb, gr::blocks::unpacked_to_packed_bb,
+ * \sa gr::blocks::packed_to_unpacked_ss, gr::blocks::unpacked_to_packed_ss,
+ * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
+ * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
+ */
+ class BLOCKS_API @NAME@ : virtual public block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(unsigned int bits_per_chunk,
+ endianness_t endianness);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/vco_f.h b/gr-blocks/include/gnuradio/blocks/vco_f.h
new file mode 100644
index 0000000000..c0fe5cd51c
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vco_f.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_VCO_F_H
+#define INCLUDED_GR_VCO_F_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief VCO - Voltage controlled oscillator
+ * \ingroup modulators_blk
+ * \ingroup waveform_generators_blk
+ *
+ * \details
+ * input: float stream of control voltages; output: float oscillator output
+ */
+ class BLOCKS_API vco_f : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::vco_f::sptr
+ typedef boost::shared_ptr<vco_f> sptr;
+
+ /*!
+ * \brief VCO - Voltage controlled oscillator
+ *
+ * \param sampling_rate sampling rate (Hz)
+ * \param sensitivity units are radians/sec/volt
+ * \param amplitude output amplitude
+ */
+ static sptr make(double sampling_rate, double sensitivity, double amplitude);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_VCO_F_H */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t
new file mode 100644
index 0000000000..8b26b0b9b0
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief source of @TYPE@'s that gets its data from a vector
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ /*!
+ * Make vector insert block.
+ *
+ * \param data vector of data to insert
+ * \param periodicity number of samples between when to send \p data
+ * \param offset initial item offset of first insert
+ */
+ static sptr make(const std::vector<@TYPE@> &data,
+ int periodicity, int offset=0);
+
+ virtual void rewind() = 0;
+ virtual void set_data(const std::vector<@TYPE@> &data) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_map.h b/gr-blocks/include/gnuradio/blocks/vector_map.h
new file mode 100644
index 0000000000..4819d52696
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_map.h
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_VECTOR_MAP_H
+#define INCLUDED_GR_VECTOR_MAP_H
+
+#include <gnuradio/blocks/api.h>
+#include <vector>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Maps elements from a set of input vectors to a set of output vectors.
+ * \ingroup slicedice_blk
+ *
+ * \details
+ * If in[i] is the input vector in the i'th stream then the output
+ * vector in the j'th stream is:
+ *
+ * out[j][k] = in[mapping[j][k][0]][mapping[j][k][1]]
+ *
+ * That is mapping is of the form (out_stream1_mapping,
+ * out_stream2_mapping, ...) and out_stream1_mapping is of the
+ * form (element1_mapping, element2_mapping, ...) and
+ * element1_mapping is of the form (in_stream, in_element).
+ */
+ class BLOCKS_API vector_map : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::vector_map::sptr
+ typedef boost::shared_ptr<vector_map> sptr;
+
+ /*!
+ * Build a vector map block.
+ *
+ * \param item_size (integer) size of vector elements
+ * \param in_vlens (vector of integers) number of elements in each
+ * input vector
+ * \param mapping (vector of vectors of vectors of integers) how to
+ * map elements from input to output vectors
+ */
+ static sptr make(size_t item_size, std::vector<size_t> in_vlens,
+ std::vector< std::vector< std::vector<size_t> > > mapping);
+
+ virtual void set_mapping(std::vector< std::vector< std::vector<size_t> > > mapping) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_VECTOR_MAP_H */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t
new file mode 100644
index 0000000000..527ebf7dff
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief @TYPE@ sink that writes to a vector
+ * \ingroup debug_tools_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(int vlen = 1);
+
+ virtual void reset() = 0;
+ virtual std::vector<@TYPE@> data() const = 0;
+ virtual std::vector<tag_t> tags() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t
new file mode 100644
index 0000000000..7ff18ad083
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief source of @TYPE@'s that gets its data from a vector
+ * \ingroup misc_blk
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(const std::vector<@TYPE@> &data,
+ bool repeat=false, int vlen=1,
+ const std::vector<tag_t> &tags=std::vector<tag_t>());
+
+ virtual void rewind() = 0;
+ virtual void set_data(const std::vector<@TYPE@> &data,
+ const std::vector<tag_t> &tags=std::vector<tag_t>()) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_to_stream.h b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h
new file mode 100644
index 0000000000..3b08bd08b5
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
+#define INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief convert a stream of gnuradio/blocks of nitems_per_block items into a stream of items
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API vector_to_stream : virtual public sync_interpolator
+ {
+ public:
+ // gr::gnuradio/blocks::vector_to_stream::sptr
+ typedef boost::shared_ptr<vector_to_stream> sptr;
+
+ /*!
+ * Make vector-to-stream block
+ *
+ * \param itemsize the item size of the stream
+ * \param nitems_per_block number of items per vector (vector size)
+ */
+ static sptr make(size_t itemsize, size_t nitems_per_block);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_VECTOR_TO_STREAM_H */
diff --git a/gr-blocks/include/gnuradio/blocks/vector_to_streams.h b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h
new file mode 100644
index 0000000000..ce10ed3155
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
+#define INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Convert 1 stream of vectors of length N to N streams of items
+ * \ingroup stream_operators_blk
+ */
+ class BLOCKS_API vector_to_streams : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::vector_to_streams::sptr
+ typedef boost::shared_ptr<vector_to_streams> sptr;
+
+ /*!
+ * Make vector-to-streams block
+ *
+ * \param itemsize the item size of the stream
+ * \param nstreams number of items per vector (vector size and
+ * number of streams produced)
+ */
+ static sptr make(size_t itemsize, size_t nstreams);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H */
diff --git a/gr-blocks/include/gnuradio/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h
new file mode 100644
index 0000000000..f0c8a4c1e7
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/wavfile.h
@@ -0,0 +1,104 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This file stores all the RIFF file type knowledge for the wavfile_*
+// gnuradio/blocks.
+
+#include <gnuradio/blocks/api.h>
+#include <cstdio>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Read signal information from a given WAV file.
+ *
+ * \param[in] fp File pointer to an opened, empty file.
+ * \param[out] sample_rate Stores the sample rate [S/s]
+ * \param[out] nchans Number of channels
+ * \param[out] bytes_per_sample Bytes per sample, can either be 1 or 2 (corresponding o
+ * 8 or 16 bit samples, respectively)
+ * \param[out] first_sample_pos Number of the first byte containing a sample. Use this
+ * with fseek() to jump from the end of the file to the
+ * first sample when in repeat mode.
+ * \param[out] samples_per_chan Number of samples per channel
+ * \return True on a successful read, false if the file could not be read or is
+ * not a valid WAV file.
+ */
+ bool
+ wavheader_parse(FILE *fp,
+ unsigned int &sample_rate,
+ int &nchans,
+ int &bytes_per_sample,
+ int &first_sample_pos,
+ unsigned int &samples_per_chan);
+
+ /*!
+ * \brief Read one sample from an open WAV file at the current position.
+ *
+ * \details
+ * Takes care of endianness.
+ */
+ short int
+ wav_read_sample(FILE *fp, int bytes_per_sample);
+
+
+ /*!
+ * \brief Write a valid RIFF file header
+ *
+ * Note: Some header values are kept blank because they're usually
+ * not known a-priori (file and chunk lengths). Use
+ * gri_wavheader_complete() to fill these in.
+ */
+ bool
+ wavheader_write(FILE *fp,
+ unsigned int sample_rate,
+ int nchans,
+ int bytes_per_sample);
+
+ /*!
+ * \brief Write one sample to an open WAV file at the current position.
+ *
+ * \details
+ * Takes care of endianness.
+ */
+ void
+ wav_write_sample(FILE *fp, short int sample, int bytes_per_sample);
+
+
+ /*!
+ * \brief Complete a WAV header
+ *
+ * \details
+ * Note: The stream position is changed during this function. If
+ * anything needs to be written to the WAV file after calling this
+ * function (which shouldn't happen), you need to fseek() to the
+ * end of the file (or whereever).
+ *
+ * \param[in] fp File pointer to an open WAV file with a blank header
+ * \param[in] byte_count Length of all samples written to the file in bytes.
+ */
+ bool
+ wavheader_complete(FILE *fp, unsigned int byte_count);
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/include/gnuradio/blocks/wavfile_sink.h b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h
new file mode 100644
index 0000000000..97550bfa98
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h
@@ -0,0 +1,87 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_WAVFILE_SINK_H
+#define INCLUDED_GR_WAVFILE_SINK_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Write stream to a Microsoft PCM (.wav) file.
+ * \ingroup audio_blk
+ *
+ * \details
+ * Values must be floats within [-1;1].
+ * Check gr_make_wavfile_sink() for extra info.
+ */
+ class BLOCKS_API wavfile_sink : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::wavfile_sink::sptr
+ typedef boost::shared_ptr<wavfile_sink> sptr;
+
+ /*
+ * \param filename The .wav file to be opened
+ * \param n_channels Number of channels (2 = stereo or I/Q output)
+ * \param sample_rate Sample rate [S/s]
+ * \param bits_per_sample 16 or 8 bit, default is 16
+ */
+ static sptr make(const char *filename,
+ int n_channels,
+ unsigned int sample_rate,
+ int bits_per_sample = 16);
+
+ /*!
+ * \brief Opens a new file and writes a WAV header. Thread-safe.
+ */
+ virtual bool open(const char* filename) = 0;
+
+ /*!
+ * \brief Closes the currently active file and completes the WAV
+ * header. Thread-safe.
+ */
+ virtual void close() = 0;
+
+ /*!
+ * \brief Set the sample rate. This will not affect the WAV file
+ * currently opened. Any following open() calls will use this new
+ * sample rate.
+ */
+ virtual void set_sample_rate(unsigned int sample_rate) = 0;
+
+ /*!
+ * \brief Set bits per sample. This will not affect the WAV file
+ * currently opened (see set_sample_rate()). If the value is
+ * neither 8 nor 16, the call is ignored and the current value
+ * is kept.
+ */
+ virtual void set_bits_per_sample(int bits_per_sample) = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_WAVFILE_SINK_H */
diff --git a/gr-blocks/include/gnuradio/blocks/wavfile_source.h b/gr-blocks/include/gnuradio/blocks/wavfile_source.h
new file mode 100644
index 0000000000..b8fe4988f1
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/wavfile_source.h
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_WAVFILE_SOURCE_H
+#define INCLUDED_GR_WAVFILE_SOURCE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief Read stream from a Microsoft PCM (.wav) file, output floats
+ * \ingroup audio_blk
+ *
+ * \details
+ * Unless otherwise called, values are within [-1;1].
+ * Check gr_make_wavfile_source() for extra info.
+ */
+ class BLOCKS_API wavfile_source : virtual public sync_block
+ {
+ public:
+ // gr::gnuradio/blocks::wavfile_source::sptr
+ typedef boost::shared_ptr<wavfile_source> sptr;
+
+ static sptr make(const char *filename, bool repeat = false);
+
+ /*!
+ * \brief Read the sample rate as specified in the wav file header
+ */
+ virtual unsigned int sample_rate() const = 0;
+
+ /*!
+ * \brief Return the number of bits per sample as specified in
+ * the wav file header. Only 8 or 16 bit are supported here.
+ */
+ virtual int bits_per_sample() const = 0;
+
+ /*!
+ * \brief Return the number of channels in the wav file as
+ * specified in the wav file header. This is also the max number
+ * of outputs you can have.
+ */
+ virtual int channels() const = 0;
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_WAVFILE_SOURCE_H */
diff --git a/gr-blocks/include/gnuradio/blocks/xor_XX.h.t b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t
new file mode 100644
index 0000000000..fa32192e76
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace blocks {
+
+ /*!
+ * \brief output = input_0 ^ input_1 ^ , ... ^ input_N)
+ * \ingroup boolean_operators_blk
+ *
+ * Bitwise boolean xor across all input streams.
+ */
+ class BLOCKS_API @NAME@ : virtual public sync_block
+ {
+ public:
+
+ // gr::blocks::@NAME@::sptr
+ typedef boost::shared_ptr<@NAME@> sptr;
+
+ static sptr make(size_t vlen=1);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/lib/add_XX_impl.cc.t b/gr-blocks/lib/add_XX_impl.cc.t
index c528e2fbff..281dcea050 100644
--- a/gr-blocks/lib/add_XX_impl.cc.t
+++ b/gr-blocks/lib/add_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/add_XX_impl.h.t b/gr-blocks/lib/add_XX_impl.h.t
index 2e20ef5fe3..22292b9fa5 100644
--- a/gr-blocks/lib/add_XX_impl.h.t
+++ b/gr-blocks/lib/add_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/add_const_XX_impl.cc.t b/gr-blocks/lib/add_const_XX_impl.cc.t
index 7fa883f4bb..87b22452dc 100644
--- a/gr-blocks/lib/add_const_XX_impl.cc.t
+++ b/gr-blocks/lib/add_const_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)),
+ io_signature::make (1, 1, sizeof (@O_TYPE@))),
d_k(k)
{
}
diff --git a/gr-blocks/lib/add_const_XX_impl.h.t b/gr-blocks/lib/add_const_XX_impl.h.t
index cae5ca8135..e0c2ae54bc 100644
--- a/gr-blocks/lib/add_const_XX_impl.h.t
+++ b/gr-blocks/lib/add_const_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/add_const_vXX_impl.cc.t b/gr-blocks/lib/add_const_vXX_impl.cc.t
index da76cfeef2..3a7174a4ef 100644
--- a/gr-blocks/lib/add_const_vXX_impl.cc.t
+++ b/gr-blocks/lib/add_const_vXX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(std::vector<@O_TYPE@> k)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*k.size()),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*k.size())),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)*k.size()),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*k.size())),
d_k(k)
{
}
diff --git a/gr-blocks/lib/add_const_vXX_impl.h.t b/gr-blocks/lib/add_const_vXX_impl.h.t
index a7a6197258..6c087d9461 100644
--- a/gr-blocks/lib/add_const_vXX_impl.h.t
+++ b/gr-blocks/lib/add_const_vXX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc
index 83359ef804..e12e86c061 100644
--- a/gr-blocks/lib/add_ff_impl.cc
+++ b/gr-blocks/lib/add_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "add_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
add_ff_impl::add_ff_impl(size_t vlen)
- : gr_sync_block("add_ff",
- gr_make_io_signature (1, -1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("add_ff",
+ io_signature::make (1, -1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/add_ff_impl.h b/gr-blocks/lib/add_ff_impl.h
index 77b90d0795..237ca37217 100644
--- a/gr-blocks/lib/add_ff_impl.h
+++ b/gr-blocks/lib/add_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_ADD_FF_IMPL_H
#define INCLUDED_BLOCKS_ADD_FF_IMPL_H
-#include <blocks/add_ff.h>
+#include <gnuradio/blocks/add_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/and_XX_impl.cc.t b/gr-blocks/lib/and_XX_impl.cc.t
index 3218a8c746..04d6dfe862 100644
--- a/gr-blocks/lib/and_XX_impl.cc.t
+++ b/gr-blocks/lib/and_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/and_XX_impl.h.t b/gr-blocks/lib/and_XX_impl.h.t
index 25f0da0c85..f7db3f2162 100644
--- a/gr-blocks/lib/and_XX_impl.h.t
+++ b/gr-blocks/lib/and_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/and_const_XX_impl.cc.t b/gr-blocks/lib/and_const_XX_impl.cc.t
index 8ff5ac3713..8eba4ed588 100644
--- a/gr-blocks/lib/and_const_XX_impl.cc.t
+++ b/gr-blocks/lib/and_const_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)),
+ io_signature::make (1, 1, sizeof (@O_TYPE@))),
d_k(k)
{
}
diff --git a/gr-blocks/lib/and_const_XX_impl.h.t b/gr-blocks/lib/and_const_XX_impl.h.t
index 2c379feb84..186fda9508 100644
--- a/gr-blocks/lib/and_const_XX_impl.h.t
+++ b/gr-blocks/lib/and_const_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc
index e7f105fc02..04f9a2f458 100644
--- a/gr-blocks/lib/annotator_1to1_impl.cc
+++ b/gr-blocks/lib/annotator_1to1_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "annotator_1to1_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <iostream>
#include <iomanip>
@@ -41,9 +41,9 @@ namespace gr {
}
annotator_1to1_impl::annotator_1to1_impl(int when, size_t sizeof_stream_item)
- : gr_sync_block("annotator_1to1",
- gr_make_io_signature(1, -1, sizeof_stream_item),
- gr_make_io_signature(1, -1, sizeof_stream_item)),
+ : sync_block("annotator_1to1",
+ io_signature::make(1, -1, sizeof_stream_item),
+ io_signature::make(1, -1, sizeof_stream_item)),
d_itemsize(sizeof_stream_item), d_when((uint64_t)when)
{
set_tag_propagation_policy(TPP_ONE_TO_ONE);
@@ -72,10 +72,10 @@ namespace gr {
for(int i = 0; i < ninputs; i++) {
abs_N = nitems_read(i);
- std::vector<gr_tag_t> all_tags;
+ std::vector<tag_t> all_tags;
get_tags_in_range(all_tags, i, abs_N, abs_N + noutput_items);
- std::vector<gr_tag_t>::iterator itr;
+ std::vector<tag_t>::iterator itr;
for(itr = all_tags.begin(); itr != all_tags.end(); itr++) {
d_stored_tags.push_back(*itr);
}
diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h
index 3306602e2c..2da73c8a66 100644
--- a/gr-blocks/lib/annotator_1to1_impl.h
+++ b/gr-blocks/lib/annotator_1to1_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H
#define INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H
-#include <blocks/annotator_1to1.h>
+#include <gnuradio/blocks/annotator_1to1.h>
namespace gr {
namespace blocks {
@@ -34,13 +34,13 @@ namespace gr {
size_t d_itemsize;
uint64_t d_when;
uint64_t d_tag_counter;
- std::vector<gr_tag_t> d_stored_tags;
+ std::vector<tag_t> d_stored_tags;
public:
annotator_1to1_impl(int when, size_t sizeof_stream_item);
~annotator_1to1_impl();
- std::vector<gr_tag_t> data() const
+ std::vector<tag_t> data() const
{
return d_stored_tags;
}
diff --git a/gr-blocks/lib/annotator_alltoall_impl.cc b/gr-blocks/lib/annotator_alltoall_impl.cc
index 4909f7f820..cedf8dd44f 100644
--- a/gr-blocks/lib/annotator_alltoall_impl.cc
+++ b/gr-blocks/lib/annotator_alltoall_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "annotator_alltoall_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <iostream>
#include <iomanip>
@@ -42,9 +42,9 @@ namespace gr {
annotator_alltoall_impl::annotator_alltoall_impl(int when,
size_t sizeof_stream_item)
- : gr_sync_block("annotator_alltoall",
- gr_make_io_signature(1, -1, sizeof_stream_item),
- gr_make_io_signature(1, -1, sizeof_stream_item)),
+ : sync_block("annotator_alltoall",
+ io_signature::make(1, -1, sizeof_stream_item),
+ io_signature::make(1, -1, sizeof_stream_item)),
d_itemsize(sizeof_stream_item), d_when((uint64_t)when)
{
set_tag_propagation_policy(TPP_ALL_TO_ALL);
@@ -73,10 +73,10 @@ namespace gr {
abs_N = nitems_read(i);
end_N = abs_N + (uint64_t)(noutput_items);
- std::vector<gr_tag_t> all_tags;
+ std::vector<tag_t> all_tags;
get_tags_in_range(all_tags, i, abs_N, end_N);
- std::vector<gr_tag_t>::iterator itr;
+ std::vector<tag_t>::iterator itr;
for(itr = all_tags.begin(); itr != all_tags.end(); itr++) {
d_stored_tags.push_back(*itr);
}
diff --git a/gr-blocks/lib/annotator_alltoall_impl.h b/gr-blocks/lib/annotator_alltoall_impl.h
index 24c21948bc..81b73a8972 100644
--- a/gr-blocks/lib/annotator_alltoall_impl.h
+++ b/gr-blocks/lib/annotator_alltoall_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_IMPL_H
#define INCLUDED_GR_ANNOTATOR_ALLTOALL_IMPL_H
-#include <blocks/annotator_alltoall.h>
+#include <gnuradio/blocks/annotator_alltoall.h>
namespace gr {
namespace blocks {
@@ -34,13 +34,13 @@ namespace gr {
size_t d_itemsize;
uint64_t d_when;
uint64_t d_tag_counter;
- std::vector<gr_tag_t> d_stored_tags;
+ std::vector<tag_t> d_stored_tags;
public:
annotator_alltoall_impl(int when, size_t sizeof_stream_item);
~annotator_alltoall_impl();
- std::vector<gr_tag_t> data() const
+ std::vector<tag_t> data() const
{
return d_stored_tags;
}
diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc
index ee5deb1f6b..499168c275 100644
--- a/gr-blocks/lib/annotator_raw_impl.cc
+++ b/gr-blocks/lib/annotator_raw_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "annotator_raw_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <iostream>
#include <iomanip>
@@ -44,9 +44,9 @@ namespace gr {
}
annotator_raw_impl::annotator_raw_impl(size_t sizeof_stream_item)
- : gr_sync_block("annotator_raw",
- gr_make_io_signature(1, 1, sizeof_stream_item),
- gr_make_io_signature(1, 1, sizeof_stream_item)),
+ : sync_block("annotator_raw",
+ io_signature::make(1, 1, sizeof_stream_item),
+ io_signature::make(1, 1, sizeof_stream_item)),
d_itemsize(sizeof_stream_item)
{
set_tag_propagation_policy(TPP_ONE_TO_ONE);
@@ -62,7 +62,7 @@ namespace gr {
{
gr::thread::scoped_lock l(d_mutex);
- gr_tag_t tag;
+ tag_t tag;
tag.srcid = pmt::intern(name());
tag.key = key;
tag.value = val;
@@ -72,7 +72,7 @@ namespace gr {
d_queued_tags.push_back(tag);
// make sure our tags are in offset order
std::sort(d_queued_tags.begin(), d_queued_tags.end(),
- gr_tag_t::offset_compare);
+ tag_t::offset_compare);
// make sure we are not adding an item in the past!
if(tag.offset > nitems_read(0)) {
throw std::runtime_error("annotator_raw::add_tag: item added too far in the past\n.");
@@ -93,7 +93,7 @@ namespace gr {
uint64_t end_N = start_N + (uint64_t)(noutput_items);
// locate queued tags that fall in this range and insert them when appropriate
- std::vector<gr_tag_t>::iterator i = d_queued_tags.begin();
+ std::vector<tag_t>::iterator i = d_queued_tags.begin();
while( i != d_queued_tags.end() ) {
if( (*i).offset >= start_N && (*i).offset < end_N) {
add_item_tag(0, (*i).offset,(*i).key, (*i).value, (*i).srcid);
diff --git a/gr-blocks/lib/annotator_raw_impl.h b/gr-blocks/lib/annotator_raw_impl.h
index e0e16c30d6..54bed2ea25 100644
--- a/gr-blocks/lib/annotator_raw_impl.h
+++ b/gr-blocks/lib/annotator_raw_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_ANNOTATOR_RAW_IMPL_H
#define INCLUDED_GR_ANNOTATOR_RAW_IMPL_H
-#include <blocks/annotator_raw.h>
-#include <thread/thread.h>
+#include <gnuradio/blocks/annotator_raw.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace blocks {
@@ -33,7 +33,7 @@ namespace gr {
{
private:
size_t d_itemsize;
- std::vector<gr_tag_t> d_queued_tags;
+ std::vector<tag_t> d_queued_tags;
gr::thread::mutex d_mutex;
public:
diff --git a/gr-blocks/lib/argmax_XX_impl.cc.t b/gr-blocks/lib/argmax_XX_impl.cc.t
index 56673ef995..87e025e2d7 100644
--- a/gr-blocks/lib/argmax_XX_impl.cc.t
+++ b/gr-blocks/lib/argmax_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, vlen*sizeof(@I_TYPE@)),
- gr_make_io_signature(2, 2, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, -1, vlen*sizeof(@I_TYPE@)),
+ io_signature::make(2, 2, sizeof(@O_TYPE@))),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/argmax_XX_impl.h.t b/gr-blocks/lib/argmax_XX_impl.h.t
index 0f1643f6b9..79da4e1d82 100644
--- a/gr-blocks/lib/argmax_XX_impl.h.t
+++ b/gr-blocks/lib/argmax_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/bin_statistics_f_impl.cc b/gr-blocks/lib/bin_statistics_f_impl.cc
index 014222a63d..1f17e85365 100644
--- a/gr-blocks/lib/bin_statistics_f_impl.cc
+++ b/gr-blocks/lib/bin_statistics_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "bin_statistics_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -33,8 +33,8 @@ namespace gr {
bin_statistics_f::sptr
bin_statistics_f::make(unsigned int vlen,
- gr_msg_queue_sptr msgq,
- gr_feval_dd *tune,
+ msg_queue::sptr msgq,
+ feval_dd *tune,
size_t tune_delay,
size_t dwell_delay)
{
@@ -44,13 +44,13 @@ namespace gr {
}
bin_statistics_f_impl::bin_statistics_f_impl(unsigned int vlen,
- gr_msg_queue_sptr msgq,
- gr_feval_dd *tune,
+ msg_queue::sptr msgq,
+ feval_dd *tune,
size_t tune_delay,
size_t dwell_delay)
- : gr_sync_block("bin_statistics_f",
- gr_make_io_signature(1, 1, sizeof(float) * vlen),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("bin_statistics_f",
+ io_signature::make(1, 1, sizeof(float) * vlen),
+ io_signature::make(0, 0, 0)),
d_vlen(vlen), d_msgq(msgq), d_tune(tune),
d_tune_delay(tune_delay), d_dwell_delay(dwell_delay),
d_center_freq(0), d_delay(0),
@@ -168,7 +168,7 @@ namespace gr {
return;
// build & send a message
- gr_message_sptr msg = gr_make_message(0, center_freq(), vlen(), vlen() * sizeof(float));
+ message::sptr msg = message::make(0, center_freq(), vlen(), vlen() * sizeof(float));
memcpy(msg->msg(), &d_max[0], vlen() * sizeof(float));
msgq()->insert_tail(msg);
}
diff --git a/gr-blocks/lib/bin_statistics_f_impl.h b/gr-blocks/lib/bin_statistics_f_impl.h
index 0abb60ed38..1d8da6b348 100644
--- a/gr-blocks/lib/bin_statistics_f_impl.h
+++ b/gr-blocks/lib/bin_statistics_f_impl.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_GR_BIN_STATISTICS_F_IMPL_H
#define INCLUDED_GR_BIN_STATISTICS_F_IMPL_H
-#include <blocks/bin_statistics_f.h>
-#include <gr_feval.h>
-#include <gr_message.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/blocks/bin_statistics_f.h>
+#include <gnuradio/feval.h>
+#include <gnuradio/message.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace blocks {
@@ -37,8 +37,8 @@ namespace gr {
enum state_t { ST_INIT, ST_TUNE_DELAY, ST_DWELL_DELAY };
size_t d_vlen;
- gr_msg_queue_sptr d_msgq;
- gr_feval_dd *d_tune;
+ msg_queue::sptr d_msgq;
+ feval_dd *d_tune;
size_t d_tune_delay;
size_t d_dwell_delay;
double d_center_freq;
@@ -56,7 +56,7 @@ namespace gr {
size_t vlen() const { return d_vlen; }
double center_freq() const { return d_center_freq; }
- gr_msg_queue_sptr msgq() const { return d_msgq; }
+ msg_queue::sptr msgq() const { return d_msgq; }
virtual void reset_stats();
virtual void accrue_stats(const float *input);
@@ -64,8 +64,8 @@ namespace gr {
public:
bin_statistics_f_impl(unsigned int vlen,
- gr_msg_queue_sptr msgq,
- gr_feval_dd *tune,
+ msg_queue::sptr msgq,
+ feval_dd *tune,
size_t tune_delay,
size_t dwell_delay);
~bin_statistics_f_impl();
diff --git a/gr-blocks/lib/burst_tagger_impl.cc b/gr-blocks/lib/burst_tagger_impl.cc
index 31c535290d..da69a0ea48 100644
--- a/gr-blocks/lib/burst_tagger_impl.cc
+++ b/gr-blocks/lib/burst_tagger_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "burst_tagger_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
burst_tagger_impl::burst_tagger_impl(size_t itemsize)
- : gr_sync_block("burst_tagger",
- gr_make_io_signature2(2, 2, itemsize, sizeof(short)),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("burst_tagger",
+ io_signature::make2(2, 2, itemsize, sizeof(short)),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_state(false)
{
std::stringstream str;
diff --git a/gr-blocks/lib/burst_tagger_impl.h b/gr-blocks/lib/burst_tagger_impl.h
index 80bdec12fb..65ad58f8b3 100644
--- a/gr-blocks/lib/burst_tagger_impl.h
+++ b/gr-blocks/lib/burst_tagger_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_BURST_TAGGER_IMPL_H
#define INCLUDED_GR_BURST_TAGGER_IMPL_H
-#include <blocks/burst_tagger.h>
+#include <gnuradio/blocks/burst_tagger.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/char_to_float_impl.cc b/gr-blocks/lib/char_to_float_impl.cc
index 22c5d2e252..de6ee5ba5a 100644
--- a/gr-blocks/lib/char_to_float_impl.cc
+++ b/gr-blocks/lib/char_to_float_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "char_to_float_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
char_to_float_impl::char_to_float_impl(size_t vlen, float scale)
- : gr_sync_block("char_to_float",
- gr_make_io_signature (1, -1, sizeof(char)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("char_to_float",
+ io_signature::make (1, -1, sizeof(char)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/char_to_float_impl.h b/gr-blocks/lib/char_to_float_impl.h
index 620d7e7371..f5677f86bd 100644
--- a/gr-blocks/lib/char_to_float_impl.h
+++ b/gr-blocks/lib/char_to_float_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CHAR_TO_FLOAT_IMPL_H
#define INCLUDED_CHAR_TO_FLOAT_IMPL_H
-#include <blocks/char_to_float.h>
+#include <gnuradio/blocks/char_to_float.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/char_to_short_impl.cc b/gr-blocks/lib/char_to_short_impl.cc
index a86a928b51..2b5414d673 100644
--- a/gr-blocks/lib/char_to_short_impl.cc
+++ b/gr-blocks/lib/char_to_short_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "char_to_short_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
char_to_short_impl::char_to_short_impl(size_t vlen)
- : gr_sync_block("char_to_short",
- gr_make_io_signature (1, -1, sizeof(char)*vlen),
- gr_make_io_signature (1, 1, sizeof(short)*vlen)),
+ : sync_block("char_to_short",
+ io_signature::make (1, -1, sizeof(char)*vlen),
+ io_signature::make (1, 1, sizeof(short)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/char_to_short_impl.h b/gr-blocks/lib/char_to_short_impl.h
index efd3ab3a8c..1009defedc 100644
--- a/gr-blocks/lib/char_to_short_impl.h
+++ b/gr-blocks/lib/char_to_short_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CHAR_TO_SHORT_IMPL_H
#define INCLUDED_CHAR_TO_SHORT_IMPL_H
-#include <blocks/char_to_short.h>
+#include <gnuradio/blocks/char_to_short.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
index 5664067591..fac30223f7 100644
--- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc
+++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "check_lfsr_32k_s_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdlib.h>
#include <stdio.h>
@@ -40,9 +40,9 @@ namespace gr {
}
check_lfsr_32k_s_impl::check_lfsr_32k_s_impl()
- : gr_sync_block("check_lfsr_32k",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("check_lfsr_32k",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(0, 0, 0)),
d_state(SEARCHING), d_history(0), d_ntotal(0), d_nright(0),
d_runlength(0), d_index(0)
{
diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.h b/gr-blocks/lib/check_lfsr_32k_s_impl.h
index f6d3c8daa2..e060e89afc 100644
--- a/gr-blocks/lib/check_lfsr_32k_s_impl.h
+++ b/gr-blocks/lib/check_lfsr_32k_s_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_CHECK_LFSR_32K_S_IMPL_H
#define INCLUDED_GR_CHECK_LFSR_32K_S_IMPL_H
-#include <blocks/check_lfsr_32k_s.h>
-#include <blocks/lfsr_32k.h>
+#include <gnuradio/blocks/check_lfsr_32k_s.h>
+#include <gnuradio/blocks/lfsr_32k.h>
namespace gr {
namespace blocks {
@@ -59,14 +59,14 @@ namespace gr {
void right()
{
- d_history = (d_history << 1) | 0x1;
+ d_history = (d_history < 1) | 0x1;
d_nright++;
d_runlength++;
}
void wrong()
{
- d_history = (d_history << 1) | 0x0;
+ d_history = (d_history < 1) | 0x0;
d_runlength = 0;
}
diff --git a/gr-blocks/lib/complex_to_arg_impl.cc b/gr-blocks/lib/complex_to_arg_impl.cc
index 87ac9966f0..38539c8004 100644
--- a/gr-blocks/lib/complex_to_arg_impl.cc
+++ b/gr-blocks/lib/complex_to_arg_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "complex_to_arg_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
complex_to_arg_impl::complex_to_arg_impl(size_t vlen)
- : gr_sync_block("complex_to_arg",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("complex_to_arg",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
@@ -60,7 +60,7 @@ namespace gr {
// The fast_atan2f is faster than Volk
for (int i = 0; i < noi; i++){
// out[i] = std::arg (in[i]);
- out[i] = gr_fast_atan2f(in[i]);
+ out[i] = gr::fast_atan2f(in[i]);
}
return noutput_items;
diff --git a/gr-blocks/lib/complex_to_arg_impl.h b/gr-blocks/lib/complex_to_arg_impl.h
index 9ccfba05ae..cc1863b2d8 100644
--- a/gr-blocks/lib/complex_to_arg_impl.h
+++ b/gr-blocks/lib/complex_to_arg_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_ARG_IMPL_H
#define INCLUDED_COMPLEX_TO_ARG_IMPL_H
-#include <blocks/complex_to_arg.h>
+#include <gnuradio/blocks/complex_to_arg.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_float_impl.cc b/gr-blocks/lib/complex_to_float_impl.cc
index 3c1109de5f..d0b2bc6b9c 100644
--- a/gr-blocks/lib/complex_to_float_impl.cc
+++ b/gr-blocks/lib/complex_to_float_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_float_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
complex_to_float_impl::complex_to_float_impl(size_t vlen)
- : gr_sync_block("complex_to_float",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 2, sizeof(float)*vlen)),
+ : sync_block("complex_to_float",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 2, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/complex_to_float_impl.h b/gr-blocks/lib/complex_to_float_impl.h
index d90ac28d58..d4fdcb7a9b 100644
--- a/gr-blocks/lib/complex_to_float_impl.h
+++ b/gr-blocks/lib/complex_to_float_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_FLOAT_IMPL_H
#define INCLUDED_COMPLEX_TO_FLOAT_IMPL_H
-#include <blocks/complex_to_float.h>
+#include <gnuradio/blocks/complex_to_float.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_imag_impl.cc b/gr-blocks/lib/complex_to_imag_impl.cc
index 760440cc9d..27d349aa1d 100644
--- a/gr-blocks/lib/complex_to_imag_impl.cc
+++ b/gr-blocks/lib/complex_to_imag_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_imag_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
complex_to_imag_impl::complex_to_imag_impl(size_t vlen)
- : gr_sync_block("complex_to_imag",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("complex_to_imag",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/complex_to_imag_impl.h b/gr-blocks/lib/complex_to_imag_impl.h
index e647e67732..6758b0f6c5 100644
--- a/gr-blocks/lib/complex_to_imag_impl.h
+++ b/gr-blocks/lib/complex_to_imag_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_IMAG_IMPL_H
#define INCLUDED_COMPLEX_TO_IMAG_IMPL_H
-#include <blocks/complex_to_imag.h>
+#include <gnuradio/blocks/complex_to_imag.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.cc b/gr-blocks/lib/complex_to_interleaved_short_impl.cc
index 2f2ea6e00d..87146364bc 100644
--- a/gr-blocks/lib/complex_to_interleaved_short_impl.cc
+++ b/gr-blocks/lib/complex_to_interleaved_short_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_interleaved_short_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
complex_to_interleaved_short_impl::complex_to_interleaved_short_impl()
- : gr_sync_interpolator("complex_to_interleaved_short",
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
- gr_make_io_signature (1, 1, sizeof(short)),
+ : sync_interpolator("complex_to_interleaved_short",
+ io_signature::make (1, 1, sizeof(gr_complex)),
+ io_signature::make (1, 1, sizeof(short)),
2)
{
}
diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.h b/gr-blocks/lib/complex_to_interleaved_short_impl.h
index 9a09d1ff99..7bcea95be0 100644
--- a/gr-blocks/lib/complex_to_interleaved_short_impl.h
+++ b/gr-blocks/lib/complex_to_interleaved_short_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_INTERLEAVED_SHORT_IMPL_H
#define INCLUDED_COMPLEX_TO_INTERLEAVED_SHORT_IMPL_H
-#include <blocks/complex_to_interleaved_short.h>
+#include <gnuradio/blocks/complex_to_interleaved_short.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_mag_impl.cc b/gr-blocks/lib/complex_to_mag_impl.cc
index 419bc53eb1..52a193f4d1 100644
--- a/gr-blocks/lib/complex_to_mag_impl.cc
+++ b/gr-blocks/lib/complex_to_mag_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_mag_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
complex_to_mag_impl::complex_to_mag_impl(size_t vlen)
- : gr_sync_block("complex_to_mag",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("complex_to_mag",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/complex_to_mag_impl.h b/gr-blocks/lib/complex_to_mag_impl.h
index fe6da3f15e..54f12ac312 100644
--- a/gr-blocks/lib/complex_to_mag_impl.h
+++ b/gr-blocks/lib/complex_to_mag_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_MAG_IMPL_H
#define INCLUDED_COMPLEX_TO_MAG_IMPL_H
-#include <blocks/complex_to_mag.h>
+#include <gnuradio/blocks/complex_to_mag.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.cc b/gr-blocks/lib/complex_to_mag_squared_impl.cc
index a3b48b153e..513527c25a 100644
--- a/gr-blocks/lib/complex_to_mag_squared_impl.cc
+++ b/gr-blocks/lib/complex_to_mag_squared_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_mag_squared_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
complex_to_mag_squared_impl::complex_to_mag_squared_impl(size_t vlen)
- : gr_sync_block("complex_to_mag_squared",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("complex_to_mag_squared",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.h b/gr-blocks/lib/complex_to_mag_squared_impl.h
index 01851d2661..0cf22c8d9b 100644
--- a/gr-blocks/lib/complex_to_mag_squared_impl.h
+++ b/gr-blocks/lib/complex_to_mag_squared_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_MAG_SQUARED_IMPL_H
#define INCLUDED_COMPLEX_TO_MAG_SQUARED_IMPL_H
-#include <blocks/complex_to_mag_squared.h>
+#include <gnuradio/blocks/complex_to_mag_squared.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/complex_to_real_impl.cc b/gr-blocks/lib/complex_to_real_impl.cc
index 6f053b669a..06d1b5ab0e 100644
--- a/gr-blocks/lib/complex_to_real_impl.cc
+++ b/gr-blocks/lib/complex_to_real_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "complex_to_real_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
complex_to_real_impl::complex_to_real_impl(size_t vlen)
- : gr_sync_block("complex_to_real",
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("complex_to_real",
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/complex_to_real_impl.h b/gr-blocks/lib/complex_to_real_impl.h
index 7d4d4306f8..233f90c93d 100644
--- a/gr-blocks/lib/complex_to_real_impl.h
+++ b/gr-blocks/lib/complex_to_real_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMPLEX_TO_REAL_IMPL_H
#define INCLUDED_COMPLEX_TO_REAL_IMPL_H
-#include <blocks/complex_to_real.h>
+#include <gnuradio/blocks/complex_to_real.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/conjugate_cc_impl.cc b/gr-blocks/lib/conjugate_cc_impl.cc
index 3d46bef68b..14fbbf172c 100644
--- a/gr-blocks/lib/conjugate_cc_impl.cc
+++ b/gr-blocks/lib/conjugate_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "conjugate_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
conjugate_cc_impl::conjugate_cc_impl()
- : gr_sync_block("conjugate_cc",
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
- gr_make_io_signature (1, 1, sizeof(gr_complex)))
+ : sync_block("conjugate_cc",
+ io_signature::make (1, 1, sizeof(gr_complex)),
+ io_signature::make (1, 1, sizeof(gr_complex)))
{
const int alignment_multiple =
volk_get_alignment() / sizeof(gr_complex);
diff --git a/gr-blocks/lib/conjugate_cc_impl.h b/gr-blocks/lib/conjugate_cc_impl.h
index 448e7b3188..d3d0f9a0b7 100644
--- a/gr-blocks/lib/conjugate_cc_impl.h
+++ b/gr-blocks/lib/conjugate_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CONJUGATE_CC_IMPL_H
#define INCLUDED_CONJUGATE_CC_IMPL_H
-#include <blocks/conjugate_cc.h>
+#include <gnuradio/blocks/conjugate_cc.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/control_loop.cc b/gr-blocks/lib/control_loop.cc
index 44f4e53394..bd33e6a7a0 100644
--- a/gr-blocks/lib/control_loop.cc
+++ b/gr-blocks/lib/control_loop.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include <blocks/control_loop.h>
-#include <gr_math.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/math.h>
#include <stdexcept>
namespace gr {
diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc
index 929f22b7d3..564ea09ef4 100644
--- a/gr-blocks/lib/copy_impl.cc
+++ b/gr-blocks/lib/copy_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "copy_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
copy_impl::copy_impl(size_t itemsize)
- : gr_block("copy",
- gr_make_io_signature(1, -1, itemsize),
- gr_make_io_signature(1, -1, itemsize)),
+ : block("copy",
+ io_signature::make(1, -1, itemsize),
+ io_signature::make(1, -1, itemsize)),
d_itemsize(itemsize),
d_enabled(true)
{
diff --git a/gr-blocks/lib/copy_impl.h b/gr-blocks/lib/copy_impl.h
index 1f0f1a655e..5f3c81a306 100644
--- a/gr-blocks/lib/copy_impl.h
+++ b/gr-blocks/lib/copy_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_COPY_IMPL_H
#define INCLUDED_GR_COPY_IMPL_H
-#include <blocks/copy.h>
+#include <gnuradio/blocks/copy.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/count_bits.cc b/gr-blocks/lib/count_bits.cc
index 167396b575..c65dc94894 100644
--- a/gr-blocks/lib/count_bits.cc
+++ b/gr-blocks/lib/count_bits.cc
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <blocks/count_bits.h>
+#include <gnuradio/blocks/count_bits.h>
/*
* these are slow and obvious. If you need something faster, fix these
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
index f52e605a0d..bc6febdb2d 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ctrlport_probe2_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string &id,
const std::string &desc, int len)
- : gr_sync_block("probe2_c",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("probe2_c",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_id(id), d_desc(desc), d_len(len)
{
set_length(len);
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h
index 4d290a4e8f..c58d97f078 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_CTRLPORT_PROBE2_C_IMPL_H
#define INCLUDED_CTRLPORT_PROBE2_C_IMPL_H
-#include <blocks/ctrlport_probe2_c.h>
-#include <rpcregisterhelpers.h>
+#include <gnuradio/blocks/ctrlport_probe2_c.h>
+#include <gnuradio/rpcregisterhelpers.h>
#include <boost/thread/shared_mutex.hpp>
namespace gr {
diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc
index e11bd0496e..1c077af481 100644
--- a/gr-blocks/lib/ctrlport_probe_c_impl.cc
+++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ctrlport_probe_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
ctrlport_probe_c_impl::ctrlport_probe_c_impl(const std::string &id,
const std::string &desc)
- : gr_sync_block("probe_c",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("probe_c",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_id(id), d_desc(desc), d_ptr(NULL), d_ptrLen(0)
{
}
diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.h b/gr-blocks/lib/ctrlport_probe_c_impl.h
index 5d9073ac10..59e9497a82 100644
--- a/gr-blocks/lib/ctrlport_probe_c_impl.h
+++ b/gr-blocks/lib/ctrlport_probe_c_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_CTRLPORT_PROBE_C_IMPL_H
#define INCLUDED_CTRLPORT_PROBE_C_IMPL_H
-#include <blocks/ctrlport_probe_c.h>
-#include <rpcregisterhelpers.h>
+#include <gnuradio/blocks/ctrlport_probe_c.h>
+#include <gnuradio/rpcregisterhelpers.h>
#include <boost/thread/shared_mutex.hpp>
namespace gr {
diff --git a/gr-blocks/lib/deinterleave_impl.cc b/gr-blocks/lib/deinterleave_impl.cc
index badf4973a6..6866cc7acb 100644
--- a/gr-blocks/lib/deinterleave_impl.cc
+++ b/gr-blocks/lib/deinterleave_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "deinterleave_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
deinterleave_impl::deinterleave_impl(size_t itemsize)
- : gr_sync_decimator("deinterleave",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (1, gr_io_signature::IO_INFINITE, itemsize),
+ : sync_decimator("deinterleave",
+ io_signature::make (1, 1, itemsize),
+ io_signature::make (1, io_signature::IO_INFINITE, itemsize),
1),
d_itemsize(itemsize)
{
diff --git a/gr-blocks/lib/deinterleave_impl.h b/gr-blocks/lib/deinterleave_impl.h
index 762c9d5fe0..d4d9392e8a 100644
--- a/gr-blocks/lib/deinterleave_impl.h
+++ b/gr-blocks/lib/deinterleave_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DEINTERLEAVE_IMPL_H
#define INCLUDED_DEINTERLEAVE_IMPL_H
-#include <blocks/deinterleave.h>
+#include <gnuradio/blocks/deinterleave.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/delay_impl.cc b/gr-blocks/lib/delay_impl.cc
index 08cd1db1c3..197aa66977 100644
--- a/gr-blocks/lib/delay_impl.cc
+++ b/gr-blocks/lib/delay_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "delay_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
delay_impl::delay_impl(size_t itemsize, int delay)
- : gr_block("delay",
- gr_make_io_signature(1, -1, itemsize),
- gr_make_io_signature(1, -1, itemsize)),
+ : block("delay",
+ io_signature::make(1, -1, itemsize),
+ io_signature::make(1, -1, itemsize)),
d_itemsize(itemsize)
{
set_dly(delay);
diff --git a/gr-blocks/lib/delay_impl.h b/gr-blocks/lib/delay_impl.h
index 1cb959359e..ad07e6aa78 100644
--- a/gr-blocks/lib/delay_impl.h
+++ b/gr-blocks/lib/delay_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_DELAY_IMPL_H
#define INCLUDED_GR_DELAY_IMPL_H
-#include <blocks/delay.h>
-#include <thread/thread.h>
+#include <gnuradio/blocks/delay.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/divide_XX_impl.cc.t b/gr-blocks/lib/divide_XX_impl.cc.t
index 223d6ad905..30cb3ab38c 100644
--- a/gr-blocks/lib/divide_XX_impl.cc.t
+++ b/gr-blocks/lib/divide_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/divide_XX_impl.h.t b/gr-blocks/lib/divide_XX_impl.h.t
index a1c486b859..2680ef7012 100644
--- a/gr-blocks/lib/divide_XX_impl.h.t
+++ b/gr-blocks/lib/divide_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/endian_swap_impl.cc b/gr-blocks/lib/endian_swap_impl.cc
index 7e67c30147..3c263e40a3 100644
--- a/gr-blocks/lib/endian_swap_impl.cc
+++ b/gr-blocks/lib/endian_swap_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "endian_swap_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
endian_swap_impl::endian_swap_impl (size_t item_size_bytes)
- : gr_sync_block("endian_swap_impl",
- gr_make_io_signature(1, 1, item_size_bytes),
- gr_make_io_signature(1, 1, item_size_bytes))
+ : sync_block("endian_swap_impl",
+ io_signature::make(1, 1, item_size_bytes),
+ io_signature::make(1, 1, item_size_bytes))
{
const int alignment_multiple = volk_get_alignment();
set_alignment(std::max(1, alignment_multiple));
diff --git a/gr-blocks/lib/endian_swap_impl.h b/gr-blocks/lib/endian_swap_impl.h
index 517df44f17..ab8fff1b65 100644
--- a/gr-blocks/lib/endian_swap_impl.h
+++ b/gr-blocks/lib/endian_swap_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_ENDIAN_SWAP_IMPL_H
#define INCLUDED_GR_ENDIAN_SWAP_IMPL_H
-#include <blocks/endian_swap.h>
+#include <gnuradio/blocks/endian_swap.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc
index a1f26220d2..975c60c63d 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.cc
+++ b/gr-blocks/lib/file_descriptor_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "file_descriptor_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -49,9 +49,9 @@ namespace gr {
}
file_descriptor_sink_impl::file_descriptor_sink_impl(size_t itemsize, int fd)
- : gr_sync_block("file_descriptor_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("file_descriptor_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize(itemsize), d_fd(fd)
{
}
diff --git a/gr-blocks/lib/file_descriptor_sink_impl.h b/gr-blocks/lib/file_descriptor_sink_impl.h
index 90b02f4163..0b455879a4 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.h
+++ b/gr-blocks/lib/file_descriptor_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_IMPL_H
#define INCLUDED_GR_FILE_DESCRIPTOR_SINK_IMPL_H
-#include <blocks/file_descriptor_sink.h>
+#include <gnuradio/blocks/file_descriptor_sink.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc
index 667e96b7fa..575681ba9b 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.cc
+++ b/gr-blocks/lib/file_descriptor_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "file_descriptor_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -52,9 +52,9 @@ namespace gr {
file_descriptor_source_impl::file_descriptor_source_impl(size_t itemsize,
int fd,
bool repeat)
- : gr_sync_block("file_descriptor_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("file_descriptor_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_fd(fd), d_repeat(repeat),
d_residue(new unsigned char[itemsize]), d_residue_len (0)
{
diff --git a/gr-blocks/lib/file_descriptor_source_impl.h b/gr-blocks/lib/file_descriptor_source_impl.h
index dd86e18af1..6bdfa03614 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.h
+++ b/gr-blocks/lib/file_descriptor_source_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_IMPL_H
#define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_IMPL_H
-#include <blocks/file_descriptor_source.h>
+#include <gnuradio/blocks/file_descriptor_source.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc
index dc87a7e956..82ecb93db3 100644
--- a/gr-blocks/lib/file_meta_sink_impl.cc
+++ b/gr-blocks/lib/file_meta_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "file_meta_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <sys/types.h>
#include <sys/stat.h>
@@ -79,9 +79,9 @@ namespace gr {
size_t max_segment_size,
const std::string &extra_dict,
bool detached_header)
- : gr_sync_block("file_meta_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("file_meta_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize(itemsize),
d_samp_rate(samp_rate), d_relative_rate(relative_rate),
d_max_seg_size(max_segment_size), d_total_seg_size(0),
@@ -396,10 +396,10 @@ namespace gr {
uint64_t abs_N = nitems_read(0);
uint64_t end_N = abs_N + (uint64_t)(noutput_items);
- std::vector<gr_tag_t> all_tags;
+ std::vector<tag_t> all_tags;
get_tags_in_range(all_tags, 0, abs_N, end_N);
- std::vector<gr_tag_t>::iterator itr;
+ std::vector<tag_t>::iterator itr;
for(itr = all_tags.begin(); itr != all_tags.end(); itr++) {
int item_offset = (int)(itr->offset - abs_N);
diff --git a/gr-blocks/lib/file_meta_sink_impl.h b/gr-blocks/lib/file_meta_sink_impl.h
index d4048e1e4e..e454341f62 100644
--- a/gr-blocks/lib/file_meta_sink_impl.h
+++ b/gr-blocks/lib/file_meta_sink_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_BLOCKS_FILE_META_SINK_IMPL_H
#define INCLUDED_BLOCKS_FILE_META_SINK_IMPL_H
-#include <blocks/file_meta_sink.h>
+#include <gnuradio/blocks/file_meta_sink.h>
#include <pmt/pmt.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
using namespace pmt;
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index 2b16b9066b..6f1338dd58 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "file_meta_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <sys/types.h>
#include <sys/stat.h>
@@ -72,9 +72,9 @@ namespace gr {
bool repeat,
bool detached_header,
const std::string &hdr_filename)
- : gr_sync_block("file_meta_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, 1)),
+ : sync_block("file_meta_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, 1)),
d_itemsize(0), d_samp_rate(0),
d_seg_size(0),
d_updated(false), d_repeat(repeat)
@@ -104,7 +104,7 @@ namespace gr {
throw std::runtime_error("file_meta_source: could not read header.\n");
// Set output signature based on itemsize info in header
- set_output_signature(gr_make_io_signature(1, 1, d_itemsize));
+ set_output_signature(io_signature::make(1, 1, d_itemsize));
}
file_meta_source_impl::~file_meta_source_impl()
@@ -197,7 +197,7 @@ namespace gr {
void
file_meta_source_impl::parse_header(pmt::pmt_t hdr, uint64_t offset,
- std::vector<gr_tag_t> &tags)
+ std::vector<tag_t> &tags)
{
pmt::pmt_t r, key;
@@ -207,7 +207,7 @@ namespace gr {
r = pmt::dict_ref(hdr, key, pmt::PMT_NIL);
d_samp_rate = pmt::to_double(r);
- gr_tag_t t;
+ tag_t t;
t.offset = offset;
t.key = key;
t.value = r;
@@ -223,7 +223,7 @@ namespace gr {
if(pmt::dict_has_key(hdr, key)) {
d_time_stamp = pmt::dict_ref(hdr, key, pmt::PMT_NIL);
- gr_tag_t t;
+ tag_t t;
t.offset = offset;
t.key = key;
t.value = d_time_stamp;
@@ -256,7 +256,7 @@ namespace gr {
void
file_meta_source_impl::parse_extras(pmt::pmt_t extras, uint64_t offset,
- std::vector<gr_tag_t> &tags)
+ std::vector<tag_t> &tags)
{
pmt::pmt_t item, key, val;
@@ -266,7 +266,7 @@ namespace gr {
key = pmt::car(item);
val = pmt::cdr(item);
- gr_tag_t t;
+ tag_t t;
t.offset = offset;
t.key = key;
t.value = val;
diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h
index 3f8ebda6ee..00d8d7e86f 100644
--- a/gr-blocks/lib/file_meta_source_impl.h
+++ b/gr-blocks/lib/file_meta_source_impl.h
@@ -23,12 +23,12 @@
#ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H
#define INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H
-#include <blocks/file_meta_source.h>
-#include <gr_tags.h>
+#include <gnuradio/blocks/file_meta_source.h>
+#include <gnuradio/tags.h>
#include <pmt/pmt.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
-#include <blocks/file_meta_sink.h>
+#include <gnuradio/blocks/file_meta_sink.h>
using namespace pmt;
@@ -55,15 +55,15 @@ namespace gr {
FILE *d_fp, *d_hdr_fp;
meta_state_t d_state;
- std::vector<gr_tag_t> d_tags;
+ std::vector<tag_t> d_tags;
protected:
bool _open(FILE **fp, const char *filename);
bool read_header(pmt_t &hdr, pmt_t &extras);
void parse_header(pmt_t hdr, uint64_t offset,
- std::vector<gr_tag_t> &tags);
+ std::vector<tag_t> &tags);
void parse_extras(pmt_t extras, uint64_t offset,
- std::vector<gr_tag_t> &tags);
+ std::vector<tag_t> &tags);
public:
file_meta_source_impl(const std::string &filename,
diff --git a/gr-blocks/lib/file_sink_base.cc b/gr-blocks/lib/file_sink_base.cc
index d3a36f3321..42e2eae528 100644
--- a/gr-blocks/lib/file_sink_base.cc
+++ b/gr-blocks/lib/file_sink_base.cc
@@ -24,14 +24,14 @@
#include "config.h"
#endif
-#include <blocks/file_sink_base.h>
+#include <gnuradio/blocks/file_sink_base.h>
#include <cstdio>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
#include <stdio.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
// win32 (mingw/msvc) specific
#ifdef HAVE_IO_H
diff --git a/gr-blocks/lib/file_sink_impl.cc b/gr-blocks/lib/file_sink_impl.cc
index 88dcb5a021..e78576e288 100644
--- a/gr-blocks/lib/file_sink_impl.cc
+++ b/gr-blocks/lib/file_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "file_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
file_sink_impl::file_sink_impl(size_t itemsize, const char *filename)
- : gr_sync_block("file_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("file_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
file_sink_base(filename, true),
d_itemsize(itemsize)
{
diff --git a/gr-blocks/lib/file_sink_impl.h b/gr-blocks/lib/file_sink_impl.h
index 8e802ad88a..f86009419e 100644
--- a/gr-blocks/lib/file_sink_impl.h
+++ b/gr-blocks/lib/file_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_FILE_SINK_IMPL_H
#define INCLUDED_GR_FILE_SINK_IMPL_H
-#include <blocks/file_sink.h>
+#include <gnuradio/blocks/file_sink.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc
index 3c30884a59..d413995549 100644
--- a/gr-blocks/lib/file_source_impl.cc
+++ b/gr-blocks/lib/file_source_impl.cc
@@ -24,9 +24,9 @@
#include "config.h"
#endif
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include "file_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <sys/types.h>
#include <sys/stat.h>
@@ -60,9 +60,9 @@ namespace gr {
}
file_source_impl::file_source_impl(size_t itemsize, const char *filename, bool repeat)
- : gr_sync_block("file_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("file_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_fp(0), d_new_fp(0), d_repeat(repeat),
d_updated(false)
{
diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h
index fc7f8053df..5f5e8c9340 100644
--- a/gr-blocks/lib/file_source_impl.h
+++ b/gr-blocks/lib/file_source_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_FILE_SOURCE_IMPL_H
#define INCLUDED_BLOCKS_FILE_SOURCE_IMPL_H
-#include <blocks/file_source.h>
+#include <gnuradio/blocks/file_source.h>
#include <boost/thread/mutex.hpp>
namespace gr {
diff --git a/gr-blocks/lib/float_array_to_int.h b/gr-blocks/lib/float_array_to_int.h
index 943736d7ee..6a528d797a 100644
--- a/gr-blocks/lib/float_array_to_int.h
+++ b/gr-blocks/lib/float_array_to_int.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H
#define INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
/*!
* convert array of floats to int with rounding and saturation.
diff --git a/gr-blocks/lib/float_array_to_uchar.h b/gr-blocks/lib/float_array_to_uchar.h
index defed8e3e4..2cc3993d50 100644
--- a/gr-blocks/lib/float_array_to_uchar.h
+++ b/gr-blocks/lib/float_array_to_uchar.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_ARRAY_TO_UCHAR_H
#define INCLUDED_FLOAT_ARRAY_TO_UCHAR_H
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
/*!
* convert array of floats to unsigned chars with rounding and saturation.
diff --git a/gr-blocks/lib/float_to_char_impl.cc b/gr-blocks/lib/float_to_char_impl.cc
index c37522dc95..cec95cb66b 100644
--- a/gr-blocks/lib/float_to_char_impl.cc
+++ b/gr-blocks/lib/float_to_char_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "float_to_char_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
float_to_char_impl::float_to_char_impl(size_t vlen, float scale)
- : gr_sync_block("float_to_char",
- gr_make_io_signature (1, 1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(char)*vlen)),
+ : sync_block("float_to_char",
+ io_signature::make (1, 1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(char)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/float_to_char_impl.h b/gr-blocks/lib/float_to_char_impl.h
index 2644f3e709..a5435d9960 100644
--- a/gr-blocks/lib/float_to_char_impl.h
+++ b/gr-blocks/lib/float_to_char_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_TO_CHAR_IMPL_H
#define INCLUDED_FLOAT_TO_CHAR_IMPL_H
-#include <blocks/float_to_char.h>
+#include <gnuradio/blocks/float_to_char.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/float_to_complex_impl.cc b/gr-blocks/lib/float_to_complex_impl.cc
index 709aa420c3..f37f2bb7a6 100644
--- a/gr-blocks/lib/float_to_complex_impl.cc
+++ b/gr-blocks/lib/float_to_complex_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "float_to_complex_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
float_to_complex_impl::float_to_complex_impl(size_t vlen)
- : gr_sync_block("float_to_complex",
- gr_make_io_signature (1, 2, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)),
+ : sync_block("float_to_complex",
+ io_signature::make (1, 2, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/float_to_complex_impl.h b/gr-blocks/lib/float_to_complex_impl.h
index 859c5bf965..d28beb2697 100644
--- a/gr-blocks/lib/float_to_complex_impl.h
+++ b/gr-blocks/lib/float_to_complex_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_TO_COMPLEX_IMPL_H
#define INCLUDED_FLOAT_TO_COMPLEX_IMPL_H
-#include <blocks/float_to_complex.h>
+#include <gnuradio/blocks/float_to_complex.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc
index 24218ab682..04db8bed2f 100644
--- a/gr-blocks/lib/float_to_int_impl.cc
+++ b/gr-blocks/lib/float_to_int_impl.cc
@@ -26,7 +26,7 @@
#include "float_to_int_impl.h"
#include "float_array_to_int.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -38,9 +38,9 @@ namespace gr {
}
float_to_int_impl::float_to_int_impl(size_t vlen, float scale)
- : gr_sync_block("float_to_int",
- gr_make_io_signature (1, 1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(int)*vlen)),
+ : sync_block("float_to_int",
+ io_signature::make (1, 1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(int)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/float_to_int_impl.h b/gr-blocks/lib/float_to_int_impl.h
index 71775fcb1c..d437b50cfa 100644
--- a/gr-blocks/lib/float_to_int_impl.h
+++ b/gr-blocks/lib/float_to_int_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_TO_INT_IMPL_H
#define INCLUDED_FLOAT_TO_INT_IMPL_H
-#include <blocks/float_to_int.h>
+#include <gnuradio/blocks/float_to_int.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/float_to_short_impl.cc b/gr-blocks/lib/float_to_short_impl.cc
index 2807ae1927..6c6b5607a9 100644
--- a/gr-blocks/lib/float_to_short_impl.cc
+++ b/gr-blocks/lib/float_to_short_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "float_to_short_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
float_to_short_impl::float_to_short_impl(size_t vlen, float scale)
- : gr_sync_block("float_to_short",
- gr_make_io_signature (1, 1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(short)*vlen)),
+ : sync_block("float_to_short",
+ io_signature::make (1, 1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(short)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/float_to_short_impl.h b/gr-blocks/lib/float_to_short_impl.h
index 5427862b38..2ca5a3bf04 100644
--- a/gr-blocks/lib/float_to_short_impl.h
+++ b/gr-blocks/lib/float_to_short_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_TO_SHORT_IMPL_H
#define INCLUDED_FLOAT_TO_SHORT_IMPL_H
-#include <blocks/float_to_short.h>
+#include <gnuradio/blocks/float_to_short.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/float_to_uchar_impl.cc b/gr-blocks/lib/float_to_uchar_impl.cc
index 22d0527b1c..a55b3dbc82 100644
--- a/gr-blocks/lib/float_to_uchar_impl.cc
+++ b/gr-blocks/lib/float_to_uchar_impl.cc
@@ -26,7 +26,7 @@
#include "float_to_uchar_impl.h"
#include "float_array_to_uchar.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -37,9 +37,9 @@ namespace gr {
}
float_to_uchar_impl::float_to_uchar_impl()
- : gr_sync_block("float_to_uchar",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(unsigned char)))
+ : sync_block("float_to_uchar",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(unsigned char)))
{
}
diff --git a/gr-blocks/lib/float_to_uchar_impl.h b/gr-blocks/lib/float_to_uchar_impl.h
index effd66c5cc..56e815c511 100644
--- a/gr-blocks/lib/float_to_uchar_impl.h
+++ b/gr-blocks/lib/float_to_uchar_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FLOAT_TO_UCHAR_IMPL_H
#define INCLUDED_FLOAT_TO_UCHAR_IMPL_H
-#include <blocks/float_to_uchar.h>
+#include <gnuradio/blocks/float_to_uchar.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/head_impl.cc b/gr-blocks/lib/head_impl.cc
index 7dfa36607c..4c33f9f08e 100644
--- a/gr-blocks/lib/head_impl.cc
+++ b/gr-blocks/lib/head_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "head_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
head_impl::head_impl(size_t sizeof_stream_item, uint64_t nitems)
- : gr_sync_block("head",
- gr_make_io_signature(1, 1, sizeof_stream_item),
- gr_make_io_signature(1, 1, sizeof_stream_item)),
+ : sync_block("head",
+ io_signature::make(1, 1, sizeof_stream_item),
+ io_signature::make(1, 1, sizeof_stream_item)),
d_nitems(nitems), d_ncopied_items(0)
{
}
diff --git a/gr-blocks/lib/head_impl.h b/gr-blocks/lib/head_impl.h
index a56acfbb27..fe2918c404 100644
--- a/gr-blocks/lib/head_impl.h
+++ b/gr-blocks/lib/head_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_HEAD_IMPL_H
#define INCLUDED_GR_HEAD_IMPL_H
-#include <blocks/head.h>
+#include <gnuradio/blocks/head.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/int_to_float_impl.cc b/gr-blocks/lib/int_to_float_impl.cc
index 0190d7ccb0..306a6f169d 100644
--- a/gr-blocks/lib/int_to_float_impl.cc
+++ b/gr-blocks/lib/int_to_float_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "int_to_float_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
int_to_float_impl::int_to_float_impl(size_t vlen, float scale)
- : gr_sync_block("int_to_float",
- gr_make_io_signature (1, 1, sizeof(int32_t)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("int_to_float",
+ io_signature::make (1, 1, sizeof(int32_t)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/int_to_float_impl.h b/gr-blocks/lib/int_to_float_impl.h
index 7498a0bb13..96b416be1d 100644
--- a/gr-blocks/lib/int_to_float_impl.h
+++ b/gr-blocks/lib/int_to_float_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_INT_TO_FLOAT_IMPL_H
#define INCLUDED_INT_TO_FLOAT_IMPL_H
-#include <blocks/int_to_float.h>
+#include <gnuradio/blocks/int_to_float.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/integrate_XX_impl.cc.t b/gr-blocks/lib/integrate_XX_impl.cc.t
index 4c82729e3c..2def0309df 100644
--- a/gr-blocks/lib/integrate_XX_impl.cc.t
+++ b/gr-blocks/lib/integrate_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(int decim)
- : gr_sync_decimator("@NAME@",
- gr_make_io_signature(1, 1, sizeof (@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof (@O_TYPE@)),
+ : sync_decimator("@NAME@",
+ io_signature::make(1, 1, sizeof (@I_TYPE@)),
+ io_signature::make(1, 1, sizeof (@O_TYPE@)),
decim),
d_decim(decim),
d_count(0)
diff --git a/gr-blocks/lib/integrate_XX_impl.h.t b/gr-blocks/lib/integrate_XX_impl.h.t
index 9fc3333882..e37ddc077d 100644
--- a/gr-blocks/lib/integrate_XX_impl.h.t
+++ b/gr-blocks/lib/integrate_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/interleave_impl.cc b/gr-blocks/lib/interleave_impl.cc
index df37ed26d6..1f68cfc512 100644
--- a/gr-blocks/lib/interleave_impl.cc
+++ b/gr-blocks/lib/interleave_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "interleave_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
interleave_impl::interleave_impl(size_t itemsize)
- : gr_sync_interpolator("interleave",
- gr_make_io_signature (1, gr_io_signature::IO_INFINITE, itemsize),
- gr_make_io_signature (1, 1, itemsize),
+ : sync_interpolator("interleave",
+ io_signature::make (1, io_signature::IO_INFINITE, itemsize),
+ io_signature::make (1, 1, itemsize),
1),
d_itemsize(itemsize)
{
diff --git a/gr-blocks/lib/interleave_impl.h b/gr-blocks/lib/interleave_impl.h
index a02517e3e1..962747c8b5 100644
--- a/gr-blocks/lib/interleave_impl.h
+++ b/gr-blocks/lib/interleave_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_INTERLEAVE_IMPL_H
#define INCLUDED_INTERLEAVE_IMPL_H
-#include <blocks/interleave.h>
+#include <gnuradio/blocks/interleave.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/interleaved_short_array_to_complex.h b/gr-blocks/lib/interleaved_short_array_to_complex.h
index 3f20fdb989..33f70ccdfa 100644
--- a/gr-blocks/lib/interleaved_short_array_to_complex.h
+++ b/gr-blocks/lib/interleaved_short_array_to_complex.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_INTERLEAVED_SHORT_ARRAY_TO_COMPLEX_H
#define INCLUDED_INTERLEAVED_SHORT_ARRAY_TO_COMPLEX_H
-#include <blocks/api.h>
-#include <gr_complex.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/gr_complex.h>
/*
* convert array of interleaved shorts to complex.
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
index 1be6fdc9d4..62823c2ee5 100644
--- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc
+++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
@@ -26,7 +26,7 @@
#include "interleaved_short_to_complex_impl.h"
#include "interleaved_short_array_to_complex.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -37,9 +37,9 @@ namespace gr {
}
interleaved_short_to_complex_impl::interleaved_short_to_complex_impl()
- : gr_sync_decimator("interleaved_short_to_complex",
- gr_make_io_signature (1, 1, sizeof(short)),
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
+ : sync_decimator("interleaved_short_to_complex",
+ io_signature::make (1, 1, sizeof(short)),
+ io_signature::make (1, 1, sizeof(gr_complex)),
2)
{
}
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h b/gr-blocks/lib/interleaved_short_to_complex_impl.h
index 62a1db308b..adb8ae8a8f 100644
--- a/gr-blocks/lib/interleaved_short_to_complex_impl.h
+++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_INTERLEAVED_SHORT_TO_COMPLEX_IMPL_H
#define INCLUDED_INTERLEAVED_SHORT_TO_COMPLEX_IMPL_H
-#include <blocks/interleaved_short_to_complex.h>
+#include <gnuradio/blocks/interleaved_short_to_complex.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc
index 312b09c253..8ce7a81d80 100644
--- a/gr-blocks/lib/keep_m_in_n_impl.cc
+++ b/gr-blocks/lib/keep_m_in_n_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "keep_m_in_n_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
keep_m_in_n_impl::keep_m_in_n_impl(size_t itemsize, int m, int n, int offset)
- : gr_block("keep_m_in_n",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (1, 1, itemsize)),
+ : block("keep_m_in_n",
+ io_signature::make (1, 1, itemsize),
+ io_signature::make (1, 1, itemsize)),
d_m(m),
d_n(n),
d_offset(offset),
diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h
index 0b8819489a..ffb580bb3a 100644
--- a/gr-blocks/lib/keep_m_in_n_impl.h
+++ b/gr-blocks/lib/keep_m_in_n_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_KEEP_M_IN_N_IMPL_H
#define INCLUDED_KEEP_M_IN_N_IMPL_H
-#include <blocks/keep_m_in_n.h>
+#include <gnuradio/blocks/keep_m_in_n.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/keep_one_in_n_impl.cc b/gr-blocks/lib/keep_one_in_n_impl.cc
index 7ab6dc14de..34012dd59a 100644
--- a/gr-blocks/lib/keep_one_in_n_impl.cc
+++ b/gr-blocks/lib/keep_one_in_n_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "keep_one_in_n_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
keep_one_in_n_impl::keep_one_in_n_impl(size_t itemsize, int n)
- : gr_block("keep_one_in_n",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (1, 1, itemsize)),
+ : block("keep_one_in_n",
+ io_signature::make (1, 1, itemsize),
+ io_signature::make (1, 1, itemsize)),
d_count(n)
{
// To avoid bad behavior with using set_relative_rate in this block with
@@ -92,11 +92,11 @@ namespace gr {
// Because we have set TPP_DONT, we have to propagate the tags here manually.
// Adjustment of the tag sample value is done using the float d_decim_rate.
- std::vector<gr_tag_t> tags;
- std::vector<gr_tag_t>::iterator t;
+ std::vector<tag_t> tags;
+ std::vector<tag_t>::iterator t;
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+ni);
for(t = tags.begin(); t != tags.end(); t++) {
- gr_tag_t new_tag = *t;
+ tag_t new_tag = *t;
new_tag.offset *= d_decim_rate;
add_item_tag(0, new_tag);
}
diff --git a/gr-blocks/lib/keep_one_in_n_impl.h b/gr-blocks/lib/keep_one_in_n_impl.h
index 1588fb1a61..4138f164a1 100644
--- a/gr-blocks/lib/keep_one_in_n_impl.h
+++ b/gr-blocks/lib/keep_one_in_n_impl.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_KEEP_ONE_IN_N_IMPL_H
#define INCLUDED_KEEP_ONE_IN_N_IMPL_H
-#include <blocks/keep_one_in_n.h>
+#include <gnuradio/blocks/keep_one_in_n.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.cc b/gr-blocks/lib/lfsr_32k_source_s_impl.cc
index 738e732b49..58b0ad7def 100644
--- a/gr-blocks/lib/lfsr_32k_source_s_impl.cc
+++ b/gr-blocks/lib/lfsr_32k_source_s_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "lfsr_32k_source_s_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
lfsr_32k_source_s_impl::lfsr_32k_source_s_impl()
- : gr_sync_block("lfsr_32k_source_s",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(short))),
+ : sync_block("lfsr_32k_source_s",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(short))),
d_index(0)
{
lfsr_32k lfsr;
diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.h b/gr-blocks/lib/lfsr_32k_source_s_impl.h
index b8c684e8d6..40fc6b6d84 100644
--- a/gr-blocks/lib/lfsr_32k_source_s_impl.h
+++ b/gr-blocks/lib/lfsr_32k_source_s_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H
#define INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H
-#include <blocks/lfsr_32k_source_s.h>
-#include <blocks/lfsr_32k.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/lfsr_32k_source_s.h>
+#include <gnuradio/blocks/lfsr_32k.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/max_XX_impl.cc.t b/gr-blocks/lib/max_XX_impl.cc.t
index 669e2fd30d..21ce85e8ec 100644
--- a/gr-blocks/lib/max_XX_impl.cc.t
+++ b/gr-blocks/lib/max_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, vlen*sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, -1, vlen*sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/max_XX_impl.h.t b/gr-blocks/lib/max_XX_impl.h.t
index 0f1643f6b9..79da4e1d82 100644
--- a/gr-blocks/lib/max_XX_impl.h.t
+++ b/gr-blocks/lib/max_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/message_burst_source_impl.cc b/gr-blocks/lib/message_burst_source_impl.cc
index 5ac417f7a5..573959e027 100644
--- a/gr-blocks/lib/message_burst_source_impl.cc
+++ b/gr-blocks/lib/message_burst_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "message_burst_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <stdexcept>
#include <string.h>
-#include <gr_tags.h>
+#include <gnuradio/tags.h>
namespace gr {
namespace blocks {
@@ -46,17 +46,17 @@ namespace gr {
}
message_burst_source::sptr
- message_burst_source::make(size_t itemsize, gr_msg_queue_sptr msgq)
+ message_burst_source::make(size_t itemsize, msg_queue::sptr msgq)
{
return gnuradio::get_initial_sptr
(new message_burst_source_impl(itemsize, msgq));
}
message_burst_source_impl::message_burst_source_impl(size_t itemsize, int msgq_limit)
- : gr_sync_block("message_burst_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
- d_itemsize(itemsize), d_msgq(gr_make_msg_queue(msgq_limit)),
+ : sync_block("message_burst_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
+ d_itemsize(itemsize), d_msgq(msg_queue::make(msgq_limit)),
d_msg_offset(0), d_eof(false)
{
std::stringstream id;
@@ -64,10 +64,10 @@ namespace gr {
d_me = pmt::string_to_symbol(id.str());
}
- message_burst_source_impl::message_burst_source_impl(size_t itemsize, gr_msg_queue_sptr msgq)
- : gr_sync_block("message_burst_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ message_burst_source_impl::message_burst_source_impl(size_t itemsize, msg_queue::sptr msgq)
+ : sync_block("message_burst_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_msgq(msgq),
d_msg_offset(0), d_eof(false)
{
diff --git a/gr-blocks/lib/message_burst_source_impl.h b/gr-blocks/lib/message_burst_source_impl.h
index 2d5e6a974f..ceb0985e65 100644
--- a/gr-blocks/lib/message_burst_source_impl.h
+++ b/gr-blocks/lib/message_burst_source_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_IMPL_H
#define INCLUDED_GR_MESSAGE_BURST_SOURCE_IMPL_H
-#include <blocks/message_burst_source.h>
-#include <gr_message.h>
+#include <gnuradio/blocks/message_burst_source.h>
+#include <gnuradio/message.h>
namespace gr {
namespace blocks {
@@ -33,8 +33,8 @@ namespace gr {
{
private:
size_t d_itemsize;
- gr_msg_queue_sptr d_msgq;
- gr_message_sptr d_msg;
+ msg_queue::sptr d_msgq;
+ message::sptr d_msg;
unsigned d_msg_offset;
bool d_eof;
@@ -42,10 +42,10 @@ namespace gr {
public:
message_burst_source_impl(size_t itemsize, int msgq_limit);
- message_burst_source_impl(size_t itemsize, gr_msg_queue_sptr msgq);
+ message_burst_source_impl(size_t itemsize, msg_queue::sptr msgq);
~message_burst_source_impl();
- gr_msg_queue_sptr msgq() const { return d_msgq; }
+ msg_queue::sptr msgq() const { return d_msgq; }
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
index 04f31f88a2..3f7c6ef097 100644
--- a/gr-blocks/lib/message_debug_impl.cc
+++ b/gr-blocks/lib/message_debug_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "message_debug_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <iostream>
@@ -97,9 +97,9 @@ namespace gr {
}
message_debug_impl::message_debug_impl()
- : gr_block("message_debug",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0))
+ : block("message_debug",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0))
{
message_port_register_in(pmt::mp("print"));
set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1));
diff --git a/gr-blocks/lib/message_debug_impl.h b/gr-blocks/lib/message_debug_impl.h
index 817a9a834c..5a6e2e4acb 100644
--- a/gr-blocks/lib/message_debug_impl.h
+++ b/gr-blocks/lib/message_debug_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_GR_MESSAGE_DEBUG_IMPL_H
#define INCLUDED_GR_MESSAGE_DEBUG_IMPL_H
-#include <blocks/message_debug.h>
-#include <gr_block.h>
-#include <thread/thread.h>
+#include <gnuradio/blocks/message_debug.h>
+#include <gnuradio/block.h>
+#include <gnuradio/thread/thread.h>
#include <pmt/pmt.h>
namespace gr {
diff --git a/gr-blocks/lib/message_sink_impl.cc b/gr-blocks/lib/message_sink_impl.cc
index fbc7b27d58..4dfcc6396b 100644
--- a/gr-blocks/lib/message_sink_impl.cc
+++ b/gr-blocks/lib/message_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "message_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -38,34 +38,34 @@ namespace gr {
namespace blocks {
message_sink::sptr
- message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block)
+ message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block)
{
return gnuradio::get_initial_sptr
(new message_sink_impl(itemsize, msgq, dont_block));
}
message_sink::sptr
- message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block,
+ message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block,
const std::string& lengthtagname)
{
return gnuradio::get_initial_sptr
(new message_sink_impl(itemsize, msgq, dont_block, lengthtagname));
}
- message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block)
- : gr_sync_block("message_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block)
+ : sync_block("message_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block),
d_tags(false), d_items_read(0)
{
}
- message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block,
+ message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block,
const std::string& lengthtagname)
- : gr_sync_block("message_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("message_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block),
d_tags(true), d_lengthtagname(lengthtagname), d_items_read(0)
{
@@ -84,7 +84,7 @@ namespace gr {
if (d_tags) {
long packet_length = 0;
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
this->get_tags_in_range(tags, 0, d_items_read, d_items_read+1);
//const size_t ninput_items = noutput_items; //assumption for sync block, this can change
for (unsigned int i = 0; i < tags.size(); i++) {
@@ -98,10 +98,10 @@ namespace gr {
if (noutput_items >= packet_length ) {
// If the message queue is full we drop the packet.
if (!d_msgq->full_p()) {
- gr_message_sptr msg = gr_make_message(0, // msg type
- d_itemsize, // arg1 for other end
- packet_length, // arg2 for other end (redundant)
- packet_length * d_itemsize); // len of msg
+ message::sptr msg = message::make(0, // msg type
+ d_itemsize, // arg1 for other end
+ packet_length, // arg2 for other end (redundant)
+ packet_length * d_itemsize); // len of msg
memcpy(msg->msg(), in, packet_length * d_itemsize);
d_msgq->handle(msg); // send it
}
@@ -114,10 +114,10 @@ namespace gr {
// If the queue if full we drop all the data we got.
if (!d_msgq->full_p()) {
// build a message to hold whatever we've got
- gr_message_sptr msg = gr_make_message(0, // msg type
- d_itemsize, // arg1 for other end
- noutput_items, // arg2 for other end (redundant)
- noutput_items * d_itemsize); // len of msg
+ message::sptr msg = message::make(0, // msg type
+ d_itemsize, // arg1 for other end
+ noutput_items, // arg2 for other end (redundant)
+ noutput_items * d_itemsize); // len of msg
memcpy(msg->msg(), in, noutput_items * d_itemsize);
d_msgq->handle(msg); // send it
diff --git a/gr-blocks/lib/message_sink_impl.h b/gr-blocks/lib/message_sink_impl.h
index 280a46765e..e0ae3d00c0 100644
--- a/gr-blocks/lib/message_sink_impl.h
+++ b/gr-blocks/lib/message_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_MESSAGE_SINK_IMPL_H
#define INCLUDED_GR_MESSAGE_SINK_IMPL_H
-#include <blocks/message_sink.h>
+#include <gnuradio/blocks/message_sink.h>
namespace gr {
namespace blocks {
@@ -32,15 +32,15 @@ namespace gr {
{
private:
size_t d_itemsize;
- gr_msg_queue_sptr d_msgq;
+ msg_queue::sptr d_msgq;
bool d_dont_block;
bool d_tags;
std::string d_lengthtagname;
uint64_t d_items_read;
public:
- message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block);
- message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block,
+ message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block);
+ message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block,
const std::string& lengthtagname);
~message_sink_impl();
diff --git a/gr-blocks/lib/message_source_impl.cc b/gr-blocks/lib/message_source_impl.cc
index 818cd336f1..05ec2f248b 100644
--- a/gr-blocks/lib/message_source_impl.cc
+++ b/gr-blocks/lib/message_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "message_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -45,14 +45,14 @@ namespace gr {
}
message_source::sptr
- message_source::make(size_t itemsize, gr_msg_queue_sptr msgq)
+ message_source::make(size_t itemsize, msg_queue::sptr msgq)
{
return gnuradio::get_initial_sptr
(new message_source_impl(itemsize, msgq));
}
message_source::sptr
- message_source::make(size_t itemsize, gr_msg_queue_sptr msgq,
+ message_source::make(size_t itemsize, msg_queue::sptr msgq,
const std::string& lengthtagname)
{
return gnuradio::get_initial_sptr
@@ -60,28 +60,28 @@ namespace gr {
}
message_source_impl::message_source_impl(size_t itemsize, int msgq_limit)
- : gr_sync_block("message_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
- d_itemsize(itemsize), d_msgq(gr_make_msg_queue(msgq_limit)),
+ : sync_block("message_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
+ d_itemsize(itemsize), d_msgq(msg_queue::make(msgq_limit)),
d_msg_offset(0), d_eof(false), d_tags(false)
{
}
- message_source_impl::message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq)
- : gr_sync_block("message_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ message_source_impl::message_source_impl(size_t itemsize, msg_queue::sptr msgq)
+ : sync_block("message_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_msgq(msgq),
d_msg_offset(0), d_eof(false), d_tags(false)
{
}
- message_source_impl::message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq,
+ message_source_impl::message_source_impl(size_t itemsize, msg_queue::sptr msgq,
const std::string& lengthtagname)
- : gr_sync_block("message_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("message_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_msgq(msgq), d_msg_offset(0), d_eof(false),
d_tags(true), d_lengthtagname(lengthtagname)
{
diff --git a/gr-blocks/lib/message_source_impl.h b/gr-blocks/lib/message_source_impl.h
index 8fbd209e0a..bbc8f728d5 100644
--- a/gr-blocks/lib/message_source_impl.h
+++ b/gr-blocks/lib/message_source_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_MESSAGE_SOURCE_IMPL_H
#define INCLUDED_GR_MESSAGE_SOURCE_IMPL_H
-#include <blocks/message_source.h>
-#include <gr_message.h>
+#include <gnuradio/blocks/message_source.h>
+#include <gnuradio/message.h>
namespace gr {
namespace blocks {
@@ -33,8 +33,8 @@ namespace gr {
{
private:
size_t d_itemsize;
- gr_msg_queue_sptr d_msgq;
- gr_message_sptr d_msg;
+ msg_queue::sptr d_msgq;
+ message::sptr d_msg;
unsigned d_msg_offset;
bool d_eof;
bool d_tags;
@@ -43,13 +43,13 @@ namespace gr {
public:
message_source_impl(size_t itemsize, int msgq_limit);
- message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq);
- message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq,
+ message_source_impl(size_t itemsize, msg_queue::sptr msgq);
+ message_source_impl(size_t itemsize, msg_queue::sptr msgq,
const std::string& lengthtagname);
~message_source_impl();
- gr_msg_queue_sptr msgq() const { return d_msgq; }
+ msg_queue::sptr msgq() const { return d_msgq; }
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc
index c4b0e5d567..3f58fdcaac 100644
--- a/gr-blocks/lib/message_strobe_impl.cc
+++ b/gr-blocks/lib/message_strobe_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "message_strobe_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
@@ -46,9 +46,9 @@ namespace gr {
}
message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, float period_ms)
- : gr_block("message_strobe",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : block("message_strobe",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_finished(false),
d_period_ms(period_ms),
d_msg(msg)
diff --git a/gr-blocks/lib/message_strobe_impl.h b/gr-blocks/lib/message_strobe_impl.h
index 1b2edae593..7a54680286 100644
--- a/gr-blocks/lib/message_strobe_impl.h
+++ b/gr-blocks/lib/message_strobe_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_MESSAGE_STROBE_IMPL_H
#define INCLUDED_GR_MESSAGE_STROBE_IMPL_H
-#include <blocks/message_strobe.h>
+#include <gnuradio/blocks/message_strobe.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/moving_average_XX_impl.cc.t b/gr-blocks/lib/moving_average_XX_impl.cc.t
index 566deff116..089166971f 100644
--- a/gr-blocks/lib/moving_average_XX_impl.cc.t
+++ b/gr-blocks/lib/moving_average_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME_IMPL@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(int length, @O_TYPE@ scale, int max_iter)
- : gr_sync_block("@NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_length(length),
d_scale(scale),
d_max_iter(max_iter),
diff --git a/gr-blocks/lib/moving_average_XX_impl.h.t b/gr-blocks/lib/moving_average_XX_impl.h.t
index 7234cbe139..17e8ef5da9 100644
--- a/gr-blocks/lib/moving_average_XX_impl.h.t
+++ b/gr-blocks/lib/moving_average_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_XX_impl.cc.t b/gr-blocks/lib/multiply_XX_impl.cc.t
index bda4eac6aa..3f82a1bbe8 100644
--- a/gr-blocks/lib/multiply_XX_impl.cc.t
+++ b/gr-blocks/lib/multiply_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/multiply_XX_impl.h.t b/gr-blocks/lib/multiply_XX_impl.h.t
index 78c62b5e1e..2b0ea25a1b 100644
--- a/gr-blocks/lib/multiply_XX_impl.h.t
+++ b/gr-blocks/lib/multiply_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_cc_impl.cc b/gr-blocks/lib/multiply_cc_impl.cc
index e5160a9d5b..b54296c112 100644
--- a/gr-blocks/lib/multiply_cc_impl.cc
+++ b/gr-blocks/lib/multiply_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <multiply_cc_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
multiply_cc_impl::multiply_cc_impl(size_t vlen)
- : gr_sync_block("multiply_cc",
- gr_make_io_signature (1, -1, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)),
+ : sync_block("multiply_cc",
+ io_signature::make (1, -1, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/multiply_cc_impl.h b/gr-blocks/lib/multiply_cc_impl.h
index 1595dc524c..0419a5439b 100644
--- a/gr-blocks/lib/multiply_cc_impl.h
+++ b/gr-blocks/lib/multiply_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_MULTIPLY_CC_IMPL_H
#define INCLUDED_BLOCKS_MULTIPLY_CC_IMPL_H
-#include <blocks/multiply_cc.h>
+#include <gnuradio/blocks/multiply_cc.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.cc b/gr-blocks/lib/multiply_conjugate_cc_impl.cc
index 7a4356c453..671e1160f6 100644
--- a/gr-blocks/lib/multiply_conjugate_cc_impl.cc
+++ b/gr-blocks/lib/multiply_conjugate_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <multiply_conjugate_cc_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
multiply_conjugate_cc_impl::multiply_conjugate_cc_impl(size_t vlen)
- : gr_sync_block("multiply_conjugate_cc",
- gr_make_io_signature (2, 2, sizeof(gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)),
+ : sync_block("multiply_conjugate_cc",
+ io_signature::make (2, 2, sizeof(gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof(gr_complex)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.h b/gr-blocks/lib/multiply_conjugate_cc_impl.h
index 66e7ec55b4..f3d3b64d6b 100644
--- a/gr-blocks/lib/multiply_conjugate_cc_impl.h
+++ b/gr-blocks/lib/multiply_conjugate_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_IMPL_H
#define INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_IMPL_H
-#include <blocks/multiply_conjugate_cc.h>
+#include <gnuradio/blocks/multiply_conjugate_cc.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_const_XX_impl.cc.t b/gr-blocks/lib/multiply_const_XX_impl.cc.t
index 8ca79f6f39..f58dd33945 100644
--- a/gr-blocks/lib/multiply_const_XX_impl.cc.t
+++ b/gr-blocks/lib/multiply_const_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)),
+ io_signature::make (1, 1, sizeof (@O_TYPE@))),
d_k(k)
{
}
diff --git a/gr-blocks/lib/multiply_const_XX_impl.h.t b/gr-blocks/lib/multiply_const_XX_impl.h.t
index cae5ca8135..e0c2ae54bc 100644
--- a/gr-blocks/lib/multiply_const_XX_impl.h.t
+++ b/gr-blocks/lib/multiply_const_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_const_cc_impl.cc b/gr-blocks/lib/multiply_const_cc_impl.cc
index 7618150da2..1f363fd4a3 100644
--- a/gr-blocks/lib/multiply_const_cc_impl.cc
+++ b/gr-blocks/lib/multiply_const_cc_impl.cc
@@ -27,7 +27,7 @@
#endif
#include <multiply_const_cc_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
multiply_const_cc_impl::multiply_const_cc_impl(gr_complex k, size_t vlen)
- : gr_sync_block ("multiply_const_cc",
- gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen),
- gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)),
+ : sync_block ("multiply_const_cc",
+ io_signature::make (1, 1, sizeof (gr_complex)*vlen),
+ io_signature::make (1, 1, sizeof (gr_complex)*vlen)),
d_k(k), d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/multiply_const_cc_impl.h b/gr-blocks/lib/multiply_const_cc_impl.h
index 81c8cc6da5..bdd7017c8f 100644
--- a/gr-blocks/lib/multiply_const_cc_impl.h
+++ b/gr-blocks/lib/multiply_const_cc_impl.h
@@ -25,7 +25,7 @@
#ifndef INCLUDED_MULTIPLY_CONST_CC_IMPL_H
#define INCLUDED_MULTIPLY_CONST_CC_IMPL_H
-#include <blocks/multiply_const_cc.h>
+#include <gnuradio/blocks/multiply_const_cc.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_const_ff_impl.cc b/gr-blocks/lib/multiply_const_ff_impl.cc
index e9cd347975..67205c06c0 100644
--- a/gr-blocks/lib/multiply_const_ff_impl.cc
+++ b/gr-blocks/lib/multiply_const_ff_impl.cc
@@ -27,7 +27,7 @@
#endif
#include <multiply_const_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
multiply_const_ff_impl::multiply_const_ff_impl(float k, size_t vlen)
- : gr_sync_block ("multiply_const_ff",
- gr_make_io_signature (1, 1, sizeof (float)*vlen),
- gr_make_io_signature (1, 1, sizeof (float)*vlen)),
+ : sync_block ("multiply_const_ff",
+ io_signature::make (1, 1, sizeof (float)*vlen),
+ io_signature::make (1, 1, sizeof (float)*vlen)),
d_k(k), d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/multiply_const_ff_impl.h b/gr-blocks/lib/multiply_const_ff_impl.h
index e63a3279a2..976d0a7507 100644
--- a/gr-blocks/lib/multiply_const_ff_impl.h
+++ b/gr-blocks/lib/multiply_const_ff_impl.h
@@ -25,7 +25,7 @@
#ifndef INCLUDED_MULTIPLY_CONST_FF_IMPL_H
#define INCLUDED_MULTIPLY_CONST_FF_IMPL_H
-#include <blocks/multiply_const_ff.h>
+#include <gnuradio/blocks/multiply_const_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_const_vXX_impl.cc.t b/gr-blocks/lib/multiply_const_vXX_impl.cc.t
index dd20f28939..55b3d3e41d 100644
--- a/gr-blocks/lib/multiply_const_vXX_impl.cc.t
+++ b/gr-blocks/lib/multiply_const_vXX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(std::vector<@O_TYPE@> k)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*k.size()),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*k.size())),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)*k.size()),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*k.size())),
d_k(k)
{
}
diff --git a/gr-blocks/lib/multiply_const_vXX_impl.h.t b/gr-blocks/lib/multiply_const_vXX_impl.h.t
index a7a6197258..6c087d9461 100644
--- a/gr-blocks/lib/multiply_const_vXX_impl.h.t
+++ b/gr-blocks/lib/multiply_const_vXX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/multiply_ff_impl.cc b/gr-blocks/lib/multiply_ff_impl.cc
index 6e8f277114..912c1bb926 100644
--- a/gr-blocks/lib/multiply_ff_impl.cc
+++ b/gr-blocks/lib/multiply_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <multiply_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
multiply_ff_impl::multiply_ff_impl(size_t vlen)
- : gr_sync_block("multiply_ff",
- gr_make_io_signature (1, -1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("multiply_ff",
+ io_signature::make (1, -1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/multiply_ff_impl.h b/gr-blocks/lib/multiply_ff_impl.h
index 2c5325a98a..e084b0e494 100644
--- a/gr-blocks/lib/multiply_ff_impl.h
+++ b/gr-blocks/lib/multiply_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_MULTIPLY_FF_IMPL_H
#define INCLUDED_BLOCKS_MULTIPLY_FF_IMPL_H
-#include <blocks/multiply_ff.h>
+#include <gnuradio/blocks/multiply_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/mute_XX_impl.cc.t b/gr-blocks/lib/mute_XX_impl.cc.t
index b29e9edada..af46dc221a 100644
--- a/gr-blocks/lib/mute_XX_impl.cc.t
+++ b/gr-blocks/lib/mute_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(bool mute)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_mute(mute)
{
}
diff --git a/gr-blocks/lib/mute_XX_impl.h.t b/gr-blocks/lib/mute_XX_impl.h.t
index de93c8eb82..b519bb20a1 100644
--- a/gr-blocks/lib/mute_XX_impl.h.t
+++ b/gr-blocks/lib/mute_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/nlog10_ff_impl.cc b/gr-blocks/lib/nlog10_ff_impl.cc
index f662b8fd51..bed2da4d0d 100644
--- a/gr-blocks/lib/nlog10_ff_impl.cc
+++ b/gr-blocks/lib/nlog10_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "nlog10_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
nlog10_ff_impl::nlog10_ff_impl(float n, size_t vlen, float k)
- : gr_sync_block("nlog10_ff",
- gr_make_io_signature (1, 1, sizeof(float)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("nlog10_ff",
+ io_signature::make (1, 1, sizeof(float)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_n(n), d_vlen(vlen), d_k(k)
{
}
diff --git a/gr-blocks/lib/nlog10_ff_impl.h b/gr-blocks/lib/nlog10_ff_impl.h
index 3789bc3173..2935904366 100644
--- a/gr-blocks/lib/nlog10_ff_impl.h
+++ b/gr-blocks/lib/nlog10_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_NLOG10_FF_IMPL_H
#define INCLUDED_NLOG10_FF_IMPL_H
-#include <blocks/nlog10_ff.h>
+#include <gnuradio/blocks/nlog10_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc
index 387eda0baf..da1398e51a 100644
--- a/gr-blocks/lib/nop_impl.cc
+++ b/gr-blocks/lib/nop_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "nop_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <boost/bind.hpp>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
nop_impl::nop_impl (size_t sizeof_stream_item)
- : gr_block("nop",
- gr_make_io_signature(0, -1, sizeof_stream_item),
- gr_make_io_signature(0, -1, sizeof_stream_item)),
+ : block("nop",
+ io_signature::make(0, -1, sizeof_stream_item),
+ io_signature::make(0, -1, sizeof_stream_item)),
d_nmsgs_recvd(0)
{
// Arrange to have count_received_msgs called when messages are received.
diff --git a/gr-blocks/lib/nop_impl.h b/gr-blocks/lib/nop_impl.h
index e01e8fc9d9..a76b2a3288 100644
--- a/gr-blocks/lib/nop_impl.h
+++ b/gr-blocks/lib/nop_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_NOP_IMPL_H
#define INCLUDED_GR_NOP_IMPL_H
-#include <blocks/nop.h>
+#include <gnuradio/blocks/nop.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/not_XX_impl.cc.t b/gr-blocks/lib/not_XX_impl.cc.t
index b491a4ccc9..cb9be5cdb8 100644
--- a/gr-blocks/lib/not_XX_impl.cc.t
+++ b/gr-blocks/lib/not_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, 1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/not_XX_impl.h.t b/gr-blocks/lib/not_XX_impl.h.t
index 25f0da0c85..f7db3f2162 100644
--- a/gr-blocks/lib/not_XX_impl.h.t
+++ b/gr-blocks/lib/not_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/null_sink_impl.cc b/gr-blocks/lib/null_sink_impl.cc
index b780a2405a..41adeea0fd 100644
--- a/gr-blocks/lib/null_sink_impl.cc
+++ b/gr-blocks/lib/null_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "null_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
null_sink_impl::null_sink_impl(size_t sizeof_stream_item)
- : gr_sync_block("null_sink",
- gr_make_io_signature(1, 1, sizeof_stream_item),
- gr_make_io_signature(0, 0, 0))
+ : sync_block("null_sink",
+ io_signature::make(1, 1, sizeof_stream_item),
+ io_signature::make(0, 0, 0))
{
}
diff --git a/gr-blocks/lib/null_sink_impl.h b/gr-blocks/lib/null_sink_impl.h
index bb4c695c23..948bc19de6 100644
--- a/gr-blocks/lib/null_sink_impl.h
+++ b/gr-blocks/lib/null_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_NULL_SINK_IMPL_H
#define INCLUDED_GR_NULL_SINK_IMPL_H
-#include <blocks/null_sink.h>
+#include <gnuradio/blocks/null_sink.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/null_source_impl.cc b/gr-blocks/lib/null_source_impl.cc
index 81999d0501..edf0104da1 100644
--- a/gr-blocks/lib/null_source_impl.cc
+++ b/gr-blocks/lib/null_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "null_source_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
null_source_impl::null_source_impl (size_t sizeof_stream_item)
- : gr_sync_block("null_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof_stream_item))
+ : sync_block("null_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof_stream_item))
{
}
diff --git a/gr-blocks/lib/null_source_impl.h b/gr-blocks/lib/null_source_impl.h
index 36201d54b6..887c77d424 100644
--- a/gr-blocks/lib/null_source_impl.h
+++ b/gr-blocks/lib/null_source_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_NULL_SOURCE_IMPL_H
#define INCLUDED_GR_NULL_SOURCE_IMPL_H
-#include <blocks/null_source.h>
+#include <gnuradio/blocks/null_source.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/or_XX_impl.cc.t b/gr-blocks/lib/or_XX_impl.cc.t
index 15f6fa0b8a..95586e4fae 100644
--- a/gr-blocks/lib/or_XX_impl.cc.t
+++ b/gr-blocks/lib/or_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/or_XX_impl.h.t b/gr-blocks/lib/or_XX_impl.h.t
index 25f0da0c85..f7db3f2162 100644
--- a/gr-blocks/lib/or_XX_impl.h.t
+++ b/gr-blocks/lib/or_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc
index 2a7fcc04cb..9009c89ab7 100644
--- a/gr-blocks/lib/pack_k_bits_bb_impl.cc
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pack_k_bits_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <iostream>
@@ -40,9 +40,9 @@ namespace gr {
}
pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k)
- : gr_sync_decimator("pack_k_bits_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
+ : sync_decimator("pack_k_bits_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char)),
k),
d_k(k)
{
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h
index 668d438a46..dfe859478c 100644
--- a/gr-blocks/lib/pack_k_bits_bb_impl.h
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PACK_K_BITS_BB_IMPL_H
#define INCLUDED_GR_PACK_K_BITS_BB_IMPL_H
-#include <blocks/pack_k_bits_bb.h>
+#include <gnuradio/blocks/pack_k_bits_bb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t
index 4f34d83470..8ac22bdf8d 100644
--- a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t
+++ b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t
@@ -27,8 +27,8 @@
#endif
#include "@NAME_IMPL@.h"
-#include <gr_io_signature.h>
-#include <blocks/log2_const.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/log2_const.h>
#include <assert.h>
namespace gr {
@@ -39,17 +39,17 @@ namespace gr {
@NAME@::sptr
@NAME@::make(unsigned int bits_per_chunk,
- gr_endianness_t endianness)
+ endianness_t endianness)
{
return gnuradio::get_initial_sptr
(new @NAME_IMPL@(bits_per_chunk, endianness));
}
@NAME_IMPL@::@NAME_IMPL@(unsigned int bits_per_chunk,
- gr_endianness_t endianness)
- : gr_block("@NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ endianness_t endianness)
+ : block("@NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_bits_per_chunk(bits_per_chunk), d_endianness(endianness), d_index(0)
{
assert(bits_per_chunk <= BITS_PER_TYPE);
diff --git a/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t b/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t
index f83496fa79..3f8b15c1a6 100644
--- a/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t
+++ b/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
@@ -34,12 +34,12 @@ namespace gr {
{
private:
unsigned int d_bits_per_chunk;
- gr_endianness_t d_endianness;
+ endianness_t d_endianness;
unsigned int d_index;
public:
@NAME_IMPL@(unsigned int bits_per_chunk,
- gr_endianness_t endianness);
+ endianness_t endianness);
~@NAME_IMPL@();
void forecast(int noutput_items,
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
index 437c733a10..ba298afc8e 100644
--- a/gr-blocks/lib/patterned_interleaver_impl.cc
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "patterned_interleaver_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern)
- : gr_block ("patterned_interleaver",
- gr_make_io_signature (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize),
- gr_make_io_signature (1, 1, itemsize)),
+ : block ("patterned_interleaver",
+ io_signature::make (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize),
+ io_signature::make (1, 1, itemsize)),
d_pattern(pattern), d_counts( pattern_max(pattern)+1, 0), d_itemsize(itemsize)
{
BOOST_FOREACH( int i, d_pattern)
diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h
index 4266c96360..2401480ad9 100644
--- a/gr-blocks/lib/patterned_interleaver_impl.h
+++ b/gr-blocks/lib/patterned_interleaver_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
#define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
-#include <blocks/patterned_interleaver.h>
+#include <gnuradio/blocks/patterned_interleaver.h>
#include <boost/foreach.hpp>
namespace gr {
diff --git a/gr-blocks/lib/pdu.cc b/gr-blocks/lib/pdu.cc
index 9d5322bfe3..0c3e3aa334 100644
--- a/gr-blocks/lib/pdu.cc
+++ b/gr-blocks/lib/pdu.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <blocks/pdu.h>
+#include <gnuradio/blocks/pdu.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
index 1fc4857f2e..d6ad78cb97 100644
--- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
+++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "pdu_to_tagged_stream_impl.h"
-#include <blocks/pdu.h>
-#include <gr_io_signature.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
pdu_to_tagged_stream_impl::pdu_to_tagged_stream_impl(pdu::vector_type type)
- : gr_sync_block("pdu_to_tagged_stream",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, pdu::itemsize(type))),
+ : sync_block("pdu_to_tagged_stream",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, pdu::itemsize(type))),
d_itemsize(pdu::itemsize(type)),
d_type(type)
{
diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h
index ca1c6437bd..8b3d13c921 100644
--- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h
+++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PDU_TO_TAGGED_STREAM_IMPL_H
#define INCLUDED_PDU_TO_TAGGED_STREAM_IMPL_H
-#include <blocks/pdu_to_tagged_stream.h>
+#include <gnuradio/blocks/pdu_to_tagged_stream.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/peak_detector2_fb_impl.cc b/gr-blocks/lib/peak_detector2_fb_impl.cc
index 0d375c3bad..dd1b677222 100644
--- a/gr-blocks/lib/peak_detector2_fb_impl.cc
+++ b/gr-blocks/lib/peak_detector2_fb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "peak_detector2_fb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -42,9 +42,9 @@ namespace gr {
peak_detector2_fb_impl::peak_detector2_fb_impl(float threshold_factor_rise,
int look_ahead, float alpha)
- : gr_sync_block("peak_detector2_fb",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature2(1, 2, sizeof(char), sizeof(float))),
+ : sync_block("peak_detector2_fb",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make2(1, 2, sizeof(char), sizeof(float))),
d_threshold_factor_rise(threshold_factor_rise),
d_look_ahead(look_ahead), d_alpha(alpha), d_avg(0.0f), d_found(false)
{
diff --git a/gr-blocks/lib/peak_detector2_fb_impl.h b/gr-blocks/lib/peak_detector2_fb_impl.h
index f03dd36a8d..53c06ca810 100644
--- a/gr-blocks/lib/peak_detector2_fb_impl.h
+++ b/gr-blocks/lib/peak_detector2_fb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_IMPL_H
#define INCLUDED_GR_PEAK_DETECTOR2_FB_IMPL_H
-#include <blocks/peak_detector2_fb.h>
+#include <gnuradio/blocks/peak_detector2_fb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/peak_detector_XX_impl.cc.t b/gr-blocks/lib/peak_detector_XX_impl.cc.t
index 27518962f5..6846a02df0 100644
--- a/gr-blocks/lib/peak_detector_XX_impl.cc.t
+++ b/gr-blocks/lib/peak_detector_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME_IMPL@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -47,9 +47,9 @@ namespace gr {
@NAME_IMPL@::@NAME_IMPL@(float threshold_factor_rise,
float threshold_factor_fall,
int look_ahead, float alpha)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(char))),
d_threshold_factor_rise(threshold_factor_rise),
d_threshold_factor_fall(threshold_factor_fall),
d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0)
diff --git a/gr-blocks/lib/peak_detector_XX_impl.h.t b/gr-blocks/lib/peak_detector_XX_impl.h.t
index ef52f0f744..ed364a490e 100644
--- a/gr-blocks/lib/peak_detector_XX_impl.h.t
+++ b/gr-blocks/lib/peak_detector_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/plateau_detector_fb_impl.cc b/gr-blocks/lib/plateau_detector_fb_impl.cc
index f68ef6463f..0c35a32f68 100644
--- a/gr-blocks/lib/plateau_detector_fb_impl.cc
+++ b/gr-blocks/lib/plateau_detector_fb_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "plateau_detector_fb_impl.h"
namespace gr {
@@ -38,9 +38,9 @@ namespace gr {
}
plateau_detector_fb_impl::plateau_detector_fb_impl(int max_len, float threshold)
- : gr_sync_block("plateau_detector_fb",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("plateau_detector_fb",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(char))),
d_max_len(max_len),
d_threshold(threshold)
{}
diff --git a/gr-blocks/lib/plateau_detector_fb_impl.h b/gr-blocks/lib/plateau_detector_fb_impl.h
index 67682d00f3..6497f0e838 100644
--- a/gr-blocks/lib/plateau_detector_fb_impl.h
+++ b/gr-blocks/lib/plateau_detector_fb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_IMPL_H
#define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_IMPL_H
-#include <blocks/plateau_detector_fb.h>
+#include <gnuradio/blocks/plateau_detector_fb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/probe_rate_impl.cc b/gr-blocks/lib/probe_rate_impl.cc
index 37749c85e3..418d9d4013 100644
--- a/gr-blocks/lib/probe_rate_impl.cc
+++ b/gr-blocks/lib/probe_rate_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "probe_rate_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
probe_rate_impl::probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha) :
- gr_sync_block("probe_rate",
- gr_make_io_signature(1,1,itemsize),
- gr_make_io_signature(0,0,itemsize)),
+ sync_block("probe_rate",
+ io_signature::make(1,1,itemsize),
+ io_signature::make(0,0,itemsize)),
d_alpha(alpha),
d_beta(1.0-alpha),
d_avg(0),
diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h
index 139fc34876..a1c69ba189 100644
--- a/gr-blocks/lib/probe_rate_impl.h
+++ b/gr-blocks/lib/probe_rate_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PROBE_RATE_IMPL_H
#define INCLUDED_GR_PROBE_RATE_IMPL_H
-#include <blocks/probe_rate.h>
+#include <gnuradio/blocks/probe_rate.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/probe_signal_X_impl.cc.t b/gr-blocks/lib/probe_signal_X_impl.cc.t
index 4cda4e5273..1bc2793af2 100644
--- a/gr-blocks/lib/probe_signal_X_impl.cc.t
+++ b/gr-blocks/lib/probe_signal_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@()
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@TYPE@)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@TYPE@)),
+ io_signature::make(0, 0, 0)),
d_level(0)
{
}
diff --git a/gr-blocks/lib/probe_signal_X_impl.h.t b/gr-blocks/lib/probe_signal_X_impl.h.t
index 9c3d05becd..c20994877f 100644
--- a/gr-blocks/lib/probe_signal_X_impl.h.t
+++ b/gr-blocks/lib/probe_signal_X_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/probe_signal_vX_impl.cc.t b/gr-blocks/lib/probe_signal_vX_impl.cc.t
index bd520b0bc8..5865bde41b 100644
--- a/gr-blocks/lib/probe_signal_vX_impl.cc.t
+++ b/gr-blocks/lib/probe_signal_vX_impl.cc.t
@@ -28,7 +28,7 @@
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -41,9 +41,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t size)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, size*sizeof(@TYPE@)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, size*sizeof(@TYPE@)),
+ io_signature::make(0, 0, 0)),
d_level(size, 0), d_size(size)
{
}
diff --git a/gr-blocks/lib/probe_signal_vX_impl.h.t b/gr-blocks/lib/probe_signal_vX_impl.h.t
index 1424334a7f..434eb44ac1 100644
--- a/gr-blocks/lib/probe_signal_vX_impl.h.t
+++ b/gr-blocks/lib/probe_signal_vX_impl.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME_IMPL@
#include <vector>
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc
index f3139245d8..c554425f8e 100644
--- a/gr-blocks/lib/qa_block_tags.cc
+++ b/gr-blocks/lib/qa_block_tags.cc
@@ -25,21 +25,19 @@
#endif
#include <qa_block_tags.h>
-#include <gr_block.h>
-#include <gr_top_block.h>
-#include <blocks/null_source.h>
-#include <blocks/null_sink.h>
-#include <blocks/head.h>
-#include <blocks/annotator_alltoall.h>
-#include <blocks/annotator_1to1.h>
-#include <blocks/keep_one_in_n.h>
-#include <gr_tags.h>
+#include <gnuradio/block.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/head.h>
+#include <gnuradio/blocks/annotator_alltoall.h>
+#include <gnuradio/blocks/annotator_1to1.h>
+#include <gnuradio/blocks/keep_one_in_n.h>
+#include <gnuradio/tags.h>
// ----------------------------------------------------------------
-using namespace pmt;
-
// set to 1 to turn on debug output
// The debug output fully checks that the tags seen are what are expected. While
// this behavior currently works with our implementation, there is no guarentee
@@ -53,10 +51,10 @@ void
qa_block_tags::t0()
{
unsigned int N = 1000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(int), N));
- gr_block_sptr snk (gr::blocks::null_sink::make(sizeof(int)));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(int), N));
+ gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(int)));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, snk, 0);
@@ -79,16 +77,16 @@ void
qa_block_tags::t1()
{
int N = 40000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(int), N));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(int), N));
gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann3(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann4(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
- gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
- gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, ann0, 0);
@@ -103,9 +101,9 @@ qa_block_tags::t1()
tb->run();
- std::vector<gr_tag_t> tags0 = ann0->data();
- std::vector<gr_tag_t> tags3 = ann3->data();
- std::vector<gr_tag_t> tags4 = ann4->data();
+ std::vector<gr::tag_t> tags0 = ann0->data();
+ std::vector<gr::tag_t> tags3 = ann3->data();
+ std::vector<gr::tag_t> tags4 = ann4->data();
// The first annotator does not receive any tags from the null sink upstream
CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -119,7 +117,7 @@ qa_block_tags::t1()
str1 << ann1->name() << ann1->unique_id();
str2 << ann2->name() << ann2->unique_id();
- pmt_t expected_tags3[8];
+ pmt::pmt_t expected_tags3[8];
expected_tags3[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0));
expected_tags3[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0));
expected_tags3[2] = mp(pmt::from_uint64(10000), mp(str1.str()), mp("seq"), mp(1));
@@ -129,7 +127,7 @@ qa_block_tags::t1()
expected_tags3[6] = mp(pmt::from_uint64(30000), mp(str1.str()), mp("seq"), mp(3));
expected_tags3[7] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6));
- pmt_t expected_tags4[8];
+ pmt::pmt_t expected_tags4[8];
expected_tags4[0] = mp(pmt::from_uint64(0), mp(str2.str()), mp("seq"), mp(0));
expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1));
expected_tags4[2] = mp(pmt::from_uint64(10000), mp(str2.str()), mp("seq"), mp(1));
@@ -160,17 +158,17 @@ void
qa_block_tags::t2 ()
{
int N = 40000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(int), N));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(int), N));
gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann3(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann4(gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
- gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
- gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
- gr_block_sptr snk2 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk2 (gr::blocks::null_sink::make(sizeof(int)));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, ann0, 0);
@@ -187,11 +185,11 @@ qa_block_tags::t2 ()
tb->run();
- std::vector<gr_tag_t> tags0 = ann0->data();
- std::vector<gr_tag_t> tags1 = ann1->data();
- std::vector<gr_tag_t> tags2 = ann2->data();
- std::vector<gr_tag_t> tags3 = ann4->data();
- std::vector<gr_tag_t> tags4 = ann4->data();
+ std::vector<gr::tag_t> tags0 = ann0->data();
+ std::vector<gr::tag_t> tags1 = ann1->data();
+ std::vector<gr::tag_t> tags2 = ann2->data();
+ std::vector<gr::tag_t> tags3 = ann4->data();
+ std::vector<gr::tag_t> tags4 = ann4->data();
// The first annotator does not receive any tags from the null sink upstream
CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -209,7 +207,7 @@ qa_block_tags::t2 ()
str0 << ann0->name() << ann0->unique_id();
str1 << ann1->name() << ann1->unique_id();
- pmt_t expected_tags2[12];
+ pmt::pmt_t expected_tags2[12];
expected_tags2[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0));
expected_tags2[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0));
expected_tags2[2] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1));
@@ -223,7 +221,7 @@ qa_block_tags::t2 ()
expected_tags2[10] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6));
expected_tags2[11] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(7));
- pmt_t expected_tags4[12];
+ pmt::pmt_t expected_tags4[12];
expected_tags4[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(2));
expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0));
expected_tags4[2] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1));
@@ -261,16 +259,16 @@ void
qa_block_tags::t3()
{
int N = 40000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(int), N));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(int), N));
gr::blocks::annotator_1to1::sptr ann0 (gr::blocks::annotator_1to1::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann1 (gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_alltoall::sptr ann2 (gr::blocks::annotator_alltoall::make(10000, sizeof(int)));
gr::blocks::annotator_1to1::sptr ann3 (gr::blocks::annotator_1to1::make(10000, sizeof(int)));
gr::blocks::annotator_1to1::sptr ann4 (gr::blocks::annotator_1to1::make(10000, sizeof(int)));
- gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
- gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, ann0, 0);
@@ -287,9 +285,9 @@ qa_block_tags::t3()
tb->run();
- std::vector<gr_tag_t> tags0 = ann0->data();
- std::vector<gr_tag_t> tags3 = ann3->data();
- std::vector<gr_tag_t> tags4 = ann4->data();
+ std::vector<gr::tag_t> tags0 = ann0->data();
+ std::vector<gr::tag_t> tags3 = ann3->data();
+ std::vector<gr::tag_t> tags4 = ann4->data();
// The first annotator does not receive any tags from the null sink upstream
CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -303,7 +301,7 @@ qa_block_tags::t3()
str1 << ann1->name() << ann1->unique_id();
str2 << ann2->name() << ann2->unique_id();
- pmt_t expected_tags3[8];
+ pmt::pmt_t expected_tags3[8];
expected_tags3[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0));
expected_tags3[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0));
expected_tags3[2] = mp(pmt::from_uint64(10000), mp(str1.str()), mp("seq"), mp(1));
@@ -313,7 +311,7 @@ qa_block_tags::t3()
expected_tags3[6] = mp(pmt::from_uint64(30000), mp(str1.str()), mp("seq"), mp(3));
expected_tags3[7] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6));
- pmt_t expected_tags4[8];
+ pmt::pmt_t expected_tags4[8];
expected_tags4[0] = mp(pmt::from_uint64(0), mp(str2.str()), mp("seq"), mp(0));
expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1));
expected_tags4[2] = mp(pmt::from_uint64(10000), mp(str2.str()), mp("seq"), mp(1));
@@ -345,14 +343,14 @@ void
qa_block_tags::t4()
{
int N = 40000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(int), N));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(int), N));
gr::blocks::annotator_1to1::sptr ann0(gr::blocks::annotator_1to1::make(10000, sizeof(int)));
gr::blocks::annotator_1to1::sptr ann1(gr::blocks::annotator_1to1::make(10000, sizeof(int)));
gr::blocks::annotator_1to1::sptr ann2(gr::blocks::annotator_1to1::make(10000, sizeof(int)));
- gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
- gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int)));
// using 1-to-1 tag propagation without having equal number of
// ins and outs. Make sure this works; will just exit run early.
@@ -364,7 +362,7 @@ qa_block_tags::t4()
tb->connect(ann2, 0, snk1, 0);
std::cerr << std::endl
- << "NOTE: This is supposed to produce an error from gr_block_executor"
+ << "NOTE: This is supposed to produce an error from block_executor"
<< std::endl;
tb->run();
}
@@ -374,13 +372,13 @@ void
qa_block_tags::t5()
{
int N = 40000;
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(float)));
- gr_block_sptr head (gr::blocks::head::make(sizeof(float), N));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(float)));
+ gr::block_sptr head (gr::blocks::head::make(sizeof(float), N));
gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(float)));
gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(float)));
gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(1000, sizeof(float)));
- gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(float)));
+ gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(float)));
// Rate change blocks
gr::blocks::keep_one_in_n::sptr dec10(gr::blocks::keep_one_in_n::make(sizeof(float), 10));
@@ -394,9 +392,9 @@ qa_block_tags::t5()
tb->run();
- std::vector<gr_tag_t> tags0 = ann0->data();
- std::vector<gr_tag_t> tags1 = ann1->data();
- std::vector<gr_tag_t> tags2 = ann2->data();
+ std::vector<gr::tag_t> tags0 = ann0->data();
+ std::vector<gr::tag_t> tags1 = ann1->data();
+ std::vector<gr::tag_t> tags2 = ann2->data();
// The first annotator does not receive any tags from the null sink upstream
CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
diff --git a/gr-blocks/lib/qa_blocks.cc b/gr-blocks/lib/qa_blocks.cc
index 409b5d5762..149ef7aa7c 100644
--- a/gr-blocks/lib/qa_blocks.cc
+++ b/gr-blocks/lib/qa_blocks.cc
@@ -30,7 +30,7 @@
#include <qa_rotator.h>
CppUnit::TestSuite *
-qa_gr_blocks::suite()
+qa_blocks::suite()
{
CppUnit::TestSuite *s = new CppUnit::TestSuite("gr-blocks");
diff --git a/gr-blocks/lib/qa_blocks.h b/gr-blocks/lib/qa_blocks.h
index ad538134bd..4d52878454 100644
--- a/gr-blocks/lib/qa_blocks.h
+++ b/gr-blocks/lib/qa_blocks.h
@@ -23,12 +23,12 @@
#ifndef _QA_GR_BLOCKS_H_
#define _QA_GR_BLOCKS_H_
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the gr-blocks directory
-class __GR_ATTR_EXPORT qa_gr_blocks
+class __GR_ATTR_EXPORT qa_blocks
{
public:
//! return suite of tests for all of gr-blocks directory
diff --git a/gr-blocks/lib/qa_gr_block.cc b/gr-blocks/lib/qa_gr_block.cc
index 7f4a01bbd0..5df1b217d4 100644
--- a/gr-blocks/lib/qa_gr_block.cc
+++ b/gr-blocks/lib/qa_gr_block.cc
@@ -25,20 +25,20 @@
#endif
#include <qa_gr_block.h>
-#include <gr_block.h>
-#include <gr_io_signature.h>
-#include <blocks/null_sink.h>
-#include <blocks/null_source.h>
+#include <gnuradio/block.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/null_source.h>
// ----------------------------------------------------------------
void
-qa_gr_block::t0 ()
+qa_block::t0 ()
{
// test creation of sources
- gr_block_sptr src1(gr::blocks::null_source::make(sizeof (int)));
+ gr::block_sptr src1(gr::blocks::null_source::make(sizeof (int)));
CPPUNIT_ASSERT_EQUAL(std::string("null_source"), src1->name ());
CPPUNIT_ASSERT_EQUAL(0, src1->input_signature()->max_streams ());
CPPUNIT_ASSERT_EQUAL(1, src1->output_signature()->min_streams ());
@@ -46,7 +46,7 @@ qa_gr_block::t0 ()
CPPUNIT_ASSERT_EQUAL((int) sizeof(int),
src1->output_signature()->sizeof_stream_item (0));
- gr_block_sptr src2(gr::blocks::null_source::make(sizeof(short)));
+ gr::block_sptr src2(gr::blocks::null_source::make(sizeof(short)));
CPPUNIT_ASSERT_EQUAL(std::string ("null_source"), src2->name ());
CPPUNIT_ASSERT_EQUAL(0, src2->input_signature()->max_streams ());
CPPUNIT_ASSERT_EQUAL(1, src2->output_signature()->min_streams ());
@@ -57,10 +57,10 @@ qa_gr_block::t0 ()
void
-qa_gr_block::t1 ()
+qa_block::t1 ()
{
// test creation of sinks
- gr_block_sptr dst1 (gr::blocks::null_sink::make (sizeof (int)));
+ gr::block_sptr dst1 (gr::blocks::null_sink::make (sizeof (int)));
CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst1->name ());
CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->min_streams ());
CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->max_streams ());
@@ -69,7 +69,7 @@ qa_gr_block::t1 ()
CPPUNIT_ASSERT_EQUAL (0, dst1->output_signature()->max_streams ());
- gr_block_sptr dst2 (gr::blocks::null_sink::make (sizeof (short)));
+ gr::block_sptr dst2 (gr::blocks::null_sink::make (sizeof (short)));
CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst2->name ());
CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->min_streams ());
CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->max_streams ());
@@ -79,11 +79,11 @@ qa_gr_block::t1 ()
}
void
-qa_gr_block::t2 ()
+qa_block::t2 ()
{
}
void
-qa_gr_block::t3 ()
+qa_block::t3 ()
{
}
diff --git a/gr-blocks/lib/qa_gr_block.h b/gr-blocks/lib/qa_gr_block.h
index 14c7c40d1f..06eb60f6e6 100644
--- a/gr-blocks/lib/qa_gr_block.h
+++ b/gr-blocks/lib/qa_gr_block.h
@@ -27,9 +27,9 @@
#include <cppunit/TestCase.h>
#include <stdexcept>
-class qa_gr_block : public CppUnit::TestCase {
+class qa_block : public CppUnit::TestCase {
- CPPUNIT_TEST_SUITE (qa_gr_block);
+ CPPUNIT_TEST_SUITE (qa_block);
CPPUNIT_TEST (t0);
CPPUNIT_TEST (t1);
CPPUNIT_TEST (t2);
diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc
index 1a3006039b..a6d1516162 100644
--- a/gr-blocks/lib/qa_gr_flowgraph.cc
+++ b/gr-blocks/lib/qa_gr_flowgraph.cc
@@ -26,9 +26,9 @@
#include <qa_gr_flowgraph.h>
#include <gr_flowgraph.h>
-#include <blocks/nop.h>
-#include <blocks/null_source.h>
-#include <blocks/null_sink.h>
+#include <gnuradio/blocks/nop.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/blocks/null_sink.h>
void qa_gr_flowgraph::t0()
{
@@ -41,8 +41,8 @@ void qa_gr_flowgraph::t1_connect()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
}
@@ -51,8 +51,8 @@ void qa_gr_flowgraph::t2_connect_invalid_src_port_neg()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
CPPUNIT_ASSERT_THROW(fg->connect(nop1, -1, nop2, 0), std::invalid_argument);
}
@@ -61,8 +61,8 @@ void qa_gr_flowgraph::t3_connect_src_port_exceeds()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
CPPUNIT_ASSERT_THROW(fg->connect(src, 1, dst, 0), std::invalid_argument);
}
@@ -71,8 +71,8 @@ void qa_gr_flowgraph::t4_connect_invalid_dst_port_neg()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, -1), std::invalid_argument);
}
@@ -81,8 +81,8 @@ void qa_gr_flowgraph::t5_connect_dst_port_exceeds()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
CPPUNIT_ASSERT_THROW(fg->connect(src, 0, dst, 1), std::invalid_argument);
}
@@ -91,9 +91,9 @@ void qa_gr_flowgraph::t6_connect_dst_in_use()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr src1 = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr src2 = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr src1 = gr::blocks::null_source::make(sizeof(int));
+ block_sptr src2 = gr::blocks::null_source::make(sizeof(int));
+ block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
fg->connect(src1, 0, dst, 0);
CPPUNIT_ASSERT_THROW(fg->connect(src2, 0, dst, 0), std::invalid_argument);
@@ -103,9 +103,9 @@ void qa_gr_flowgraph::t7_connect_one_src_two_dst()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int));
- gr_block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int));
fg->connect(src, 0, dst1, 0);
fg->connect(src, 0, dst2, 0);
@@ -115,8 +115,8 @@ void qa_gr_flowgraph::t8_connect_type_mismatch()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(char));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(char));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, 0), std::invalid_argument);
}
@@ -125,8 +125,8 @@ void qa_gr_flowgraph::t9_disconnect()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
fg->disconnect(nop1, 0, nop2, 0);
@@ -136,9 +136,9 @@ void qa_gr_flowgraph::t10_disconnect_unconnected_block()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop3 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop3 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop3, 0), std::invalid_argument);
@@ -148,8 +148,8 @@ void qa_gr_flowgraph::t11_disconnect_unconnected_port()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop2, 1), std::invalid_argument);
@@ -159,8 +159,8 @@ void qa_gr_flowgraph::t12_validate()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
fg->validate();
@@ -170,8 +170,8 @@ void qa_gr_flowgraph::t13_validate_missing_input_assignment()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
fg->connect(nop1, 0, nop2, 2);
@@ -182,8 +182,8 @@ void qa_gr_flowgraph::t14_validate_missing_output_assignment()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
fg->connect(nop1, 2, nop2, 1);
@@ -194,8 +194,8 @@ void qa_gr_flowgraph::t15_clear()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
fg->connect(nop1, 0, nop2, 0);
@@ -212,17 +212,17 @@ void qa_gr_flowgraph::t16_partition()
{
gr_flowgraph_sptr fg = gr_make_flowgraph();
- gr_block_sptr nop11 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop12 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop13 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop14 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop11 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop12 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop13 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop14 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop21 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop22 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop23 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop21 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop22 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop23 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop31 = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr nop32 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop31 = gr::blocks::nop::make(sizeof(int));
+ block_sptr nop32 = gr::blocks::nop::make(sizeof(int));
// Build disjoint graph #1
fg->connect(nop11, 0, nop12, 0);
@@ -236,7 +236,7 @@ void qa_gr_flowgraph::t16_partition()
// Build disjoint graph #3
fg->connect(nop31, 0, nop32, 0);
- std::vector<gr_basic_block_vector_t> graphs = fg->partition();
+ std::vector<basic_block_vector_t> graphs = fg->partition();
CPPUNIT_ASSERT(graphs.size() == 3);
CPPUNIT_ASSERT(graphs[0].size() == 4);
diff --git a/gr-blocks/lib/qa_gr_hier_block2.cc b/gr-blocks/lib/qa_gr_hier_block2.cc
index a3d599039c..bf9a167b14 100644
--- a/gr-blocks/lib/qa_gr_hier_block2.cc
+++ b/gr-blocks/lib/qa_gr_hier_block2.cc
@@ -25,14 +25,14 @@
#endif
#include <qa_gr_hier_block2.h>
-#include <gr_hier_block2.h>
-#include <gr_io_signature.h>
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/io_signature.h>
-void qa_gr_hier_block2::test_make()
+void qa_hier_block2::test_make()
{
- gr_hier_block2_sptr src1(gr_make_hier_block2("test",
- gr_make_io_signature(1, 1, 1 * sizeof(int)),
- gr_make_io_signature(1, 1, 1 * sizeof(int))));
+ gr::hier_block2_sptr src1(gr::make_hier_block2("test",
+ gr::io_signature::make(1, 1, 1 * sizeof(int)),
+ gr::io_signature::make(1, 1, 1 * sizeof(int))));
CPPUNIT_ASSERT(src1);
CPPUNIT_ASSERT_EQUAL(std::string("test"), src1->name());
diff --git a/gr-blocks/lib/qa_gr_hier_block2.h b/gr-blocks/lib/qa_gr_hier_block2.h
index 653cd27251..34a77256c6 100644
--- a/gr-blocks/lib/qa_gr_hier_block2.h
+++ b/gr-blocks/lib/qa_gr_hier_block2.h
@@ -27,9 +27,9 @@
#include <cppunit/TestCase.h>
#include <stdexcept>
-class qa_gr_hier_block2 : public CppUnit::TestCase
+class qa_hier_block2 : public CppUnit::TestCase
{
- CPPUNIT_TEST_SUITE(qa_gr_hier_block2);
+ CPPUNIT_TEST_SUITE(qa_hier_block2);
CPPUNIT_TEST(test_make);
diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc
index eb747d32cc..1d45c89233 100644
--- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc
+++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc
@@ -25,12 +25,12 @@
#endif
#include <qa_gr_hier_block2_derived.h>
-#include <gr_top_block.h>
-#include <gr_io_signature.h>
-#include <blocks/null_source.h>
-#include <blocks/null_sink.h>
-#include <blocks/head.h>
-#include <blocks/copy.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/head.h>
+#include <gnuradio/blocks/copy.h>
// Declare a test C++ hierarchical block
@@ -38,7 +38,7 @@ class gr_derived_block;
typedef boost::shared_ptr<gr_derived_block> gr_derived_block_sptr;
gr_derived_block_sptr gr_make_derived_block();
-class gr_derived_block : public gr_hier_block2
+class gr_derived_block : public gr::hier_block2
{
private:
friend gr_derived_block_sptr gr_make_derived_block();
@@ -56,11 +56,11 @@ gr_make_derived_block()
}
gr_derived_block::gr_derived_block()
- : gr_hier_block2("gr_derived_block",
- gr_make_io_signature(1, 1, sizeof(int)), // Input signature
- gr_make_io_signature(1, 1, sizeof(int))) // Output signature
+ : gr::hier_block2("gr_derived_block",
+ gr::io_signature::make(1, 1, sizeof(int)), // Input signature
+ gr::io_signature::make(1, 1, sizeof(int))) // Output signature
{
- gr_block_sptr copy(gr::blocks::copy::make(sizeof(int)));
+ gr::block_sptr copy(gr::blocks::copy::make(sizeof(int)));
connect(self(), 0, copy, 0);
connect(copy, 0, self(), 0);
@@ -70,14 +70,14 @@ gr_derived_block::~gr_derived_block()
{
}
-void qa_gr_hier_block2_derived::test_1()
+void qa_hier_block2_derived::test_1()
{
- gr_top_block_sptr tb(gr_make_top_block("test"));
+ gr::top_block_sptr tb(gr::make_top_block("test"));
- gr_block_sptr src(gr::blocks::null_source::make(sizeof(int)));
- gr_block_sptr head(gr::blocks::head::make(sizeof(int), 1000));
+ gr::block_sptr src(gr::blocks::null_source::make(sizeof(int)));
+ gr::block_sptr head(gr::blocks::head::make(sizeof(int), 1000));
gr_derived_block_sptr blk(gr_make_derived_block());
- gr_block_sptr dst(gr::blocks::null_sink::make(sizeof(int)));
+ gr::block_sptr dst(gr::blocks::null_sink::make(sizeof(int)));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, blk, 0);
diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.h b/gr-blocks/lib/qa_gr_hier_block2_derived.h
index 8e0a1880ce..2c0a74356f 100644
--- a/gr-blocks/lib/qa_gr_hier_block2_derived.h
+++ b/gr-blocks/lib/qa_gr_hier_block2_derived.h
@@ -28,9 +28,9 @@
#include <stdexcept>
// Declare a QA test case
-class qa_gr_hier_block2_derived : public CppUnit::TestCase
+class qa_hier_block2_derived : public CppUnit::TestCase
{
- CPPUNIT_TEST_SUITE(qa_gr_hier_block2_derived);
+ CPPUNIT_TEST_SUITE(qa_hier_block2_derived);
CPPUNIT_TEST(test_1);
CPPUNIT_TEST_SUITE_END();
diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc
index cb75cd14d0..39709d23d2 100644
--- a/gr-blocks/lib/qa_gr_top_block.cc
+++ b/gr-blocks/lib/qa_gr_top_block.cc
@@ -25,48 +25,49 @@
#endif
#include <qa_gr_top_block.h>
-#include <gr_top_block.h>
-#include <blocks/head.h>
-#include <blocks/nop.h>
-#include <blocks/null_source.h>
-#include <blocks/null_sink.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/blocks/head.h>
+#include <gnuradio/blocks/nop.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/blocks/null_sink.h>
#include <iostream>
#define VERBOSE 0
-void qa_gr_top_block::t0()
+void qa_top_block::t0()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t0()\n";
+ if (VERBOSE) std::cout << "qa_top_block::t0()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
CPPUNIT_ASSERT(tb);
}
-void qa_gr_top_block::t1_run()
+void qa_top_block::t1_run()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t1()\n";
+ if (VERBOSE) std::cout << "qa_top_block::t1()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, dst, 0);
tb->run();
}
-void qa_gr_top_block::t2_start_stop_wait()
+void qa_top_block::t2_start_stop_wait()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t2()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t2()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
tb->connect(src, 0, head, 0);
tb->connect(head, 0, dst, 0);
@@ -76,14 +77,15 @@ void qa_gr_top_block::t2_start_stop_wait()
tb->wait();
}
-void qa_gr_top_block::t3_lock_unlock()
+void qa_top_block::t3_lock_unlock()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t3()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t3()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
tb->connect(src, 0, dst, 0);
@@ -96,15 +98,16 @@ void qa_gr_top_block::t3_lock_unlock()
tb->wait();
}
-void qa_gr_top_block::t4_reconfigure()
+void qa_top_block::t4_reconfigure()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t4()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t4()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
// Start infinite flowgraph
tb->connect(src, 0, dst, 0);
@@ -122,15 +125,16 @@ void qa_gr_top_block::t4_reconfigure()
}
-void qa_gr_top_block::t5_max_noutputs()
+void qa_top_block::t5_max_noutputs()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t5()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t5()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
// Start infinite flowgraph
tb->connect(src, 0, head, 0);
@@ -139,15 +143,16 @@ void qa_gr_top_block::t5_max_noutputs()
tb->wait();
}
-void qa_gr_top_block::t6_reconfig_max_noutputs()
+void qa_top_block::t6_reconfig_max_noutputs()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t6()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t6()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
// Start infinite flowgraph
tb->connect(src, 0, dst, 0);
@@ -166,15 +171,16 @@ void qa_gr_top_block::t6_reconfig_max_noutputs()
tb->wait();
}
-void qa_gr_top_block::t7_max_noutputs_per_block()
+void qa_top_block::t7_max_noutputs_per_block()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t7()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t7()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
head->set_max_noutput_items(100);
@@ -185,15 +191,16 @@ void qa_gr_top_block::t7_max_noutputs_per_block()
tb->wait();
}
-void qa_gr_top_block::t8_reconfig_max_noutputs_per_block()
+void qa_top_block::t8_reconfig_max_noutputs_per_block()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t8()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t8()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
head->set_max_noutput_items(99);
@@ -214,15 +221,16 @@ void qa_gr_top_block::t8_reconfig_max_noutputs_per_block()
tb->wait();
}
-void qa_gr_top_block::t9_max_output_buffer()
+void qa_top_block::t9_max_output_buffer()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t9()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t9()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
head->set_max_output_buffer(1024);
@@ -233,15 +241,16 @@ void qa_gr_top_block::t9_max_output_buffer()
tb->wait();
}
-void qa_gr_top_block::t10_reconfig_max_output_buffer()
+void qa_top_block::t10_reconfig_max_output_buffer()
{
- if (VERBOSE) std::cout << "qa_gr_top_block::t10()\n";
+ if(VERBOSE)
+ std::cout << "qa_top_block::t10()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ gr::top_block_sptr tb = gr::make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
- gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000);
+ gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
head->set_max_output_buffer(1000);
@@ -251,7 +260,7 @@ void qa_gr_top_block::t10_reconfig_max_output_buffer()
// Reconfigure with gr_head in the middle
tb->lock();
- gr_block_sptr nop = gr::blocks::nop::make(sizeof(int));
+ gr::block_sptr nop = gr::blocks::nop::make(sizeof(int));
nop->set_max_output_buffer(4000);
tb->disconnect(src, 0, dst, 0);
tb->connect(src, 0, head, 0);
@@ -263,11 +272,11 @@ void qa_gr_top_block::t10_reconfig_max_output_buffer()
tb->wait();
}
-void qa_gr_top_block::t11_set_block_affinity()
+void qa_top_block::t11_set_block_affinity()
{
- gr_top_block_sptr tb = gr_make_top_block("top");
- gr_block_sptr src (gr::blocks::null_source::make(sizeof(float)));
- gr_block_sptr snk (gr::blocks::null_sink::make(sizeof(float)));
+ gr::top_block_sptr tb = gr::make_top_block("top");
+ gr::block_sptr src (gr::blocks::null_source::make(sizeof(float)));
+ gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(float)));
std::vector<int> set(1, 0), ret;
src->set_processor_affinity(set);
diff --git a/gr-blocks/lib/qa_gr_top_block.h b/gr-blocks/lib/qa_gr_top_block.h
index 634eeab1f8..e3ea3227e9 100644
--- a/gr-blocks/lib/qa_gr_top_block.h
+++ b/gr-blocks/lib/qa_gr_top_block.h
@@ -27,9 +27,9 @@
#include <cppunit/TestCase.h>
#include <stdexcept>
-class qa_gr_top_block : public CppUnit::TestCase
+class qa_top_block : public CppUnit::TestCase
{
- CPPUNIT_TEST_SUITE(qa_gr_top_block);
+ CPPUNIT_TEST_SUITE(qa_top_block);
CPPUNIT_TEST(t0);
CPPUNIT_TEST(t1_run);
diff --git a/gr-blocks/lib/qa_rotator.cc b/gr-blocks/lib/qa_rotator.cc
index 877392075a..63cae39ca8 100644
--- a/gr-blocks/lib/qa_rotator.cc
+++ b/gr-blocks/lib/qa_rotator.cc
@@ -24,13 +24,13 @@
#include <config.h>
#endif
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestAssert.h>
#include <qa_rotator.h>
-#include <blocks/rotator.h>
+#include <gnuradio/blocks/rotator.h>
#include <stdio.h>
#include <cmath>
-#include <gr_expj.h>
+#include <gnuradio/expj.h>
// error vector magnitude
__GR_ATTR_UNUSED static float
diff --git a/gr-blocks/lib/qa_set_msg_handler.cc b/gr-blocks/lib/qa_set_msg_handler.cc
index cc94243d89..47e5698787 100644
--- a/gr-blocks/lib/qa_set_msg_handler.cc
+++ b/gr-blocks/lib/qa_set_msg_handler.cc
@@ -25,12 +25,12 @@
#endif
#include <qa_set_msg_handler.h>
-#include <gr_top_block.h>
-#include <blocks/head.h>
-#include <blocks/null_source.h>
-#include <blocks/null_sink.h>
-#include <blocks/nop.h>
-#include <messages/msg_passing.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/blocks/head.h>
+#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/blocks/nop.h>
+#include <gnuradio/messages/msg_passing.h>
#include <iostream>
#include <boost/thread/thread.hpp>
@@ -49,11 +49,11 @@ void qa_set_msg_handler::t0()
if (VERBOSE) std::cout << "qa_set_msg_handler::t0()\n";
- gr_top_block_sptr tb = gr_make_top_block("top");
+ top_block_sptr tb = make_top_block("top");
- gr_block_sptr src = gr::blocks::null_source::make(sizeof(int));
+ block_sptr src = gr::blocks::null_source::make(sizeof(int));
gr::blocks::nop::sptr nop = gr::blocks::nop::make(sizeof(int));
- gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+ block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
tb->connect(src, 0, nop, 0);
tb->connect(nop, 0, dst, 0);
diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc
index 0b194a0537..6941beae85 100644
--- a/gr-blocks/lib/random_pdu_impl.cc
+++ b/gr-blocks/lib/random_pdu_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "random_pdu_impl.h"
-#include <gr_io_signature.h>
-#include <blocks/pdu.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/pdu.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
random_pdu_impl::random_pdu_impl(int min_items, int max_items)
- : gr_block("random_pdu",
- gr_make_io_signature (0, 0, 0),
- gr_make_io_signature (0, 0, 0)),
+ : block("random_pdu",
+ io_signature::make (0, 0, 0),
+ io_signature::make (0, 0, 0)),
d_urange(min_items, max_items),
d_brange(0, 255),
d_rvar(d_rng, d_urange),
diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h
index 3197f740a0..77e7bdd525 100644
--- a/gr-blocks/lib/random_pdu_impl.h
+++ b/gr-blocks/lib/random_pdu_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
#define INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H
-#include <blocks/random_pdu.h>
+#include <gnuradio/blocks/random_pdu.h>
#include <boost/random.hpp>
#include <boost/generator_iterator.hpp>
diff --git a/gr-blocks/lib/regenerate_bb_impl.cc b/gr-blocks/lib/regenerate_bb_impl.cc
index 4472efb6d4..8b65940749 100644
--- a/gr-blocks/lib/regenerate_bb_impl.cc
+++ b/gr-blocks/lib/regenerate_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "regenerate_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
regenerate_bb_impl::regenerate_bb_impl(int period, unsigned int max_regen)
- : gr_sync_block("regenerate_bb",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("regenerate_bb",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(char))),
d_period(period),
d_countdown(0),
d_max_regen(max_regen),
diff --git a/gr-blocks/lib/regenerate_bb_impl.h b/gr-blocks/lib/regenerate_bb_impl.h
index bcfa18391f..22b963c491 100644
--- a/gr-blocks/lib/regenerate_bb_impl.h
+++ b/gr-blocks/lib/regenerate_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_REGENERATE_BB_H
#define INCLUDED_GR_REGENERATE_BB_IMPL_H
-#include <blocks/regenerate_bb.h>
+#include <gnuradio/blocks/regenerate_bb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/repack_bits_bb_impl.cc b/gr-blocks/lib/repack_bits_bb_impl.cc
index c7ed054c8a..af83187e92 100644
--- a/gr-blocks/lib/repack_bits_bb_impl.cc
+++ b/gr-blocks/lib/repack_bits_bb_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "repack_bits_bb_impl.h"
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
repack_bits_bb_impl::repack_bits_bb_impl(int k, int l, const std::string &len_tag_key, bool align_output)
- : gr_tagged_stream_block("repack_bits_bb",
- gr_make_io_signature(1, 1, sizeof (char)),
- gr_make_io_signature(1, 1, sizeof (char)),
+ : tagged_stream_block("repack_bits_bb",
+ io_signature::make(1, 1, sizeof (char)),
+ io_signature::make(1, 1, sizeof (char)),
len_tag_key),
d_k(k), d_l(l),
d_packet_mode(!len_tag_key.empty()),
diff --git a/gr-blocks/lib/repack_bits_bb_impl.h b/gr-blocks/lib/repack_bits_bb_impl.h
index bf39f8cb0f..ffb8349d35 100644
--- a/gr-blocks/lib/repack_bits_bb_impl.h
+++ b/gr-blocks/lib/repack_bits_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_IMPL_H
#define INCLUDED_BLOCKS_REPACK_BITS_BB_IMPL_H
-#include <blocks/repack_bits_bb.h>
+#include <gnuradio/blocks/repack_bits_bb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc
index 939a33b878..f77903544f 100644
--- a/gr-blocks/lib/repeat_impl.cc
+++ b/gr-blocks/lib/repeat_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "repeat_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
repeat_impl::repeat_impl(size_t itemsize, int interp)
- : gr_sync_interpolator("repeat",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (1, 1, itemsize),
+ : sync_interpolator("repeat",
+ io_signature::make (1, 1, itemsize),
+ io_signature::make (1, 1, itemsize),
interp),
d_itemsize(itemsize),
d_interp(interp)
diff --git a/gr-blocks/lib/repeat_impl.h b/gr-blocks/lib/repeat_impl.h
index 6451d0d988..1942729194 100644
--- a/gr-blocks/lib/repeat_impl.h
+++ b/gr-blocks/lib/repeat_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_REPEAT_IMPL_H
#define INCLUDED_REPEAT_IMPL_H
-#include <blocks/repeat.h>
+#include <gnuradio/blocks/repeat.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/rms_cf_impl.cc b/gr-blocks/lib/rms_cf_impl.cc
index 9b2c031e10..9ef243beba 100644
--- a/gr-blocks/lib/rms_cf_impl.cc
+++ b/gr-blocks/lib/rms_cf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "rms_cf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
rms_cf_impl::rms_cf_impl(double alpha)
- : gr_sync_block("rms_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float)))
+ : sync_block("rms_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float)))
{
set_alpha(alpha);
}
diff --git a/gr-blocks/lib/rms_cf_impl.h b/gr-blocks/lib/rms_cf_impl.h
index 316ab2f304..66ee12463e 100644
--- a/gr-blocks/lib/rms_cf_impl.h
+++ b/gr-blocks/lib/rms_cf_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_RMS_CF_IMPL_H
#define INCLUDED_BLOCKS_RMS_CF_IMPL_H
-#include <blocks/rms_cf.h>
+#include <gnuradio/blocks/rms_cf.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/rms_ff_impl.cc b/gr-blocks/lib/rms_ff_impl.cc
index 8e004ad61e..c84193c9f3 100644
--- a/gr-blocks/lib/rms_ff_impl.cc
+++ b/gr-blocks/lib/rms_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "rms_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cmath>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
rms_ff_impl::rms_ff_impl(double alpha)
- : gr_sync_block("rms_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float)))
+ : sync_block("rms_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float)))
{
set_alpha(alpha);
}
diff --git a/gr-blocks/lib/rms_ff_impl.h b/gr-blocks/lib/rms_ff_impl.h
index 34d7d986c0..49ef1e07b3 100644
--- a/gr-blocks/lib/rms_ff_impl.h
+++ b/gr-blocks/lib/rms_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_RMS_FF_IMPL_H
#define INCLUDED_BLOCKS_RMS_FF_IMPL_H
-#include <blocks/rms_ff.h>
+#include <gnuradio/blocks/rms_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/sample_and_hold_XX_impl.cc.t b/gr-blocks/lib/sample_and_hold_XX_impl.cc.t
index 617b2d6ee5..27597b67dd 100644
--- a/gr-blocks/lib/sample_and_hold_XX_impl.cc.t
+++ b/gr-blocks/lib/sample_and_hold_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -40,9 +40,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@()
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature2(2, 2, sizeof(@I_TYPE@), sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make2(2, 2, sizeof(@I_TYPE@), sizeof(char)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_data(0)
{
}
diff --git a/gr-blocks/lib/sample_and_hold_XX_impl.h.t b/gr-blocks/lib/sample_and_hold_XX_impl.h.t
index 048bf0d0e7..ed7d6f4d40 100644
--- a/gr-blocks/lib/sample_and_hold_XX_impl.h.t
+++ b/gr-blocks/lib/sample_and_hold_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/short_to_char_impl.cc b/gr-blocks/lib/short_to_char_impl.cc
index 54875a2b3e..f4a5c80c32 100644
--- a/gr-blocks/lib/short_to_char_impl.cc
+++ b/gr-blocks/lib/short_to_char_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "short_to_char_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
short_to_char_impl::short_to_char_impl(size_t vlen)
- : gr_sync_block("short_to_char",
- gr_make_io_signature (1, 1, sizeof(short)*vlen),
- gr_make_io_signature (1, 1, sizeof(char)*vlen)),
+ : sync_block("short_to_char",
+ io_signature::make (1, 1, sizeof(short)*vlen),
+ io_signature::make (1, 1, sizeof(char)*vlen)),
d_vlen(vlen)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/short_to_char_impl.h b/gr-blocks/lib/short_to_char_impl.h
index 37474094d6..491d9bb250 100644
--- a/gr-blocks/lib/short_to_char_impl.h
+++ b/gr-blocks/lib/short_to_char_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_SHORT_TO_CHAR_IMPL_H
#define INCLUDED_SHORT_TO_CHAR_IMPL_H
-#include <blocks/short_to_char.h>
+#include <gnuradio/blocks/short_to_char.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/short_to_float_impl.cc b/gr-blocks/lib/short_to_float_impl.cc
index 6186018168..147b0c07f4 100644
--- a/gr-blocks/lib/short_to_float_impl.cc
+++ b/gr-blocks/lib/short_to_float_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "short_to_float_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
short_to_float_impl::short_to_float_impl(size_t vlen, float scale)
- : gr_sync_block("short_to_float",
- gr_make_io_signature (1, 1, sizeof(short)*vlen),
- gr_make_io_signature (1, 1, sizeof(float)*vlen)),
+ : sync_block("short_to_float",
+ io_signature::make (1, 1, sizeof(short)*vlen),
+ io_signature::make (1, 1, sizeof(float)*vlen)),
d_vlen(vlen), d_scale(scale)
{
const int alignment_multiple =
diff --git a/gr-blocks/lib/short_to_float_impl.h b/gr-blocks/lib/short_to_float_impl.h
index c36b42a8c1..1b34a4f420 100644
--- a/gr-blocks/lib/short_to_float_impl.h
+++ b/gr-blocks/lib/short_to_float_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_SHORT_TO_FLOAT_IMPL_H
#define INCLUDED_SHORT_TO_FLOAT_IMPL_H
-#include <blocks/short_to_float.h>
+#include <gnuradio/blocks/short_to_float.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/skiphead_impl.cc b/gr-blocks/lib/skiphead_impl.cc
index feb39eb8f4..da9cb11280 100644
--- a/gr-blocks/lib/skiphead_impl.cc
+++ b/gr-blocks/lib/skiphead_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "skiphead_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
skiphead_impl::skiphead_impl(size_t itemsize, uint64_t nitems_to_skip)
- : gr_block("skiphead",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(1, 1, itemsize)),
+ : block("skiphead",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(1, 1, itemsize)),
d_nitems_to_skip(nitems_to_skip), d_nitems(0)
{
}
diff --git a/gr-blocks/lib/skiphead_impl.h b/gr-blocks/lib/skiphead_impl.h
index d8e0870cb1..db4df50adb 100644
--- a/gr-blocks/lib/skiphead_impl.h
+++ b/gr-blocks/lib/skiphead_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SKIPHEAD_IMPL_H
#define INCLUDED_GR_SKIPHEAD_IMPL_H
-#include <blocks/skiphead.h>
+#include <gnuradio/blocks/skiphead.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index e4ef40f87a..9daf8c30c9 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -26,8 +26,8 @@
#include "socket_pdu_impl.h"
#include "tcp_connection.h"
-#include <gr_io_signature.h>
-#include <blocks/pdu.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/pdu.h>
namespace gr {
namespace blocks {
@@ -39,9 +39,9 @@ namespace gr {
}
socket_pdu_impl::socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU)
- : gr_block("socket_pdu",
- gr_make_io_signature (0, 0, 0),
- gr_make_io_signature (0, 0, 0))
+ : block("socket_pdu",
+ io_signature::make (0, 0, 0),
+ io_signature::make (0, 0, 0))
{
message_port_register_in(PDU_PORT_ID);
message_port_register_out(PDU_PORT_ID);
diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h
index 78602754c7..3099d90e00 100644
--- a/gr-blocks/lib/socket_pdu_impl.h
+++ b/gr-blocks/lib/socket_pdu_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
#define INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
-#include <blocks/socket_pdu.h>
+#include <gnuradio/blocks/socket_pdu.h>
#include "stream_pdu_base.h"
#include "tcp_connection.h"
diff --git a/gr-blocks/lib/stream_mux_impl.cc b/gr-blocks/lib/stream_mux_impl.cc
index 214734c4bc..1e42c2504f 100644
--- a/gr-blocks/lib/stream_mux_impl.cc
+++ b/gr-blocks/lib/stream_mux_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "stream_mux_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <cstdio>
@@ -40,9 +40,9 @@ namespace gr {
}
stream_mux_impl::stream_mux_impl(size_t itemsize, const std::vector<int> &lengths)
- : gr_block("stream_mux",
- gr_make_io_signature (1, -1, itemsize),
- gr_make_io_signature (1, 1, itemsize)),
+ : block("stream_mux",
+ io_signature::make (1, -1, itemsize),
+ io_signature::make (1, 1, itemsize)),
d_itemsize(itemsize),
d_stream(0),
d_residual(0),
diff --git a/gr-blocks/lib/stream_mux_impl.h b/gr-blocks/lib/stream_mux_impl.h
index 7b2dac95c2..328eb0710e 100644
--- a/gr-blocks/lib/stream_mux_impl.h
+++ b/gr-blocks/lib/stream_mux_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_STREAM_MUX_IMPL_H
#define INCLUDED_STREAM_MUX_IMPL_H
-#include <blocks/stream_mux.h>
+#include <gnuradio/blocks/stream_mux.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/stream_pdu_base.cc b/gr-blocks/lib/stream_pdu_base.cc
index c887ad2fac..a07fa86950 100644
--- a/gr-blocks/lib/stream_pdu_base.cc
+++ b/gr-blocks/lib/stream_pdu_base.cc
@@ -32,8 +32,8 @@
#include <winsock2.h>
#endif
-#include <blocks/pdu.h>
-#include <gr_basic_block.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/basic_block.h>
#include "stream_pdu_base.h"
#include <boost/format.hpp>
@@ -57,7 +57,7 @@ namespace gr {
}
void
- stream_pdu_base::start_rxthread(gr_basic_block *blk, pmt::pmt_t port)
+ stream_pdu_base::start_rxthread(basic_block *blk, pmt::pmt_t port)
{
d_blk = blk;
d_port = port;
diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h
index c305880b07..cd976eed42 100644
--- a/gr-blocks/lib/stream_pdu_base.h
+++ b/gr-blocks/lib/stream_pdu_base.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_STREAM_PDU_BASE_H
#define INCLUDED_STREAM_PDU_BASE_H
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <pmt/pmt.h>
-class gr_basic_block;
+class basic_block;
namespace gr {
namespace blocks {
@@ -45,12 +45,12 @@ namespace gr {
gr::thread::thread d_thread;
pmt::pmt_t d_port;
- gr_basic_block *d_blk;
+ basic_block *d_blk;
void run();
void send(pmt::pmt_t msg);
bool wait_ready();
- void start_rxthread(gr_basic_block *blk, pmt::pmt_t rxport);
+ void start_rxthread(basic_block *blk, pmt::pmt_t rxport);
void stop_rxthread();
};
diff --git a/gr-blocks/lib/stream_to_streams_impl.cc b/gr-blocks/lib/stream_to_streams_impl.cc
index 9e9052e7d5..76974ce0ad 100644
--- a/gr-blocks/lib/stream_to_streams_impl.cc
+++ b/gr-blocks/lib/stream_to_streams_impl.cc
@@ -25,29 +25,31 @@
#endif
#include "stream_to_streams_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
namespace blocks {
- stream_to_streams::sptr stream_to_streams::make(size_t itemsize, size_t nstreams)
+ stream_to_streams::sptr
+ stream_to_streams::make(size_t itemsize, size_t nstreams)
{
- return gnuradio::get_initial_sptr(new stream_to_streams_impl(itemsize, nstreams));
+ return gnuradio::get_initial_sptr
+ (new stream_to_streams_impl(itemsize, nstreams));
}
stream_to_streams_impl::stream_to_streams_impl(size_t itemsize, size_t nstreams)
- : gr_sync_decimator("stream_to_streams",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (nstreams, nstreams, itemsize),
- nstreams)
+ : sync_decimator("stream_to_streams",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(nstreams, nstreams, itemsize),
+ nstreams)
{
}
int
stream_to_streams_impl::work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
{
size_t item_size = output_signature()->sizeof_stream_item(0);
diff --git a/gr-blocks/lib/stream_to_streams_impl.h b/gr-blocks/lib/stream_to_streams_impl.h
index 9a96983ff2..bd3763572b 100644
--- a/gr-blocks/lib/stream_to_streams_impl.h
+++ b/gr-blocks/lib/stream_to_streams_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_STREAM_TO_STREAMS_IMPL_H
#define INCLUDED_STREAM_TO_STREAMS_IMPL_H
-#include <blocks/stream_to_streams.h>
+#include <gnuradio/blocks/stream_to_streams.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/stream_to_vector_impl.cc b/gr-blocks/lib/stream_to_vector_impl.cc
index 80ced5a74b..8576c7fbf5 100644
--- a/gr-blocks/lib/stream_to_vector_impl.cc
+++ b/gr-blocks/lib/stream_to_vector_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "stream_to_vector_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
stream_to_vector_impl::stream_to_vector_impl(size_t itemsize, size_t nitems_per_block)
- : gr_sync_decimator ("stream_to_vector",
- gr_make_io_signature (1, 1, itemsize),
- gr_make_io_signature (1, 1, itemsize * nitems_per_block),
+ : sync_decimator ("stream_to_vector",
+ io_signature::make (1, 1, itemsize),
+ io_signature::make (1, 1, itemsize * nitems_per_block),
nitems_per_block)
{
}
diff --git a/gr-blocks/lib/stream_to_vector_impl.h b/gr-blocks/lib/stream_to_vector_impl.h
index f8031f0058..3484d397ed 100644
--- a/gr-blocks/lib/stream_to_vector_impl.h
+++ b/gr-blocks/lib/stream_to_vector_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_STREAM_TO_VECTOR_IMPL_H
#define INCLUDED_STREAM_TO_VECTOR_IMPL_H
-#include <blocks/stream_to_vector.h>
+#include <gnuradio/blocks/stream_to_vector.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/streams_to_stream_impl.cc b/gr-blocks/lib/streams_to_stream_impl.cc
index 09c593e815..8d2f330443 100644
--- a/gr-blocks/lib/streams_to_stream_impl.cc
+++ b/gr-blocks/lib/streams_to_stream_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "streams_to_stream_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
streams_to_stream_impl::streams_to_stream_impl(size_t itemsize, size_t nstreams)
- : gr_sync_interpolator ("streams_to_stream",
- gr_make_io_signature (nstreams, nstreams, itemsize),
- gr_make_io_signature (1, 1, itemsize),
+ : sync_interpolator ("streams_to_stream",
+ io_signature::make (nstreams, nstreams, itemsize),
+ io_signature::make (1, 1, itemsize),
nstreams)
{
}
diff --git a/gr-blocks/lib/streams_to_stream_impl.h b/gr-blocks/lib/streams_to_stream_impl.h
index 6f686172c9..e3ffde504c 100644
--- a/gr-blocks/lib/streams_to_stream_impl.h
+++ b/gr-blocks/lib/streams_to_stream_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_STREAMS_TO_STREAM_IMPL_H
#define INCLUDED_STREAMS_TO_STREAM_IMPL_H
-#include <blocks/streams_to_stream.h>
+#include <gnuradio/blocks/streams_to_stream.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/streams_to_vector_impl.cc b/gr-blocks/lib/streams_to_vector_impl.cc
index c524a78e49..a65e11b57c 100644
--- a/gr-blocks/lib/streams_to_vector_impl.cc
+++ b/gr-blocks/lib/streams_to_vector_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "streams_to_vector_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
streams_to_vector_impl::streams_to_vector_impl(size_t itemsize, size_t nstreams)
- : gr_sync_block ("streams_to_vector",
- gr_make_io_signature (nstreams, nstreams, itemsize),
- gr_make_io_signature (1, 1, nstreams * itemsize))
+ : sync_block ("streams_to_vector",
+ io_signature::make (nstreams, nstreams, itemsize),
+ io_signature::make (1, 1, nstreams * itemsize))
{
}
diff --git a/gr-blocks/lib/streams_to_vector_impl.h b/gr-blocks/lib/streams_to_vector_impl.h
index 4a14e9d4f5..5590e416b2 100644
--- a/gr-blocks/lib/streams_to_vector_impl.h
+++ b/gr-blocks/lib/streams_to_vector_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_STREAMS_TO_VECTOR_IMPL_H
#define INCLUDED_STREAMS_TO_VECTOR_IMPL_H
-#include <blocks/streams_to_vector.h>
+#include <gnuradio/blocks/streams_to_vector.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/stretch_ff_impl.cc b/gr-blocks/lib/stretch_ff_impl.cc
index 90bbc7ee5a..4d43d13d68 100644
--- a/gr-blocks/lib/stretch_ff_impl.cc
+++ b/gr-blocks/lib/stretch_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "stretch_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
stretch_ff_impl::stretch_ff_impl(float lo, size_t vlen)
- : gr_sync_block("stretch_ff",
- gr_make_io_signature(1, 1, vlen * sizeof(float)),
- gr_make_io_signature(1, 1, vlen * sizeof(float))),
+ : sync_block("stretch_ff",
+ io_signature::make(1, 1, vlen * sizeof(float)),
+ io_signature::make(1, 1, vlen * sizeof(float))),
d_lo(lo), d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/stretch_ff_impl.h b/gr-blocks/lib/stretch_ff_impl.h
index af69d835a5..b44de80314 100644
--- a/gr-blocks/lib/stretch_ff_impl.h
+++ b/gr-blocks/lib/stretch_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_STRETCH_FF_IMPL_H
#define INCLUDED_GR_STRETCH_FF_IMPL_H
-#include <blocks/stretch_ff.h>
+#include <gnuradio/blocks/stretch_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/sub_XX_impl.cc.t b/gr-blocks/lib/sub_XX_impl.cc.t
index 35ae31452d..d0fa167495 100644
--- a/gr-blocks/lib/sub_XX_impl.cc.t
+++ b/gr-blocks/lib/sub_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/sub_XX_impl.h.t b/gr-blocks/lib/sub_XX_impl.h.t
index a1c486b859..2680ef7012 100644
--- a/gr-blocks/lib/sub_XX_impl.h.t
+++ b/gr-blocks/lib/sub_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc
index 3bcffb664f..56f701b9d7 100644
--- a/gr-blocks/lib/tag_debug_impl.cc
+++ b/gr-blocks/lib/tag_debug_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "tag_debug_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <iomanip>
@@ -42,9 +42,9 @@ namespace gr {
tag_debug_impl::tag_debug_impl(size_t sizeof_stream_item,
const std::string &name)
- : gr_sync_block("tag_debug",
- gr_make_io_signature(1, -1, sizeof_stream_item),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("tag_debug",
+ io_signature::make(1, -1, sizeof_stream_item),
+ io_signature::make(0, 0, 0)),
d_name(name), d_display(true)
{
}
@@ -53,7 +53,7 @@ namespace gr {
{
}
- std::vector<gr_tag_t>
+ std::vector<tag_t>
tag_debug_impl::current_tags()
{
gr::thread::scoped_lock l(d_mutex);
diff --git a/gr-blocks/lib/tag_debug_impl.h b/gr-blocks/lib/tag_debug_impl.h
index caf5b6b4f5..80d714edc2 100644
--- a/gr-blocks/lib/tag_debug_impl.h
+++ b/gr-blocks/lib/tag_debug_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_TAG_DEBUG_IMPL_H
#define INCLUDED_GR_TAG_DEBUG_IMPL_H
-#include <blocks/tag_debug.h>
-#include <thread/thread.h>
+#include <gnuradio/blocks/tag_debug.h>
+#include <gnuradio/thread/thread.h>
#include <stddef.h>
namespace gr {
@@ -34,8 +34,8 @@ namespace gr {
{
private:
std::string d_name;
- std::vector<gr_tag_t> d_tags;
- std::vector<gr_tag_t>::iterator d_tags_itr;
+ std::vector<tag_t> d_tags;
+ std::vector<tag_t>::iterator d_tags_itr;
bool d_display;
gr::thread::mutex d_mutex;
@@ -43,7 +43,7 @@ namespace gr {
tag_debug_impl(size_t sizeof_stream_item, const std::string &name);
~tag_debug_impl();
- std::vector<gr_tag_t> current_tags();
+ std::vector<tag_t> current_tags();
void set_display(bool d);
diff --git a/gr-blocks/lib/tagged_file_sink_impl.cc b/gr-blocks/lib/tagged_file_sink_impl.cc
index 7d011e45f0..830791181b 100644
--- a/gr-blocks/lib/tagged_file_sink_impl.cc
+++ b/gr-blocks/lib/tagged_file_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "tagged_file_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -61,9 +61,9 @@ namespace gr {
}
tagged_file_sink_impl::tagged_file_sink_impl(size_t itemsize, double samp_rate)
- : gr_sync_block("tagged_file_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("tagged_file_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize (itemsize), d_n(0), d_sample_rate(samp_rate)
{
d_state = NOT_IN_BURST;
@@ -87,18 +87,18 @@ namespace gr {
pmt::pmt_t bkey = pmt::string_to_symbol("burst");
pmt::pmt_t tkey = pmt::string_to_symbol("rx_time"); // use gr_tags::key_time
- std::vector<gr_tag_t> all_tags;
+ std::vector<tag_t> all_tags;
get_tags_in_range(all_tags, 0, start_N, end_N);
- std::sort(all_tags.begin(), all_tags.end(), gr_tag_t::offset_compare);
+ std::sort(all_tags.begin(), all_tags.end(), tag_t::offset_compare);
- std::vector<gr_tag_t>::iterator vitr = all_tags.begin();
+ std::vector<tag_t>::iterator vitr = all_tags.begin();
// Look for a time tag and initialize d_timeval.
- std::vector<gr_tag_t> time_tags_outer;
+ std::vector<tag_t> time_tags_outer;
get_tags_in_range(time_tags_outer, 0, start_N, end_N, tkey);
if(time_tags_outer.size() > 0) {
- const gr_tag_t tag = time_tags_outer[0];
+ const tag_t tag = time_tags_outer[0];
uint64_t offset = tag.offset;
pmt::pmt_t time = tag.value;
uint64_t tsecs = pmt::to_uint64(pmt::tuple_ref(time, 0));
@@ -123,11 +123,11 @@ namespace gr {
// Find time burst occurred by getting latest time tag and extrapolating
// to new time based on sample rate of this block.
- std::vector<gr_tag_t> time_tags;
+ std::vector<tag_t> time_tags;
//get_tags_in_range(time_tags, 0, d_last_N, N, gr_tags::key_time);
get_tags_in_range(time_tags, 0, d_last_N, N, tkey);
if(time_tags.size() > 0) {
- const gr_tag_t tag = time_tags[time_tags.size()-1];
+ const tag_t tag = time_tags[time_tags.size()-1];
uint64_t time_nitems = tag.offset;
diff --git a/gr-blocks/lib/tagged_file_sink_impl.h b/gr-blocks/lib/tagged_file_sink_impl.h
index f64cedf2f9..7b1d43e641 100644
--- a/gr-blocks/lib/tagged_file_sink_impl.h
+++ b/gr-blocks/lib/tagged_file_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_TAGGED_FILE_SINK_IMPL_H
#define INCLUDED_GR_TAGGED_FILE_SINK_IMPL_H
-#include <blocks/tagged_file_sink.h>
+#include <gnuradio/blocks/tagged_file_sink.h>
#include <cstdio> // for FILE
namespace gr {
diff --git a/gr-blocks/lib/tagged_stream_mux_impl.cc b/gr-blocks/lib/tagged_stream_mux_impl.cc
index 59e36fa07e..78b573016e 100644
--- a/gr-blocks/lib/tagged_stream_mux_impl.cc
+++ b/gr-blocks/lib/tagged_stream_mux_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "tagged_stream_mux_impl.h"
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
tagged_stream_mux_impl::tagged_stream_mux_impl(size_t itemsize, const std::string &lengthtagname)
- : gr_tagged_stream_block("tagged_stream_mux",
- gr_make_io_signature(1, -1, itemsize),
- gr_make_io_signature(1, 1, itemsize),
+ : tagged_stream_block("tagged_stream_mux",
+ io_signature::make(1, -1, itemsize),
+ io_signature::make(1, 1, itemsize),
lengthtagname),
d_itemsize(itemsize)
{
@@ -74,7 +74,7 @@ namespace gr {
for (unsigned int i = 0; i < input_items.size(); i++) {
const unsigned char *in = (const unsigned char *) input_items[i];
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(tags, i, nitems_read(i), nitems_read(i)+ninput_items[i]);
for (unsigned int j = 0; j < tags.size(); j++) {
const uint64_t offset = tags[j].offset - nitems_read(i) + nitems_written(0) + n_produced;
diff --git a/gr-blocks/lib/tagged_stream_mux_impl.h b/gr-blocks/lib/tagged_stream_mux_impl.h
index 19862e6868..dd7eaf6352 100644
--- a/gr-blocks/lib/tagged_stream_mux_impl.h
+++ b/gr-blocks/lib/tagged_stream_mux_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_TAGGED_STREAM_MUX_IMPL_H
#include <vector>
-#include <blocks/tagged_stream_mux.h>
+#include <gnuradio/blocks/tagged_stream_mux.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
index 4abc5818b0..b452470efa 100644
--- a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
+++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "tagged_stream_to_pdu_impl.h"
-#include <blocks/pdu.h>
-#include <gr_io_signature.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
tagged_stream_to_pdu_impl::tagged_stream_to_pdu_impl(pdu::vector_type type)
- : gr_sync_block("tagged_stream_to_pdu",
- gr_make_io_signature(1, 1, pdu::itemsize(type)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("tagged_stream_to_pdu",
+ io_signature::make(1, 1, pdu::itemsize(type)),
+ io_signature::make(0, 0, 0)),
d_itemsize(pdu::itemsize(type)),
d_inpdu(false),
d_type(type),
diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.h b/gr-blocks/lib/tagged_stream_to_pdu_impl.h
index 84d7f6c3cb..4e9568a1c5 100644
--- a/gr-blocks/lib/tagged_stream_to_pdu_impl.h
+++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_TAGGED_STREAM_TO_PDU_IMPL_H
#define INCLUDED_TAGGED_STREAM_TO_PDU_IMPL_H
-#include <blocks/tagged_stream_to_pdu.h>
+#include <gnuradio/blocks/tagged_stream_to_pdu.h>
namespace gr {
namespace blocks {
@@ -39,8 +39,8 @@ namespace gr {
pmt::pmt_t d_pdu_meta;
pmt::pmt_t d_pdu_vector;
- std::vector<gr_tag_t>::iterator d_tags_itr;
- std::vector<gr_tag_t> d_tags;
+ std::vector<tag_t>::iterator d_tags_itr;
+ std::vector<tag_t> d_tags;
public:
tagged_stream_to_pdu_impl(pdu::vector_type type);
diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc
index 33bb6f10f1..ce719d1843 100644
--- a/gr-blocks/lib/tcp_connection.cc
+++ b/gr-blocks/lib/tcp_connection.cc
@@ -25,8 +25,8 @@
#endif
#include "tcp_connection.h"
-#include <gr_basic_block.h>
-#include <blocks/pdu.h>
+#include <gnuradio/basic_block.h>
+#include <gnuradio/blocks/pdu.h>
namespace gr {
namespace blocks {
@@ -55,7 +55,7 @@ namespace gr {
}
void
- tcp_connection::start(gr_basic_block *block)
+ tcp_connection::start(gr::basic_block *block)
{
d_block = block;
d_socket.async_read_some(boost::asio::buffer(d_buf),
diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h
index 32a5ef8c79..f4d32fa90a 100644
--- a/gr-blocks/lib/tcp_connection.h
+++ b/gr-blocks/lib/tcp_connection.h
@@ -27,9 +27,10 @@
#include <boost/asio.hpp>
#include <pmt/pmt.h>
-class gr_basic_block;
-
namespace gr {
+
+ class basic_block;
+
namespace blocks {
class tcp_connection
@@ -38,7 +39,7 @@ namespace gr {
boost::asio::ip::tcp::socket d_socket;
boost::array<char, 10000> d_buf;
std::string d_message;
- gr_basic_block *d_block;
+ basic_block *d_block;
tcp_connection(boost::asio::io_service& io_service);
@@ -49,7 +50,7 @@ namespace gr {
boost::asio::ip::tcp::socket& socket() { return d_socket; };
- void start(gr_basic_block *block);
+ void start(gr::basic_block *block);
void send(pmt::pmt_t vector);
void handle_read(const boost::system::error_code& error, size_t bytes_transferred);
void handle_write(const boost::system::error_code& error, size_t bytes_transferred) { }
diff --git a/gr-blocks/lib/test_gr_blocks.cc b/gr-blocks/lib/test_gr_blocks.cc
index 14f047fb7b..2d8f0d6d2a 100644
--- a/gr-blocks/lib/test_gr_blocks.cc
+++ b/gr-blocks/lib/test_gr_blocks.cc
@@ -27,7 +27,7 @@
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include <qa_blocks.h>
#include <iostream>
@@ -35,10 +35,10 @@ int
main(int argc, char **argv)
{
CppUnit::TextTestRunner runner;
- std::ofstream xmlfile(get_unittest_path("gr_blocks.xml").c_str());
+ std::ofstream xmlfile(get_unittest_path("blocks.xml").c_str());
CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
- runner.addTest(qa_gr_blocks::suite());
+ runner.addTest(qa_blocks::suite());
runner.setOutputter(xmlout);
bool was_successful = runner.run("", false);
diff --git a/gr-blocks/lib/threshold_ff_impl.cc b/gr-blocks/lib/threshold_ff_impl.cc
index 477f2b1c89..86432de113 100644
--- a/gr-blocks/lib/threshold_ff_impl.cc
+++ b/gr-blocks/lib/threshold_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "threshold_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -39,9 +39,9 @@ namespace gr {
threshold_ff_impl::threshold_ff_impl(float lo, float hi,
float initial_state)
- : gr_sync_block("threshold_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("threshold_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_lo(lo), d_hi(hi), d_last_state(initial_state)
{
}
diff --git a/gr-blocks/lib/threshold_ff_impl.h b/gr-blocks/lib/threshold_ff_impl.h
index 41afaa52aa..13d71c433f 100644
--- a/gr-blocks/lib/threshold_ff_impl.h
+++ b/gr-blocks/lib/threshold_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_THRESHOLD_FF_IMPL_H
#define INCLUDED_GR_THRESHOLD_FF_IMPL_H
-#include <blocks/threshold_ff.h>
+#include <gnuradio/blocks/threshold_ff.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/throttle_impl.cc b/gr-blocks/lib/throttle_impl.cc
index b1cfe4b3c8..42f3665c86 100644
--- a/gr-blocks/lib/throttle_impl.cc
+++ b/gr-blocks/lib/throttle_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "throttle_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstring>
#include <boost/thread/thread.hpp>
@@ -41,9 +41,9 @@ namespace gr {
throttle_impl::throttle_impl(size_t itemsize,
double samples_per_second)
- : gr_sync_block("throttle",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("throttle",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize)
{
set_sample_rate(samples_per_second);
diff --git a/gr-blocks/lib/throttle_impl.h b/gr-blocks/lib/throttle_impl.h
index 2f2cdf108b..797cb7d942 100644
--- a/gr-blocks/lib/throttle_impl.h
+++ b/gr-blocks/lib/throttle_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_THROTTLE_IMPL_H
#define INCLUDED_GR_THROTTLE_IMPL_H
-#include <blocks/throttle.h>
+#include <gnuradio/blocks/throttle.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/transcendental_impl.cc b/gr-blocks/lib/transcendental_impl.cc
index 725899ca85..d9a635fdc2 100644
--- a/gr-blocks/lib/transcendental_impl.cc
+++ b/gr-blocks/lib/transcendental_impl.cc
@@ -21,7 +21,7 @@
*/
#include "transcendental_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <complex> //complex math
#include <cmath> //real math
@@ -126,9 +126,9 @@ namespace gr {
transcendental_impl::transcendental_impl(const work_fcn_type &work_fcn,
const size_t io_size)
- : gr_sync_block("transcendental",
- gr_make_io_signature(1, 1, io_size),
- gr_make_io_signature(1, 1, io_size)),
+ : sync_block("transcendental",
+ io_signature::make(1, 1, io_size),
+ io_signature::make(1, 1, io_size)),
_work_fcn(work_fcn)
{
// NOP
diff --git a/gr-blocks/lib/transcendental_impl.h b/gr-blocks/lib/transcendental_impl.h
index 47055551e4..bb82b23b66 100644
--- a/gr-blocks/lib/transcendental_impl.h
+++ b/gr-blocks/lib/transcendental_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_TRANSCENDENTAL_IMPL_H
#define INCLUDED_GR_TRANSCENDENTAL_IMPL_H
-#include <blocks/transcendental.h>
+#include <gnuradio/blocks/transcendental.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc
index 8de817738f..0e2b63fab7 100644
--- a/gr-blocks/lib/tuntap_pdu_impl.cc
+++ b/gr-blocks/lib/tuntap_pdu_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "tuntap_pdu_impl.h"
-#include <gr_io_signature.h>
-#include <blocks/pdu.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/pdu.h>
#include <boost/format.hpp>
#include <sys/types.h>
@@ -54,9 +54,9 @@ namespace gr {
#if (defined(linux) || defined(__linux) || defined(__linux__))
tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU)
- : gr_block("tuntap_pdu",
- gr_make_io_signature (0, 0, 0),
- gr_make_io_signature (0, 0, 0)),
+ : block("tuntap_pdu",
+ io_signature::make (0, 0, 0),
+ io_signature::make (0, 0, 0)),
stream_pdu_base(MTU),
d_dev(dev)
{
diff --git a/gr-blocks/lib/tuntap_pdu_impl.h b/gr-blocks/lib/tuntap_pdu_impl.h
index 396d9d51c8..41e4587ac4 100644
--- a/gr-blocks/lib/tuntap_pdu_impl.h
+++ b/gr-blocks/lib/tuntap_pdu_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H
#define INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H
-#include <blocks/tuntap_pdu.h>
+#include <gnuradio/blocks/tuntap_pdu.h>
#include "stream_pdu_base.h"
#if (defined(linux) || defined(__linux) || defined(__linux__))
diff --git a/gr-blocks/lib/uchar_array_to_float.h b/gr-blocks/lib/uchar_array_to_float.h
index e6772c2a8d..9b499760aa 100644
--- a/gr-blocks/lib/uchar_array_to_float.h
+++ b/gr-blocks/lib/uchar_array_to_float.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_UCHAR_ARRAY_TO_FLOAT_H
#define INCLUDED_UCHAR_ARRAY_TO_FLOAT_H
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
/*
* convert array of unsigned chars to floats
diff --git a/gr-blocks/lib/uchar_to_float_impl.cc b/gr-blocks/lib/uchar_to_float_impl.cc
index 608c05ad47..20887881d9 100644
--- a/gr-blocks/lib/uchar_to_float_impl.cc
+++ b/gr-blocks/lib/uchar_to_float_impl.cc
@@ -26,7 +26,7 @@
#include "uchar_to_float_impl.h"
#include "uchar_array_to_float.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -37,9 +37,9 @@ namespace gr {
}
uchar_to_float_impl::uchar_to_float_impl()
- : gr_sync_block("uchar_to_float",
- gr_make_io_signature (1, 1, sizeof(unsigned char)),
- gr_make_io_signature (1, 1, sizeof(float)))
+ : sync_block("uchar_to_float",
+ io_signature::make (1, 1, sizeof(unsigned char)),
+ io_signature::make (1, 1, sizeof(float)))
{
}
diff --git a/gr-blocks/lib/uchar_to_float_impl.h b/gr-blocks/lib/uchar_to_float_impl.h
index 250dc2c86e..1e3f4d59c5 100644
--- a/gr-blocks/lib/uchar_to_float_impl.h
+++ b/gr-blocks/lib/uchar_to_float_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_UCHAR_TO_FLOAT_IMPL_H
#define INCLUDED_UCHAR_TO_FLOAT_IMPL_H
-#include <blocks/uchar_to_float.h>
+#include <gnuradio/blocks/uchar_to_float.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc
index 7c1b0ed9e3..a23d3274cb 100644
--- a/gr-blocks/lib/udp_sink_impl.cc
+++ b/gr-blocks/lib/udp_sink_impl.cc
@@ -25,11 +25,11 @@
#endif
#include "udp_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <boost/array.hpp>
#include <boost/asio.hpp>
#include <boost/format.hpp>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <stdexcept>
#include <stdio.h>
#include <string.h>
@@ -50,9 +50,9 @@ namespace gr {
udp_sink_impl::udp_sink_impl(size_t itemsize,
const std::string &host, int port,
int payload_size, bool eof)
- : gr_sync_block("udp_sink",
- gr_make_io_signature(1, 1, itemsize),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("udp_sink",
+ io_signature::make(1, 1, itemsize),
+ io_signature::make(0, 0, 0)),
d_itemsize(itemsize), d_payload_size(payload_size), d_eof(eof),
d_connected(false)
{
diff --git a/gr-blocks/lib/udp_sink_impl.h b/gr-blocks/lib/udp_sink_impl.h
index 0f0d081422..c593e6e809 100644
--- a/gr-blocks/lib/udp_sink_impl.h
+++ b/gr-blocks/lib/udp_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_UDP_SINK_IMPL_H
#define INCLUDED_GR_UDP_SINK_IMPL_H
-#include <blocks/udp_sink.h>
+#include <gnuradio/blocks/udp_sink.h>
#include <boost/asio.hpp>
namespace gr {
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc
index 5b108c393e..e62c2b0df1 100644
--- a/gr-blocks/lib/udp_source_impl.cc
+++ b/gr-blocks/lib/udp_source_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "udp_source_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
#include <stdexcept>
#include <errno.h>
#include <stdio.h>
@@ -48,9 +48,9 @@ namespace gr {
udp_source_impl::udp_source_impl(size_t itemsize,
const std::string &host, int port,
int payload_size, bool eof)
- : gr_sync_block("udp_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, itemsize)),
+ : sync_block("udp_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, itemsize)),
d_itemsize(itemsize), d_payload_size(payload_size),
d_eof(eof), d_connected(false), d_residual(0), d_sent(0), d_offset(0)
{
diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h
index d6c773726b..949364cf29 100644
--- a/gr-blocks/lib/udp_source_impl.h
+++ b/gr-blocks/lib/udp_source_impl.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_GR_UDP_SOURCE_IMPL_H
#define INCLUDED_GR_UDP_SOURCE_IMPL_H
-#include <blocks/udp_source.h>
+#include <gnuradio/blocks/udp_source.h>
#include <boost/asio.hpp>
#include <boost/format.hpp>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
index 367100be84..70055f9381 100644
--- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "unpack_k_bits_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <iostream>
@@ -40,9 +40,9 @@ namespace gr {
}
unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k)
- : gr_sync_interpolator("unpack_k_bits_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
+ : sync_interpolator("unpack_k_bits_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char)),
k),
d_k(k)
{
diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.h b/gr-blocks/lib/unpack_k_bits_bb_impl.h
index c72d16ebf8..7355d235c5 100644
--- a/gr-blocks/lib/unpack_k_bits_bb_impl.h
+++ b/gr-blocks/lib/unpack_k_bits_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H
#define INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H
-#include <blocks/unpack_k_bits_bb.h>
+#include <gnuradio/blocks/unpack_k_bits_bb.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t b/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t
index 3a7428fd8f..8e06570740 100644
--- a/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t
+++ b/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME_IMPL@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
namespace gr {
@@ -37,17 +37,17 @@ namespace gr {
@NAME@::sptr
@NAME@::make(unsigned int bits_per_chunk,
- gr_endianness_t endianness)
+ endianness_t endianness)
{
return gnuradio::get_initial_sptr
(new @NAME_IMPL@(bits_per_chunk, endianness));
}
@NAME_IMPL@::@NAME_IMPL@(unsigned int bits_per_chunk,
- gr_endianness_t endianness)
- : gr_block("@NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ endianness_t endianness)
+ : block("@NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_bits_per_chunk(bits_per_chunk), d_endianness(endianness), d_index(0)
{
assert(bits_per_chunk <= BITS_PER_TYPE);
diff --git a/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t b/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t
index c8f414c559..2076c65e9b 100644
--- a/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t
+++ b/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
@@ -34,12 +34,12 @@ namespace gr {
{
private:
unsigned int d_bits_per_chunk;
- gr_endianness_t d_endianness;
+ endianness_t d_endianness;
unsigned int d_index;
public:
@NAME_IMPL@(unsigned int bits_per_chunk,
- gr_endianness_t endianness);
+ endianness_t endianness);
~@NAME_IMPL@();
void forecast(int noutput_items,
diff --git a/gr-blocks/lib/vco_f_impl.cc b/gr-blocks/lib/vco_f_impl.cc
index 21e7d0a0f2..42be98ad4e 100644
--- a/gr-blocks/lib/vco_f_impl.cc
+++ b/gr-blocks/lib/vco_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "vco_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
vco_f_impl::vco_f_impl(double sampling_rate, double sensitivity, double amplitude)
- : gr_sync_block("vco_f",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("vco_f",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_sampling_rate(sampling_rate), d_sensitivity(sensitivity),
d_amplitude(amplitude), d_k(d_sensitivity/d_sampling_rate)
{
diff --git a/gr-blocks/lib/vco_f_impl.h b/gr-blocks/lib/vco_f_impl.h
index 37435b7736..6e7a6dd7b6 100644
--- a/gr-blocks/lib/vco_f_impl.h
+++ b/gr-blocks/lib/vco_f_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_VCO_F_IMPL_H
#define INCLUDED_GR_VCO_F_IMPL_H
-#include <blocks/vco_f.h>
-#include <gr_fxpt_vco.h>
+#include <gnuradio/blocks/vco_f.h>
+#include <gnuradio/fxpt_vco.h>
namespace gr {
namespace blocks {
@@ -36,7 +36,7 @@ namespace gr {
double d_sensitivity;
double d_amplitude;
double d_k;
- gr_fxpt_vco d_vco;
+ gr::fxpt_vco d_vco;
public:
vco_f_impl(double sampling_rate, double sensitivity, double amplitude);
diff --git a/gr-blocks/lib/vector_insert_X_impl.cc.t b/gr-blocks/lib/vector_insert_X_impl.cc.t
index adf31fe05a..a4645816d8 100644
--- a/gr-blocks/lib/vector_insert_X_impl.cc.t
+++ b/gr-blocks/lib/vector_insert_X_impl.cc.t
@@ -28,7 +28,7 @@
#include <@NAME_IMPL@.h>
#include <algorithm>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <stdio.h>
@@ -44,9 +44,9 @@ namespace gr {
@NAME_IMPL@::@NAME_IMPL@(const std::vector<@TYPE@> &data,
int periodicity, int offset)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@TYPE@)),
+ io_signature::make(1, 1, sizeof(@TYPE@))),
d_data(data),
d_offset(offset),
d_periodicity(periodicity)
diff --git a/gr-blocks/lib/vector_insert_X_impl.h.t b/gr-blocks/lib/vector_insert_X_impl.h.t
index f447ef1e80..12a7bbe6bc 100644
--- a/gr-blocks/lib/vector_insert_X_impl.h.t
+++ b/gr-blocks/lib/vector_insert_X_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/vector_map_impl.cc b/gr-blocks/lib/vector_map_impl.cc
index 19b57bac8b..d50dcb56bc 100644
--- a/gr-blocks/lib/vector_map_impl.cc
+++ b/gr-blocks/lib/vector_map_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "vector_map_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -62,10 +62,10 @@ namespace gr {
vector_map_impl::vector_map_impl(size_t item_size, std::vector<size_t> in_vlens,
std::vector< std::vector< std::vector<size_t> > > mapping)
- : gr_sync_block("vector_map",
- gr_make_io_signaturev(in_vlens.size(), in_vlens.size(),
+ : sync_block("vector_map",
+ io_signature::makev(in_vlens.size(), in_vlens.size(),
get_in_sizeofs(item_size, in_vlens)),
- gr_make_io_signaturev(mapping.size(), mapping.size(),
+ io_signature::makev(mapping.size(), mapping.size(),
get_out_sizeofs(item_size, mapping))),
d_item_size(item_size), d_in_vlens(in_vlens)
{
diff --git a/gr-blocks/lib/vector_map_impl.h b/gr-blocks/lib/vector_map_impl.h
index 08faa2ce09..64f5e091e6 100644
--- a/gr-blocks/lib/vector_map_impl.h
+++ b/gr-blocks/lib/vector_map_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_VECTOR_MAP_IMPL_H
#define INCLUDED_GR_VECTOR_MAP_IMPL_H
-#include <blocks/vector_map.h>
-#include <thread/thread.h>
+#include <gnuradio/blocks/vector_map.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/vector_sink_X_impl.cc.t b/gr-blocks/lib/vector_sink_X_impl.cc.t
index 3be2861025..a8d674f15a 100644
--- a/gr-blocks/lib/vector_sink_X_impl.cc.t
+++ b/gr-blocks/lib/vector_sink_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <algorithm>
#include <iostream>
@@ -42,9 +42,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(int vlen)
- : gr_sync_block("@NAME@",
- gr_make_io_signature(1, 1, sizeof(@TYPE@) * vlen),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("@NAME@",
+ io_signature::make(1, 1, sizeof(@TYPE@) * vlen),
+ io_signature::make(0, 0, 0)),
d_vlen(vlen)
{
}
@@ -58,7 +58,7 @@ namespace gr {
return d_data;
}
- std::vector<gr_tag_t>
+ std::vector<tag_t>
@NAME_IMPL@::tags() const
{
return d_tags;
@@ -73,7 +73,7 @@ namespace gr {
for(int i = 0; i < noutput_items * d_vlen; i++)
d_data.push_back (iptr[i]);
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0) + noutput_items);
d_tags.insert(d_tags.end(), tags.begin(), tags.end());
return noutput_items;
diff --git a/gr-blocks/lib/vector_sink_X_impl.h.t b/gr-blocks/lib/vector_sink_X_impl.h.t
index 60d21e0c8c..b5d3bd6432 100644
--- a/gr-blocks/lib/vector_sink_X_impl.h.t
+++ b/gr-blocks/lib/vector_sink_X_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
@@ -34,7 +34,7 @@ namespace gr {
{
private:
std::vector<@TYPE@> d_data;
- std::vector<gr_tag_t> d_tags;
+ std::vector<tag_t> d_tags;
int d_vlen;
public:
@@ -43,7 +43,7 @@ namespace gr {
void reset() { d_data.clear(); }
std::vector<@TYPE@> data() const;
- std::vector<gr_tag_t> tags() const;
+ std::vector<tag_t> tags() const;
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/vector_source_X_impl.cc.t b/gr-blocks/lib/vector_source_X_impl.cc.t
index 9c1c63a213..93f672bfb9 100644
--- a/gr-blocks/lib/vector_source_X_impl.cc.t
+++ b/gr-blocks/lib/vector_source_X_impl.cc.t
@@ -28,7 +28,7 @@
#include <@NAME_IMPL@.h>
#include <algorithm>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -37,7 +37,7 @@ namespace gr {
@NAME@::sptr
@NAME@::make(const std::vector<@TYPE@> &data,
bool repeat, int vlen,
- const std::vector<gr_tag_t> &tags)
+ const std::vector<tag_t> &tags)
{
return gnuradio::get_initial_sptr
(new @NAME_IMPL@(data, repeat, vlen, tags));
@@ -45,10 +45,10 @@ namespace gr {
@NAME_IMPL@::@NAME_IMPL@(const std::vector<@TYPE@> &data,
bool repeat, int vlen,
- const std::vector<gr_tag_t> &tags)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(@TYPE@) * vlen)),
+ const std::vector<tag_t> &tags)
+ : sync_block("@BASE_NAME@",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(@TYPE@) * vlen)),
d_data(data),
d_repeat(repeat),
d_offset(0),
@@ -72,7 +72,7 @@ namespace gr {
void
@NAME_IMPL@::set_data (const std::vector<@TYPE@> &data,
- const std::vector<gr_tag_t> &tags)
+ const std::vector<tag_t> &tags)
{
d_data = data;
d_tags = tags;
diff --git a/gr-blocks/lib/vector_source_X_impl.h.t b/gr-blocks/lib/vector_source_X_impl.h.t
index 78ec52bacf..2641c6661b 100644
--- a/gr-blocks/lib/vector_source_X_impl.h.t
+++ b/gr-blocks/lib/vector_source_X_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
@@ -38,18 +38,18 @@ namespace gr {
unsigned int d_offset;
int d_vlen;
bool d_settags;
- std::vector<gr_tag_t> d_tags;
+ std::vector<tag_t> d_tags;
unsigned int d_tagpos;
public:
@NAME_IMPL@(const std::vector<@TYPE@> &data,
bool repeat, int vlen,
- const std::vector<gr_tag_t> &tags);
+ const std::vector<tag_t> &tags);
~@NAME_IMPL@();
void rewind() { d_offset=0; }
void set_data(const std::vector<@TYPE@> &data,
- const std::vector<gr_tag_t> &tags);
+ const std::vector<tag_t> &tags);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/vector_to_stream_impl.cc b/gr-blocks/lib/vector_to_stream_impl.cc
index fa833a3ec8..637a252052 100644
--- a/gr-blocks/lib/vector_to_stream_impl.cc
+++ b/gr-blocks/lib/vector_to_stream_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "vector_to_stream_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
vector_to_stream_impl::vector_to_stream_impl(size_t itemsize, size_t nitems_per_block)
- : gr_sync_interpolator ("vector_to_stream",
- gr_make_io_signature (1, 1, itemsize * nitems_per_block),
- gr_make_io_signature (1, 1, itemsize),
+ : sync_interpolator ("vector_to_stream",
+ io_signature::make (1, 1, itemsize * nitems_per_block),
+ io_signature::make (1, 1, itemsize),
nitems_per_block)
{
}
diff --git a/gr-blocks/lib/vector_to_stream_impl.h b/gr-blocks/lib/vector_to_stream_impl.h
index 4128f60900..d2f4759cd9 100644
--- a/gr-blocks/lib/vector_to_stream_impl.h
+++ b/gr-blocks/lib/vector_to_stream_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_VECTOR_TO_STREAM_IMPL_H
#define INCLUDED_VECTOR_TO_STREAM_IMPL_H
-#include <blocks/vector_to_stream.h>
+#include <gnuradio/blocks/vector_to_stream.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/vector_to_streams_impl.cc b/gr-blocks/lib/vector_to_streams_impl.cc
index 09d32c5c52..99f35b0ab3 100644
--- a/gr-blocks/lib/vector_to_streams_impl.cc
+++ b/gr-blocks/lib/vector_to_streams_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "vector_to_streams_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -36,9 +36,9 @@ namespace gr {
}
vector_to_streams_impl::vector_to_streams_impl(size_t itemsize, size_t nstreams)
- : gr_sync_block ("vector_to_streams",
- gr_make_io_signature (1, 1, nstreams * itemsize),
- gr_make_io_signature (nstreams, nstreams, itemsize))
+ : sync_block ("vector_to_streams",
+ io_signature::make (1, 1, nstreams * itemsize),
+ io_signature::make (nstreams, nstreams, itemsize))
{
}
diff --git a/gr-blocks/lib/vector_to_streams_impl.h b/gr-blocks/lib/vector_to_streams_impl.h
index 81bcfd0762..b5393729eb 100644
--- a/gr-blocks/lib/vector_to_streams_impl.h
+++ b/gr-blocks/lib/vector_to_streams_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_VECTOR_TO_STREAMS_IMPL_H
#define INCLUDED_VECTOR_TO_STREAMS_IMPL_H
-#include <blocks/vector_to_streams.h>
+#include <gnuradio/blocks/vector_to_streams.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc
index 16d80adc83..e741cbab4e 100644
--- a/gr-blocks/lib/wavfile.cc
+++ b/gr-blocks/lib/wavfile.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <blocks/wavfile.h>
+#include <gnuradio/blocks/wavfile.h>
#include <cstring>
#include <stdint.h>
#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
diff --git a/gr-blocks/lib/wavfile_sink_impl.cc b/gr-blocks/lib/wavfile_sink_impl.cc
index 4591b1f9fa..9a96f7ca3d 100644
--- a/gr-blocks/lib/wavfile_sink_impl.cc
+++ b/gr-blocks/lib/wavfile_sink_impl.cc
@@ -25,14 +25,14 @@
#endif
#include "wavfile_sink_impl.h"
-#include <blocks/wavfile.h>
-#include <gr_io_signature.h>
+#include <gnuradio/blocks/wavfile.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <climits>
#include <cstring>
#include <cmath>
#include <fcntl.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <boost/math/special_functions/round.hpp>
// win32 (mingw/msvc) specific
@@ -70,9 +70,9 @@ namespace gr {
int n_channels,
unsigned int sample_rate,
int bits_per_sample)
- : gr_sync_block("wavfile_sink",
- gr_make_io_signature(1, n_channels, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("wavfile_sink",
+ io_signature::make(1, n_channels, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_sample_rate(sample_rate), d_nchans(n_channels),
d_fp(0), d_new_fp(0), d_updated(false)
{
diff --git a/gr-blocks/lib/wavfile_sink_impl.h b/gr-blocks/lib/wavfile_sink_impl.h
index 4ad9958884..52dfd2259b 100644
--- a/gr-blocks/lib/wavfile_sink_impl.h
+++ b/gr-blocks/lib/wavfile_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_WAVFILE_SINK_IMPL_H
#define INCLUDED_GR_WAVFILE_SINK_IMPL_H
-#include <blocks/wavfile_sink.h>
+#include <gnuradio/blocks/wavfile_sink.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/wavfile_source_impl.cc b/gr-blocks/lib/wavfile_source_impl.cc
index 2e3b0e240c..7538792d1c 100644
--- a/gr-blocks/lib/wavfile_source_impl.cc
+++ b/gr-blocks/lib/wavfile_source_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "wavfile_source_impl.h"
-#include <gr_io_signature.h>
-#include <blocks/wavfile.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/wavfile.h>
#include <sys/types.h>
#include <fcntl.h>
#include <stdexcept>
@@ -58,9 +58,9 @@ namespace gr {
}
wavfile_source_impl::wavfile_source_impl (const char *filename, bool repeat)
- : gr_sync_block("wavfile_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 2, sizeof(float))),
+ : sync_block("wavfile_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 2, sizeof(float))),
d_fp(NULL), d_repeat(repeat),
d_sample_rate(1), d_nchans(1), d_bytes_per_sample(2), d_first_sample_pos(0),
d_samples_per_chan(0), d_sample_idx(0)
@@ -102,7 +102,7 @@ namespace gr {
}
// Re-set the output signature
- set_output_signature(gr_make_io_signature(1, d_nchans, sizeof(float)));
+ set_output_signature(io_signature::make(1, d_nchans, sizeof(float)));
}
wavfile_source_impl::~wavfile_source_impl ()
diff --git a/gr-blocks/lib/wavfile_source_impl.h b/gr-blocks/lib/wavfile_source_impl.h
index 4875731a08..3996cb0606 100644
--- a/gr-blocks/lib/wavfile_source_impl.h
+++ b/gr-blocks/lib/wavfile_source_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_WAVFILE_SOURCE_IMPL_H
#define INCLUDED_GR_WAVFILE_SOURCE_IMPL_H
-#include <blocks/wavfile_source.h>
+#include <gnuradio/blocks/wavfile_source.h>
#include <cstdio> // for FILE
namespace gr {
diff --git a/gr-blocks/lib/xor_XX_impl.cc.t b/gr-blocks/lib/xor_XX_impl.cc.t
index eea9265126..6b9df4f4fb 100644
--- a/gr-blocks/lib/xor_XX_impl.cc.t
+++ b/gr-blocks/lib/xor_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include <@NAME_IMPL@.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace blocks {
@@ -38,9 +38,9 @@ namespace gr {
}
@NAME_IMPL@::@NAME_IMPL@(size_t vlen)
- : gr_sync_block ("@NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ : sync_block ("@NAME@",
+ io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen),
+ io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)),
d_vlen(vlen)
{
}
diff --git a/gr-blocks/lib/xor_XX_impl.h.t b/gr-blocks/lib/xor_XX_impl.h.t
index 25f0da0c85..f7db3f2162 100644
--- a/gr-blocks/lib/xor_XX_impl.h.t
+++ b/gr-blocks/lib/xor_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME_IMPL@
#define @GUARD_NAME_IMPL@
-#include <blocks/@NAME@.h>
+#include <gnuradio/blocks/@NAME@.h>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/python/qa_keep_one_in_n.py b/gr-blocks/python/qa_keep_one_in_n.py
index f06ed33d6b..a96f0a9518 100755
--- a/gr-blocks/python/qa_keep_one_in_n.py
+++ b/gr-blocks/python/qa_keep_one_in_n.py
@@ -37,6 +37,7 @@ class test_keep_one_in_n(gr_unittest.TestCase):
src = blocks.vector_source_b(src_data);
op = blocks.keep_one_in_n(gr.sizeof_char, 5)
dst = blocks.vector_sink_b()
+ print "HERE"
self.tb.connect(src, op, dst)
self.tb.run()
self.assertEqual(dst.data(), expected_data)
diff --git a/gr-blocks/python/qa_message_tags.py b/gr-blocks/python/qa_message_tags.py
index 0ab857b1aa..952c699455 100644
--- a/gr-blocks/python/qa_message_tags.py
+++ b/gr-blocks/python/qa_message_tags.py
@@ -7,8 +7,8 @@ class test_message_tags (gr_unittest.TestCase):
def test_1 (self):
data = ('hello', 'you', 'there')
- tx_msgq = gr.msg_queue ()
- rx_msgq = gr.msg_queue ()
+ tx_msgq = gr.msg_queue()
+ rx_msgq = gr.msg_queue()
for d in data:
tx_msgq.insert_tail(gr.message_from_string(d))
tb = gr.top_block()
diff --git a/gr-blocks/python/qa_repack_bits_bb.py b/gr-blocks/python/qa_repack_bits_bb.py
index 9da6cf26c6..209b6e1324 100755
--- a/gr-blocks/python/qa_repack_bits_bb.py
+++ b/gr-blocks/python/qa_repack_bits_bb.py
@@ -79,7 +79,7 @@ class qa_repack_bits_bb (gr_unittest.TestCase):
k = 8
l = 3
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(src_data))
@@ -104,7 +104,7 @@ class qa_repack_bits_bb (gr_unittest.TestCase):
k = 3
l = 8
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(src_data))
diff --git a/gr-blocks/python/qa_tagged_stream_mux.py b/gr-blocks/python/qa_tagged_stream_mux.py
index 1759c44623..e9c3343000 100755
--- a/gr-blocks/python/qa_tagged_stream_mux.py
+++ b/gr-blocks/python/qa_tagged_stream_mux.py
@@ -27,7 +27,7 @@ import numpy
def make_len_tags(tupl, key):
tags = []
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.key = pmt.string_to_symbol(key)
n_read = 0
for element in tupl:
@@ -38,7 +38,7 @@ def make_len_tags(tupl, key):
return tags
def make_len_tag(offset, key, value):
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = offset
tag.key = pmt.string_to_symbol(key)
tag.value = pmt.to_pmt(value)
@@ -73,11 +73,11 @@ class qa_tagged_stream_mux (gr_unittest.TestCase):
make_len_tag(5, tagname, 3),
make_len_tag(8, tagname, 1)
)
- test_tag_0 = gr.gr_tag_t()
+ test_tag_0 = gr.tag_t()
test_tag_0.key = pmt.string_to_symbol('spam')
test_tag_0.offset = 4 # On the second '1'
test_tag_0.value = pmt.to_pmt(42)
- test_tag_1 = gr.gr_tag_t()
+ test_tag_1 = gr.tag_t()
test_tag_1.key = pmt.string_to_symbol('eggs')
test_tag_1.offset = 3 # On the first '3' of the 2nd stream
test_tag_1.value = pmt.to_pmt(23)
diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
index 09fcf7692a..a68f01b692 100644
--- a/gr-blocks/swig/CMakeLists.txt
+++ b/gr-blocks/swig/CMakeLists.txt
@@ -24,7 +24,6 @@ include(GrPython)
include(GrSwig)
set(GR_SWIG_INCLUDE_DIRS
- ${CMAKE_CURRENT_BINARY_DIR}/../include
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
@@ -51,11 +50,14 @@ set(GR_SWIG_BLOCK_IFILES
blocks_swig0
blocks_swig1
blocks_swig2
+ blocks_swig3
+ blocks_swig4
+ blocks_swig5
)
foreach(swigfile ${GR_SWIG_BLOCK_IFILES})
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
- set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/blocks)
+ set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/blocks)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_TARGET_DEPS blocks_generated_includes)
set(GR_SWIG_LIBRARIES gnuradio-blocks)
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
deleted file mode 100644
index f808d1e771..0000000000
--- a/gr-blocks/swig/blocks_swig.i
+++ /dev/null
@@ -1,638 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012-2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#define BLOCKS_API
-
-%include "runtime_swig.i"
-%include "blocks/pdu.h"
-
-//load generated python docstrings
-%include "blocks_swig_doc.i"
-
-%include <gr_endianness.h>
-
-// For vector_map.
-%template() std::vector< std::vector< std::vector<size_t> > >;
-
-%{
-#include "blocks/add_ff.h"
-#include "blocks/add_ss.h"
-#include "blocks/add_ii.h"
-#include "blocks/add_cc.h"
-#include "blocks/add_const_ff.h"
-#include "blocks/add_const_bb.h"
-#include "blocks/add_const_ss.h"
-#include "blocks/add_const_ii.h"
-#include "blocks/add_const_cc.h"
-#include "blocks/add_const_vff.h"
-#include "blocks/add_const_vbb.h"
-#include "blocks/add_const_vss.h"
-#include "blocks/add_const_vii.h"
-#include "blocks/add_const_vcc.h"
-#include "blocks/and_bb.h"
-#include "blocks/and_ss.h"
-#include "blocks/and_ii.h"
-#include "blocks/and_const_bb.h"
-#include "blocks/and_const_ss.h"
-#include "blocks/and_const_ii.h"
-#include "blocks/annotator_1to1.h"
-#include "blocks/annotator_alltoall.h"
-#include "blocks/annotator_raw.h"
-#include "blocks/argmax_fs.h"
-#include "blocks/argmax_is.h"
-#include "blocks/argmax_ss.h"
-#include "blocks/bin_statistics_f.h"
-#include "blocks/burst_tagger.h"
-#include "blocks/char_to_float.h"
-#include "blocks/char_to_short.h"
-#include "blocks/check_lfsr_32k_s.h"
-#include "blocks/complex_to_interleaved_short.h"
-#include "blocks/complex_to_float.h"
-#include "blocks/complex_to_real.h"
-#include "blocks/complex_to_imag.h"
-#include "blocks/complex_to_mag.h"
-#include "blocks/complex_to_mag_squared.h"
-#include "blocks/complex_to_arg.h"
-#include "blocks/conjugate_cc.h"
-#include "blocks/control_loop.h"
-#include "blocks/copy.h"
-#include "blocks/deinterleave.h"
-#include "blocks/delay.h"
-#include "blocks/divide_ff.h"
-#include "blocks/divide_ss.h"
-#include "blocks/divide_ii.h"
-#include "blocks/divide_cc.h"
-#include "blocks/endian_swap.h"
-#include "blocks/file_descriptor_sink.h"
-#include "blocks/file_descriptor_source.h"
-#include "blocks/file_sink_base.h"
-#include "blocks/file_sink.h"
-#include "blocks/file_source.h"
-#include "blocks/file_meta_sink.h"
-#include "blocks/file_meta_source.h"
-#include "blocks/float_to_char.h"
-#include "blocks/float_to_complex.h"
-#include "blocks/float_to_int.h"
-#include "blocks/float_to_short.h"
-#include "blocks/float_to_uchar.h"
-#include "blocks/head.h"
-#include "blocks/int_to_float.h"
-#include "blocks/integrate_ss.h"
-#include "blocks/integrate_ii.h"
-#include "blocks/integrate_ff.h"
-#include "blocks/integrate_cc.h"
-#include "blocks/interleave.h"
-#include "blocks/interleaved_short_to_complex.h"
-#include "blocks/keep_m_in_n.h"
-#include "blocks/keep_one_in_n.h"
-#include "blocks/lfsr_32k_source_s.h"
-#include "blocks/max_ff.h"
-#include "blocks/max_ii.h"
-#include "blocks/max_ss.h"
-#include "blocks/message_debug.h"
-#include "blocks/message_sink.h"
-#include "blocks/message_source.h"
-#include "blocks/message_strobe.h"
-#include "blocks/message_burst_source.h"
-#include "blocks/moving_average_cc.h"
-#include "blocks/moving_average_ff.h"
-#include "blocks/moving_average_ii.h"
-#include "blocks/moving_average_ss.h"
-#include "blocks/multiply_ss.h"
-#include "blocks/multiply_ii.h"
-#include "blocks/multiply_ff.h"
-#include "blocks/multiply_cc.h"
-#include "blocks/multiply_conjugate_cc.h"
-#include "blocks/multiply_const_ss.h"
-#include "blocks/multiply_const_ii.h"
-#include "blocks/multiply_const_ff.h"
-#include "blocks/multiply_const_cc.h"
-#include "blocks/multiply_const_vss.h"
-#include "blocks/multiply_const_vii.h"
-#include "blocks/multiply_const_vff.h"
-#include "blocks/multiply_const_vcc.h"
-#include "blocks/mute_ss.h"
-#include "blocks/mute_ii.h"
-#include "blocks/mute_ff.h"
-#include "blocks/mute_cc.h"
-#include "blocks/nlog10_ff.h"
-#include "blocks/nop.h"
-#include "blocks/not_bb.h"
-#include "blocks/not_ss.h"
-#include "blocks/not_ii.h"
-#include "blocks/null_sink.h"
-#include "blocks/null_source.h"
-#include "blocks/patterned_interleaver.h"
-#include "blocks/pack_k_bits_bb.h"
-#include "blocks/packed_to_unpacked_bb.h"
-#include "blocks/packed_to_unpacked_ss.h"
-#include "blocks/packed_to_unpacked_ii.h"
-#include "blocks/pdu_to_tagged_stream.h"
-#include "blocks/peak_detector_fb.h"
-#include "blocks/peak_detector_ib.h"
-#include "blocks/peak_detector_sb.h"
-#include "blocks/peak_detector2_fb.h"
-#include "blocks/plateau_detector_fb.h"
-#include "blocks/probe_rate.h"
-#include "blocks/probe_signal_b.h"
-#include "blocks/probe_signal_s.h"
-#include "blocks/probe_signal_i.h"
-#include "blocks/probe_signal_f.h"
-#include "blocks/probe_signal_c.h"
-#include "blocks/probe_signal_vb.h"
-#include "blocks/probe_signal_vs.h"
-#include "blocks/probe_signal_vi.h"
-#include "blocks/probe_signal_vf.h"
-#include "blocks/probe_signal_vc.h"
-#include "blocks/or_bb.h"
-#include "blocks/or_ss.h"
-#include "blocks/or_ii.h"
-#include "blocks/random_pdu.h"
-#include "blocks/regenerate_bb.h"
-#include "blocks/repack_bits_bb.h"
-#include "blocks/repeat.h"
-#include "blocks/rms_cf.h"
-#include "blocks/rms_ff.h"
-#include "blocks/sample_and_hold_bb.h"
-#include "blocks/sample_and_hold_ss.h"
-#include "blocks/sample_and_hold_ii.h"
-#include "blocks/sample_and_hold_ff.h"
-#include "blocks/short_to_char.h"
-#include "blocks/short_to_float.h"
-#include "blocks/skiphead.h"
-#include "blocks/socket_pdu.h"
-#include "blocks/stream_mux.h"
-#include "blocks/stream_to_streams.h"
-#include "blocks/stream_to_vector.h"
-#include "blocks/streams_to_stream.h"
-#include "blocks/streams_to_vector.h"
-#include "blocks/stretch_ff.h"
-#include "blocks/sub_ff.h"
-#include "blocks/sub_ss.h"
-#include "blocks/sub_ii.h"
-#include "blocks/sub_cc.h"
-#include "blocks/tag_debug.h"
-#include "blocks/tagged_file_sink.h"
-#include "blocks/tagged_stream_mux.h"
-#include "blocks/tagged_stream_to_pdu.h"
-#include "blocks/threshold_ff.h"
-#include "blocks/throttle.h"
-#include "blocks/transcendental.h"
-#include "blocks/tuntap_pdu.h"
-#include "blocks/uchar_to_float.h"
-#include "blocks/udp_sink.h"
-#include "blocks/udp_source.h"
-#include "blocks/unpack_k_bits_bb.h"
-#include "blocks/unpacked_to_packed_bb.h"
-#include "blocks/unpacked_to_packed_ss.h"
-#include "blocks/unpacked_to_packed_ii.h"
-#include "blocks/vco_f.h"
-#include "blocks/vector_map.h"
-#include "blocks/vector_to_stream.h"
-#include "blocks/vector_to_streams.h"
-#include "blocks/vector_insert_b.h"
-#include "blocks/vector_insert_s.h"
-#include "blocks/vector_insert_i.h"
-#include "blocks/vector_insert_f.h"
-#include "blocks/vector_insert_c.h"
-#include "blocks/vector_sink_b.h"
-#include "blocks/vector_sink_s.h"
-#include "blocks/vector_sink_i.h"
-#include "blocks/vector_sink_f.h"
-#include "blocks/vector_sink_c.h"
-#include "blocks/vector_source_b.h"
-#include "blocks/vector_source_s.h"
-#include "blocks/vector_source_i.h"
-#include "blocks/vector_source_f.h"
-#include "blocks/vector_source_c.h"
-#include "blocks/wavfile_sink.h"
-#include "blocks/wavfile_source.h"
-#include "blocks/xor_bb.h"
-#include "blocks/xor_ss.h"
-#include "blocks/xor_ii.h"
-%}
-
-%include "blocks/add_ff.h"
-%include "blocks/add_ss.h"
-%include "blocks/add_ii.h"
-%include "blocks/add_cc.h"
-%include "blocks/add_const_ff.h"
-%include "blocks/add_const_bb.h"
-%include "blocks/add_const_ss.h"
-%include "blocks/add_const_ii.h"
-%include "blocks/add_const_cc.h"
-%include "blocks/add_const_vff.h"
-%include "blocks/add_const_vbb.h"
-%include "blocks/add_const_vss.h"
-%include "blocks/add_const_vii.h"
-%include "blocks/add_const_vcc.h"
-%include "blocks/and_bb.h"
-%include "blocks/and_ss.h"
-%include "blocks/and_ii.h"
-%include "blocks/and_const_bb.h"
-%include "blocks/and_const_ss.h"
-%include "blocks/and_const_ii.h"
-%include "blocks/annotator_1to1.h"
-%include "blocks/annotator_alltoall.h"
-%include "blocks/annotator_raw.h"
-%include "blocks/argmax_fs.h"
-%include "blocks/argmax_is.h"
-%include "blocks/argmax_ss.h"
-%include "blocks/char_to_float.h"
-%include "blocks/bin_statistics_f.h"
-%include "blocks/burst_tagger.h"
-%include "blocks/char_to_short.h"
-%include "blocks/check_lfsr_32k_s.h"
-%include "blocks/complex_to_interleaved_short.h"
-%include "blocks/complex_to_float.h"
-%include "blocks/complex_to_real.h"
-%include "blocks/complex_to_imag.h"
-%include "blocks/complex_to_mag.h"
-%include "blocks/complex_to_mag_squared.h"
-%include "blocks/complex_to_arg.h"
-%include "blocks/conjugate_cc.h"
-%include "blocks/control_loop.h"
-%include "blocks/copy.h"
-%include "blocks/deinterleave.h"
-%include "blocks/delay.h"
-%include "blocks/file_descriptor_sink.h"
-%include "blocks/file_descriptor_source.h"
-%include "blocks/file_sink_base.h"
-%include "blocks/file_sink.h"
-%include "blocks/file_source.h"
-%include "blocks/file_meta_sink.h"
-%include "blocks/file_meta_source.h"
-%include "blocks/divide_ff.h"
-%include "blocks/divide_ss.h"
-%include "blocks/divide_ii.h"
-%include "blocks/divide_cc.h"
-%include "blocks/endian_swap.h"
-%include "blocks/float_to_char.h"
-%include "blocks/float_to_complex.h"
-%include "blocks/float_to_int.h"
-%include "blocks/float_to_short.h"
-%include "blocks/float_to_uchar.h"
-%include "blocks/head.h"
-%include "blocks/int_to_float.h"
-%include "blocks/integrate_ss.h"
-%include "blocks/integrate_ii.h"
-%include "blocks/integrate_ff.h"
-%include "blocks/integrate_cc.h"
-%include "blocks/interleave.h"
-%include "blocks/interleaved_short_to_complex.h"
-%include "blocks/keep_m_in_n.h"
-%include "blocks/keep_one_in_n.h"
-%include "blocks/lfsr_32k_source_s.h"
-%include "blocks/max_ff.h"
-%include "blocks/max_ii.h"
-%include "blocks/max_ss.h"
-%include "blocks/message_debug.h"
-%include "blocks/message_sink.h"
-%include "blocks/message_source.h"
-%include "blocks/message_strobe.h"
-%include "blocks/message_burst_source.h"
-%include "blocks/moving_average_cc.h"
-%include "blocks/moving_average_ff.h"
-%include "blocks/moving_average_ii.h"
-%include "blocks/moving_average_ss.h"
-%include "blocks/multiply_ss.h"
-%include "blocks/multiply_ii.h"
-%include "blocks/multiply_ff.h"
-%include "blocks/multiply_cc.h"
-%include "blocks/multiply_conjugate_cc.h"
-%include "blocks/multiply_const_ss.h"
-%include "blocks/multiply_const_ii.h"
-%include "blocks/multiply_const_ff.h"
-%include "blocks/multiply_const_cc.h"
-%include "blocks/multiply_const_vss.h"
-%include "blocks/multiply_const_vii.h"
-%include "blocks/multiply_const_vff.h"
-%include "blocks/multiply_const_vcc.h"
-%include "blocks/mute_ss.h"
-%include "blocks/mute_ii.h"
-%include "blocks/mute_ff.h"
-%include "blocks/mute_cc.h"
-%include "blocks/nlog10_ff.h"
-%include "blocks/nop.h"
-%include "blocks/not_bb.h"
-%include "blocks/not_ss.h"
-%include "blocks/not_ii.h"
-%include "blocks/null_sink.h"
-%include "blocks/null_source.h"
-%include "blocks/probe_signal_b.h"
-%include "blocks/probe_signal_s.h"
-%include "blocks/probe_signal_i.h"
-%include "blocks/probe_signal_f.h"
-%include "blocks/probe_signal_c.h"
-%include "blocks/probe_signal_vb.h"
-%include "blocks/probe_signal_vs.h"
-%include "blocks/probe_signal_vi.h"
-%include "blocks/probe_signal_vf.h"
-%include "blocks/probe_signal_vc.h"
-%include "blocks/or_bb.h"
-%include "blocks/or_ss.h"
-%include "blocks/or_ii.h"
-%include "blocks/pack_k_bits_bb.h"
-%include "blocks/packed_to_unpacked_bb.h"
-%include "blocks/packed_to_unpacked_ss.h"
-%include "blocks/packed_to_unpacked_ii.h"
-%include "blocks/patterned_interleaver.h"
-%include "blocks/tag_debug.h"
-%include "blocks/pdu_to_tagged_stream.h"
-%include "blocks/peak_detector_fb.h"
-%include "blocks/peak_detector_ib.h"
-%include "blocks/peak_detector_sb.h"
-%include "blocks/peak_detector2_fb.h"
-%include "blocks/random_pdu.h"
-%include "blocks/plateau_detector_fb.h"
-%include "blocks/probe_rate.h"
-%include "blocks/regenerate_bb.h"
-%include "blocks/repack_bits_bb.h"
-%include "blocks/repeat.h"
-%include "blocks/rms_cf.h"
-%include "blocks/rms_ff.h"
-%include "blocks/sample_and_hold_bb.h"
-%include "blocks/sample_and_hold_ss.h"
-%include "blocks/sample_and_hold_ii.h"
-%include "blocks/sample_and_hold_ff.h"
-%include "blocks/short_to_char.h"
-%include "blocks/short_to_float.h"
-%include "blocks/skiphead.h"
-%include "blocks/socket_pdu.h"
-%include "blocks/stream_mux.h"
-%include "blocks/stream_to_streams.h"
-%include "blocks/stream_to_vector.h"
-%include "blocks/streams_to_stream.h"
-%include "blocks/streams_to_vector.h"
-%include "blocks/stretch_ff.h"
-%include "blocks/sub_ff.h"
-%include "blocks/sub_ss.h"
-%include "blocks/sub_ii.h"
-%include "blocks/sub_cc.h"
-%include "blocks/tagged_file_sink.h"
-%include "blocks/tagged_stream_mux.h"
-%include "blocks/tagged_stream_to_pdu.h"
-%include "blocks/threshold_ff.h"
-%include "blocks/throttle.h"
-%include "blocks/transcendental.h"
-%include "blocks/tuntap_pdu.h"
-%include "blocks/uchar_to_float.h"
-%include "blocks/udp_sink.h"
-%include "blocks/udp_source.h"
-%include "blocks/unpack_k_bits_bb.h"
-%include "blocks/unpacked_to_packed_bb.h"
-%include "blocks/unpacked_to_packed_ss.h"
-%include "blocks/unpacked_to_packed_ii.h"
-%include "blocks/vco_f.h"
-%include "blocks/vector_map.h"
-%include "blocks/vector_to_stream.h"
-%include "blocks/vector_to_streams.h"
-%include "blocks/vector_insert_b.h"
-%include "blocks/vector_insert_s.h"
-%include "blocks/vector_insert_i.h"
-%include "blocks/vector_insert_f.h"
-%include "blocks/vector_insert_c.h"
-%include "blocks/vector_sink_b.h"
-%include "blocks/vector_sink_s.h"
-%include "blocks/vector_sink_i.h"
-%include "blocks/vector_sink_f.h"
-%include "blocks/vector_sink_c.h"
-%include "blocks/vector_source_b.h"
-%include "blocks/vector_source_s.h"
-%include "blocks/vector_source_i.h"
-%include "blocks/vector_source_f.h"
-%include "blocks/vector_source_c.h"
-%include "blocks/wavfile_sink.h"
-%include "blocks/wavfile_source.h"
-%include "blocks/xor_bb.h"
-%include "blocks/xor_ss.h"
-%include "blocks/xor_ii.h"
-
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, annotator_1to1);
-GR_SWIG_BLOCK_MAGIC2(blocks, annotator_alltoall);
-GR_SWIG_BLOCK_MAGIC2(blocks, annotator_raw);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger);
-GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg);
-GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, copy);
-GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, delay);
-GR_SWIG_BLOCK_MAGIC2(blocks, endian_swap);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_descriptor_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_descriptor_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_meta_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, file_meta_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar);
-GR_SWIG_BLOCK_MAGIC2(blocks, head);
-GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, message_debug);
-GR_SWIG_BLOCK_MAGIC2(blocks, message_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, message_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, message_strobe);
-GR_SWIG_BLOCK_MAGIC2(blocks, message_burst_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, nop);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, null_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, null_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
-GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc);
-GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repeat);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, skiphead);
-GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, throttle);
-GR_SWIG_BLOCK_MAGIC2(blocks, transcendental);
-GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, vco_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_map);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii);
-
-
-#ifdef GR_CTRLPORT
-
-%{
-#include "blocks/ctrlport_probe_c.h"
-#include "blocks/ctrlport_probe2_c.h"
-%}
-
-%include "blocks/ctrlport_probe_c.h"
-%include "blocks/ctrlport_probe2_c.h"
-
-GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe2_c);
-
-#endif /* GR_CTRLPORT */
diff --git a/gr-blocks/swig/blocks_swig.py.in b/gr-blocks/swig/blocks_swig.py.in
index 287413b594..a0bd574c18 100644
--- a/gr-blocks/swig/blocks_swig.py.in
+++ b/gr-blocks/swig/blocks_swig.py.in
@@ -22,3 +22,6 @@
from blocks_swig0 import *
from blocks_swig1 import *
from blocks_swig2 import *
+from blocks_swig3 import *
+from blocks_swig4 import *
+from blocks_swig5 import *
diff --git a/gr-blocks/swig/blocks_swig0.i b/gr-blocks/swig/blocks_swig0.i
index 353fef0412..f87cb9c5e4 100644
--- a/gr-blocks/swig/blocks_swig0.i
+++ b/gr-blocks/swig/blocks_swig0.i
@@ -26,116 +26,55 @@
%include "blocks_swig0_doc.i"
-%template() std::vector<size_t>;
-%template() std::vector< std::vector< std::vector<size_t> > >;
-
%{
-#include "blocks/annotator_1to1.h"
-#include "blocks/annotator_alltoall.h"
-#include "blocks/annotator_raw.h"
-#include "blocks/control_loop.h"
-#include "blocks/copy.h"
-#include "blocks/delay.h"
-#include "blocks/endian_swap.h"
-#include "blocks/file_descriptor_sink.h"
-#include "blocks/file_descriptor_source.h"
-#include "blocks/file_sink_base.h"
-#include "blocks/file_sink.h"
-#include "blocks/file_source.h"
-#include "blocks/file_meta_sink.h"
-#include "blocks/file_meta_source.h"
-#include "blocks/head.h"
-#include "blocks/message_debug.h"
-#include "blocks/message_sink.h"
-#include "blocks/message_source.h"
-#include "blocks/message_strobe.h"
-#include "blocks/message_burst_source.h"
-#include "blocks/nop.h"
-#include "blocks/null_sink.h"
-#include "blocks/null_source.h"
-#include "blocks/skiphead.h"
-#include "blocks/stream_mux.h"
-#include "blocks/stream_to_streams.h"
-#include "blocks/stream_to_vector.h"
-#include "blocks/streams_to_stream.h"
-#include "blocks/streams_to_vector.h"
-#include "blocks/tag_debug.h"
-#include "blocks/tagged_file_sink.h"
-#include "blocks/throttle.h"
-#include "blocks/vector_map.h"
-#include "blocks/vector_to_stream.h"
-#include "blocks/vector_to_streams.h"
-#include "blocks/vector_insert_b.h"
-#include "blocks/vector_insert_s.h"
-#include "blocks/vector_insert_i.h"
-#include "blocks/vector_insert_f.h"
-#include "blocks/vector_insert_c.h"
-#include "blocks/vector_sink_b.h"
-#include "blocks/vector_sink_s.h"
-#include "blocks/vector_sink_i.h"
-#include "blocks/vector_sink_f.h"
-#include "blocks/vector_sink_c.h"
-#include "blocks/vector_source_b.h"
-#include "blocks/vector_source_s.h"
-#include "blocks/vector_source_i.h"
-#include "blocks/vector_source_f.h"
-#include "blocks/vector_source_c.h"
-#include "blocks/wavfile_sink.h"
-#include "blocks/wavfile_source.h"
+#include "gnuradio/blocks/annotator_1to1.h"
+#include "gnuradio/blocks/annotator_alltoall.h"
+#include "gnuradio/blocks/annotator_raw.h"
+#include "gnuradio/blocks/control_loop.h"
+#include "gnuradio/blocks/copy.h"
+#include "gnuradio/blocks/delay.h"
+#include "gnuradio/blocks/endian_swap.h"
+#include "gnuradio/blocks/file_descriptor_sink.h"
+#include "gnuradio/blocks/file_descriptor_source.h"
+#include "gnuradio/blocks/file_sink_base.h"
+#include "gnuradio/blocks/file_sink.h"
+#include "gnuradio/blocks/file_source.h"
+#include "gnuradio/blocks/file_meta_sink.h"
+#include "gnuradio/blocks/file_meta_source.h"
+#include "gnuradio/blocks/head.h"
+#include "gnuradio/blocks/message_debug.h"
+#include "gnuradio/blocks/message_sink.h"
+#include "gnuradio/blocks/message_source.h"
+#include "gnuradio/blocks/message_strobe.h"
+#include "gnuradio/blocks/message_burst_source.h"
+#include "gnuradio/blocks/nop.h"
+#include "gnuradio/blocks/null_sink.h"
+#include "gnuradio/blocks/null_source.h"
%}
-%include "blocks/annotator_1to1.h"
-%include "blocks/annotator_alltoall.h"
-%include "blocks/annotator_raw.h"
-%include "blocks/control_loop.h"
-%include "blocks/copy.h"
-%include "blocks/delay.h"
-%include "blocks/endian_swap.h"
-%include "blocks/file_descriptor_sink.h"
-%include "blocks/file_descriptor_source.h"
-%include "blocks/file_sink_base.h"
-%include "blocks/file_sink.h"
-%include "blocks/file_source.h"
-%include "blocks/file_meta_sink.h"
-%include "blocks/file_meta_source.h"
-%include "blocks/head.h"
-%include "blocks/message_debug.h"
-%include "blocks/message_sink.h"
-%include "blocks/message_source.h"
-%include "blocks/message_strobe.h"
-%include "blocks/message_burst_source.h"
-%include "blocks/nop.h"
-%include "blocks/null_sink.h"
-%include "blocks/null_source.h"
-%include "blocks/skiphead.h"
-%include "blocks/stream_mux.h"
-%include "blocks/stream_to_streams.h"
-%include "blocks/stream_to_vector.h"
-%include "blocks/streams_to_stream.h"
-%include "blocks/streams_to_vector.h"
-%include "blocks/tag_debug.h"
-%include "blocks/tagged_file_sink.h"
-%include "blocks/throttle.h"
-%include "blocks/vector_map.h"
-%include "blocks/vector_to_stream.h"
-%include "blocks/vector_to_streams.h"
-%include "blocks/vector_insert_b.h"
-%include "blocks/vector_insert_s.h"
-%include "blocks/vector_insert_i.h"
-%include "blocks/vector_insert_f.h"
-%include "blocks/vector_insert_c.h"
-%include "blocks/vector_sink_b.h"
-%include "blocks/vector_sink_s.h"
-%include "blocks/vector_sink_i.h"
-%include "blocks/vector_sink_f.h"
-%include "blocks/vector_sink_c.h"
-%include "blocks/vector_source_b.h"
-%include "blocks/vector_source_s.h"
-%include "blocks/vector_source_i.h"
-%include "blocks/vector_source_f.h"
-%include "blocks/vector_source_c.h"
-%include "blocks/wavfile_sink.h"
-%include "blocks/wavfile_source.h"
+%include "gnuradio/blocks/annotator_1to1.h"
+%include "gnuradio/blocks/annotator_alltoall.h"
+%include "gnuradio/blocks/annotator_raw.h"
+%include "gnuradio/blocks/control_loop.h"
+%include "gnuradio/blocks/copy.h"
+%include "gnuradio/blocks/delay.h"
+%include "gnuradio/blocks/endian_swap.h"
+%include "gnuradio/blocks/file_descriptor_sink.h"
+%include "gnuradio/blocks/file_descriptor_source.h"
+%include "gnuradio/blocks/file_sink_base.h"
+%include "gnuradio/blocks/file_sink.h"
+%include "gnuradio/blocks/file_source.h"
+%include "gnuradio/blocks/file_meta_sink.h"
+%include "gnuradio/blocks/file_meta_source.h"
+%include "gnuradio/blocks/head.h"
+%include "gnuradio/blocks/message_debug.h"
+%include "gnuradio/blocks/message_sink.h"
+%include "gnuradio/blocks/message_source.h"
+%include "gnuradio/blocks/message_strobe.h"
+%include "gnuradio/blocks/message_burst_source.h"
+%include "gnuradio/blocks/nop.h"
+%include "gnuradio/blocks/null_sink.h"
+%include "gnuradio/blocks/null_source.h"
GR_SWIG_BLOCK_MAGIC2(blocks, annotator_1to1);
GR_SWIG_BLOCK_MAGIC2(blocks, annotator_alltoall);
@@ -158,45 +97,16 @@ GR_SWIG_BLOCK_MAGIC2(blocks, message_burst_source);
GR_SWIG_BLOCK_MAGIC2(blocks, nop);
GR_SWIG_BLOCK_MAGIC2(blocks, null_sink);
GR_SWIG_BLOCK_MAGIC2(blocks, null_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, skiphead);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector);
-GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, throttle);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_map);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source);
#ifdef GR_CTRLPORT
%{
-#include "blocks/ctrlport_probe_c.h"
-#include "blocks/ctrlport_probe2_c.h"
+#include "gnuradio/blocks/ctrlport_probe_c.h"
+#include "gnuradio/blocks/ctrlport_probe2_c.h"
%}
-%include "blocks/ctrlport_probe_c.h"
-%include "blocks/ctrlport_probe2_c.h"
+%include "gnuradio/blocks/ctrlport_probe_c.h"
+%include "gnuradio/blocks/ctrlport_probe2_c.h"
GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe_c);
GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe2_c);
diff --git a/gr-blocks/swig/blocks_swig1.i b/gr-blocks/swig/blocks_swig1.i
index 557afca97b..257a266dee 100644
--- a/gr-blocks/swig/blocks_swig1.i
+++ b/gr-blocks/swig/blocks_swig1.i
@@ -24,250 +24,99 @@
%include "runtime_swig.i"
-//load generated python docstrings
%include "blocks_swig1_doc.i"
+%template() std::vector<size_t>;
+%template() std::vector< std::vector< std::vector<size_t> > >;
+
%{
-#include "blocks/add_ff.h"
-#include "blocks/add_ss.h"
-#include "blocks/add_ii.h"
-#include "blocks/add_cc.h"
-#include "blocks/add_const_bb.h"
-#include "blocks/add_const_ff.h"
-#include "blocks/add_const_ss.h"
-#include "blocks/add_const_ii.h"
-#include "blocks/add_const_cc.h"
-#include "blocks/add_const_vbb.h"
-#include "blocks/add_const_vff.h"
-#include "blocks/add_const_vss.h"
-#include "blocks/add_const_vii.h"
-#include "blocks/add_const_vcc.h"
-#include "blocks/and_bb.h"
-#include "blocks/and_ss.h"
-#include "blocks/and_ii.h"
-#include "blocks/and_const_bb.h"
-#include "blocks/and_const_ss.h"
-#include "blocks/and_const_ii.h"
-#include "blocks/argmax_fs.h"
-#include "blocks/argmax_is.h"
-#include "blocks/argmax_ss.h"
-#include "blocks/bin_statistics_f.h"
-#include "blocks/burst_tagger.h"
-#include "blocks/char_to_float.h"
-#include "blocks/char_to_short.h"
-#include "blocks/check_lfsr_32k_s.h"
-#include "blocks/complex_to_interleaved_short.h"
-#include "blocks/complex_to_float.h"
-#include "blocks/complex_to_real.h"
-#include "blocks/complex_to_imag.h"
-#include "blocks/complex_to_mag.h"
-#include "blocks/complex_to_mag_squared.h"
-#include "blocks/complex_to_arg.h"
-#include "blocks/conjugate_cc.h"
-#include "blocks/deinterleave.h"
-#include "blocks/divide_ff.h"
-#include "blocks/divide_ss.h"
-#include "blocks/divide_ii.h"
-#include "blocks/divide_cc.h"
-#include "blocks/float_to_char.h"
-#include "blocks/float_to_complex.h"
-#include "blocks/float_to_int.h"
-#include "blocks/float_to_short.h"
-#include "blocks/float_to_uchar.h"
-#include "blocks/int_to_float.h"
-#include "blocks/integrate_ss.h"
-#include "blocks/integrate_ii.h"
-#include "blocks/integrate_ff.h"
-#include "blocks/integrate_cc.h"
-#include "blocks/interleave.h"
-#include "blocks/interleaved_short_to_complex.h"
-#include "blocks/keep_m_in_n.h"
-#include "blocks/keep_one_in_n.h"
-#include "blocks/lfsr_32k_source_s.h"
-#include "blocks/max_ff.h"
-#include "blocks/max_ii.h"
-#include "blocks/max_ss.h"
-#include "blocks/moving_average_cc.h"
-#include "blocks/moving_average_ff.h"
-#include "blocks/moving_average_ii.h"
-#include "blocks/moving_average_ss.h"
-#include "blocks/multiply_ss.h"
-#include "blocks/multiply_ii.h"
-#include "blocks/multiply_ff.h"
-#include "blocks/multiply_cc.h"
-#include "blocks/multiply_conjugate_cc.h"
-#include "blocks/multiply_const_ss.h"
-#include "blocks/multiply_const_ii.h"
-#include "blocks/multiply_const_ff.h"
-#include "blocks/multiply_const_cc.h"
-#include "blocks/multiply_const_vss.h"
-#include "blocks/multiply_const_vii.h"
-#include "blocks/multiply_const_vff.h"
-#include "blocks/multiply_const_vcc.h"
-#include "blocks/mute_ss.h"
-#include "blocks/mute_ii.h"
-#include "blocks/mute_ff.h"
-#include "blocks/mute_cc.h"
+#include "gnuradio/blocks/skiphead.h"
+#include "gnuradio/blocks/stream_mux.h"
+#include "gnuradio/blocks/stream_to_streams.h"
+#include "gnuradio/blocks/stream_to_vector.h"
+#include "gnuradio/blocks/streams_to_stream.h"
+#include "gnuradio/blocks/streams_to_vector.h"
+#include "gnuradio/blocks/tag_debug.h"
+#include "gnuradio/blocks/tagged_file_sink.h"
+#include "gnuradio/blocks/throttle.h"
+#include "gnuradio/blocks/vector_map.h"
+#include "gnuradio/blocks/vector_to_stream.h"
+#include "gnuradio/blocks/vector_to_streams.h"
+#include "gnuradio/blocks/vector_insert_b.h"
+#include "gnuradio/blocks/vector_insert_s.h"
+#include "gnuradio/blocks/vector_insert_i.h"
+#include "gnuradio/blocks/vector_insert_f.h"
+#include "gnuradio/blocks/vector_insert_c.h"
+#include "gnuradio/blocks/vector_sink_b.h"
+#include "gnuradio/blocks/vector_sink_s.h"
+#include "gnuradio/blocks/vector_sink_i.h"
+#include "gnuradio/blocks/vector_sink_f.h"
+#include "gnuradio/blocks/vector_sink_c.h"
+#include "gnuradio/blocks/vector_source_b.h"
+#include "gnuradio/blocks/vector_source_s.h"
+#include "gnuradio/blocks/vector_source_i.h"
+#include "gnuradio/blocks/vector_source_f.h"
+#include "gnuradio/blocks/vector_source_c.h"
+#include "gnuradio/blocks/wavfile_sink.h"
+#include "gnuradio/blocks/wavfile_source.h"
%}
-%include "blocks/add_ff.h"
-%include "blocks/add_ss.h"
-%include "blocks/add_ii.h"
-%include "blocks/add_cc.h"
-%include "blocks/add_const_bb.h"
-%include "blocks/add_const_ff.h"
-%include "blocks/add_const_ss.h"
-%include "blocks/add_const_ii.h"
-%include "blocks/add_const_cc.h"
-%include "blocks/add_const_vbb.h"
-%include "blocks/add_const_vff.h"
-%include "blocks/add_const_vss.h"
-%include "blocks/add_const_vii.h"
-%include "blocks/add_const_vcc.h"
-%include "blocks/and_bb.h"
-%include "blocks/and_ss.h"
-%include "blocks/and_ii.h"
-%include "blocks/and_const_bb.h"
-%include "blocks/and_const_ss.h"
-%include "blocks/and_const_ii.h"
-%include "blocks/argmax_fs.h"
-%include "blocks/argmax_is.h"
-%include "blocks/argmax_ss.h"
-%include "blocks/char_to_float.h"
-%include "blocks/bin_statistics_f.h"
-%include "blocks/burst_tagger.h"
-%include "blocks/char_to_short.h"
-%include "blocks/check_lfsr_32k_s.h"
-%include "blocks/complex_to_interleaved_short.h"
-%include "blocks/complex_to_float.h"
-%include "blocks/complex_to_real.h"
-%include "blocks/complex_to_imag.h"
-%include "blocks/complex_to_mag.h"
-%include "blocks/complex_to_mag_squared.h"
-%include "blocks/complex_to_arg.h"
-%include "blocks/conjugate_cc.h"
-%include "blocks/deinterleave.h"
-%include "blocks/divide_ff.h"
-%include "blocks/divide_ss.h"
-%include "blocks/divide_ii.h"
-%include "blocks/divide_cc.h"
-%include "blocks/float_to_char.h"
-%include "blocks/float_to_complex.h"
-%include "blocks/float_to_int.h"
-%include "blocks/float_to_short.h"
-%include "blocks/float_to_uchar.h"
-%include "blocks/int_to_float.h"
-%include "blocks/integrate_ss.h"
-%include "blocks/integrate_ii.h"
-%include "blocks/integrate_ff.h"
-%include "blocks/integrate_cc.h"
-%include "blocks/interleave.h"
-%include "blocks/interleaved_short_to_complex.h"
-%include "blocks/keep_m_in_n.h"
-%include "blocks/keep_one_in_n.h"
-%include "blocks/lfsr_32k_source_s.h"
-%include "blocks/max_ff.h"
-%include "blocks/max_ii.h"
-%include "blocks/max_ss.h"
-%include "blocks/moving_average_cc.h"
-%include "blocks/moving_average_ff.h"
-%include "blocks/moving_average_ii.h"
-%include "blocks/moving_average_ss.h"
-%include "blocks/multiply_ss.h"
-%include "blocks/multiply_ii.h"
-%include "blocks/multiply_ff.h"
-%include "blocks/multiply_cc.h"
-%include "blocks/multiply_conjugate_cc.h"
-%include "blocks/multiply_const_ss.h"
-%include "blocks/multiply_const_ii.h"
-%include "blocks/multiply_const_ff.h"
-%include "blocks/multiply_const_cc.h"
-%include "blocks/multiply_const_vss.h"
-%include "blocks/multiply_const_vii.h"
-%include "blocks/multiply_const_vff.h"
-%include "blocks/multiply_const_vcc.h"
-%include "blocks/mute_ss.h"
-%include "blocks/mute_ii.h"
-%include "blocks/mute_ff.h"
-%include "blocks/mute_cc.h"
+%include "gnuradio/blocks/skiphead.h"
+%include "gnuradio/blocks/stream_mux.h"
+%include "gnuradio/blocks/stream_to_streams.h"
+%include "gnuradio/blocks/stream_to_vector.h"
+%include "gnuradio/blocks/streams_to_stream.h"
+%include "gnuradio/blocks/streams_to_vector.h"
+%include "gnuradio/blocks/tag_debug.h"
+%include "gnuradio/blocks/tagged_file_sink.h"
+%include "gnuradio/blocks/throttle.h"
+%include "gnuradio/blocks/vector_map.h"
+%include "gnuradio/blocks/vector_to_stream.h"
+%include "gnuradio/blocks/vector_to_streams.h"
+%include "gnuradio/blocks/vector_insert_b.h"
+%include "gnuradio/blocks/vector_insert_s.h"
+%include "gnuradio/blocks/vector_insert_i.h"
+%include "gnuradio/blocks/vector_insert_f.h"
+%include "gnuradio/blocks/vector_insert_c.h"
+%include "gnuradio/blocks/vector_sink_b.h"
+%include "gnuradio/blocks/vector_sink_s.h"
+%include "gnuradio/blocks/vector_sink_i.h"
+%include "gnuradio/blocks/vector_sink_f.h"
+%include "gnuradio/blocks/vector_sink_c.h"
+%include "gnuradio/blocks/vector_source_b.h"
+%include "gnuradio/blocks/vector_source_s.h"
+%include "gnuradio/blocks/vector_source_i.h"
+%include "gnuradio/blocks/vector_source_f.h"
+%include "gnuradio/blocks/vector_source_c.h"
+%include "gnuradio/blocks/wavfile_sink.h"
+%include "gnuradio/blocks/wavfile_source.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii);
-GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is);
-GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger);
-GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared);
-GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg);
-GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short);
-GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar);
-GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleave);
-GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n);
-GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, max_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff);
-GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, skiphead);
+GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux);
+GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams);
+GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector);
+GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream);
+GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector);
+GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug);
+GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink);
+GR_SWIG_BLOCK_MAGIC2(blocks, throttle);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_map);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c);
+GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink);
+GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source);
diff --git a/gr-blocks/swig/blocks_swig2.i b/gr-blocks/swig/blocks_swig2.i
index bfc1075cd7..d41b3f02a1 100644
--- a/gr-blocks/swig/blocks_swig2.i
+++ b/gr-blocks/swig/blocks_swig2.i
@@ -23,203 +23,134 @@
#define BLOCKS_API
%include "runtime_swig.i"
-%include "blocks/pdu.h"
-
-%include <gr_endianness.h>
//load generated python docstrings
-%include "blocks_swig1_doc.i"
+%include "blocks_swig2_doc.i"
%{
-#include "blocks/nlog10_ff.h"
-#include "blocks/not_bb.h"
-#include "blocks/not_ss.h"
-#include "blocks/not_ii.h"
-#include "blocks/patterned_interleaver.h"
-#include "blocks/pack_k_bits_bb.h"
-#include "blocks/packed_to_unpacked_bb.h"
-#include "blocks/packed_to_unpacked_ss.h"
-#include "blocks/packed_to_unpacked_ii.h"
-#include "blocks/pdu_to_tagged_stream.h"
-#include "blocks/peak_detector_fb.h"
-#include "blocks/peak_detector_ib.h"
-#include "blocks/peak_detector_sb.h"
-#include "blocks/peak_detector2_fb.h"
-#include "blocks/plateau_detector_fb.h"
-#include "blocks/probe_rate.h"
-#include "blocks/probe_signal_b.h"
-#include "blocks/probe_signal_s.h"
-#include "blocks/probe_signal_i.h"
-#include "blocks/probe_signal_f.h"
-#include "blocks/probe_signal_c.h"
-#include "blocks/probe_signal_vb.h"
-#include "blocks/probe_signal_vs.h"
-#include "blocks/probe_signal_vi.h"
-#include "blocks/probe_signal_vf.h"
-#include "blocks/probe_signal_vc.h"
-#include "blocks/or_bb.h"
-#include "blocks/or_ss.h"
-#include "blocks/or_ii.h"
-#include "blocks/random_pdu.h"
-#include "blocks/regenerate_bb.h"
-#include "blocks/repack_bits_bb.h"
-#include "blocks/repeat.h"
-#include "blocks/rms_cf.h"
-#include "blocks/rms_ff.h"
-#include "blocks/sample_and_hold_bb.h"
-#include "blocks/sample_and_hold_ss.h"
-#include "blocks/sample_and_hold_ii.h"
-#include "blocks/sample_and_hold_ff.h"
-#include "blocks/short_to_char.h"
-#include "blocks/short_to_float.h"
-#include "blocks/socket_pdu.h"
-#include "blocks/stretch_ff.h"
-#include "blocks/sub_ff.h"
-#include "blocks/sub_ss.h"
-#include "blocks/sub_ii.h"
-#include "blocks/sub_cc.h"
-#include "blocks/tagged_stream_mux.h"
-#include "blocks/tagged_stream_to_pdu.h"
-#include "blocks/threshold_ff.h"
-#include "blocks/transcendental.h"
-#include "blocks/tuntap_pdu.h"
-#include "blocks/uchar_to_float.h"
-#include "blocks/udp_sink.h"
-#include "blocks/udp_source.h"
-#include "blocks/unpack_k_bits_bb.h"
-#include "blocks/unpacked_to_packed_bb.h"
-#include "blocks/unpacked_to_packed_ss.h"
-#include "blocks/unpacked_to_packed_ii.h"
-#include "blocks/vco_f.h"
-#include "blocks/xor_bb.h"
-#include "blocks/xor_ss.h"
-#include "blocks/xor_ii.h"
+#include "gnuradio/blocks/add_ff.h"
+#include "gnuradio/blocks/add_ss.h"
+#include "gnuradio/blocks/add_ii.h"
+#include "gnuradio/blocks/add_cc.h"
+#include "gnuradio/blocks/add_const_bb.h"
+#include "gnuradio/blocks/add_const_ff.h"
+#include "gnuradio/blocks/add_const_ss.h"
+#include "gnuradio/blocks/add_const_ii.h"
+#include "gnuradio/blocks/add_const_cc.h"
+#include "gnuradio/blocks/add_const_vbb.h"
+#include "gnuradio/blocks/add_const_vff.h"
+#include "gnuradio/blocks/add_const_vss.h"
+#include "gnuradio/blocks/add_const_vii.h"
+#include "gnuradio/blocks/add_const_vcc.h"
+#include "gnuradio/blocks/and_bb.h"
+#include "gnuradio/blocks/and_ss.h"
+#include "gnuradio/blocks/and_ii.h"
+#include "gnuradio/blocks/and_const_bb.h"
+#include "gnuradio/blocks/and_const_ss.h"
+#include "gnuradio/blocks/and_const_ii.h"
+#include "gnuradio/blocks/argmax_fs.h"
+#include "gnuradio/blocks/argmax_is.h"
+#include "gnuradio/blocks/argmax_ss.h"
+#include "gnuradio/blocks/bin_statistics_f.h"
+#include "gnuradio/blocks/burst_tagger.h"
+#include "gnuradio/blocks/char_to_float.h"
+#include "gnuradio/blocks/char_to_short.h"
+#include "gnuradio/blocks/check_lfsr_32k_s.h"
+#include "gnuradio/blocks/complex_to_interleaved_short.h"
+#include "gnuradio/blocks/complex_to_float.h"
+#include "gnuradio/blocks/complex_to_real.h"
+#include "gnuradio/blocks/complex_to_imag.h"
+#include "gnuradio/blocks/complex_to_mag.h"
+#include "gnuradio/blocks/complex_to_mag_squared.h"
+#include "gnuradio/blocks/complex_to_arg.h"
+#include "gnuradio/blocks/conjugate_cc.h"
+#include "gnuradio/blocks/deinterleave.h"
+#include "gnuradio/blocks/divide_ff.h"
+#include "gnuradio/blocks/divide_ss.h"
+#include "gnuradio/blocks/divide_ii.h"
+#include "gnuradio/blocks/divide_cc.h"
%}
-%include "blocks/nlog10_ff.h"
-%include "blocks/not_bb.h"
-%include "blocks/not_ss.h"
-%include "blocks/not_ii.h"
-%include "blocks/probe_signal_b.h"
-%include "blocks/probe_signal_s.h"
-%include "blocks/probe_signal_i.h"
-%include "blocks/probe_signal_f.h"
-%include "blocks/probe_signal_c.h"
-%include "blocks/probe_signal_vb.h"
-%include "blocks/probe_signal_vs.h"
-%include "blocks/probe_signal_vi.h"
-%include "blocks/probe_signal_vf.h"
-%include "blocks/probe_signal_vc.h"
-%include "blocks/or_bb.h"
-%include "blocks/or_ss.h"
-%include "blocks/or_ii.h"
-%include "blocks/pack_k_bits_bb.h"
-%include "blocks/packed_to_unpacked_bb.h"
-%include "blocks/packed_to_unpacked_ss.h"
-%include "blocks/packed_to_unpacked_ii.h"
-%include "blocks/patterned_interleaver.h"
-%include "blocks/pdu_to_tagged_stream.h"
-%include "blocks/peak_detector_fb.h"
-%include "blocks/peak_detector_ib.h"
-%include "blocks/peak_detector_sb.h"
-%include "blocks/peak_detector2_fb.h"
-%include "blocks/plateau_detector_fb.h"
-%include "blocks/probe_rate.h"
-%include "blocks/random_pdu.h"
-%include "blocks/regenerate_bb.h"
-%include "blocks/repack_bits_bb.h"
-%include "blocks/repeat.h"
-%include "blocks/rms_cf.h"
-%include "blocks/rms_ff.h"
-%include "blocks/sample_and_hold_bb.h"
-%include "blocks/sample_and_hold_ss.h"
-%include "blocks/sample_and_hold_ii.h"
-%include "blocks/sample_and_hold_ff.h"
-%include "blocks/short_to_char.h"
-%include "blocks/short_to_float.h"
-%include "blocks/socket_pdu.h"
-%include "blocks/stretch_ff.h"
-%include "blocks/sub_ff.h"
-%include "blocks/sub_ss.h"
-%include "blocks/sub_ii.h"
-%include "blocks/sub_cc.h"
-%include "blocks/tagged_stream_mux.h"
-%include "blocks/tagged_stream_to_pdu.h"
-%include "blocks/threshold_ff.h"
-%include "blocks/transcendental.h"
-%include "blocks/tuntap_pdu.h"
-%include "blocks/uchar_to_float.h"
-%include "blocks/udp_sink.h"
-%include "blocks/udp_source.h"
-%include "blocks/unpack_k_bits_bb.h"
-%include "blocks/unpacked_to_packed_bb.h"
-%include "blocks/unpacked_to_packed_ss.h"
-%include "blocks/unpacked_to_packed_ii.h"
-%include "blocks/vco_f.h"
-%include "blocks/xor_bb.h"
-%include "blocks/xor_ss.h"
-%include "blocks/xor_ii.h"
+%include "gnuradio/blocks/add_ff.h"
+%include "gnuradio/blocks/add_ss.h"
+%include "gnuradio/blocks/add_ii.h"
+%include "gnuradio/blocks/add_cc.h"
+%include "gnuradio/blocks/add_const_bb.h"
+%include "gnuradio/blocks/add_const_ff.h"
+%include "gnuradio/blocks/add_const_ss.h"
+%include "gnuradio/blocks/add_const_ii.h"
+%include "gnuradio/blocks/add_const_cc.h"
+%include "gnuradio/blocks/add_const_vbb.h"
+%include "gnuradio/blocks/add_const_vff.h"
+%include "gnuradio/blocks/add_const_vss.h"
+%include "gnuradio/blocks/add_const_vii.h"
+%include "gnuradio/blocks/add_const_vcc.h"
+%include "gnuradio/blocks/and_bb.h"
+%include "gnuradio/blocks/and_ss.h"
+%include "gnuradio/blocks/and_ii.h"
+%include "gnuradio/blocks/and_const_bb.h"
+%include "gnuradio/blocks/and_const_ss.h"
+%include "gnuradio/blocks/and_const_ii.h"
+%include "gnuradio/blocks/argmax_fs.h"
+%include "gnuradio/blocks/argmax_is.h"
+%include "gnuradio/blocks/argmax_ss.h"
+%include "gnuradio/blocks/char_to_float.h"
+%include "gnuradio/blocks/bin_statistics_f.h"
+%include "gnuradio/blocks/burst_tagger.h"
+%include "gnuradio/blocks/char_to_short.h"
+%include "gnuradio/blocks/check_lfsr_32k_s.h"
+%include "gnuradio/blocks/complex_to_interleaved_short.h"
+%include "gnuradio/blocks/complex_to_float.h"
+%include "gnuradio/blocks/complex_to_real.h"
+%include "gnuradio/blocks/complex_to_imag.h"
+%include "gnuradio/blocks/complex_to_mag.h"
+%include "gnuradio/blocks/complex_to_mag_squared.h"
+%include "gnuradio/blocks/complex_to_arg.h"
+%include "gnuradio/blocks/conjugate_cc.h"
+%include "gnuradio/blocks/deinterleave.h"
+%include "gnuradio/blocks/divide_ff.h"
+%include "gnuradio/blocks/divide_ss.h"
+%include "gnuradio/blocks/divide_ii.h"
+%include "gnuradio/blocks/divide_cc.h"
-GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
-GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb);
-GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb);
-GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf);
-GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc);
-GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, repeat);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf);
-GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char);
-GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux);
-GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff);
-GR_SWIG_BLOCK_MAGIC2(blocks, transcendental);
-GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu);
-GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink);
-GR_SWIG_BLOCK_MAGIC2(blocks, udp_source);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii);
-GR_SWIG_BLOCK_MAGIC2(blocks, vco_f);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss);
-GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs);
+GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is);
+GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger);
+GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short);
+GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared);
+GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg);
+GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
diff --git a/gr-blocks/swig/blocks_swig3.i b/gr-blocks/swig/blocks_swig3.i
new file mode 100644
index 0000000000..bfa2e68a40
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig3.i
@@ -0,0 +1,150 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#define BLOCKS_API
+
+%include "runtime_swig.i"
+
+//load generated python docstrings
+%include "blocks_swig3_doc.i"
+
+%{
+#include "gnuradio/blocks/float_to_char.h"
+#include "gnuradio/blocks/float_to_complex.h"
+#include "gnuradio/blocks/float_to_int.h"
+#include "gnuradio/blocks/float_to_short.h"
+#include "gnuradio/blocks/float_to_uchar.h"
+#include "gnuradio/blocks/int_to_float.h"
+#include "gnuradio/blocks/integrate_ss.h"
+#include "gnuradio/blocks/integrate_ii.h"
+#include "gnuradio/blocks/integrate_ff.h"
+#include "gnuradio/blocks/integrate_cc.h"
+#include "gnuradio/blocks/interleave.h"
+#include "gnuradio/blocks/interleaved_short_to_complex.h"
+#include "gnuradio/blocks/keep_m_in_n.h"
+#include "gnuradio/blocks/keep_one_in_n.h"
+#include "gnuradio/blocks/lfsr_32k_source_s.h"
+#include "gnuradio/blocks/max_ff.h"
+#include "gnuradio/blocks/max_ii.h"
+#include "gnuradio/blocks/max_ss.h"
+#include "gnuradio/blocks/moving_average_cc.h"
+#include "gnuradio/blocks/moving_average_ff.h"
+#include "gnuradio/blocks/moving_average_ii.h"
+#include "gnuradio/blocks/moving_average_ss.h"
+#include "gnuradio/blocks/multiply_ss.h"
+#include "gnuradio/blocks/multiply_ii.h"
+#include "gnuradio/blocks/multiply_ff.h"
+#include "gnuradio/blocks/multiply_cc.h"
+#include "gnuradio/blocks/multiply_conjugate_cc.h"
+#include "gnuradio/blocks/multiply_const_ss.h"
+#include "gnuradio/blocks/multiply_const_ii.h"
+#include "gnuradio/blocks/multiply_const_ff.h"
+#include "gnuradio/blocks/multiply_const_cc.h"
+#include "gnuradio/blocks/multiply_const_vss.h"
+#include "gnuradio/blocks/multiply_const_vii.h"
+#include "gnuradio/blocks/multiply_const_vff.h"
+#include "gnuradio/blocks/multiply_const_vcc.h"
+#include "gnuradio/blocks/mute_ss.h"
+#include "gnuradio/blocks/mute_ii.h"
+#include "gnuradio/blocks/mute_ff.h"
+#include "gnuradio/blocks/mute_cc.h"
+%}
+
+%include "gnuradio/blocks/float_to_char.h"
+%include "gnuradio/blocks/float_to_complex.h"
+%include "gnuradio/blocks/float_to_int.h"
+%include "gnuradio/blocks/float_to_short.h"
+%include "gnuradio/blocks/float_to_uchar.h"
+%include "gnuradio/blocks/int_to_float.h"
+%include "gnuradio/blocks/integrate_ss.h"
+%include "gnuradio/blocks/integrate_ii.h"
+%include "gnuradio/blocks/integrate_ff.h"
+%include "gnuradio/blocks/integrate_cc.h"
+%include "gnuradio/blocks/interleave.h"
+%include "gnuradio/blocks/interleaved_short_to_complex.h"
+%include "gnuradio/blocks/keep_m_in_n.h"
+%include "gnuradio/blocks/keep_one_in_n.h"
+%include "gnuradio/blocks/lfsr_32k_source_s.h"
+%include "gnuradio/blocks/max_ff.h"
+%include "gnuradio/blocks/max_ii.h"
+%include "gnuradio/blocks/max_ss.h"
+%include "gnuradio/blocks/moving_average_cc.h"
+%include "gnuradio/blocks/moving_average_ff.h"
+%include "gnuradio/blocks/moving_average_ii.h"
+%include "gnuradio/blocks/moving_average_ss.h"
+%include "gnuradio/blocks/multiply_ss.h"
+%include "gnuradio/blocks/multiply_ii.h"
+%include "gnuradio/blocks/multiply_ff.h"
+%include "gnuradio/blocks/multiply_cc.h"
+%include "gnuradio/blocks/multiply_conjugate_cc.h"
+%include "gnuradio/blocks/multiply_const_ss.h"
+%include "gnuradio/blocks/multiply_const_ii.h"
+%include "gnuradio/blocks/multiply_const_ff.h"
+%include "gnuradio/blocks/multiply_const_cc.h"
+%include "gnuradio/blocks/multiply_const_vss.h"
+%include "gnuradio/blocks/multiply_const_vii.h"
+%include "gnuradio/blocks/multiply_const_vff.h"
+%include "gnuradio/blocks/multiply_const_vcc.h"
+%include "gnuradio/blocks/mute_ss.h"
+%include "gnuradio/blocks/mute_ii.h"
+%include "gnuradio/blocks/mute_ff.h"
+%include "gnuradio/blocks/mute_cc.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar);
+GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, interleave);
+GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n);
+GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n);
+GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, max_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff);
+GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc);
+GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc);
diff --git a/gr-blocks/swig/blocks_swig4.i b/gr-blocks/swig/blocks_swig4.i
new file mode 100644
index 0000000000..ecd63dd3ac
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig4.i
@@ -0,0 +1,123 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#define BLOCKS_API
+
+%include "runtime_swig.i"
+%include "gnuradio/blocks/pdu.h"
+
+%include <gnuradio/endianness.h>
+
+//load generated python docstrings
+%include "blocks_swig4_doc.i"
+
+%{
+#include "gnuradio/blocks/nlog10_ff.h"
+#include "gnuradio/blocks/not_bb.h"
+#include "gnuradio/blocks/not_ss.h"
+#include "gnuradio/blocks/not_ii.h"
+#include "gnuradio/blocks/patterned_interleaver.h"
+#include "gnuradio/blocks/pack_k_bits_bb.h"
+#include "gnuradio/blocks/packed_to_unpacked_bb.h"
+#include "gnuradio/blocks/packed_to_unpacked_ss.h"
+#include "gnuradio/blocks/packed_to_unpacked_ii.h"
+#include "gnuradio/blocks/pdu_to_tagged_stream.h"
+#include "gnuradio/blocks/peak_detector_fb.h"
+#include "gnuradio/blocks/peak_detector_ib.h"
+#include "gnuradio/blocks/peak_detector_sb.h"
+#include "gnuradio/blocks/peak_detector2_fb.h"
+#include "gnuradio/blocks/plateau_detector_fb.h"
+#include "gnuradio/blocks/probe_rate.h"
+#include "gnuradio/blocks/probe_signal_b.h"
+#include "gnuradio/blocks/probe_signal_s.h"
+#include "gnuradio/blocks/probe_signal_i.h"
+#include "gnuradio/blocks/probe_signal_f.h"
+#include "gnuradio/blocks/probe_signal_c.h"
+#include "gnuradio/blocks/probe_signal_vb.h"
+#include "gnuradio/blocks/probe_signal_vs.h"
+#include "gnuradio/blocks/probe_signal_vi.h"
+#include "gnuradio/blocks/probe_signal_vf.h"
+#include "gnuradio/blocks/probe_signal_vc.h"
+#include "gnuradio/blocks/or_bb.h"
+#include "gnuradio/blocks/or_ss.h"
+#include "gnuradio/blocks/or_ii.h"
+%}
+
+%include "gnuradio/blocks/nlog10_ff.h"
+%include "gnuradio/blocks/not_bb.h"
+%include "gnuradio/blocks/not_ss.h"
+%include "gnuradio/blocks/not_ii.h"
+%include "gnuradio/blocks/probe_signal_b.h"
+%include "gnuradio/blocks/probe_signal_s.h"
+%include "gnuradio/blocks/probe_signal_i.h"
+%include "gnuradio/blocks/probe_signal_f.h"
+%include "gnuradio/blocks/probe_signal_c.h"
+%include "gnuradio/blocks/probe_signal_vb.h"
+%include "gnuradio/blocks/probe_signal_vs.h"
+%include "gnuradio/blocks/probe_signal_vi.h"
+%include "gnuradio/blocks/probe_signal_vf.h"
+%include "gnuradio/blocks/probe_signal_vc.h"
+%include "gnuradio/blocks/or_bb.h"
+%include "gnuradio/blocks/or_ss.h"
+%include "gnuradio/blocks/or_ii.h"
+%include "gnuradio/blocks/pack_k_bits_bb.h"
+%include "gnuradio/blocks/packed_to_unpacked_bb.h"
+%include "gnuradio/blocks/packed_to_unpacked_ss.h"
+%include "gnuradio/blocks/packed_to_unpacked_ii.h"
+%include "gnuradio/blocks/patterned_interleaver.h"
+%include "gnuradio/blocks/pdu_to_tagged_stream.h"
+%include "gnuradio/blocks/peak_detector_fb.h"
+%include "gnuradio/blocks/peak_detector_ib.h"
+%include "gnuradio/blocks/peak_detector_sb.h"
+%include "gnuradio/blocks/peak_detector2_fb.h"
+%include "gnuradio/blocks/plateau_detector_fb.h"
+%include "gnuradio/blocks/probe_rate.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
+GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb);
+GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib);
+GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb);
+GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb);
+GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb);
+GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf);
+GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc);
diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig5.i
new file mode 100644
index 0000000000..2eefe88d05
--- /dev/null
+++ b/gr-blocks/swig/blocks_swig5.i
@@ -0,0 +1,138 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#define BLOCKS_API
+
+%include "runtime_swig.i"
+%include "gnuradio/blocks/pdu.h"
+
+%include <gnuradio/endianness.h>
+
+//load generated python docstrings
+%include "blocks_swig5_doc.i"
+
+%{
+#include "gnuradio/blocks/random_pdu.h"
+#include "gnuradio/blocks/regenerate_bb.h"
+#include "gnuradio/blocks/repack_bits_bb.h"
+#include "gnuradio/blocks/repeat.h"
+#include "gnuradio/blocks/rms_cf.h"
+#include "gnuradio/blocks/rms_ff.h"
+#include "gnuradio/blocks/sample_and_hold_bb.h"
+#include "gnuradio/blocks/sample_and_hold_ss.h"
+#include "gnuradio/blocks/sample_and_hold_ii.h"
+#include "gnuradio/blocks/sample_and_hold_ff.h"
+#include "gnuradio/blocks/short_to_char.h"
+#include "gnuradio/blocks/short_to_float.h"
+#include "gnuradio/blocks/socket_pdu.h"
+#include "gnuradio/blocks/stretch_ff.h"
+#include "gnuradio/blocks/sub_ff.h"
+#include "gnuradio/blocks/sub_ss.h"
+#include "gnuradio/blocks/sub_ii.h"
+#include "gnuradio/blocks/sub_cc.h"
+#include "gnuradio/blocks/tagged_stream_mux.h"
+#include "gnuradio/blocks/tagged_stream_to_pdu.h"
+#include "gnuradio/blocks/threshold_ff.h"
+#include "gnuradio/blocks/transcendental.h"
+#include "gnuradio/blocks/tuntap_pdu.h"
+#include "gnuradio/blocks/uchar_to_float.h"
+#include "gnuradio/blocks/udp_sink.h"
+#include "gnuradio/blocks/udp_source.h"
+#include "gnuradio/blocks/unpack_k_bits_bb.h"
+#include "gnuradio/blocks/unpacked_to_packed_bb.h"
+#include "gnuradio/blocks/unpacked_to_packed_ss.h"
+#include "gnuradio/blocks/unpacked_to_packed_ii.h"
+#include "gnuradio/blocks/vco_f.h"
+#include "gnuradio/blocks/xor_bb.h"
+#include "gnuradio/blocks/xor_ss.h"
+#include "gnuradio/blocks/xor_ii.h"
+%}
+
+%include "gnuradio/blocks/random_pdu.h"
+%include "gnuradio/blocks/regenerate_bb.h"
+%include "gnuradio/blocks/repack_bits_bb.h"
+%include "gnuradio/blocks/repeat.h"
+%include "gnuradio/blocks/rms_cf.h"
+%include "gnuradio/blocks/rms_ff.h"
+%include "gnuradio/blocks/sample_and_hold_bb.h"
+%include "gnuradio/blocks/sample_and_hold_ss.h"
+%include "gnuradio/blocks/sample_and_hold_ii.h"
+%include "gnuradio/blocks/sample_and_hold_ff.h"
+%include "gnuradio/blocks/short_to_char.h"
+%include "gnuradio/blocks/short_to_float.h"
+%include "gnuradio/blocks/socket_pdu.h"
+%include "gnuradio/blocks/stretch_ff.h"
+%include "gnuradio/blocks/sub_ff.h"
+%include "gnuradio/blocks/sub_ss.h"
+%include "gnuradio/blocks/sub_ii.h"
+%include "gnuradio/blocks/sub_cc.h"
+%include "gnuradio/blocks/tagged_stream_mux.h"
+%include "gnuradio/blocks/tagged_stream_to_pdu.h"
+%include "gnuradio/blocks/threshold_ff.h"
+%include "gnuradio/blocks/transcendental.h"
+%include "gnuradio/blocks/tuntap_pdu.h"
+%include "gnuradio/blocks/uchar_to_float.h"
+%include "gnuradio/blocks/udp_sink.h"
+%include "gnuradio/blocks/udp_source.h"
+%include "gnuradio/blocks/unpack_k_bits_bb.h"
+%include "gnuradio/blocks/unpacked_to_packed_bb.h"
+%include "gnuradio/blocks/unpacked_to_packed_ss.h"
+%include "gnuradio/blocks/unpacked_to_packed_ii.h"
+%include "gnuradio/blocks/vco_f.h"
+%include "gnuradio/blocks/xor_bb.h"
+%include "gnuradio/blocks/xor_ss.h"
+%include "gnuradio/blocks/xor_ii.h"
+
+GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
+GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, repeat);
+GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf);
+GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char);
+GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu);
+GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux);
+GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu);
+GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, transcendental);
+GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu);
+GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float);
+GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink);
+GR_SWIG_BLOCK_MAGIC2(blocks, udp_source);
+GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, vco_f);
+GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb);
+GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii);
diff --git a/gr-blocks/tests/benchmark_nco.cc b/gr-blocks/tests/benchmark_nco.cc
index 4c2ed120db..593972494d 100644
--- a/gr-blocks/tests/benchmark_nco.cc
+++ b/gr-blocks/tests/benchmark_nco.cc
@@ -33,8 +33,8 @@
#endif
#include <unistd.h>
-#include <blocks/nco.h>
-#include <blocks/fxpt_nco.h>
+#include <gnuradio/blocks/nco.h>
+#include <gnuradio/blocks/fxpt_nco.h>
#include <string.h>
#define ITERATIONS 20000000
diff --git a/gr-blocks/tests/benchmark_vco.cc b/gr-blocks/tests/benchmark_vco.cc
index 955dc08051..865e36df4e 100644
--- a/gr-blocks/tests/benchmark_vco.cc
+++ b/gr-blocks/tests/benchmark_vco.cc
@@ -33,8 +33,8 @@
#endif
#include <unistd.h>
-#include <blocks/vco.h>
-#include <blocks/fxpt_vco.h>
+#include <gnuradio/blocks/vco.h>
+#include <gnuradio/blocks/fxpt_vco.h>
#include <string.h>
#define ITERATIONS 5000000
diff --git a/gr-channels/include/channels/api.h b/gr-channels/include/channels/api.h
index 808336b042..1fd1d9ba8f 100644
--- a/gr-channels/include/channels/api.h
+++ b/gr-channels/include/channels/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_CHANNELS_API_H
#define INCLUDED_CHANNELS_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_channels_EXPORTS
# define CHANNELS_API __GR_ATTR_EXPORT
diff --git a/gr-channels/include/channels/channel_model.h b/gr-channels/include/channels/channel_model.h
index 8e5430f05c..d41545c1c4 100644
--- a/gr-channels/include/channels/channel_model.h
+++ b/gr-channels/include/channels/channel_model.h
@@ -24,8 +24,8 @@
#define INCLUDED_CHANNELS_CHANNEL_MODEL_H
#include <channels/api.h>
-#include <gr_hier_block2.h>
-#include <gr_types.h>
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/types.h>
namespace gr {
namespace channels {
@@ -45,7 +45,7 @@ namespace gr {
* Multipath can be approximated in this model by using a FIR
* filter representation of a multipath delay profile..
*/
- class CHANNELS_API channel_model : virtual public gr_hier_block2
+ class CHANNELS_API channel_model : virtual public hier_block2
{
public:
// gr::channels::channel_model::sptr
diff --git a/gr-channels/include/channels/fading_model.h b/gr-channels/include/channels/fading_model.h
index 50632a61fc..a6037535c7 100644
--- a/gr-channels/include/channels/fading_model.h
+++ b/gr-channels/include/channels/fading_model.h
@@ -24,8 +24,8 @@
#define INCLUDED_CHANNELS_FADING_MODEL_H
#include <channels/api.h>
-#include <gr_sync_block.h>
-#include <gr_types.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>
namespace gr {
namespace channels {
@@ -39,7 +39,7 @@ namespace gr {
* be used to help evaluate, design, and test various signals,
* waveforms, and algorithms.
*/
- class CHANNELS_API fading_model : virtual public gr_sync_block
+ class CHANNELS_API fading_model : virtual public sync_block
{
public:
// gr::channels::channel_model::sptr
diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc
index aafab12f37..450c925eb1 100644
--- a/gr-channels/lib/channel_model_impl.cc
+++ b/gr-channels/lib/channel_model_impl.cc
@@ -21,7 +21,7 @@
*/
#include "channel_model_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -48,9 +48,9 @@ namespace gr {
double epsilon,
const std::vector<gr_complex> &taps,
double noise_seed)
- : gr_hier_block2("channel_model",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)))
+ : hier_block2("channel_model",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)))
{
d_taps = taps;
while(d_taps.size() < 2) {
diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h
index b94555f122..68b8dc392d 100644
--- a/gr-channels/lib/channel_model_impl.h
+++ b/gr-channels/lib/channel_model_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
-#include <gr_top_block.h>
-#include <blocks/add_cc.h>
-#include <blocks/multiply_cc.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/blocks/add_cc.h>
+#include <gnuradio/blocks/multiply_cc.h>
#include <analog/sig_source_c.h>
#include <analog/fastnoise_source_c.h>
#include <channels/channel_model.h>
diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc
index ecebe4a069..a39a6cf44f 100644
--- a/gr-channels/lib/fading_model_impl.cc
+++ b/gr-channels/lib/fading_model_impl.cc
@@ -21,17 +21,17 @@
*/
#include "fading_model_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <boost/format.hpp>
#include <boost/random.hpp>
-#include <gr_fxpt.h>
+#include <gnuradio/fxpt.h>
#include <sincostable.h>
-// FASTSINCOS: 0 = slow native, 1 = gr_fxpt impl, 2 = sincostable.h
+// FASTSINCOS: 0 = slow native, 1 = gr::fxpt impl, 2 = sincostable.h
#define FASTSINCOS 2
@@ -47,9 +47,9 @@ namespace gr {
// Block constructor
fading_model_impl::fading_model_impl( unsigned int N, float fDTs, bool LOS, float K, int seed )
- : gr_sync_block("fading_model",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("fading_model",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
seed_1((int)seed),
dist_1(-M_PI, M_PI),
rv_1( seed_1, dist_1 ), // U(-pi,pi)
@@ -163,8 +163,8 @@ namespace gr {
for(int n=1; n<d_N; n++){
float alpha_n = (2*M_PI*n - M_PI + d_theta)/4*d_N;
#if FASTSINCOS == 1
- float s_i = scale_sin*gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(alpha_n))+d_psi[n+1]));
- float s_q = scale_sin*gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::sin(gr_fxpt::float_to_fixed(alpha_n))+d_phi[n+1]));
+ float s_i = scale_sin*gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(alpha_n))+d_psi[n+1]));
+ float s_q = scale_sin*gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::sin(gr::fxpt::float_to_fixed(alpha_n))+d_phi[n+1]));
#elif FASTSINCOS == 2
float s_i = scale_sin*d_table.cos(2*M_PI*d_fDTs*d_m*d_table.cos(alpha_n)+d_psi[n+1]);
float s_q = scale_sin*d_table.cos(2*M_PI*d_fDTs*d_m*d_table.sin(alpha_n)+d_phi[n+1]);
@@ -179,8 +179,8 @@ namespace gr {
if(d_LOS){
#if FASTSINCOS == 1
- float los_i = gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
- float los_q = gr_fxpt::sin(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
+ float los_i = gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
+ float los_q = gr::fxpt::sin(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
#elif FASTSINCOS == 2
float los_i = d_table.cos(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]);
float los_q = d_table.sin(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]);
diff --git a/gr-channels/lib/fading_model_impl.h b/gr-channels/lib/fading_model_impl.h
index 5c2d7f3877..cad5a42fb2 100644
--- a/gr-channels/lib/fading_model_impl.h
+++ b/gr-channels/lib/fading_model_impl.h
@@ -23,14 +23,14 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <channels/fading_model.h>
//#include <iostream>
#include <boost/format.hpp>
#include <boost/random.hpp>
-#include <gr_fxpt.h>
+#include <gnuradio/fxpt.h>
#include <sincostable.h>
namespace gr {
diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/comedi/api.h
index 54aa18f317..1afaf0d18c 100644
--- a/gr-comedi/include/comedi/api.h
+++ b/gr-comedi/include/comedi/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_COMEDI_API_H
#define INCLUDED_COMEDI_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_comedi_EXPORTS
# define COMEDI_API __GR_ATTR_EXPORT
diff --git a/gr-comedi/include/comedi/sink_s.h b/gr-comedi/include/comedi/sink_s.h
index 309bce17e5..3996957dde 100644
--- a/gr-comedi/include/comedi/sink_s.h
+++ b/gr-comedi/include/comedi/sink_s.h
@@ -24,7 +24,7 @@
#define INCLUDED_COMEDI_SINK_H
#include <comedi/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace comedi {
@@ -36,7 +36,7 @@ namespace gr {
*
* Input samples must be in the range [-32768,32767].
*/
- class COMEDI_API sink_s : virtual public gr_sync_block
+ class COMEDI_API sink_s : virtual public sync_block
{
public:
// gr::comedi::sink_s::sptr
diff --git a/gr-comedi/include/comedi/source_s.h b/gr-comedi/include/comedi/source_s.h
index 6608e45446..25276948e1 100644
--- a/gr-comedi/include/comedi/source_s.h
+++ b/gr-comedi/include/comedi/source_s.h
@@ -24,7 +24,7 @@
#define INCLUDED_COMEDI_SOURCE_S_H
#include <comedi/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace comedi {
@@ -36,7 +36,7 @@ namespace gr {
*
* Output samples will be in the range [-32768,32767].
*/
- class COMEDI_API source_s : virtual public gr_sync_block
+ class COMEDI_API source_s : virtual public sync_block
{
public:
// gr::comedi::source_s::sptr
diff --git a/gr-comedi/lib/sink_s_impl.cc b/gr-comedi/lib/sink_s_impl.cc
index bc7ec5022a..df2040adf9 100644
--- a/gr-comedi/lib/sink_s_impl.cc
+++ b/gr-comedi/lib/sink_s_impl.cc
@@ -27,7 +27,7 @@
#include <sys/mman.h>
#include "sink_s_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdio.h>
#include <errno.h>
#include <iostream>
@@ -58,9 +58,9 @@ namespace gr {
sink_s_impl::sink_s_impl(int sampling_freq,
const std::string device_name)
- : gr_sync_block("comedi_sink_s",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("comedi_sink_s",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_freq(sampling_freq),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_dev(0),
@@ -142,7 +142,7 @@ namespace gr {
set_output_multiple(d_n_chan*sizeof(sampl_t));
assert(sizeof(sampl_t) == sizeof(short));
- set_output_signature(gr_make_io_signature(1, 1, sizeof(sampl_t)));
+ set_output_signature(io_signature::make(1, 1, sizeof(sampl_t)));
}
bool
diff --git a/gr-comedi/lib/source_s_impl.cc b/gr-comedi/lib/source_s_impl.cc
index 2082177933..2c839208be 100644
--- a/gr-comedi/lib/source_s_impl.cc
+++ b/gr-comedi/lib/source_s_impl.cc
@@ -27,7 +27,7 @@
#include <sys/mman.h>
#include "source_s_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdio.h>
#include <errno.h>
#include <iostream>
@@ -55,9 +55,9 @@ namespace gr {
source_s_impl::source_s_impl(int sampling_freq,
const std::string device_name)
- : gr_sync_block("comedi_source_s",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("comedi_source_s",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sampling_freq(sampling_freq),
d_device_name(device_name.empty() ? default_device_name() : device_name),
d_dev(0),
@@ -139,7 +139,7 @@ namespace gr {
set_output_multiple(d_n_chan*sizeof(sampl_t));
assert(sizeof(sampl_t) == sizeof(short));
- set_output_signature(gr_make_io_signature(1, 1, sizeof(sampl_t)));
+ set_output_signature(io_signature::make(1, 1, sizeof(sampl_t)));
}
bool
diff --git a/gr-digital/include/digital/additive_scrambler_bb.h b/gr-digital/include/digital/additive_scrambler_bb.h
index bc4d4b36e9..9f0493b756 100644
--- a/gr-digital/include/digital/additive_scrambler_bb.h
+++ b/gr-digital/include/digital/additive_scrambler_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -45,7 +45,7 @@ namespace gr {
* processed, the shift register is reset to the seed value.
* This allows processing fixed length vectors of samples.
*/
- class DIGITAL_API additive_scrambler_bb : virtual public gr_sync_block
+ class DIGITAL_API additive_scrambler_bb : virtual public sync_block
{
public:
// gr::digital::additive_scrambler_bb::sptr
diff --git a/gr-digital/include/digital/api.h b/gr-digital/include/digital/api.h
index 815f7b6627..71ca19ad58 100644
--- a/gr-digital/include/digital/api.h
+++ b/gr-digital/include/digital/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_API_H
#define INCLUDED_DIGITAL_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_digital_EXPORTS
# define DIGITAL_API __GR_ATTR_EXPORT
diff --git a/gr-digital/include/digital/binary_slicer_fb.h b/gr-digital/include/digital/binary_slicer_fb.h
index 47e0246094..2d5bf6e51d 100644
--- a/gr-digital/include/digital/binary_slicer_fb.h
+++ b/gr-digital/include/digital/binary_slicer_fb.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_BINARY_SLICER_FB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -37,7 +37,7 @@ namespace gr {
* x < 0 --> 0
* x >= 0 --> 1
*/
- class DIGITAL_API binary_slicer_fb : virtual public gr_sync_block
+ class DIGITAL_API binary_slicer_fb : virtual public sync_block
{
public:
// gr::digital::binary_slicer_fb::sptr
diff --git a/gr-digital/include/digital/chunks_to_symbols_XX.h.t b/gr-digital/include/digital/chunks_to_symbols_XX.h.t
index 6ad10ae261..5d25e68943 100644
--- a/gr-digital/include/digital/chunks_to_symbols_XX.h.t
+++ b/gr-digital/include/digital/chunks_to_symbols_XX.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <digital/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace digital {
@@ -52,7 +52,7 @@ namespace gr {
* \sa gr::digital::chunks_to_symbols_sf, gr::digital::chunks_to_symbols_sc.
*/
- class DIGITAL_API @NAME@ : virtual public gr_sync_interpolator
+ class DIGITAL_API @NAME@ : virtual public sync_interpolator
{
public:
// gr::digital::@BASE_NAME@::sptr
diff --git a/gr-digital/include/digital/clock_recovery_mm_cc.h b/gr-digital/include/digital/clock_recovery_mm_cc.h
index a7917e528a..e2c948ac4d 100644
--- a/gr-digital/include/digital/clock_recovery_mm_cc.h
+++ b/gr-digital/include/digital/clock_recovery_mm_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -44,7 +44,7 @@ namespace gr {
* and Muller algorithm," Electronics Letters, Vol. 31, no. 13, 22
* June 1995, pp. 1032 - 1033.
*/
- class DIGITAL_API clock_recovery_mm_cc : virtual public gr_block
+ class DIGITAL_API clock_recovery_mm_cc : virtual public block
{
public:
// gr::digital::clock_recovery_mm_cc::sptr
diff --git a/gr-digital/include/digital/clock_recovery_mm_ff.h b/gr-digital/include/digital/clock_recovery_mm_ff.h
index 491f3ec21a..e5a229c704 100644
--- a/gr-digital/include/digital/clock_recovery_mm_ff.h
+++ b/gr-digital/include/digital/clock_recovery_mm_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -41,7 +41,7 @@ namespace gr {
* Estimation and Signal Processing" by Heinrich Meyr, Marc
* Moeneclaey, & Stefan Fechtel. ISBN 0-471-50275-8.
*/
- class DIGITAL_API clock_recovery_mm_ff : virtual public gr_block
+ class DIGITAL_API clock_recovery_mm_ff : virtual public block
{
public:
// gr::digital::clock_recovery_mm_ff::sptr
diff --git a/gr-digital/include/digital/cma_equalizer_cc.h b/gr-digital/include/digital/cma_equalizer_cc.h
index 0ccd1c21ba..bfe851e689 100644
--- a/gr-digital/include/digital/cma_equalizer_cc.h
+++ b/gr-digital/include/digital/cma_equalizer_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
#include <digital/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace digital {
@@ -41,7 +41,7 @@ namespace gr {
* Transactions on Communications, Vol. 28, No. 11, pp. 1867 -
* 1875, 1980.
*/
- class DIGITAL_API cma_equalizer_cc: virtual public gr_sync_decimator
+ class DIGITAL_API cma_equalizer_cc: virtual public sync_decimator
{
protected:
virtual gr_complex error(const gr_complex &out) = 0;
diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h
index a5e490b428..d81cac478e 100644
--- a/gr-digital/include/digital/constellation.h
+++ b/gr-digital/include/digital/constellation.h
@@ -26,7 +26,7 @@
#include <digital/api.h>
#include <digital/metric_type.h>
#include <boost/enable_shared_from_this.hpp>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <vector>
namespace gr {
diff --git a/gr-digital/include/digital/constellation_decoder_cb.h b/gr-digital/include/digital/constellation_decoder_cb.h
index 39cc6ac822..fd6e3d0ec3 100644
--- a/gr-digital/include/digital/constellation_decoder_cb.h
+++ b/gr-digital/include/digital/constellation_decoder_cb.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <digital/constellation.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -40,7 +40,7 @@ namespace gr {
* object.
*/
class DIGITAL_API constellation_decoder_cb
- : virtual public gr_block
+ : virtual public block
{
public:
// gr::digital::constellation_decoder_cb::sptr
diff --git a/gr-digital/include/digital/constellation_receiver_cb.h b/gr-digital/include/digital/constellation_receiver_cb.h
index 31138974ef..255ae4da67 100644
--- a/gr-digital/include/digital/constellation_receiver_cb.h
+++ b/gr-digital/include/digital/constellation_receiver_cb.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <digital/constellation.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -43,7 +43,7 @@ namespace gr {
* the NCO are updated according to this error.
*/
class DIGITAL_API constellation_receiver_cb
- : virtual public gr_block
+ : virtual public block
{
public:
// gr::digital::constellation_receiver_cb::sptr
diff --git a/gr-digital/include/digital/correlate_access_code_bb.h b/gr-digital/include/digital/correlate_access_code_bb.h
index 12c0f39961..544d427f60 100644
--- a/gr-digital/include/digital/correlate_access_code_bb.h
+++ b/gr-digital/include/digital/correlate_access_code_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <string>
namespace gr {
@@ -45,7 +45,7 @@ namespace gr {
* the corresponding data bit is the first data bit following the
* access code. Otherwise the flag bit is 0.
*/
- class DIGITAL_API correlate_access_code_bb : virtual public gr_sync_block
+ class DIGITAL_API correlate_access_code_bb : virtual public sync_block
{
public:
// gr::digital::correlate_access_code_bb::sptr
diff --git a/gr-digital/include/digital/correlate_access_code_tag_bb.h b/gr-digital/include/digital/correlate_access_code_tag_bb.h
index 5e04aa0b6e..51d088e82f 100644
--- a/gr-digital/include/digital/correlate_access_code_tag_bb.h
+++ b/gr-digital/include/digital/correlate_access_code_tag_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <string>
namespace gr {
@@ -42,7 +42,7 @@ namespace gr {
* key name [tag_name], specified in the constructor. Used for
* searching an input data stream for preambles, etc.
*/
- class DIGITAL_API correlate_access_code_tag_bb : virtual public gr_sync_block
+ class DIGITAL_API correlate_access_code_tag_bb : virtual public sync_block
{
public:
// gr::digital::correlate_access_code_tag_bb::sptr
diff --git a/gr-digital/include/digital/costas_loop_cc.h b/gr-digital/include/digital/costas_loop_cc.h
index 8ac0444cb8..555d5ad09f 100644
--- a/gr-digital/include/digital/costas_loop_cc.h
+++ b/gr-digital/include/digital/costas_loop_cc.h
@@ -24,8 +24,8 @@
#define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
#include <digital/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -56,7 +56,7 @@ namespace gr {
* stream 2 is the normalized frequency of the loop
*/
class DIGITAL_API costas_loop_cc
- : virtual public gr_sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
diff --git a/gr-digital/include/digital/cpmmod_bc.h b/gr-digital/include/digital/cpmmod_bc.h
index 85fb0fae81..1597d5d7db 100644
--- a/gr-digital/include/digital/cpmmod_bc.h
+++ b/gr-digital/include/digital/cpmmod_bc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CPMMOD_BC_H
#include <digital/api.h>
-#include <gr_hier_block2.h>
+#include <gnuradio/hier_block2.h>
#include <analog/cpm.h>
namespace gr {
@@ -46,7 +46,7 @@ namespace gr {
* The modulator will silently accept any other inputs, though.
* The output is the phase-modulated signal.
*/
- class DIGITAL_API cpmmod_bc : virtual public gr_hier_block2
+ class DIGITAL_API cpmmod_bc : virtual public hier_block2
{
public:
// gr::digital::cpmmod_bc::sptr
diff --git a/gr-digital/include/digital/crc32.h b/gr-digital/include/digital/crc32.h
index 180719bf73..a10960084d 100644
--- a/gr-digital/include/digital/crc32.h
+++ b/gr-digital/include/digital/crc32.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <string>
-#include <gr_types.h>
+#include <gnuradio/types.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/crc32_bb.h b/gr-digital/include/digital/crc32_bb.h
index 52f056c716..8b44e79efa 100644
--- a/gr-digital/include/digital/crc32_bb.h
+++ b/gr-digital/include/digital/crc32_bb.h
@@ -25,7 +25,7 @@
#define INCLUDED_DIGITAL_CRC32_BB_H
#include <digital/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace digital {
@@ -42,7 +42,7 @@ namespace gr {
* Output: The same bytes as incoming, but trailing a CRC32 of the packet.
* The tag is re-set to the new length.
*/
- class DIGITAL_API crc32_bb : virtual public gr_tagged_stream_block
+ class DIGITAL_API crc32_bb : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<crc32_bb> sptr;
diff --git a/gr-digital/include/digital/descrambler_bb.h b/gr-digital/include/digital/descrambler_bb.h
index 9fa1d68425..5494f3fac1 100644
--- a/gr-digital/include/digital/descrambler_bb.h
+++ b/gr-digital/include/digital/descrambler_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DESCRAMBLER_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -38,7 +38,7 @@ namespace gr {
* the LSB only of the input data stream, i.e., on an "unpacked
* binary" stream, and produces the same format on its output.
*/
- class DIGITAL_API descrambler_bb : virtual public gr_sync_block
+ class DIGITAL_API descrambler_bb : virtual public sync_block
{
public:
// gr::digital::descrambler_bb::sptr
diff --git a/gr-digital/include/digital/diff_decoder_bb.h b/gr-digital/include/digital/diff_decoder_bb.h
index 0b28b2a553..bb1b254f27 100644
--- a/gr-digital/include/digital/diff_decoder_bb.h
+++ b/gr-digital/include/digital/diff_decoder_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DIFF_DECODER_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -37,7 +37,7 @@ namespace gr {
* Uses current and previous symbols and the alphabet modulus to
* perform differential decoding.
*/
- class DIGITAL_API diff_decoder_bb : virtual public gr_sync_block
+ class DIGITAL_API diff_decoder_bb : virtual public sync_block
{
public:
// gr::digital::diff_decoder_bb::sptr
diff --git a/gr-digital/include/digital/diff_encoder_bb.h b/gr-digital/include/digital/diff_encoder_bb.h
index ef9d0970a0..20ef12dae6 100644
--- a/gr-digital/include/digital/diff_encoder_bb.h
+++ b/gr-digital/include/digital/diff_encoder_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DIFF_ENCODER_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -37,7 +37,7 @@ namespace gr {
* Uses current and previous symbols and the alphabet modulus to
* perform differential encoding.
*/
- class DIGITAL_API diff_encoder_bb : virtual public gr_sync_block
+ class DIGITAL_API diff_encoder_bb : virtual public sync_block
{
public:
// gr::digital::diff_encoder_bb::sptr
diff --git a/gr-digital/include/digital/diff_phasor_cc.h b/gr-digital/include/digital/diff_phasor_cc.h
index e2bf2bce59..803f025ce0 100644
--- a/gr-digital/include/digital/diff_phasor_cc.h
+++ b/gr-digital/include/digital/diff_phasor_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DIFF_PHASOR_CC_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -39,7 +39,7 @@ namespace gr {
*
* out[i] = in[i] * conj(in[i-1]);
*/
- class DIGITAL_API diff_phasor_cc : virtual public gr_sync_block
+ class DIGITAL_API diff_phasor_cc : virtual public sync_block
{
public:
// gr::digital::diff_phasor_cc::sptr
diff --git a/gr-digital/include/digital/fll_band_edge_cc.h b/gr-digital/include/digital/fll_band_edge_cc.h
index 0bf3471112..9802f825b1 100644
--- a/gr-digital/include/digital/fll_band_edge_cc.h
+++ b/gr-digital/include/digital/fll_band_edge_cc.h
@@ -24,8 +24,8 @@
#define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
#include <digital/api.h>
-#include <gr_sync_block.h>
-#include <blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/blocks/control_loop.h>
namespace gr {
namespace digital {
@@ -81,7 +81,7 @@ namespace gr {
* large.
*/
class DIGITAL_API fll_band_edge_cc
- : virtual public gr_sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
diff --git a/gr-digital/include/digital/framer_sink_1.h b/gr-digital/include/digital/framer_sink_1.h
index b562778704..e317ada5bd 100644
--- a/gr-digital/include/digital/framer_sink_1.h
+++ b/gr-digital/include/digital/framer_sink_1.h
@@ -24,8 +24,8 @@
#define INCLUDED_GR_FRAMER_SINK_1_H
#include <digital/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace digital {
@@ -48,7 +48,7 @@ namespace gr {
* the corresponding bit is the the first bit of the packet. That
* is, this bit is the first one after the access code.
*/
- class DIGITAL_API framer_sink_1 : virtual public gr_sync_block
+ class DIGITAL_API framer_sink_1 : virtual public sync_block
{
public:
// gr::digital::framer_sink_1::sptr
@@ -59,7 +59,7 @@ namespace gr {
*
* \param target_queue The message queue where frames go.
*/
- static sptr make(gr_msg_queue_sptr target_queue);
+ static sptr make(msg_queue::sptr target_queue);
};
} /* namespace digital */
diff --git a/gr-digital/include/digital/glfsr_source_b.h b/gr-digital/include/digital/glfsr_source_b.h
index 7fefb747aa..1a08b5a328 100644
--- a/gr-digital/include/digital/glfsr_source_b.h
+++ b/gr-digital/include/digital/glfsr_source_b.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_GLFSR_SOURCE_B_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Galois LFSR pseudo-random source
* \ingroup waveform_generators_blk
*/
- class DIGITAL_API glfsr_source_b : virtual public gr_sync_block
+ class DIGITAL_API glfsr_source_b : virtual public sync_block
{
public:
// gr::digital::glfsr_source_b::sptr
diff --git a/gr-digital/include/digital/glfsr_source_f.h b/gr-digital/include/digital/glfsr_source_f.h
index e591498d8c..bf840dc3b2 100644
--- a/gr-digital/include/digital/glfsr_source_f.h
+++ b/gr-digital/include/digital/glfsr_source_f.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_GLFSR_SOURCE_F_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Galois LFSR pseudo-random source generating float outputs -1.0 - 1.0.
* \ingroup waveform_generators_blk
*/
- class DIGITAL_API glfsr_source_f : virtual public gr_sync_block
+ class DIGITAL_API glfsr_source_f : virtual public sync_block
{
public:
// gr::digital::glfsr_source_f::sptr
diff --git a/gr-digital/include/digital/header_payload_demux.h b/gr-digital/include/digital/header_payload_demux.h
index 1427062d77..da703fb5fb 100644
--- a/gr-digital/include/digital/header_payload_demux.h
+++ b/gr-digital/include/digital/header_payload_demux.h
@@ -23,7 +23,7 @@
#define INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -59,7 +59,7 @@ namespace gr {
* A special case are tags on items that make up the guard interval. These are copied
* to the first item of the following symbol.
*/
- class DIGITAL_API header_payload_demux : virtual public gr_block
+ class DIGITAL_API header_payload_demux : virtual public block
{
public:
typedef boost::shared_ptr<header_payload_demux> sptr;
diff --git a/gr-digital/include/digital/kurtotic_equalizer_cc.h b/gr-digital/include/digital/kurtotic_equalizer_cc.h
index be8c5f5cc2..e15e962776 100644
--- a/gr-digital/include/digital/kurtotic_equalizer_cc.h
+++ b/gr-digital/include/digital/kurtotic_equalizer_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
#include <digital/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace digital {
@@ -41,7 +41,7 @@ namespace gr {
* Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057."
*/
class DIGITAL_API kurtotic_equalizer_cc :
- virtual public gr_sync_decimator
+ virtual public sync_decimator
{
protected:
virtual gr_complex error(const gr_complex &out) = 0;
diff --git a/gr-digital/include/digital/lms_dd_equalizer_cc.h b/gr-digital/include/digital/lms_dd_equalizer_cc.h
index 7286c9ad3c..ca8d882358 100644
--- a/gr-digital/include/digital/lms_dd_equalizer_cc.h
+++ b/gr-digital/include/digital/lms_dd_equalizer_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
#include <digital/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
#include <digital/constellation.h>
namespace gr {
@@ -65,7 +65,7 @@ namespace gr {
* Prentice Hall, 1996.
*/
class DIGITAL_API lms_dd_equalizer_cc :
- virtual public gr_sync_decimator
+ virtual public sync_decimator
{
protected:
virtual gr_complex error(const gr_complex &out) = 0;
diff --git a/gr-digital/include/digital/map_bb.h b/gr-digital/include/digital/map_bb.h
index 0a55a61213..4ad04b95cb 100644
--- a/gr-digital/include/digital/map_bb.h
+++ b/gr-digital/include/digital/map_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_MAP_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -40,7 +40,7 @@ namespace gr {
*
* -> output[i] = map[input[i]]
*/
- class DIGITAL_API map_bb : virtual public gr_sync_block
+ class DIGITAL_API map_bb : virtual public sync_block
{
public:
// gr::digital::map_bb::sptr
diff --git a/gr-digital/include/digital/mpsk_receiver_cc.h b/gr-digital/include/digital/mpsk_receiver_cc.h
index 68874d178e..fcf4030978 100644
--- a/gr-digital/include/digital/mpsk_receiver_cc.h
+++ b/gr-digital/include/digital/mpsk_receiver_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -65,7 +65,7 @@ namespace gr {
* self-noise.
*
*/
- class DIGITAL_API mpsk_receiver_cc : virtual public gr_block
+ class DIGITAL_API mpsk_receiver_cc : virtual public block
{
public:
// gr::digital::mpsk_receiver_cc::sptr
diff --git a/gr-digital/include/digital/mpsk_snr_est.h b/gr-digital/include/digital/mpsk_snr_est.h
index f9edcbd05a..30c20e755e 100644
--- a/gr-digital/include/digital/mpsk_snr_est.h
+++ b/gr-digital/include/digital/mpsk_snr_est.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_MPSK_SNR_EST_H
#include <digital/api.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/mpsk_snr_est_cc.h b/gr-digital/include/digital/mpsk_snr_est_cc.h
index 14e8ca3b20..45acda5764 100644
--- a/gr-digital/include/digital/mpsk_snr_est_cc.h
+++ b/gr-digital/include/digital/mpsk_snr_est_cc.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <digital/mpsk_snr_est.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -49,7 +49,7 @@ namespace gr {
* amount of error should be assumed and/or estimated for real
* channel conditions.
*/
- class DIGITAL_API mpsk_snr_est_cc : virtual public gr_sync_block
+ class DIGITAL_API mpsk_snr_est_cc : virtual public sync_block
{
public:
// gr::digital::mpsk_snr_est_cc::sptr
diff --git a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h b/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h
index 2eaeb75611..9ada039b31 100644
--- a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h
+++ b/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h
@@ -25,7 +25,7 @@
#define INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_H
#include <digital/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace digital {
@@ -57,7 +57,7 @@ namespace gr {
* \p fft_len-1 both identify the carrier below the DC carrier.
*
*/
- class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public gr_tagged_stream_block
+ class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<ofdm_carrier_allocator_cvc> sptr;
diff --git a/gr-digital/include/digital/ofdm_chanest_vcvc.h b/gr-digital/include/digital/ofdm_chanest_vcvc.h
index 0607743d57..cfea140a9b 100644
--- a/gr-digital/include/digital/ofdm_chanest_vcvc.h
+++ b/gr-digital/include/digital/ofdm_chanest_vcvc.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -53,7 +53,7 @@ namespace gr {
* Communications, IEEE Transactions on, 1997.
* [2] K.D. Kammeyer, "Nachrichtenuebertragung," Chapter. 16.3.2.
*/
- class DIGITAL_API ofdm_chanest_vcvc : virtual public gr_block
+ class DIGITAL_API ofdm_chanest_vcvc : virtual public block
{
public:
typedef boost::shared_ptr<ofdm_chanest_vcvc> sptr;
diff --git a/gr-digital/include/digital/ofdm_cyclic_prefixer.h b/gr-digital/include/digital/ofdm_cyclic_prefixer.h
index f8e45edd90..e924adb92d 100644
--- a/gr-digital/include/digital/ofdm_cyclic_prefixer.h
+++ b/gr-digital/include/digital/ofdm_cyclic_prefixer.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H
#include <digital/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace digital {
@@ -46,7 +46,7 @@ namespace gr {
*
* The pulse shape is a raised cosine in the time domain.
*/
- class DIGITAL_API ofdm_cyclic_prefixer : virtual public gr_tagged_stream_block
+ class DIGITAL_API ofdm_cyclic_prefixer : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<ofdm_cyclic_prefixer> sptr;
diff --git a/gr-digital/include/digital/ofdm_equalizer_base.h b/gr-digital/include/digital/ofdm_equalizer_base.h
index 4e3a88d589..a0b9c76673 100644
--- a/gr-digital/include/digital/ofdm_equalizer_base.h
+++ b/gr-digital/include/digital/ofdm_equalizer_base.h
@@ -23,8 +23,8 @@
#define INCLUDED_DIGITAL_OFDM_EQUALIZER_BASE_H
#include <digital/api.h>
-#include <gr_tags.h>
-#include <gr_complex.h>
+#include <gnuradio/tags.h>
+#include <gnuradio/gr_complex.h>
#include <boost/enable_shared_from_this.hpp>
namespace gr {
@@ -55,7 +55,7 @@ namespace gr {
gr_complex *frame,
int n_sym,
const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(),
- const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>()) = 0;
+ const std::vector<tag_t> &tags = std::vector<tag_t>()) = 0;
//! Return the current channel state
virtual void get_channel_state(std::vector<gr_complex> &taps) = 0;
int fft_len() { return d_fft_len; };
diff --git a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/digital/ofdm_equalizer_simpledfe.h
index 7bf6950965..b81f3c7022 100644
--- a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h
+++ b/gr-digital/include/digital/ofdm_equalizer_simpledfe.h
@@ -80,7 +80,7 @@ namespace gr {
void equalize(gr_complex *frame,
int n_sym,
const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(),
- const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>());
+ const std::vector<tag_t> &tags = std::vector<tag_t>());
/*
* \param fft_len FFT length
diff --git a/gr-digital/include/digital/ofdm_equalizer_static.h b/gr-digital/include/digital/ofdm_equalizer_static.h
index 6507479f4b..3856871c99 100644
--- a/gr-digital/include/digital/ofdm_equalizer_static.h
+++ b/gr-digital/include/digital/ofdm_equalizer_static.h
@@ -67,7 +67,7 @@ namespace gr {
void equalize(gr_complex *frame,
int n_sym,
const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(),
- const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>());
+ const std::vector<tag_t> &tags = std::vector<tag_t>());
/*
* \param fft_len FFT length
diff --git a/gr-digital/include/digital/ofdm_frame_acquisition.h b/gr-digital/include/digital/ofdm_frame_acquisition.h
index b8f8ff7662..cf2ae27e21 100644
--- a/gr-digital/include/digital/ofdm_frame_acquisition.h
+++ b/gr-digital/include/digital/ofdm_frame_acquisition.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -49,7 +49,7 @@ namespace gr {
* equalization on all subcarriers. This corrects for the phase
* and amplitude distortion caused by the channel.
*/
- class DIGITAL_API ofdm_frame_acquisition : virtual public gr_block
+ class DIGITAL_API ofdm_frame_acquisition : virtual public block
{
public:
// gr::digital::ofdm_frame_acquisition::sptr
diff --git a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h
index f8e15fb577..e0ecb6a004 100644
--- a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h
+++ b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h
@@ -24,7 +24,7 @@
#include <digital/api.h>
#include <digital/ofdm_equalizer_base.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace digital {
@@ -38,7 +38,7 @@ namespace gr {
* Input: a tagged series of OFDM symbols.
* Output: The same as the input, but equalized.
*/
- class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public gr_tagged_stream_block
+ class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<ofdm_frame_equalizer_vcvc> sptr;
diff --git a/gr-digital/include/digital/ofdm_frame_sink.h b/gr-digital/include/digital/ofdm_frame_sink.h
index ff31bad919..9408578554 100644
--- a/gr-digital/include/digital/ofdm_frame_sink.h
+++ b/gr-digital/include/digital/ofdm_frame_sink.h
@@ -24,8 +24,8 @@
#define INCLUDED_DIGITAL_OFDM_FRAME_SINK_H
#include <digital/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace digital {
@@ -42,7 +42,7 @@ namespace gr {
* reference to an object to do the demapping and slicing for a
* given modulation type.
*/
- class DIGITAL_API ofdm_frame_sink : virtual public gr_sync_block
+ class DIGITAL_API ofdm_frame_sink : virtual public sync_block
{
public:
// gr::digital::ofdm_frame_sink::sptr
@@ -60,7 +60,7 @@ namespace gr {
*/
static sptr make(const std::vector<gr_complex> &sym_position,
const std::vector<char> &sym_value_out,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int occupied_tones,
float phase_gain=0.25, float freq_gain=0.25*0.25/4);
};
diff --git a/gr-digital/include/digital/ofdm_insert_preamble.h b/gr-digital/include/digital/ofdm_insert_preamble.h
index a9ad61e1d0..8abe4772b7 100644
--- a/gr-digital/include/digital/ofdm_insert_preamble.h
+++ b/gr-digital/include/digital/ofdm_insert_preamble.h
@@ -23,7 +23,7 @@
#define INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -55,7 +55,7 @@ namespace gr {
* symbol is the first symbol, otherwise 0.
* </pre>
*/
- class DIGITAL_API ofdm_insert_preamble : virtual public gr_block
+ class DIGITAL_API ofdm_insert_preamble : virtual public block
{
public:
// gr::digital::ofdm_insert_preamble::sptr
diff --git a/gr-digital/include/digital/ofdm_mapper_bcv.h b/gr-digital/include/digital/ofdm_mapper_bcv.h
index 49ae9adc92..9719ab3e86 100644
--- a/gr-digital/include/digital/ofdm_mapper_bcv.h
+++ b/gr-digital/include/digital/ofdm_mapper_bcv.h
@@ -24,8 +24,8 @@
#define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H
#include <digital/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace digital {
@@ -39,7 +39,7 @@ namespace gr {
* \details
* Abstract class must be subclassed with specific mapping.
*/
- class DIGITAL_API ofdm_mapper_bcv : virtual public gr_sync_block
+ class DIGITAL_API ofdm_mapper_bcv : virtual public sync_block
{
public:
// gr::digital::ofdm_mapper_bcv::sptr
@@ -58,7 +58,7 @@ namespace gr {
unsigned occupied_carriers,
unsigned int fft_length);
- virtual gr_msg_queue_sptr msgq() const = 0;
+ virtual msg_queue::sptr msgq() const = 0;
};
} /* namespace digital */
diff --git a/gr-digital/include/digital/ofdm_sampler.h b/gr-digital/include/digital/ofdm_sampler.h
index 5df16be3e4..10c43c28ef 100644
--- a/gr-digital/include/digital/ofdm_sampler.h
+++ b/gr-digital/include/digital/ofdm_sampler.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_SAMPLER_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
* \brief does the rest of the OFDM stuff
* \ingroup ofdm_blk
*/
- class DIGITAL_API ofdm_sampler : virtual public gr_block
+ class DIGITAL_API ofdm_sampler : virtual public block
{
public:
// gr::digital::ofdm_sampler::sptr
diff --git a/gr-digital/include/digital/ofdm_serializer_vcc.h b/gr-digital/include/digital/ofdm_serializer_vcc.h
index f02b0f85bb..6210821699 100644
--- a/gr-digital/include/digital/ofdm_serializer_vcc.h
+++ b/gr-digital/include/digital/ofdm_serializer_vcc.h
@@ -23,7 +23,7 @@
#define INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_H
#include <digital/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
#include <digital/ofdm_carrier_allocator_cvc.h>
namespace gr {
@@ -49,7 +49,7 @@ namespace gr {
* Input: Complex vectors of length \p fft_len
* Output: Complex scalars, in the same order as specified in occupied_carriers.
*/
- class DIGITAL_API ofdm_serializer_vcc : virtual public gr_tagged_stream_block
+ class DIGITAL_API ofdm_serializer_vcc : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<ofdm_serializer_vcc> sptr;
diff --git a/gr-digital/include/digital/ofdm_sync_sc_cfb.h b/gr-digital/include/digital/ofdm_sync_sc_cfb.h
index 84f3e704a3..db01e14dc7 100644
--- a/gr-digital/include/digital/ofdm_sync_sc_cfb.h
+++ b/gr-digital/include/digital/ofdm_sync_sc_cfb.h
@@ -25,7 +25,7 @@
#define INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_H
#include <digital/api.h>
-#include <gr_hier_block2.h>
+#include <gnuradio/hier_block2.h>
namespace gr {
namespace digital {
@@ -61,7 +61,7 @@ namespace gr {
* [1] Schmidl, T.M. and Cox, D.C., "Robust frequency and timing synchronization for OFDM",
* Communications, IEEE Transactions on, 1997.
*/
- class DIGITAL_API ofdm_sync_sc_cfb : virtual public gr_hier_block2
+ class DIGITAL_API ofdm_sync_sc_cfb : virtual public hier_block2
{
public:
typedef boost::shared_ptr<ofdm_sync_sc_cfb> sptr;
diff --git a/gr-digital/include/digital/packet_header_default.h b/gr-digital/include/digital/packet_header_default.h
index e4c994593f..0e619c9a95 100644
--- a/gr-digital/include/digital/packet_header_default.h
+++ b/gr-digital/include/digital/packet_header_default.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H
#define INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H
-#include <gr_tags.h>
+#include <gnuradio/tags.h>
#include <digital/api.h>
#include <boost/enable_shared_from_this.hpp>
@@ -79,7 +79,7 @@ namespace gr {
virtual bool header_formatter(
long packet_len,
unsigned char *out,
- const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>()
+ const std::vector<tag_t> &tags=std::vector<tag_t>()
);
/*!
@@ -89,7 +89,7 @@ namespace gr {
*/
virtual bool header_parser(
const unsigned char *header,
- std::vector<gr_tag_t> &tags);
+ std::vector<tag_t> &tags);
static sptr make(
long header_len,
diff --git a/gr-digital/include/digital/packet_header_ofdm.h b/gr-digital/include/digital/packet_header_ofdm.h
index 30d6a953cd..734c04692a 100644
--- a/gr-digital/include/digital/packet_header_ofdm.h
+++ b/gr-digital/include/digital/packet_header_ofdm.h
@@ -60,7 +60,7 @@ namespace gr {
*/
bool header_parser(
const unsigned char *header,
- std::vector<gr_tag_t> &tags);
+ std::vector<tag_t> &tags);
/*!
* \param occupied_carriers See carrier allocator
diff --git a/gr-digital/include/digital/packet_headergenerator_bb.h b/gr-digital/include/digital/packet_headergenerator_bb.h
index 426f49dee5..52e260f446 100644
--- a/gr-digital/include/digital/packet_headergenerator_bb.h
+++ b/gr-digital/include/digital/packet_headergenerator_bb.h
@@ -23,7 +23,7 @@
#define INCLUDED_PACKET_HEADERGENERATOR_BB_H
#include <digital/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/tagged_stream_block.h>
#include <digital/packet_header_default.h>
namespace gr {
@@ -41,7 +41,7 @@ namespace gr {
* or a subclass thereof). If only a number of bits is specified, a
* default header is generated (see packet_header_default).
*/
- class DIGITAL_API packet_headergenerator_bb : virtual public gr_tagged_stream_block
+ class DIGITAL_API packet_headergenerator_bb : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<packet_headergenerator_bb> sptr;
diff --git a/gr-digital/include/digital/packet_headerparser_b.h b/gr-digital/include/digital/packet_headerparser_b.h
index cdf76f1209..a387cd7282 100644
--- a/gr-digital/include/digital/packet_headerparser_b.h
+++ b/gr-digital/include/digital/packet_headerparser_b.h
@@ -23,7 +23,7 @@
#define INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <digital/packet_header_default.h>
namespace gr {
@@ -46,7 +46,7 @@ namespace gr {
* If only a header length is given, this block uses the default header
* format.
*/
- class DIGITAL_API packet_headerparser_b : virtual public gr_sync_block
+ class DIGITAL_API packet_headerparser_b : virtual public sync_block
{
public:
typedef boost::shared_ptr<packet_headerparser_b> sptr;
diff --git a/gr-digital/include/digital/packet_sink.h b/gr-digital/include/digital/packet_sink.h
index 42f826535f..41992d98eb 100644
--- a/gr-digital/include/digital/packet_sink.h
+++ b/gr-digital/include/digital/packet_sink.h
@@ -24,8 +24,8 @@
#define INCLUDED_GR_PACKET_SINK_H
#include <digital/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace digital {
@@ -53,7 +53,7 @@ namespace gr {
* generally be replaced with a correlate access code and frame
* sink blocks.
*/
- class DIGITAL_API packet_sink : virtual public gr_sync_block
+ class DIGITAL_API packet_sink : virtual public sync_block
{
public:
// gr::digital::packet_sink::sptr
@@ -67,7 +67,7 @@ namespace gr {
* \param threshold Number of bits that can be incorrect in the \p sync_vector.
*/
static sptr make(const std::vector<unsigned char>& sync_vector,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int threshold=-1);
//! return true if we detect carrier
diff --git a/gr-digital/include/digital/pfb_clock_sync_ccf.h b/gr-digital/include/digital/pfb_clock_sync_ccf.h
index 2cdb55ca4a..29da5dff48 100644
--- a/gr-digital/include/digital/pfb_clock_sync_ccf.h
+++ b/gr-digital/include/digital/pfb_clock_sync_ccf.h
@@ -26,7 +26,7 @@
#include <digital/api.h>
#include <filter/fir_filter.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -146,7 +146,7 @@ namespace gr {
* was added to better work with equalizers, which do a better job
* of modeling the channel if they have 2 samps/sym.
*/
- class DIGITAL_API pfb_clock_sync_ccf : virtual public gr_block
+ class DIGITAL_API pfb_clock_sync_ccf : virtual public block
{
public:
// gr::digital::pfb_clock_sync_ccf::sptr
diff --git a/gr-digital/include/digital/pfb_clock_sync_fff.h b/gr-digital/include/digital/pfb_clock_sync_fff.h
index f0fc6df314..8c18a1788a 100644
--- a/gr-digital/include/digital/pfb_clock_sync_fff.h
+++ b/gr-digital/include/digital/pfb_clock_sync_fff.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <filter/fir_filter.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -145,7 +145,7 @@ namespace gr {
* was added to better work with equalizers, which do a better job
* of modeling the channel if they have 2 samps/sym.
*/
- class DIGITAL_API pfb_clock_sync_fff : virtual public gr_block
+ class DIGITAL_API pfb_clock_sync_fff : virtual public block
{
public:
// gr::digital::pfb_clock_sync_fff::sptr
diff --git a/gr-digital/include/digital/pn_correlator_cc.h b/gr-digital/include/digital/pn_correlator_cc.h
index 147983f892..ae3ebe9ef4 100644
--- a/gr-digital/include/digital/pn_correlator_cc.h
+++ b/gr-digital/include/digital/pn_correlator_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_PN_CORRELATOR_CC_H
#include <digital/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace digital {
@@ -38,7 +38,7 @@ namespace gr {
* against reference PN code, one sample per PN code period. The
* PN sequence is generated using a GLFSR.
*/
- class DIGITAL_API pn_correlator_cc : virtual public gr_sync_decimator
+ class DIGITAL_API pn_correlator_cc : virtual public sync_decimator
{
public:
// gr::digital::pn_correlator_cc::sptr
diff --git a/gr-digital/include/digital/probe_density_b.h b/gr-digital/include/digital/probe_density_b.h
index b0343d2cfb..f2ed8f9441 100644
--- a/gr-digital/include/digital/probe_density_b.h
+++ b/gr-digital/include/digital/probe_density_b.h
@@ -22,7 +22,7 @@
#define INCLUDED_GR_PROBE_DENSITY_B_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -37,7 +37,7 @@ namespace gr {
* If you send this block a stream of unpacked bytes, it will tell
* you what the bit density is.
*/
- class DIGITAL_API probe_density_b : virtual public gr_sync_block
+ class DIGITAL_API probe_density_b : virtual public sync_block
{
public:
// gr::digital::probe_density_b::sptr
diff --git a/gr-digital/include/digital/probe_mpsk_snr_est_c.h b/gr-digital/include/digital/probe_mpsk_snr_est_c.h
index 289940cdd1..98a4bbcc2e 100644
--- a/gr-digital/include/digital/probe_mpsk_snr_est_c.h
+++ b/gr-digital/include/digital/probe_mpsk_snr_est_c.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <digital/mpsk_snr_est.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -46,7 +46,7 @@ namespace gr {
* conditions; some amount of error should be assumed and/or
* estimated for real channel conditions.
*/
- class DIGITAL_API probe_mpsk_snr_est_c : virtual public gr_sync_block
+ class DIGITAL_API probe_mpsk_snr_est_c : virtual public sync_block
{
public:
// gr::digital::probe_mpsk_snr_est_c::sptr
diff --git a/gr-digital/include/digital/scrambler_bb.h b/gr-digital/include/digital/scrambler_bb.h
index 6360662dae..2c6b97571f 100644
--- a/gr-digital/include/digital/scrambler_bb.h
+++ b/gr-digital/include/digital/scrambler_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_SCRAMBLER_BB_H
#include <digital/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
@@ -38,7 +38,7 @@ namespace gr {
* i.e., on an "unpacked binary" stream, and produces the same
* format on its output.
*/
- class DIGITAL_API scrambler_bb : virtual public gr_sync_block
+ class DIGITAL_API scrambler_bb : virtual public sync_block
{
public:
// gr::digital::scrambler_bb::sptr
diff --git a/gr-digital/include/digital/simple_correlator.h b/gr-digital/include/digital/simple_correlator.h
index 5cb7ddc6ee..05863cbf35 100644
--- a/gr-digital/include/digital/simple_correlator.h
+++ b/gr-digital/include/digital/simple_correlator.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_SIMPLE_CORRELATOR_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -34,7 +34,7 @@ namespace gr {
* \ingroup packet_operators_blk
* \ingroup deprecated_blk
*/
- class DIGITAL_API simple_correlator : virtual public gr_block
+ class DIGITAL_API simple_correlator : virtual public block
{
public:
// gr::digital::simple_correlator::sptr
diff --git a/gr-digital/include/digital/simple_framer.h b/gr-digital/include/digital/simple_framer.h
index 951e13d8f2..ad17e97d53 100644
--- a/gr-digital/include/digital/simple_framer.h
+++ b/gr-digital/include/digital/simple_framer.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_SIMPLE_FRAMER_H
#include <digital/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace digital {
@@ -39,7 +39,7 @@ namespace gr {
* frame is prepended with the GRSF_SYNC (defind in
* simple_framer_sync.h) and an 8-bit sequence number.
*/
- class DIGITAL_API simple_framer : virtual public gr_block
+ class DIGITAL_API simple_framer : virtual public block
{
public:
// gr::digital::simple_framer::sptr
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.cc b/gr-digital/lib/additive_scrambler_bb_impl.cc
index 8238f2d988..8f2229e6b6 100644
--- a/gr-digital/lib/additive_scrambler_bb_impl.cc
+++ b/gr-digital/lib/additive_scrambler_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "additive_scrambler_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -41,9 +41,9 @@ namespace gr {
int seed,
int len,
int count)
- : gr_sync_block("additive_scrambler_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("additive_scrambler_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_lfsr(mask, seed, len),
d_count(count),
d_bits(0), d_len(len), d_seed(seed)
diff --git a/gr-digital/lib/binary_slicer_fb_impl.cc b/gr-digital/lib/binary_slicer_fb_impl.cc
index f8a9cf22de..335e2e549a 100644
--- a/gr-digital/lib/binary_slicer_fb_impl.cc
+++ b/gr-digital/lib/binary_slicer_fb_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "binary_slicer_fb_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace digital {
@@ -37,9 +37,9 @@ namespace gr {
}
binary_slicer_fb_impl::binary_slicer_fb_impl()
- : gr_sync_block("binary_slicer_fb",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("binary_slicer_fb",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
}
@@ -56,7 +56,7 @@ namespace gr {
unsigned char *out = (unsigned char *)output_items[0];
for(int i = 0; i < noutput_items; i++) {
- out[i] = gr_binary_slicer(in[i]);
+ out[i] = gr::binary_slicer(in[i]);
}
return noutput_items;
diff --git a/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t b/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t
index 39eca32db6..3ecb8c17e5 100644
--- a/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t
+++ b/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@IMPL_NAME@::@IMPL_NAME@(const std::vector<@O_TYPE@> &symbol_table, const int D)
- : gr_sync_interpolator("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@)),
+ : sync_interpolator("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@)),
D),
d_D(D), d_symbol_table(symbol_table)
{
diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.cc b/gr-digital/lib/clock_recovery_mm_cc_impl.cc
index 168d9f7772..124b85efb6 100644
--- a/gr-digital/lib/clock_recovery_mm_cc_impl.cc
+++ b/gr-digital/lib/clock_recovery_mm_cc_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "clock_recovery_mm_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
+#include <gnuradio/math.h>
#include <stdexcept>
#include <iostream>
@@ -50,13 +50,13 @@ namespace gr {
clock_recovery_mm_cc_impl::clock_recovery_mm_cc_impl(float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit)
- : gr_block("clock_recovery_mm_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature2(1, 2, sizeof(gr_complex), sizeof(float))),
+ : block("clock_recovery_mm_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make2(1, 2, sizeof(gr_complex), sizeof(float))),
d_mu(mu), d_omega(omega), d_gain_omega(gain_omega),
d_omega_relative_limit(omega_relative_limit),
d_gain_mu(gain_mu), d_last_sample(0), d_interp(new filter::mmse_fir_interpolator_cc()),
- d_verbose(gr_prefs::singleton()->get_bool("clock_recovery_mm_cc", "verbose", false)),
+ d_verbose(prefs::singleton()->get_bool("clock_recovery_mm_cc", "verbose", false)),
d_p_2T(0), d_p_1T(0), d_p_0T(0), d_c_2T(0), d_c_1T(0), d_c_0T(0)
{
if(omega <= 0.0)
@@ -147,9 +147,9 @@ namespace gr {
out[oo++] = d_p_0T;
// limit mm_val
- mm_val = gr_branchless_clip(mm_val,4.0);
+ mm_val = gr::branchless_clip(mm_val,4.0);
d_omega = d_omega + d_gain_omega * mm_val;
- d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
+ d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
d_mu = d_mu + d_omega + d_gain_mu * mm_val;
ii += (int)floor(d_mu);
@@ -180,10 +180,10 @@ namespace gr {
out[oo++] = d_p_0T;
// limit mm_val
- mm_val = gr_branchless_clip(mm_val,1.0);
+ mm_val = gr::branchless_clip(mm_val,1.0);
d_omega = d_omega + d_gain_omega * mm_val;
- d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
+ d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
d_mu = d_mu + d_omega + d_gain_mu * mm_val;
ii += (int)floor(d_mu);
diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.cc b/gr-digital/lib/clock_recovery_mm_ff_impl.cc
index 4ac3e40c5d..6c16777ed7 100644
--- a/gr-digital/lib/clock_recovery_mm_ff_impl.cc
+++ b/gr-digital/lib/clock_recovery_mm_ff_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "clock_recovery_mm_ff_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
#include <stdexcept>
namespace gr {
@@ -46,9 +46,9 @@ namespace gr {
clock_recovery_mm_ff_impl::clock_recovery_mm_ff_impl(float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit)
- : gr_block("clock_recovery_mm_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("clock_recovery_mm_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_mu(mu), d_gain_mu(gain_mu), d_gain_omega(gain_omega),
d_omega_relative_limit(omega_relative_limit),
d_last_sample(0), d_interp(new filter::mmse_fir_interpolator_ff())
@@ -104,7 +104,7 @@ namespace gr {
d_last_sample = out[oo];
d_omega = d_omega + d_gain_omega * mm_val;
- d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
+ d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);
d_mu = d_mu + d_omega + d_gain_mu * mm_val;
ii += (int)floor(d_mu);
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc
index e4e6c56466..6f11e617bb 100644
--- a/gr-digital/lib/cma_equalizer_cc_impl.cc
+++ b/gr-digital/lib/cma_equalizer_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "cma_equalizer_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -41,9 +41,9 @@ namespace gr {
cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps, float modulus,
float mu, int sps)
- : gr_sync_decimator("cma_equalizer_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator("cma_equalizer_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
sps),
fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0,0))),
d_new_taps(num_taps, gr_complex(0,0)),
@@ -79,8 +79,8 @@ namespace gr {
cma_equalizer_cc_impl::error(const gr_complex &out)
{
gr_complex error = out*(norm(out) - d_modulus);
- float re = gr_clip(error.real(), 1.0);
- float im = gr_clip(error.imag(), 1.0);
+ float re = gr::clip(error.real(), 1.0);
+ float im = gr::clip(error.imag(), 1.0);
return gr_complex(re, im);
}
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.h b/gr-digital/lib/cma_equalizer_cc_impl.h
index 553501bf46..5c45209dc8 100644
--- a/gr-digital/lib/cma_equalizer_cc_impl.h
+++ b/gr-digital/lib/cma_equalizer_cc_impl.h
@@ -25,7 +25,7 @@
#include <digital/cma_equalizer_cc.h>
#include <filter/fir_filter.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
index d249c493ad..13d6029a06 100644
--- a/gr-digital/lib/constellation.cc
+++ b/gr-digital/lib/constellation.cc
@@ -24,10 +24,10 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <digital/constellation.h>
-#include <gr_math.h>
-#include <gr_complex.h>
+#include <gnuradio/math.h>
+#include <gnuradio/gr_complex.h>
#include <math.h>
#include <iostream>
#include <stdlib.h>
diff --git a/gr-digital/lib/constellation_decoder_cb_impl.cc b/gr-digital/lib/constellation_decoder_cb_impl.cc
index e764ccc629..e8075d2225 100644
--- a/gr-digital/lib/constellation_decoder_cb_impl.cc
+++ b/gr-digital/lib/constellation_decoder_cb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "constellation_decoder_cb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -39,9 +39,9 @@ namespace gr {
constellation_decoder_cb_impl::
constellation_decoder_cb_impl(constellation_sptr constellation)
- : gr_block("constellation_decoder_cb",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : block("constellation_decoder_cb",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_constellation(constellation),
d_dim(constellation->dimensionality())
{
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc
index 30be24aab9..cd44386ea0 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.cc
+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
@@ -25,10 +25,9 @@
#endif
#include "constellation_receiver_cb_impl.h"
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <gr_math.h>
-#include <gr_expj.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
+#include <gnuradio/expj.h>
#include <stdexcept>
namespace gr {
@@ -51,9 +50,9 @@ namespace gr {
static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
constellation_receiver_cb_impl::constellation_receiver_cb_impl(constellation_sptr constellation,
float loop_bw, float fmin, float fmax)
- : gr_block("constellation_receiver_cb",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signaturev(1, 5, iosig)),
+ : block("constellation_receiver_cb",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::makev(1, 5, iosig)),
blocks::control_loop(loop_bw, fmax, fmin),
d_constellation(constellation),
d_current_const_point(0)
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h
index 7c34518340..47453e67bc 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.h
+++ b/gr-digital/lib/constellation_receiver_cb_impl.h
@@ -24,9 +24,9 @@
#define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
#include <digital/constellation_receiver_cb.h>
-#include <attributes.h>
-#include <gr_complex.h>
-#include <blocks/control_loop.h>
+#include <gnuradio/attributes.h>
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/blocks/control_loop.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc
index 0ada203c65..dea831dfbc 100644
--- a/gr-digital/lib/correlate_access_code_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "correlate_access_code_bb_impl.h"
-#include <gr_io_signature.h>
-#include <blocks/count_bits.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/count_bits.h>
#include <stdexcept>
#include <cstdio>
@@ -44,9 +44,9 @@ namespace gr {
correlate_access_code_bb_impl::correlate_access_code_bb_impl(
const std::string &access_code, int threshold)
- : gr_sync_block("correlate_access_code_bb",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("correlate_access_code_bb",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(char))),
d_data_reg(0), d_flag_reg(0), d_flag_bit(0), d_mask(0),
d_threshold(threshold)
{
diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
index 8ac601bb9d..0d64caa7ab 100644
--- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "correlate_access_code_tag_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
-#include <blocks/count_bits.h>
+#include <gnuradio/blocks/count_bits.h>
#include <cstdio>
#include <iostream>
@@ -49,9 +49,9 @@ namespace gr {
correlate_access_code_tag_bb_impl::correlate_access_code_tag_bb_impl(
const std::string &access_code, int threshold, const std::string &tag_name)
- : gr_sync_block("correlate_access_code_tag_bb",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(char))),
+ : sync_block("correlate_access_code_tag_bb",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(char))),
d_data_reg(0), d_mask(0),
d_threshold(threshold), d_len(0)
{
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
index fcdd45045b..a0b1edf509 100644
--- a/gr-digital/lib/costas_loop_cc_impl.cc
+++ b/gr-digital/lib/costas_loop_cc_impl.cc
@@ -25,10 +25,10 @@
#endif
#include "costas_loop_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
-#include <gr_sincos.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
+#include <gnuradio/sincos.h>
+#include <gnuradio/math.h>
namespace gr {
namespace digital {
@@ -41,9 +41,9 @@ namespace gr {
}
costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order)
- : gr_sync_block("costas_loop_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature2(1, 2, sizeof(gr_complex), sizeof(float))),
+ : sync_block("costas_loop_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make2(1, 2, sizeof(gr_complex), sizeof(float))),
blocks::control_loop(loop_bw, 1.0, -1.0),
d_order(order), d_phase_detector(NULL)
{
@@ -132,7 +132,7 @@ namespace gr {
optr[i] = iptr[i] * nco_out;
error = (*this.*d_phase_detector)(optr[i]);
- error = gr_branchless_clip(error, 1.0);
+ error = gr::branchless_clip(error, 1.0);
advance_loop(error);
phase_wrap();
@@ -147,7 +147,7 @@ namespace gr {
optr[i] = iptr[i] * nco_out;
error = (*this.*d_phase_detector)(optr[i]);
- error = gr_branchless_clip(error, 1.0);
+ error = gr::branchless_clip(error, 1.0);
advance_loop(error);
phase_wrap();
diff --git a/gr-digital/lib/cpmmod_bc_impl.cc b/gr-digital/lib/cpmmod_bc_impl.cc
index 763a4cc1e2..4b2457f90e 100644
--- a/gr-digital/lib/cpmmod_bc_impl.cc
+++ b/gr-digital/lib/cpmmod_bc_impl.cc
@@ -23,7 +23,7 @@
#endif
#include "cpmmod_bc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -55,9 +55,9 @@ namespace gr {
analog::cpm::cpm_type type, float h,
int samples_per_sym,
int L, double beta)
- : gr_hier_block2(name,
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))),
+ : hier_block2(name,
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make2(1, 1, sizeof(gr_complex), sizeof(float))),
d_type(type), d_index(h), d_sps(samples_per_sym), d_length(L), d_beta(beta),
d_taps(analog::cpm::phase_response(type, samples_per_sym, L, beta)),
d_char_to_float(blocks::char_to_float::make()),
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h
index 9cfec4959e..7ae150100c 100644
--- a/gr-digital/lib/cpmmod_bc_impl.h
+++ b/gr-digital/lib/cpmmod_bc_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H
#include <digital/cpmmod_bc.h>
-#include <blocks/char_to_float.h>
+#include <gnuradio/blocks/char_to_float.h>
#include <analog/frequency_modulator_fc.h>
#include <filter/interp_fir_filter_fff.h>
diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc
index 89cc0d1083..5a72d528ab 100644
--- a/gr-digital/lib/crc32_bb_impl.cc
+++ b/gr-digital/lib/crc32_bb_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "crc32_bb_impl.h"
#include <digital/crc32.h>
@@ -38,9 +38,9 @@ namespace gr {
}
crc32_bb_impl::crc32_bb_impl(bool check, const std::string& lengthtagname)
- : gr_tagged_stream_block("crc32_bb",
- gr_make_io_signature(1, 1, sizeof (char)),
- gr_make_io_signature(1, 1, sizeof (char)),
+ : tagged_stream_block("crc32_bb",
+ io_signature::make(1, 1, sizeof (char)),
+ io_signature::make(1, 1, sizeof (char)),
lengthtagname),
d_check(check)
{
@@ -85,7 +85,7 @@ namespace gr {
memcpy((void *) (out + packet_length), &crc, 4); // FIXME big-endian/little-endian, this might be wrong
}
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+packet_length);
for (size_t i = 0; i < tags.size(); i++) {
tags[i].offset -= nitems_read(0);
diff --git a/gr-digital/lib/descrambler_bb_impl.cc b/gr-digital/lib/descrambler_bb_impl.cc
index 8124df37ef..69e9dd0cef 100644
--- a/gr-digital/lib/descrambler_bb_impl.cc
+++ b/gr-digital/lib/descrambler_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "descrambler_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -38,9 +38,9 @@ namespace gr {
}
descrambler_bb_impl::descrambler_bb_impl(int mask, int seed, int len)
- : gr_sync_block("descrambler_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("descrambler_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_lfsr(mask, seed, len)
{
}
diff --git a/gr-digital/lib/diff_decoder_bb_impl.cc b/gr-digital/lib/diff_decoder_bb_impl.cc
index 74c247a830..f0e1de0935 100644
--- a/gr-digital/lib/diff_decoder_bb_impl.cc
+++ b/gr-digital/lib/diff_decoder_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "diff_decoder_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -37,9 +37,9 @@ namespace gr {
}
diff_decoder_bb_impl::diff_decoder_bb_impl(unsigned int modulus)
- : gr_sync_block("diff_decoder_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("diff_decoder_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_modulus(modulus)
{
set_history(2); // need to look at two inputs
diff --git a/gr-digital/lib/diff_decoder_bb_impl.h b/gr-digital/lib/diff_decoder_bb_impl.h
index 56a15ba128..2e06d3cf5f 100644
--- a/gr-digital/lib/diff_decoder_bb_impl.h
+++ b/gr-digital/lib/diff_decoder_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DIFF_DECODER_BB_IMPL_H
#include <digital/diff_decoder_bb.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/diff_encoder_bb_impl.cc b/gr-digital/lib/diff_encoder_bb_impl.cc
index 411efe006c..529aade3db 100644
--- a/gr-digital/lib/diff_encoder_bb_impl.cc
+++ b/gr-digital/lib/diff_encoder_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "diff_encoder_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -38,9 +38,9 @@ namespace gr {
}
diff_encoder_bb_impl::diff_encoder_bb_impl(unsigned int modulus)
- : gr_sync_block("diff_encoder_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("diff_encoder_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_last_out(0), d_modulus(modulus)
{
}
diff --git a/gr-digital/lib/diff_phasor_cc_impl.cc b/gr-digital/lib/diff_phasor_cc_impl.cc
index 0e7a108121..0e70a4bf62 100644
--- a/gr-digital/lib/diff_phasor_cc_impl.cc
+++ b/gr-digital/lib/diff_phasor_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "diff_phasor_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -38,9 +38,9 @@ namespace gr {
}
diff_phasor_cc_impl::diff_phasor_cc_impl()
- : gr_sync_block("diff_phasor_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)))
+ : sync_block("diff_phasor_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)))
{
set_history(2);
}
diff --git a/gr-digital/lib/diff_phasor_cc_impl.h b/gr-digital/lib/diff_phasor_cc_impl.h
index 844fc826d8..7e06b35ad4 100644
--- a/gr-digital/lib/diff_phasor_cc_impl.h
+++ b/gr-digital/lib/diff_phasor_cc_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DIFF_PHASOR_CC_IMPL_H
#include <digital/diff_phasor_cc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc
index c438b813f4..d67f13a412 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.cc
+++ b/gr-digital/lib/fll_band_edge_cc_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "fll_band_edge_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
#include <cstdio>
namespace gr {
@@ -55,9 +55,9 @@ namespace gr {
static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
fll_band_edge_cc_impl::fll_band_edge_cc_impl(float samps_per_sym, float rolloff,
int filter_size, float bandwidth)
- : gr_sync_block("fll_band_edge_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signaturev(1, 4, iosig)),
+ : sync_block("fll_band_edge_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::makev(1, 4, iosig)),
blocks::control_loop(bandwidth, M_TWOPI*(2.0/samps_per_sym),
-M_TWOPI*(2.0/samps_per_sym)),
d_updated(false)
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h
index 9eb3e6e7ae..6237b53cff 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.h
+++ b/gr-digital/lib/fll_band_edge_cc_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H
#include <digital/fll_band_edge_cc.h>
-#include <blocks/control_loop.h>
+#include <gnuradio/blocks/control_loop.h>
#include <filter/fir_filter.h>
namespace gr {
diff --git a/gr-digital/lib/framer_sink_1_impl.cc b/gr-digital/lib/framer_sink_1_impl.cc
index 1dda5ca50c..76347101a4 100644
--- a/gr-digital/lib/framer_sink_1_impl.cc
+++ b/gr-digital/lib/framer_sink_1_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "framer_sink_1_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <string>
@@ -71,16 +71,16 @@ namespace gr {
}
framer_sink_1::sptr
- framer_sink_1::make(gr_msg_queue_sptr target_queue)
+ framer_sink_1::make(msg_queue::sptr target_queue)
{
return gnuradio::get_initial_sptr
(new framer_sink_1_impl(target_queue));
}
- framer_sink_1_impl::framer_sink_1_impl(gr_msg_queue_sptr target_queue)
- : gr_sync_block("framer_sink_1",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(0, 0, 0)),
+ framer_sink_1_impl::framer_sink_1_impl(msg_queue::sptr target_queue)
+ : sync_block("framer_sink_1",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(0, 0, 0)),
d_target_queue(target_queue)
{
enter_search();
@@ -139,8 +139,8 @@ namespace gr {
if(d_packetlen == 0) { // check for zero-length payload
// build a zero-length message
// NOTE: passing header field as arg1 is not scalable
- gr_message_sptr msg =
- gr_make_message(0, d_packet_whitener_offset, 0, 0);
+ message::sptr msg =
+ message::make(0, d_packet_whitener_offset, 0, 0);
d_target_queue->insert_tail(msg); // send it
msg.reset(); // free it up
@@ -168,8 +168,8 @@ namespace gr {
if(d_packetlen_cnt == d_packetlen) { // packet is filled
// build a message
// NOTE: passing header field as arg1 is not scalable
- gr_message_sptr msg =
- gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
+ message::sptr msg =
+ message::make(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
memcpy(msg->msg(), d_packet, d_packetlen_cnt);
d_target_queue->insert_tail(msg); // send it
diff --git a/gr-digital/lib/framer_sink_1_impl.h b/gr-digital/lib/framer_sink_1_impl.h
index ff2839acbf..d30c1f316d 100644
--- a/gr-digital/lib/framer_sink_1_impl.h
+++ b/gr-digital/lib/framer_sink_1_impl.h
@@ -36,17 +36,17 @@ namespace gr {
static const int MAX_PKT_LEN = 4096;
static const int HEADERBITLEN = 32;
- gr_msg_queue_sptr d_target_queue; // where to send the packet when received
- state_t d_state;
- unsigned int d_header; // header bits
- int d_headerbitlen_cnt; // how many so far
+ msg_queue::sptr d_target_queue; // where to send the packet when received
+ state_t d_state;
+ unsigned int d_header; // header bits
+ int d_headerbitlen_cnt; // how many so far
- unsigned char d_packet[MAX_PKT_LEN]; // assembled payload
- unsigned char d_packet_byte; // byte being assembled
- int d_packet_byte_index; // which bit of d_packet_byte we're working on
- int d_packetlen; // length of packet
- int d_packet_whitener_offset; // offset into whitener string to use
- int d_packetlen_cnt; // how many so far
+ unsigned char d_packet[MAX_PKT_LEN]; // assembled payload
+ unsigned char d_packet_byte; // byte being assembled
+ int d_packet_byte_index; // which bit of d_packet_byte we're working on
+ int d_packetlen; // length of packet
+ int d_packet_whitener_offset; // offset into whitener string to use
+ int d_packetlen_cnt; // how many so far
protected:
void enter_search();
@@ -69,7 +69,7 @@ namespace gr {
}
public:
- framer_sink_1_impl(gr_msg_queue_sptr target_queue);
+ framer_sink_1_impl(msg_queue::sptr target_queue);
~framer_sink_1_impl();
int work(int noutput_items,
diff --git a/gr-digital/lib/glfsr_source_b_impl.cc b/gr-digital/lib/glfsr_source_b_impl.cc
index e4171d80e7..260bd45c24 100644
--- a/gr-digital/lib/glfsr_source_b_impl.cc
+++ b/gr-digital/lib/glfsr_source_b_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "glfsr_source_b_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -40,9 +40,9 @@ namespace gr {
glfsr_source_b_impl::glfsr_source_b_impl(int degree, bool repeat,
int mask, int seed)
- : gr_sync_block("glfsr_source_b",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("glfsr_source_b",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_repeat(repeat), d_index(0)
{
if(degree < 1 || degree > 32)
diff --git a/gr-digital/lib/glfsr_source_f_impl.cc b/gr-digital/lib/glfsr_source_f_impl.cc
index 1e0ee2d85e..cb637df4ea 100644
--- a/gr-digital/lib/glfsr_source_f_impl.cc
+++ b/gr-digital/lib/glfsr_source_f_impl.cc
@@ -26,7 +26,7 @@
#endif
#include "glfsr_source_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
glfsr_source_f_impl::glfsr_source_f_impl(int degree, bool repeat,
int mask, int seed)
- : gr_sync_block("glfsr_source_f",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("glfsr_source_f",
+ io_signature::make(0, 0, 0),
+ io_signature::make(1, 1, sizeof(float))),
d_repeat(repeat), d_index(0)
{
if(degree < 1 || degree > 32)
diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc
index a2e81c5b8e..79e2d3770d 100644
--- a/gr-digital/lib/header_payload_demux_impl.cc
+++ b/gr-digital/lib/header_payload_demux_impl.cc
@@ -24,7 +24,7 @@
#endif
#include <climits>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "header_payload_demux_impl.h"
namespace gr {
@@ -70,9 +70,9 @@ namespace gr {
const std::string &trigger_tag_key,
bool output_symbols,
size_t itemsize
- ) : gr_block("header_payload_demux",
- gr_make_io_signature2(1, 2, itemsize, sizeof(char)),
- gr_make_io_signature(2, 2, (output_symbols ? itemsize * items_per_symbol : itemsize))),
+ ) : block("header_payload_demux",
+ io_signature::make2(1, 2, itemsize, sizeof(char)),
+ io_signature::make(2, 2, (output_symbols ? itemsize * items_per_symbol : itemsize))),
d_header_len(header_len),
d_items_per_symbol(items_per_symbol),
d_gi(guard_interval),
@@ -199,7 +199,7 @@ namespace gr {
}
}
if (d_uses_trigger_tag) {
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+noutput_items);
uint64_t min_offset = ULLONG_MAX;
int tag_index = -1;
@@ -250,7 +250,7 @@ namespace gr {
void
header_payload_demux_impl::copy_symbol(const unsigned char *&in, unsigned char *&out, int port, int &nread, int &nproduced)
{
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
memcpy((void *) out,
(void *) (in + d_gi * d_itemsize),
d_itemsize * d_items_per_symbol
diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
index c3be3b5d06..edf2f34452 100644
--- a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
+++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "kurtotic_equalizer_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
kurtotic_equalizer_cc_impl::kurtotic_equalizer_cc_impl(int num_taps, float mu)
- : gr_sync_decimator("kurtotic_equalizer_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator("kurtotic_equalizer_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
1),
filter::kernel::fir_filter_ccc(1, std::vector<gr_complex>(num_taps, gr_complex(0,0)))
{
diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.h b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
index 0f2ff23808..41178c3eb8 100644
--- a/gr-digital/lib/kurtotic_equalizer_cc_impl.h
+++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
@@ -25,7 +25,7 @@
#include <digital/kurtotic_equalizer_cc.h>
#include <filter/fir_filter.h>
-#include <gr_math.h>
+#include <gnuradio/math.h>
#include <stdexcept>
namespace gr {
@@ -73,8 +73,8 @@ namespace gr {
(sign(d_u) * (nrm*cnj - 2.0f*d_p*cnj - conj(d_q)*out) -
abs(d_u)*cnj);
- float re = gr_clip(F.real(), 1.0);
- float im = gr_clip(F.imag(), 1.0);
+ float re = gr::clip(F.real(), 1.0);
+ float im = gr::clip(F.imag(), 1.0);
return gr_complex(re, im);
}
diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
index 15008ca8e7..530b3aa6fd 100644
--- a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
+++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "lms_dd_equalizer_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_misc.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/misc.h>
#include <volk/volk.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
lms_dd_equalizer_cc_impl::lms_dd_equalizer_cc_impl(int num_taps, float mu,
int sps,
constellation_sptr cnst)
- : gr_sync_decimator("lms_dd_equalizer_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator("lms_dd_equalizer_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
sps),
fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0,0))),
d_new_taps(num_taps, gr_complex(0,0)),
diff --git a/gr-digital/lib/map_bb_impl.cc b/gr-digital/lib/map_bb_impl.cc
index 4ea91835a9..c4f9209a88 100644
--- a/gr-digital/lib/map_bb_impl.cc
+++ b/gr-digital/lib/map_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "map_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -37,9 +37,9 @@ namespace gr {
}
map_bb_impl::map_bb_impl(const std::vector<int> &map)
- : gr_sync_block("map_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("map_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
set_map(map);
}
diff --git a/gr-digital/lib/map_bb_impl.h b/gr-digital/lib/map_bb_impl.h
index 59f1e834b7..356bf8bde6 100644
--- a/gr-digital/lib/map_bb_impl.h
+++ b/gr-digital/lib/map_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_MAP_BB_IMPL_H
#include <digital/map_bb.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.cc b/gr-digital/lib/mpsk_receiver_cc_impl.cc
index ea11b7cdaa..0d7464a0fb 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.cc
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.cc
@@ -25,10 +25,9 @@
#endif
#include "mpsk_receiver_cc_impl.h"
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <gr_math.h>
-#include <gr_expj.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
+#include <gnuradio/expj.h>
#include <stdexcept>
namespace gr {
@@ -60,9 +59,9 @@ namespace gr {
float mu, float gain_mu,
float omega, float gain_omega,
float omega_rel)
- : gr_block("mpsk_receiver_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : block("mpsk_receiver_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
blocks::control_loop(loop_bw, fmax, fmin),
d_M(M), d_theta(theta),
d_current_const_point(0),
@@ -163,14 +162,14 @@ namespace gr {
float mpsk_receiver_cc_impl::phase_error_detector_generic(gr_complex sample) const
{
- //return gr_fast_atan2f(sample*conj(d_constellation[d_current_const_point]));
+ //return gr::fast_atan2f(sample*conj(d_constellation[d_current_const_point]));
return -arg(sample*conj(d_constellation[d_current_const_point]));
}
unsigned int
mpsk_receiver_cc_impl::decision_bpsk(gr_complex sample) const
{
- return (gr_branchless_binary_slicer(sample.real()) ^ 1);
+ return (gr::branchless_binary_slicer(sample.real()) ^ 1);
//return gr_binary_slicer(sample.real()) ^ 1;
}
@@ -179,8 +178,8 @@ namespace gr {
{
unsigned int index;
- //index = gr_branchless_quad_0deg_slicer(sample);
- index = gr_quad_0deg_slicer(sample);
+ //index = gr::branchless_quad_0deg_slicer(sample);
+ index = gr::quad_0deg_slicer(sample);
return index;
}
@@ -257,10 +256,10 @@ namespace gr {
y = (d_p_0T - d_p_2T) * conj(d_c_1T);
u = y - x;
mm_error = u.real(); // the error signal is in the real part
- mm_error = gr_branchless_clip(mm_error, 1.0); // limit mm_val
+ mm_error = gr::branchless_clip(mm_error, 1.0); // limit mm_val
d_omega = d_omega + d_gain_omega * mm_error; // update omega based on loop error
- d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_rel); // make sure we don't walk away
+ d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_rel); // make sure we don't walk away
d_mu += d_omega + d_gain_mu * mm_error; // update mu based on loop error
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h
index ed53d0f2e4..c8807c2a4e 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.h
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.h
@@ -24,9 +24,9 @@
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H
#include <digital/mpsk_receiver_cc.h>
-#include <attributes.h>
-#include <blocks/control_loop.h>
-#include <gr_complex.h>
+#include <gnuradio/attributes.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/gr_complex.h>
#include <fstream>
#include <filter/mmse_fir_interpolator_cc.h>
diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.cc b/gr-digital/lib/mpsk_snr_est_cc_impl.cc
index 6d11dd315c..07a411e4c5 100644
--- a/gr-digital/lib/mpsk_snr_est_cc_impl.cc
+++ b/gr-digital/lib/mpsk_snr_est_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "mpsk_snr_est_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -43,9 +43,9 @@ namespace gr {
mpsk_snr_est_cc_impl::mpsk_snr_est_cc_impl(snr_est_type_t type,
int tag_nsamples,
double alpha)
- : gr_sync_block("mpsk_snr_est_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)))
+ : sync_block("mpsk_snr_est_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)))
{
d_snr_est = NULL;
diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.h b/gr-digital/lib/mpsk_snr_est_cc_impl.h
index 530d223aec..49bf078457 100644
--- a/gr-digital/lib/mpsk_snr_est_cc_impl.h
+++ b/gr-digital/lib/mpsk_snr_est_cc_impl.h
@@ -25,7 +25,7 @@
#include <digital/api.h>
#include <digital/mpsk_snr_est_cc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
index afeb10e1d5..467718e424 100644
--- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
+++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_carrier_allocator_cvc_impl.h"
namespace gr {
@@ -62,9 +62,9 @@ namespace gr {
const std::vector<std::vector<gr_complex> > &sync_words,
const std::string &len_tag_key,
const bool output_is_shifted
- ) : gr_tagged_stream_block("ofdm_carrier_allocator_cvc",
- gr_make_io_signature(1, 1, sizeof (gr_complex)),
- gr_make_io_signature(1, 1, sizeof (gr_complex) * fft_len), len_tag_key),
+ ) : tagged_stream_block("ofdm_carrier_allocator_cvc",
+ io_signature::make(1, 1, sizeof (gr_complex)),
+ io_signature::make(1, 1, sizeof (gr_complex) * fft_len), len_tag_key),
d_fft_len(fft_len),
d_occupied_carriers(occupied_carriers),
d_pilot_carriers(pilot_carriers),
@@ -140,7 +140,7 @@ namespace gr {
{
const gr_complex *in = (const gr_complex *) input_items[0];
gr_complex *out = (gr_complex *) output_items[0];
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
memset((void *) out, 0x00, sizeof(gr_complex) * d_fft_len * noutput_items);
// Copy Sync word
diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
index d0d8faba59..a4025cc381 100644
--- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
+++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_chanest_vcvc_impl.h"
namespace gr {
@@ -46,9 +46,9 @@ namespace gr {
}
ofdm_chanest_vcvc_impl::ofdm_chanest_vcvc_impl(const std::vector<gr_complex> &sync_symbol1, const std::vector<gr_complex> &sync_symbol2, int n_data_symbols, int eq_noise_red_len, int max_carr_offset, bool force_one_sync_symbol)
- : gr_block("ofdm_chanest_vcvc",
- gr_make_io_signature(1, 1, sizeof (gr_complex) * sync_symbol1.size()),
- gr_make_io_signature(1, 1, sizeof (gr_complex) * sync_symbol1.size())),
+ : block("ofdm_chanest_vcvc",
+ io_signature::make(1, 1, sizeof (gr_complex) * sync_symbol1.size()),
+ io_signature::make(1, 1, sizeof (gr_complex) * sync_symbol1.size())),
d_fft_len(sync_symbol1.size()),
d_n_data_syms(n_data_symbols),
d_n_sync_syms(1),
@@ -241,7 +241,7 @@ namespace gr {
in += framesize * d_fft_len;
out += d_n_data_syms * d_fft_len;
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
this->get_tags_in_range(tags, 0,
this->nitems_read(0)+i*framesize,
this->nitems_read(0)+(i+1)*framesize);
diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc
index d48c5f7e45..9db7273e26 100644
--- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc
+++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_cyclic_prefixer_impl.h"
namespace gr {
@@ -38,9 +38,9 @@ namespace gr {
ofdm_cyclic_prefixer_impl::ofdm_cyclic_prefixer_impl(size_t input_size, size_t output_size, int rolloff_len, const std::string &len_tag_key)
- : gr_tagged_stream_block ("ofdm_cyclic_prefixer",
- gr_make_io_signature (1, 1, input_size*sizeof(gr_complex)),
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
+ : tagged_stream_block ("ofdm_cyclic_prefixer",
+ io_signature::make (1, 1, input_size*sizeof(gr_complex)),
+ io_signature::make (1, 1, sizeof(gr_complex)),
len_tag_key),
d_fft_len(input_size),
d_output_size(output_size),
@@ -140,7 +140,7 @@ namespace gr {
}
d_delay_line.assign(d_delay_line.size(), 0);
}
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(
tags, 0,
nitems_read(0), nitems_read(0)+symbols_to_read
diff --git a/gr-digital/lib/ofdm_equalizer_simpledfe.cc b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
index fcb0e18cbf..a822c6cc60 100644
--- a/gr-digital/lib/ofdm_equalizer_simpledfe.cc
+++ b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
@@ -78,7 +78,7 @@ namespace gr {
ofdm_equalizer_simpledfe::equalize(gr_complex *frame,
int n_sym,
const std::vector<gr_complex> &initial_taps,
- const std::vector<gr_tag_t> &tags)
+ const std::vector<tag_t> &tags)
{
if (!initial_taps.empty()) {
d_channel_state = initial_taps;
diff --git a/gr-digital/lib/ofdm_equalizer_static.cc b/gr-digital/lib/ofdm_equalizer_static.cc
index 8601eff430..72c7d14064 100644
--- a/gr-digital/lib/ofdm_equalizer_static.cc
+++ b/gr-digital/lib/ofdm_equalizer_static.cc
@@ -70,7 +70,7 @@ namespace gr {
ofdm_equalizer_static::equalize(gr_complex *frame,
int n_sym,
const std::vector<gr_complex> &initial_taps,
- const std::vector<gr_tag_t> &tags)
+ const std::vector<tag_t> &tags)
{
d_channel_state = initial_taps;
diff --git a/gr-digital/lib/ofdm_frame_acquisition_impl.cc b/gr-digital/lib/ofdm_frame_acquisition_impl.cc
index 1f45338d8f..2c2d6eff7a 100644
--- a/gr-digital/lib/ofdm_frame_acquisition_impl.cc
+++ b/gr-digital/lib/ofdm_frame_acquisition_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "ofdm_frame_acquisition_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
+#include <gnuradio/math.h>
#include <cstdio>
namespace gr {
@@ -54,9 +54,9 @@ namespace gr {
unsigned int cplen,
const std::vector<gr_complex> &known_symbol,
unsigned int max_fft_shift_len)
- : gr_block("ofdm_frame_acquisition",
- gr_make_io_signature2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length),
- gr_make_io_signature2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char))),
+ : block("ofdm_frame_acquisition",
+ io_signature::make2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length),
+ io_signature::make2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char))),
d_occupied_carriers(occupied_carriers),
d_fft_length(fft_length),
d_cplen(cplen),
diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
index 68050f24b1..8546eb119b 100644
--- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
+++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_frame_equalizer_vcvc_impl.h"
namespace gr {
@@ -49,9 +49,9 @@ namespace gr {
const std::string &len_tag_key,
bool propagate_channel_state,
int fixed_frame_len
- ) : gr_tagged_stream_block("ofdm_frame_equalizer_vcvc",
- gr_make_io_signature(1, 1, sizeof (gr_complex) * equalizer->fft_len()),
- gr_make_io_signature(1, 1, sizeof (gr_complex) * equalizer->fft_len()),
+ ) : tagged_stream_block("ofdm_frame_equalizer_vcvc",
+ io_signature::make(1, 1, sizeof (gr_complex) * equalizer->fft_len()),
+ io_signature::make(1, 1, sizeof (gr_complex) * equalizer->fft_len()),
len_tag_key),
d_fft_len(equalizer->fft_len()),
d_eq(equalizer),
@@ -85,7 +85,7 @@ namespace gr {
frame_len = ninput_items[0];
}
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1);
for (unsigned i = 0; i < tags.size(); i++) {
if (pmt::symbol_to_string(tags[i].key) == "ofdm_sync_chan_taps") {
diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
index 81789e22c4..c219052148 100644
--- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
+++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
@@ -38,7 +38,7 @@ namespace gr {
protected:
// These aren't really necessary, so let's override them with nuthin'
- void remove_length_tags(const std::vector<std::vector<gr_tag_t> > &tags) {};
+ void remove_length_tags(const std::vector<std::vector<tag_t> > &tags) {};
void update_length_tags(int n_produced, int n_ports) {};
public:
diff --git a/gr-digital/lib/ofdm_frame_sink_impl.cc b/gr-digital/lib/ofdm_frame_sink_impl.cc
index d2f00d3a45..b2e4f44ec9 100644
--- a/gr-digital/lib/ofdm_frame_sink_impl.cc
+++ b/gr-digital/lib/ofdm_frame_sink_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "ofdm_frame_sink_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
+#include <gnuradio/math.h>
#include <cmath>
#include <cstdio>
#include <stdexcept>
@@ -186,7 +186,7 @@ namespace gr {
ofdm_frame_sink::sptr
ofdm_frame_sink::make(const std::vector<gr_complex> &sym_position,
const std::vector<char> &sym_value_out,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int occupied_carriers,
float phase_gain, float freq_gain)
{
@@ -198,12 +198,12 @@ namespace gr {
ofdm_frame_sink_impl::ofdm_frame_sink_impl(const std::vector<gr_complex> &sym_position,
const std::vector<char> &sym_value_out,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int occupied_carriers,
float phase_gain, float freq_gain)
- : gr_sync_block("ofdm_frame_sink",
- gr_make_io_signature2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)*occupied_carriers)),
+ : sync_block("ofdm_frame_sink",
+ io_signature::make2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)),
+ io_signature::make(1, 1, sizeof(gr_complex)*occupied_carriers)),
d_target_queue(target_queue), d_occupied_carriers(occupied_carriers),
d_byte_offset(0), d_partial_byte(0),
d_resid(0), d_nresid(0),d_phase(0),d_freq(0),
@@ -357,8 +357,8 @@ namespace gr {
}
if(d_packetlen_cnt == d_packetlen) {
- gr_message_sptr msg =
- gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen);
+ message::sptr msg =
+ message::make(0, d_packet_whitener_offset, 0, d_packetlen);
memcpy(msg->msg(), d_packet, d_packetlen_cnt);
d_target_queue->insert_tail(msg); // send it
msg.reset(); // free it up
@@ -389,8 +389,8 @@ namespace gr {
if (d_packetlen_cnt == d_packetlen){ // packet is filled
// build a message
// NOTE: passing header field as arg1 is not scalable
- gr_message_sptr msg =
- gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
+ message::sptr msg =
+ message::make(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
memcpy(msg->msg(), d_packet, d_packetlen_cnt);
d_target_queue->insert_tail(msg); // send it
diff --git a/gr-digital/lib/ofdm_frame_sink_impl.h b/gr-digital/lib/ofdm_frame_sink_impl.h
index 49d5d6b5c0..dcf4a06163 100644
--- a/gr-digital/lib/ofdm_frame_sink_impl.h
+++ b/gr-digital/lib/ofdm_frame_sink_impl.h
@@ -36,7 +36,7 @@ namespace gr {
static const int MAX_PKT_LEN = 4096;
static const int HEADERBYTELEN = 4;
- gr_msg_queue_sptr d_target_queue; // where to send the packet when received
+ msg_queue::sptr d_target_queue; // where to send the packet when received
state_t d_state;
unsigned int d_header; // header bits
int d_headerbytelen_cnt; // how many so far
@@ -90,7 +90,7 @@ namespace gr {
public:
ofdm_frame_sink_impl(const std::vector<gr_complex> &sym_position,
const std::vector<char> &sym_value_out,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int occupied_tones,
float phase_gain=0.25, float freq_gain=0.25*0.25/4);
~ofdm_frame_sink_impl();
diff --git a/gr-digital/lib/ofdm_insert_preamble_impl.cc b/gr-digital/lib/ofdm_insert_preamble_impl.cc
index 100e69e22c..dcc3a900a4 100644
--- a/gr-digital/lib/ofdm_insert_preamble_impl.cc
+++ b/gr-digital/lib/ofdm_insert_preamble_impl.cc
@@ -24,7 +24,7 @@
#endif
#include "ofdm_insert_preamble_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <iostream>
#include <string>
@@ -42,11 +42,11 @@ namespace gr {
ofdm_insert_preamble_impl::ofdm_insert_preamble_impl(int fft_length,
const std::vector<std::vector<gr_complex> > &preamble)
- : gr_block("ofdm_insert_preamble",
- gr_make_io_signature2(1, 2,
+ : block("ofdm_insert_preamble",
+ io_signature::make2(1, 2,
sizeof(gr_complex)*fft_length,
sizeof(char)),
- gr_make_io_signature2(1, 2,
+ io_signature::make2(1, 2,
sizeof(gr_complex)*fft_length,
sizeof(char))),
d_fft_length(fft_length),
diff --git a/gr-digital/lib/ofdm_mapper_bcv_impl.cc b/gr-digital/lib/ofdm_mapper_bcv_impl.cc
index 5b5359d7b9..b241a3be71 100644
--- a/gr-digital/lib/ofdm_mapper_bcv_impl.cc
+++ b/gr-digital/lib/ofdm_mapper_bcv_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ofdm_mapper_bcv_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <string>
@@ -49,11 +49,11 @@ namespace gr {
unsigned int msgq_limit,
unsigned int occupied_carriers,
unsigned int fft_length)
- : gr_sync_block("ofdm_mapper_bcv",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char))),
+ : sync_block("ofdm_mapper_bcv",
+ io_signature::make(0, 0, 0),
+ io_signature::make2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char))),
d_constellation(constellation),
- d_msgq(gr_make_msg_queue(msgq_limit)), d_msg_offset(0), d_eof(false),
+ d_msgq(msg_queue::make(msgq_limit)), d_msg_offset(0), d_eof(false),
d_occupied_carriers(occupied_carriers),
d_fft_length(fft_length),
d_bit_offset(0),
diff --git a/gr-digital/lib/ofdm_mapper_bcv_impl.h b/gr-digital/lib/ofdm_mapper_bcv_impl.h
index 6459ed73d8..2754b0a04b 100644
--- a/gr-digital/lib/ofdm_mapper_bcv_impl.h
+++ b/gr-digital/lib/ofdm_mapper_bcv_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_IMPL_H
#include <digital/ofdm_mapper_bcv.h>
-#include <gr_message.h>
+#include <gnuradio/message.h>
#include <vector>
namespace gr {
@@ -34,10 +34,10 @@ namespace gr {
{
private:
std::vector<gr_complex> d_constellation;
- gr_msg_queue_sptr d_msgq;
- gr_message_sptr d_msg;
- unsigned d_msg_offset;
- bool d_eof;
+ msg_queue::sptr d_msgq;
+ message::sptr d_msg;
+ unsigned d_msg_offset;
+ bool d_eof;
unsigned int d_occupied_carriers;
unsigned int d_fft_length;
@@ -61,7 +61,7 @@ namespace gr {
unsigned int fft_length);
~ofdm_mapper_bcv_impl(void);
- gr_msg_queue_sptr msgq() const { return d_msgq; }
+ msg_queue::sptr msgq() const { return d_msgq; }
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-digital/lib/ofdm_sampler_impl.cc b/gr-digital/lib/ofdm_sampler_impl.cc
index 0724b7cf26..dd6197dfc7 100644
--- a/gr-digital/lib/ofdm_sampler_impl.cc
+++ b/gr-digital/lib/ofdm_sampler_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "ofdm_sampler_impl.h"
-#include <gr_io_signature.h>
-#include <gr_expj.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/expj.h>
#include <cstdio>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
ofdm_sampler_impl::ofdm_sampler_impl(unsigned int fft_length,
unsigned int symbol_length,
unsigned int timeout)
- : gr_block("ofdm_sampler",
- gr_make_io_signature2(2, 2, sizeof(gr_complex), sizeof(char)),
- gr_make_io_signature2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length)),
+ : block("ofdm_sampler",
+ io_signature::make2(2, 2, sizeof(gr_complex), sizeof(char)),
+ io_signature::make2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length)),
d_state(STATE_NO_SIG), d_timeout_max(timeout),
d_fft_length(fft_length), d_symbol_length(symbol_length)
{
diff --git a/gr-digital/lib/ofdm_sampler_impl.h b/gr-digital/lib/ofdm_sampler_impl.h
index 369447465f..a562bc54b3 100644
--- a/gr-digital/lib/ofdm_sampler_impl.h
+++ b/gr-digital/lib/ofdm_sampler_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_OFDM_SAMPLER_IMPL_H
#include <digital/ofdm_sampler.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.cc b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
index 09c0039a1c..9ca6d59ec9 100644
--- a/gr-digital/lib/ofdm_serializer_vcc_impl.cc
+++ b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_serializer_vcc_impl.h"
namespace gr {
@@ -75,9 +75,9 @@ namespace gr {
const std::string &packet_len_tag_key,
int symbols_skipped,
bool input_is_shifted)
- : gr_tagged_stream_block ("ofdm_serializer_vcc",
- gr_make_io_signature(1, 1, sizeof (gr_complex) * fft_len),
- gr_make_io_signature(1, 1, sizeof (gr_complex)),
+ : tagged_stream_block ("ofdm_serializer_vcc",
+ io_signature::make(1, 1, sizeof (gr_complex) * fft_len),
+ io_signature::make(1, 1, sizeof (gr_complex)),
len_tag_key),
d_fft_len(fft_len),
d_occupied_carriers(occupied_carriers),
@@ -143,7 +143,7 @@ namespace gr {
long packet_length = 0; // Output frame
int carr_offset = 0;
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
// Packet mode
if (!d_length_tag_key_str.empty()) {
get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1);
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
index 822b9021e2..4486808425 100644
--- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
+++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
@@ -24,18 +24,18 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "ofdm_sync_sc_cfb_impl.h"
-#include <blocks/plateau_detector_fb.h>
-#include <blocks/complex_to_arg.h>
-#include <blocks/complex_to_mag_squared.h>
-#include <blocks/conjugate_cc.h>
-#include <blocks/delay.h>
-#include <blocks/divide_ff.h>
-#include <blocks/multiply_cc.h>
-#include <blocks/multiply_ff.h>
-#include <blocks/sample_and_hold_ff.h>
+#include <gnuradio/blocks/plateau_detector_fb.h>
+#include <gnuradio/blocks/complex_to_arg.h>
+#include <gnuradio/blocks/complex_to_mag_squared.h>
+#include <gnuradio/blocks/conjugate_cc.h>
+#include <gnuradio/blocks/delay.h>
+#include <gnuradio/blocks/divide_ff.h>
+#include <gnuradio/blocks/multiply_cc.h>
+#include <gnuradio/blocks/multiply_ff.h>
+#include <gnuradio/blocks/sample_and_hold_ff.h>
#include <filter/fir_filter_ccf.h>
#include <filter/fir_filter_fff.h>
@@ -49,12 +49,12 @@ namespace gr {
}
ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len)
- : gr_hier_block2 ("ofdm_sync_sc_cfb",
- gr_make_io_signature(1, 1, sizeof (gr_complex)),
+ : hier_block2 ("ofdm_sync_sc_cfb",
+ io_signature::make(1, 1, sizeof (gr_complex)),
#ifndef SYNC_ADD_DEBUG_OUTPUT
- gr_make_io_signature2(2, 2, sizeof (float), sizeof (unsigned char)))
+ io_signature::make2(2, 2, sizeof (float), sizeof (unsigned char)))
#else
- gr_make_io_signature3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float)))
+ io_signature::make3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float)))
#endif
{
std::vector<float> ma_taps(fft_len/2, 1.0);
diff --git a/gr-digital/lib/packet_header_default.cc b/gr-digital/lib/packet_header_default.cc
index ef5e44ac8d..8299e5625e 100644
--- a/gr-digital/lib/packet_header_default.cc
+++ b/gr-digital/lib/packet_header_default.cc
@@ -64,7 +64,7 @@ namespace gr {
bool packet_header_default::header_formatter(
long packet_len,
unsigned char *out,
- const std::vector<gr_tag_t> &tags
+ const std::vector<tag_t> &tags
)
{
packet_len &= 0x0FFF;
@@ -91,11 +91,11 @@ namespace gr {
bool packet_header_default::header_parser(
const unsigned char *in,
- std::vector<gr_tag_t> &tags)
+ std::vector<tag_t> &tags)
{
unsigned header_len = 0;
unsigned header_num = 0;
- gr_tag_t tag;
+ tag_t tag;
int k = 0; // Position in "in"
for (int i = 0; i < 12 && k < d_header_len; i += d_bits_per_byte, k++) {
diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc
index cd42273285..bf0f642932 100644
--- a/gr-digital/lib/packet_header_ofdm.cc
+++ b/gr-digital/lib/packet_header_ofdm.cc
@@ -85,7 +85,7 @@ namespace gr {
bool packet_header_ofdm::header_parser(
const unsigned char *in,
- std::vector<gr_tag_t> &tags)
+ std::vector<tag_t> &tags)
{
if (!packet_header_default::header_parser(in, tags)) {
return false;
@@ -108,7 +108,7 @@ namespace gr {
frame_len++;
i += d_occupied_carriers[k].size();
}
- gr_tag_t tag;
+ tag_t tag;
tag.key = d_frame_len_tag_key;
tag.value = pmt::from_long(frame_len);
tags.push_back(tag);
diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.cc b/gr-digital/lib/packet_headergenerator_bb_impl.cc
index 3232858148..a0191fe85a 100644
--- a/gr-digital/lib/packet_headergenerator_bb_impl.cc
+++ b/gr-digital/lib/packet_headergenerator_bb_impl.cc
@@ -24,7 +24,7 @@
#endif
#include <boost/format.hpp>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "packet_headergenerator_bb_impl.h"
namespace gr {
@@ -57,9 +57,9 @@ namespace gr {
const gr::digital::packet_header_default::sptr &header_formatter,
const std::string &len_tag_key
)
- : gr_tagged_stream_block("packet_headergenerator_bb_impl",
- gr_make_io_signature(1, 1, sizeof (char)),
- gr_make_io_signature(1, 1, sizeof (char)),
+ : tagged_stream_block("packet_headergenerator_bb_impl",
+ io_signature::make(1, 1, sizeof (char)),
+ io_signature::make(1, 1, sizeof (char)),
len_tag_key),
d_formatter(header_formatter)
{
diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.h b/gr-digital/lib/packet_headergenerator_bb_impl.h
index ce60fdf76c..aaad42aebc 100644
--- a/gr-digital/lib/packet_headergenerator_bb_impl.h
+++ b/gr-digital/lib/packet_headergenerator_bb_impl.h
@@ -39,7 +39,7 @@ namespace gr {
);
~packet_headergenerator_bb_impl();
- void remove_length_tags(const std::vector<std::vector<gr_tag_t> > &tags) {};
+ void remove_length_tags(const std::vector<std::vector<tag_t> > &tags) {};
int calculate_output_stream_length(const gr_vector_int &ninput_items) { return d_formatter->header_len(); };
int work(int noutput_items,
diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc
index 17e5e85091..d55a3bd303 100644
--- a/gr-digital/lib/packet_headerparser_b_impl.cc
+++ b/gr-digital/lib/packet_headerparser_b_impl.cc
@@ -24,7 +24,7 @@
#endif
#include <boost/format.hpp>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "packet_headerparser_b_impl.h"
#define msg_port_id pmt::mp("header_data")
@@ -48,9 +48,9 @@ namespace gr {
}
packet_headerparser_b_impl::packet_headerparser_b_impl(const gr::digital::packet_header_default::sptr &header_formatter)
- : gr_sync_block("packet_headerparser_b",
- gr_make_io_signature(1, 1, sizeof (unsigned char)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("packet_headerparser_b",
+ io_signature::make(1, 1, sizeof (unsigned char)),
+ io_signature::make(0, 0, 0)),
d_header_formatter(header_formatter)
{
message_port_register_out(msg_port_id);
@@ -72,7 +72,7 @@ namespace gr {
return 0;
}
- std::vector<gr_tag_t> tags;
+ std::vector<tag_t> tags;
if (!d_header_formatter->header_parser(in, tags)) {
GR_LOG_INFO(d_logger, boost::format("Detected an invalid packet at item %1%") % nitems_read(0));
message_port_pub(msg_port_id, pmt::PMT_F);
diff --git a/gr-digital/lib/packet_sink_impl.cc b/gr-digital/lib/packet_sink_impl.cc
index 1d79b3d717..56a3d8b395 100644
--- a/gr-digital/lib/packet_sink_impl.cc
+++ b/gr-digital/lib/packet_sink_impl.cc
@@ -25,14 +25,14 @@
#endif
#include "packet_sink_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdexcept>
-#include <blocks/count_bits.h>
+#include <gnuradio/blocks/count_bits.h>
#include <string.h>
namespace gr {
@@ -79,17 +79,17 @@ static const int DEFAULT_THRESHOLD = 12;
packet_sink::sptr
packet_sink::make(const std::vector<unsigned char>& sync_vector,
- gr_msg_queue_sptr target_queue, int threshold)
+ msg_queue::sptr target_queue, int threshold)
{
return gnuradio::get_initial_sptr
(new packet_sink_impl(sync_vector, target_queue, threshold));
}
packet_sink_impl::packet_sink_impl(const std::vector<unsigned char>& sync_vector,
- gr_msg_queue_sptr target_queue, int threshold)
- : gr_sync_block("packet_sink",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ msg_queue::sptr target_queue, int threshold)
+ : sync_block("packet_sink",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_target_queue(target_queue), d_threshold(threshold == -1 ? DEFAULT_THRESHOLD : threshold)
{
d_sync_vector = 0;
@@ -184,7 +184,7 @@ static const int DEFAULT_THRESHOLD = 12;
if(d_packetlen_cnt == d_packetlen) { // packet is filled
// build a message
- gr_message_sptr msg = gr_make_message(0, 0, 0, d_packetlen_cnt);
+ message::sptr msg = message::make(0, 0, 0, d_packetlen_cnt);
memcpy(msg->msg(), d_packet, d_packetlen_cnt);
d_target_queue->insert_tail(msg); // send it
diff --git a/gr-digital/lib/packet_sink_impl.h b/gr-digital/lib/packet_sink_impl.h
index a63db7a142..a6c80629c6 100644
--- a/gr-digital/lib/packet_sink_impl.h
+++ b/gr-digital/lib/packet_sink_impl.h
@@ -36,7 +36,7 @@ namespace gr {
static const int MAX_PKT_LEN = 4096;
static const int HEADERBITLEN = 32;
- gr_msg_queue_sptr d_target_queue; // where to send the packet when received
+ msg_queue::sptr d_target_queue; // where to send the packet when received
unsigned long long d_sync_vector; // access code to locate start of packet
unsigned int d_threshold; // how many bits may be wrong in sync vector
@@ -45,7 +45,7 @@ namespace gr {
unsigned long long d_shift_reg; // used to look for sync_vector
unsigned int d_header; // header bits
- int d_headerbitlen_cnt;// how many so far
+ int d_headerbitlen_cnt;// how many so far
unsigned char d_packet[MAX_PKT_LEN]; // assembled payload
unsigned char d_packet_byte; // byte being assembled
@@ -75,7 +75,7 @@ namespace gr {
public:
packet_sink_impl(const std::vector<unsigned char>& sync_vector,
- gr_msg_queue_sptr target_queue,
+ msg_queue::sptr target_queue,
int threshold=-1);
~packet_sink_impl();
diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
index 3c4a0e8ad4..685c0e6150 100644
--- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc
@@ -28,8 +28,8 @@
#include <cmath>
#include "pfb_clock_sync_ccf_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace digital {
@@ -58,9 +58,9 @@ namespace gr {
float init_phase,
float max_rate_deviation,
int osps)
- : gr_block("pfb_clock_sync_ccf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signaturev(1, 4, iosig)),
+ : block("pfb_clock_sync_ccf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::makev(1, 4, iosig)),
d_updated(false), d_nfilters(filter_size),
d_max_dev(max_rate_deviation),
d_osps(osps), d_error(0), d_out_idx(0)
@@ -443,7 +443,7 @@ namespace gr {
d_k = d_k + d_alpha*d_error;
// Keep our rate within a good range
- d_rate_f = gr_branchless_clip(d_rate_f, d_max_dev);
+ d_rate_f = gr::branchless_clip(d_rate_f, d_max_dev);
i+=d_osps;
count += (int)floor(d_sps);
diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
index fb60192324..236738c550 100644
--- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc
+++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc
@@ -28,8 +28,8 @@
#include <cmath>
#include "pfb_clock_sync_fff_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
namespace gr {
namespace digital {
@@ -58,9 +58,9 @@ namespace gr {
float init_phase,
float max_rate_deviation,
int osps)
- : gr_block("pfb_clock_sync_fff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signaturev(1, 4, iosig)),
+ : block("pfb_clock_sync_fff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::makev(1, 4, iosig)),
d_updated(false), d_nfilters(filter_size),
d_max_dev(max_rate_deviation),
d_osps(osps), d_error(0), d_out_idx(0)
@@ -421,7 +421,7 @@ namespace gr {
d_k = d_k + d_alpha*d_error;
// Keep our rate within a good range
- d_rate_f = gr_branchless_clip(d_rate_f, d_max_dev);
+ d_rate_f = gr::branchless_clip(d_rate_f, d_max_dev);
i+=d_osps;
count += (int)floor(d_sps);
diff --git a/gr-digital/lib/pn_correlator_cc_impl.cc b/gr-digital/lib/pn_correlator_cc_impl.cc
index da0bdbefe9..649b73be14 100644
--- a/gr-digital/lib/pn_correlator_cc_impl.cc
+++ b/gr-digital/lib/pn_correlator_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pn_correlator_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -40,9 +40,9 @@ namespace gr {
pn_correlator_cc_impl::pn_correlator_cc_impl(int degree,
int mask,
int seed)
- : gr_sync_decimator("pn_correlator_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator("pn_correlator_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
(unsigned int)((1ULL << degree)-1)) // PN code length
{
d_len = (unsigned int)((1ULL << degree)-1);
diff --git a/gr-digital/lib/probe_density_b_impl.cc b/gr-digital/lib/probe_density_b_impl.cc
index 532930ad1b..d718d4b44d 100644
--- a/gr-digital/lib/probe_density_b_impl.cc
+++ b/gr-digital/lib/probe_density_b_impl.cc
@@ -23,7 +23,7 @@
#endif
#include "probe_density_b_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -37,9 +37,9 @@ namespace gr {
}
probe_density_b_impl::probe_density_b_impl(double alpha)
- : gr_sync_block("density_b",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(0, 0, 0))
+ : sync_block("density_b",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(0, 0, 0))
{
set_alpha(alpha);
d_density = 1.0;
diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc
index fb71bdc110..6fa7c1bd0d 100644
--- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc
+++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "probe_mpsk_snr_est_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -43,9 +43,9 @@ namespace gr {
probe_mpsk_snr_est_c_impl::probe_mpsk_snr_est_c_impl(snr_est_type_t type,
int msg_nsamples,
double alpha)
- : gr_sync_block("probe_mpsk_snr_est_c",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0))
+ : sync_block("probe_mpsk_snr_est_c",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0))
{
d_snr_est = NULL;
diff --git a/gr-digital/lib/scrambler_bb_impl.cc b/gr-digital/lib/scrambler_bb_impl.cc
index d656fe2430..3b32833419 100644
--- a/gr-digital/lib/scrambler_bb_impl.cc
+++ b/gr-digital/lib/scrambler_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "scrambler_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace digital {
@@ -38,9 +38,9 @@ namespace gr {
}
scrambler_bb_impl::scrambler_bb_impl(int mask, int seed, int len)
- : gr_sync_block("scrambler_bb",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : sync_block("scrambler_bb",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_lfsr(mask, seed, len)
{
}
diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h
index 8525e7ef5c..31a0e294ba 100644
--- a/gr-digital/lib/scrambler_bb_impl.h
+++ b/gr-digital/lib/scrambler_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_SCRAMBLER_BB_IMPL_H
#include <digital/scrambler_bb.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <digital/lfsr.h>
namespace gr {
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc
index 6b35b4cf0d..37ee137525 100644
--- a/gr-digital/lib/simple_correlator_impl.cc
+++ b/gr-digital/lib/simple_correlator_impl.cc
@@ -26,8 +26,8 @@
#include "simple_correlator_impl.h"
#include <digital/simple_framer_sync.h>
-#include <gr_io_signature.h>
-#include <blocks/count_bits.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/count_bits.h>
#include <assert.h>
#include <stdexcept>
#include <string.h>
@@ -46,9 +46,9 @@ namespace gr {
}
simple_correlator_impl::simple_correlator_impl(int payload_bytesize)
- : gr_block("simple_correlator",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : block("simple_correlator",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_payload_bytesize(payload_bytesize),
d_state(ST_LOOKING), d_osi(0),
d_bblen((payload_bytesize + GRSF_PAYLOAD_OVERHEAD) * GRSF_BITS_PER_BYTE),
diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc
index ff7e3ab614..64e70d5cfb 100644
--- a/gr-digital/lib/simple_framer_impl.cc
+++ b/gr-digital/lib/simple_framer_impl.cc
@@ -26,7 +26,7 @@
#include "simple_framer_impl.h"
#include <digital/simple_framer_sync.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
#include <string>
@@ -41,9 +41,9 @@ namespace gr {
}
simple_framer_impl::simple_framer_impl(int payload_bytesize)
- : gr_block("simple_framer",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(unsigned char))),
+ : block("simple_framer",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(unsigned char))),
d_seqno (0), d_payload_bytesize (payload_bytesize),
d_input_block_size (payload_bytesize),
d_output_block_size (payload_bytesize + GRSF_OVERHEAD)
diff --git a/gr-digital/python/qa_crc32_bb.py b/gr-digital/python/qa_crc32_bb.py
index 6f5249ca08..4991f49e14 100755
--- a/gr-digital/python/qa_crc32_bb.py
+++ b/gr-digital/python/qa_crc32_bb.py
@@ -36,7 +36,7 @@ class qa_crc32_bb (gr_unittest.TestCase):
""" Make sure the output of a CRC set is 4 bytes longer than the input. """
data = range(16)
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(data))
@@ -53,7 +53,7 @@ class qa_crc32_bb (gr_unittest.TestCase):
is the same as the input. """
data = (0, 1, 2, 3, 4, 5, 6, 7, 8)
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(data))
@@ -70,23 +70,23 @@ class qa_crc32_bb (gr_unittest.TestCase):
tag_name = "length"
pack_len = 8
packets = range(pack_len*2)
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tag_name)
tag1.value = pmt.from_long(pack_len)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = pack_len
tag2.key = pmt.string_to_symbol(tag_name)
tag2.value = pmt.from_long(pack_len)
- testtag1 = gr.gr_tag_t()
+ testtag1 = gr.tag_t()
testtag1.offset = 1
testtag1.key = pmt.string_to_symbol("tag1")
testtag1.value = pmt.from_long(0)
- testtag2 = gr.gr_tag_t()
+ testtag2 = gr.tag_t()
testtag2.offset = pack_len
testtag2.key = pmt.string_to_symbol("tag2")
testtag2.value = pmt.from_long(0)
- testtag3 = gr.gr_tag_t()
+ testtag3 = gr.tag_t()
testtag3.offset = len(packets)-1
testtag3.key = pmt.string_to_symbol("tag3")
testtag3.value = pmt.from_long(0)
@@ -112,7 +112,7 @@ class qa_crc32_bb (gr_unittest.TestCase):
""" Corrupt the data and make sure it fails CRC test. """
data = (0, 1, 2, 3, 4, 5, 6, 7)
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(data))
@@ -130,11 +130,11 @@ class qa_crc32_bb (gr_unittest.TestCase):
""" Make sure tags on the CRC aren't lost. """
data = (0, 1, 2, 3, 4, 5, 6, 7, 8, 230, 166, 39, 8)
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(data))
- testtag = gr.gr_tag_t()
+ testtag = gr.tag_t()
testtag.offset = len(data)-1
testtag.key = pmt.string_to_symbol('tag1')
testtag.value = pmt.from_long(0)
diff --git a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
index f5c72fb87e..c0c9929646 100755
--- a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
+++ b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
@@ -46,7 +46,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase):
expected_result = tuple(sync_word[0] + [1j, 0, 0, 1, 2, 3])
# ^ DC carrier
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(tx_symbols))
@@ -74,7 +74,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase):
expected_result = (1j, 0, 1, 2, 3)
# ^ DC carrier
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(tx_symbols))
@@ -100,7 +100,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase):
pilot_carriers = ((3,),)
expected_result = (1j, 0, 1, 0, 2, 3)
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(tx_symbols))
@@ -134,27 +134,27 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase):
0, 13, 1j, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 2j, 0, 0)
fft_len = 16
tag_name = "len"
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tag_name)
tag1.value = pmt.from_long(len(tx_symbols))
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = len(tx_symbols)
tag2.key = pmt.string_to_symbol(tag_name)
tag2.value = pmt.from_long(len(tx_symbols))
- testtag1 = gr.gr_tag_t()
+ testtag1 = gr.tag_t()
testtag1.offset = 0
testtag1.key = pmt.string_to_symbol('tag1')
testtag1.value = pmt.from_long(0)
- testtag2 = gr.gr_tag_t()
+ testtag2 = gr.tag_t()
testtag2.offset = 7 # On the 2nd OFDM symbol
testtag2.key = pmt.string_to_symbol('tag2')
testtag2.value = pmt.from_long(0)
- testtag3 = gr.gr_tag_t()
+ testtag3 = gr.tag_t()
testtag3.offset = len(tx_symbols)+1 # First OFDM symbol of packet 2
testtag3.key = pmt.string_to_symbol('tag3')
testtag3.value = pmt.from_long(0)
- testtag4 = gr.gr_tag_t()
+ testtag4 = gr.tag_t()
testtag4.offset = 2*len(tx_symbols)-1 # Last OFDM symbol of packet 2
testtag4.key = pmt.string_to_symbol('tag4')
testtag4.value = pmt.from_long(0)
diff --git a/gr-digital/python/qa_ofdm_chanest_vcvc.py b/gr-digital/python/qa_ofdm_chanest_vcvc.py
index d095bbcd9c..b11bb4c556 100755
--- a/gr-digital/python/qa_ofdm_chanest_vcvc.py
+++ b/gr-digital/python/qa_ofdm_chanest_vcvc.py
@@ -61,11 +61,11 @@ class qa_ofdm_sync_eqinit_vcvc (gr_unittest.TestCase):
tx_data = shift_tuple(sync_symbol1, carr_offset) + \
shift_tuple(sync_symbol2, carr_offset) + \
shift_tuple(data_symbol, carr_offset)
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol("test_tag_1")
tag1.value = pmt.from_long(23)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 2
tag2.key = pmt.string_to_symbol("test_tag_2")
tag2.value = pmt.from_long(42)
diff --git a/gr-digital/python/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/qa_ofdm_cyclic_prefixer.py
index 0469b3f970..69091d8d00 100755
--- a/gr-digital/python/qa_ofdm_cyclic_prefixer.py
+++ b/gr-digital/python/qa_ofdm_cyclic_prefixer.py
@@ -67,11 +67,11 @@ class test_ofdm_cyclic_prefixer (gr_unittest.TestCase):
tag_name = "length"
expected_result = (7.0/2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2
7.0/2+1.0/2, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1.0/2)
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(2)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 1
tag2.key = pmt.string_to_symbol("random_tag")
tag2.value = pmt.from_long(42)
diff --git a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
index cb087da2f4..a7cf78e928 100755
--- a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
+++ b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
@@ -40,11 +40,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase):
n_syms = 3
len_tag_key = "frame_len"
tx_data = (1,) * fft_len * n_syms
- len_tag = gr.gr_tag_t()
+ len_tag = gr.tag_t()
len_tag.offset = 0
len_tag.key = pmt.string_to_symbol(len_tag_key)
len_tag.value = pmt.from_long(n_syms)
- chan_tag = gr.gr_tag_t()
+ chan_tag = gr.tag_t()
chan_tag.offset = 0
chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps")
chan_tag.value = pmt.init_c32vector(fft_len, (1,) * fft_len)
@@ -85,11 +85,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase):
idx2 = idx+2*fft_len
channel[idx2] = channel[idx2] * numpy.exp(1j * 0 * numpy.pi * (numpy.random.rand()-.5))
len_tag_key = "frame_len"
- len_tag = gr.gr_tag_t()
+ len_tag = gr.tag_t()
len_tag.offset = 0
len_tag.key = pmt.string_to_symbol(len_tag_key)
len_tag.value = pmt.from_long(4)
- chan_tag = gr.gr_tag_t()
+ chan_tag = gr.tag_t()
chan_tag.offset = 0
chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps")
chan_tag.value = pmt.init_c32vector(fft_len, channel[:fft_len])
@@ -167,11 +167,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase):
idx2 = idx+2*fft_len
channel[idx2] = channel[idx2] * numpy.exp(1j * 0 * numpy.pi * (numpy.random.rand()-.5))
len_tag_key = "frame_len"
- len_tag = gr.gr_tag_t()
+ len_tag = gr.tag_t()
len_tag.offset = 0
len_tag.key = pmt.string_to_symbol(len_tag_key)
len_tag.value = pmt.from_long(4)
- chan_tag = gr.gr_tag_t()
+ chan_tag = gr.tag_t()
chan_tag.offset = 0
chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps")
chan_tag.value = pmt.init_c32vector(fft_len, channel[:fft_len])
diff --git a/gr-digital/python/qa_ofdm_serializer_vcc.py b/gr-digital/python/qa_ofdm_serializer_vcc.py
index d0f0bf6449..4449c1a24d 100755
--- a/gr-digital/python/qa_ofdm_serializer_vcc.py
+++ b/gr-digital/python/qa_ofdm_serializer_vcc.py
@@ -47,7 +47,7 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),)
n_syms = len(tx_symbols)/fft_len
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(n_syms)
@@ -74,11 +74,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),)
n_syms = len(tx_symbols)/fft_len
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(n_syms)
- offsettag = gr.gr_tag_t()
+ offsettag = gr.tag_t()
offsettag.offset = 0
offsettag.key = pmt.string_to_symbol("ofdm_sync_carr_offset")
offsettag.value = pmt.from_long(carr_offset)
@@ -104,7 +104,7 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
sync_word = (range(fft_len),)
tx_data = tuple([numpy.random.randint(0, 10) for x in range(4 * n_syms)])
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(tx_data))
@@ -139,11 +139,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
tx_data = tuple([numpy.random.randint(0, 10) for x in range(4 * n_syms)])
#tx_data = (1,) * occupied_carriers[0] * n_syms
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(len(tx_data))
- offsettag = gr.gr_tag_t()
+ offsettag = gr.tag_t()
offsettag.offset = 0
offsettag.key = pmt.string_to_symbol("ofdm_sync_carr_offset")
offsettag.value = pmt.from_long(carr_offset)
@@ -182,11 +182,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),)
n_syms = len(tx_symbols)/fft_len
tag_name = "len"
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = 0
tag.key = pmt.string_to_symbol(tag_name)
tag.value = pmt.from_long(n_syms)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 0
tag2.key = pmt.string_to_symbol("packet_len")
tag2.value = pmt.from_long(len(expected_result))
diff --git a/gr-digital/python/qa_packet_headergenerator_bb.py b/gr-digital/python/qa_packet_headergenerator_bb.py
index 03d3af3010..0471385afd 100755
--- a/gr-digital/python/qa_packet_headergenerator_bb.py
+++ b/gr-digital/python/qa_packet_headergenerator_bb.py
@@ -36,15 +36,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase):
# 3 PDUs: | | |
data = (1, 2, 3, 4, 1, 2) + tuple(range(25))
tagname = "packet_len"
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tagname)
tag1.value = pmt.from_long(4)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 4
tag2.key = pmt.string_to_symbol(tagname)
tag2.value = pmt.from_long(2)
- tag3 = gr.gr_tag_t()
+ tag3 = gr.tag_t()
tag3.offset = 6
tag3.key = pmt.string_to_symbol(tagname)
tag3.value = pmt.from_long(25)
@@ -65,15 +65,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase):
# 3 PDUs: | | | |
data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4)
tagname = "packet_len"
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tagname)
tag1.value = pmt.from_long(4)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 4
tag2.key = pmt.string_to_symbol(tagname)
tag2.value = pmt.from_long(2)
- tag3 = gr.gr_tag_t()
+ tag3 = gr.tag_t()
tag3.offset = 6
tag3.key = pmt.string_to_symbol(tagname)
tag3.value = pmt.from_long(4)
@@ -95,15 +95,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase):
# 3 PDUs: | | | |
data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4)
tagname = "packet_len"
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tagname)
tag1.value = pmt.from_long(4)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 4
tag2.key = pmt.string_to_symbol(tagname)
tag2.value = pmt.from_long(2)
- tag3 = gr.gr_tag_t()
+ tag3 = gr.tag_t()
tag3.offset = 6
tag3.key = pmt.string_to_symbol(tagname)
tag3.value = pmt.from_long(4)
@@ -125,15 +125,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase):
# 3 PDUs: | | | |
data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4)
tagname = "packet_len"
- tag1 = gr.gr_tag_t()
+ tag1 = gr.tag_t()
tag1.offset = 0
tag1.key = pmt.string_to_symbol(tagname)
tag1.value = pmt.from_long(4)
- tag2 = gr.gr_tag_t()
+ tag2 = gr.tag_t()
tag2.offset = 4
tag2.key = pmt.string_to_symbol(tagname)
tag2.value = pmt.from_long(2)
- tag3 = gr.gr_tag_t()
+ tag3 = gr.tag_t()
tag3.offset = 6
tag3.key = pmt.string_to_symbol(tagname)
tag3.value = pmt.from_long(4)
diff --git a/gr-digital/python/utils/tagged_streams.py b/gr-digital/python/utils/tagged_streams.py
index f2a58ffe1e..c7edbf61eb 100644
--- a/gr-digital/python/utils/tagged_streams.py
+++ b/gr-digital/python/utils/tagged_streams.py
@@ -27,7 +27,7 @@ def make_lengthtags(lengths, offsets, tagname='length', vlen=1):
tags = []
assert(len(offsets) == len(lengths))
for offset, length in zip(offsets, lengths):
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = offset/vlen
tag.key = pmt.string_to_symbol(tagname)
tag.value = pmt.from_long(length/vlen)
@@ -124,7 +124,7 @@ def packets_to_vectors(packets, lengthtagname, vlen=1):
offset = 0
for packet in packets:
data.extend(packet)
- tag = gr.gr_tag_t()
+ tag = gr.tag_t()
tag.offset = offset/vlen
tag.key = pmt.string_to_symbol(lengthtagname)
tag.value = pmt.from_long(len(packet)/vlen)
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 54f9c64e2d..a721e6ec52 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -32,9 +32,9 @@
%include "analog/cpm.h"
%{
-#include <blocks/control_loop.h>
+#include <gnuradio/blocks/control_loop.h>
%}
-%include <blocks/control_loop.h>
+%include <gnuradio/blocks/control_loop.h>
%{
#include "digital/additive_scrambler_bb.h"
diff --git a/gr-fcd/examples/c++/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc
index 4f129add19..5855fe7124 100644
--- a/gr-fcd/examples/c++/fcd_nfm_rx.cc
+++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc
@@ -32,7 +32,7 @@
#endif
// Include header files for each block used in flowgraph
-#include <gr_top_block.h>
+#include <gnuradio/top_block.h>
#include <filter/firdes.h>
#include <filter/fir_filter_ccf.h>
#include <analog/quadrature_demod_cf.h>
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
// Construct a top block that will contain flowgraph blocks.
- gr_top_block_sptr tb = gr_make_top_block("fcd_nfm_rx");
+ top_block_sptr tb = make_top_block("fcd_nfm_rx");
// FCD source
fcd_source_c_sptr fcd = fcd_make_source_c(device);
diff --git a/gr-fcd/include/fcd/fcd_api.h b/gr-fcd/include/fcd/fcd_api.h
index 9b8a16639a..83afbbd694 100644
--- a/gr-fcd/include/fcd/fcd_api.h
+++ b/gr-fcd/include/fcd/fcd_api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_FCD_API_H
#define INCLUDED_FCD_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_fcd_EXPORTS
# define FCD_API __GR_ATTR_EXPORT
diff --git a/gr-fcd/include/fcd/fcd_source_c.h b/gr-fcd/include/fcd/fcd_source_c.h
index 0fc7bb00d1..75642d351a 100644
--- a/gr-fcd/include/fcd/fcd_source_c.h
+++ b/gr-fcd/include/fcd/fcd_source_c.h
@@ -22,7 +22,7 @@
#define INCLUDED_FCD_SOURCE_C_H
#include <fcd_api.h>
-#include <gr_hier_block2.h>
+#include <gnuradio/hier_block2.h>
class fcd_source_c;
@@ -51,7 +51,7 @@ FCD_API fcd_source_c_sptr fcd_make_source_c(const std::string device_name = "");
* interface to work properly. As of early 2011, FCDs still come with firmware
* 18b. You can use qthid 2.2 (not 3) to upgrade the firmware: http://qthid.sf.net
*/
-class FCD_API fcd_source_c : virtual public gr_hier_block2
+class FCD_API fcd_source_c : virtual public gr::hier_block2
{
public:
/*! \brief Set frequency with Hz resolution.
diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc
index eb61183115..d998509128 100644
--- a/gr-fcd/lib/fcd_source_c_impl.cc
+++ b/gr-fcd/lib/fcd_source_c_impl.cc
@@ -25,9 +25,9 @@
#include <fcd_source_c_impl.h>
#include <fcd.h>
#include <fcdhidcmd.h> // needed for extended API
-#include <gr_io_signature.h>
-#include <blocks/float_to_complex.h>
-#include <attributes.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/float_to_complex.h>
+#include <gnuradio/attributes.h>
//#include <iostream>
//using namespace std;
@@ -47,9 +47,9 @@ static const int MIN_OUT = 1; /*!< Minimum number of output streams. */
static const int MAX_OUT = 1; /*!< Maximum number of output streams. */
fcd_source_c_impl::fcd_source_c_impl(const std::string device_name)
- : gr_hier_block2 ("fcd_source_c",
- gr_make_io_signature (MIN_IN, MAX_IN, sizeof (gr_complex)),
- gr_make_io_signature (MIN_OUT, MAX_OUT, sizeof (gr_complex))),
+ : gr::hier_block2("fcd_source_c",
+ gr::io_signature::make(MIN_IN, MAX_IN, sizeof(gr_complex)),
+ gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof(gr_complex))),
d_freq_corr(-120),
d_freq_req(0)
{
diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt
index 043714c6b3..1c92d10f7f 100644
--- a/gr-fcd/swig/CMakeLists.txt
+++ b/gr-fcd/swig/CMakeLists.txt
@@ -28,6 +28,7 @@ include(GrSwig)
set(GR_SWIG_INCLUDE_DIRS
${GR_FCD_INCLUDE_DIRS}
${GR_AUDIO_INCLUDE_DIRS}
+ ${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
@@ -41,7 +42,8 @@ set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcd_swig_doc.i)
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fcd)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
-set(GR_SWIG_LIBRARIES gnuradio-fcd)
+set(GR_SWIG_LIBRARIES gnuradio-fcd
+ gnuradio-runtime gnuradio-audio gnuradio-blocks)
GR_SWIG_MAKE(fcd_swig fcd_swig.i)
diff --git a/gr-fec/include/fec/api.h b/gr-fec/include/fec/api.h
index 62c0fd98de..51315f6c03 100644
--- a/gr-fec/include/fec/api.h
+++ b/gr-fec/include/fec/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_FEC_API_H
#define INCLUDED_FEC_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_fec_EXPORTS
# define FEC_API __GR_ATTR_EXPORT
diff --git a/gr-fec/include/fec/decode_ccsds_27_fb.h b/gr-fec/include/fec/decode_ccsds_27_fb.h
index f55f8d5c08..84d368c824 100644
--- a/gr-fec/include/fec/decode_ccsds_27_fb.h
+++ b/gr-fec/include/fec/decode_ccsds_27_fb.h
@@ -24,7 +24,7 @@
#define INCLUDED_FEC_DECODE_CCSDS_27_FB_H
#include <fec/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace fec {
@@ -49,7 +49,7 @@ namespace gr {
* from the corresponding inputs.
*/
- class FEC_API decode_ccsds_27_fb : virtual public gr_sync_decimator
+ class FEC_API decode_ccsds_27_fb : virtual public sync_decimator
{
public:
diff --git a/gr-fec/include/fec/encode_ccsds_27_bb.h b/gr-fec/include/fec/encode_ccsds_27_bb.h
index 9f89982288..c9051e0c47 100644
--- a/gr-fec/include/fec/encode_ccsds_27_bb.h
+++ b/gr-fec/include/fec/encode_ccsds_27_bb.h
@@ -24,7 +24,7 @@
#define INCLUDED_FEC_ENCODE_CCSDS_27_BB_H
#include <fec/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace fec {
@@ -46,7 +46,7 @@ namespace gr {
* There is no provision to "flush" the encoder.
*/
- class FEC_API encode_ccsds_27_bb : virtual public gr_sync_interpolator
+ class FEC_API encode_ccsds_27_bb : virtual public sync_interpolator
{
public:
diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
index 87bdc46402..51033a86c0 100644
--- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc
+++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "decode_ccsds_27_fb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace fec {
@@ -36,9 +36,9 @@ namespace gr {
}
decode_ccsds_27_fb_impl::decode_ccsds_27_fb_impl()
- : gr_sync_decimator("decode_ccsds_27_fb",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(char)),
+ : sync_decimator("decode_ccsds_27_fb",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(char)),
2*8) // Rate 1/2 code, unpacked to packed conversion
{
float RATE = 0.5;
diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.cc b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
index 0a348f372f..921cbb0e75 100644
--- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc
+++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "encode_ccsds_27_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
extern "C" {
#include <fec/viterbi.h>
@@ -40,9 +40,9 @@ namespace gr {
}
encode_ccsds_27_bb_impl::encode_ccsds_27_bb_impl()
- : gr_sync_interpolator("encode_ccsds_27_bb",
- gr_make_io_signature (1, 1, sizeof(char)),
- gr_make_io_signature (1, 1, sizeof(char)),
+ : sync_interpolator("encode_ccsds_27_bb",
+ io_signature::make (1, 1, sizeof(char)),
+ io_signature::make (1, 1, sizeof(char)),
16) // Rate 1/2 code, packed to unpacked conversion
{
d_encstate = 0;
diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/fft/api.h
index a569ceb265..ce2a49f4be 100644
--- a/gr-fft/include/fft/api.h
+++ b/gr-fft/include/fft/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_FFT_API_H
#define INCLUDED_FFT_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_fft_EXPORTS
# define FFT_API __GR_ATTR_EXPORT
diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/fft/fft.h
index 305b1cb711..9d2467df6f 100644
--- a/gr-fft/include/fft/fft.h
+++ b/gr-fft/include/fft/fft.h
@@ -28,7 +28,7 @@
*/
#include <fft/api.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <boost/thread.hpp>
namespace gr {
diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/fft/fft_vcc.h
index 2f5b5a23f0..d0a0a53417 100644
--- a/gr-fft/include/fft/fft_vcc.h
+++ b/gr-fft/include/fft/fft_vcc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FFT_FFT_VCC_H
#include <fft/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Compute forward or reverse FFT. complex vector in / complex vector out.
* \ingroup fourier_analysis_blk
*/
- class FFT_API fft_vcc : virtual public gr_sync_block
+ class FFT_API fft_vcc : virtual public sync_block
{
public:
diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/fft/fft_vfc.h
index 89491113b6..a3f5e133e5 100644
--- a/gr-fft/include/fft/fft_vfc.h
+++ b/gr-fft/include/fft/fft_vfc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FFT_FFT_VFC_H
#include <fft/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Compute forward or reverse FFT. float vector in / complex vector out.
* \ingroup fourier_analysis_blk
*/
- class FFT_API fft_vfc : virtual public gr_sync_block
+ class FFT_API fft_vfc : virtual public sync_block
{
public:
diff --git a/gr-fft/include/fft/goertzel.h b/gr-fft/include/fft/goertzel.h
index ff37355e64..7ec0a3d614 100644
--- a/gr-fft/include/fft/goertzel.h
+++ b/gr-fft/include/fft/goertzel.h
@@ -24,7 +24,7 @@
#define INCLUDED_FFT_IMPL_GOERTZEL_H
#include <fft/api.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
namespace gr {
namespace fft {
diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/fft/goertzel_fc.h
index 26b0d0d11c..d22fa98ab3 100644
--- a/gr-fft/include/fft/goertzel_fc.h
+++ b/gr-fft/include/fft/goertzel_fc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FFT_GOERTZEL_FC_H
#include <fft/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Goertzel single-bin DFT calculation.
* \ingroup fourier_analysis_blk
*/
- class FFT_API goertzel_fc : virtual public gr_sync_decimator
+ class FFT_API goertzel_fc : virtual public sync_decimator
{
public:
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index 60838ee302..b3d0f04bc0 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -21,7 +21,7 @@
*/
#include <fft/fft.h>
-#include <gr_sys_paths.h>
+#include <gnuradio/sys_paths.h>
#include <fftw3.h>
#ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom
@@ -36,7 +36,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); }
#define fftwl_import_wisdom_from_file(f) fftwl_import_wisdom(my_fftw_read_char, (void*) (f))
#endif //_MSC_VER
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@ -86,7 +86,7 @@ namespace gr {
wisdom_filename()
{
static fs::path path;
- path = fs::path(gr_appdata_path()) / ".gr_fftw_wisdom";
+ path = fs::path(gr::appdata_path()) / ".gr_fftw_wisdom";
return path.string().c_str();
}
diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc
index ebcd5ec53f..96f3e5b51c 100644
--- a/gr-fft/lib/fft_vcc_fftw.cc
+++ b/gr-fft/lib/fft_vcc_fftw.cc
@@ -25,7 +25,7 @@
#endif
#include "fft_vcc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
#include <string.h>
@@ -44,9 +44,9 @@ namespace gr {
fft_vcc_fftw::fft_vcc_fftw(int fft_size, bool forward,
const std::vector<float> &window,
bool shift, int nthreads)
- : gr_sync_block("fft_vcc_fftw",
- gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex)),
- gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+ : sync_block("fft_vcc_fftw",
+ io_signature::make(1, 1, fft_size * sizeof(gr_complex)),
+ io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
d_fft_size(fft_size), d_forward(forward), d_shift(shift)
{
d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc
index 890dac7be7..dec2157b06 100644
--- a/gr-fft/lib/fft_vfc_fftw.cc
+++ b/gr-fft/lib/fft_vfc_fftw.cc
@@ -25,7 +25,7 @@
#endif
#include "fft_vfc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
#include <string.h>
@@ -44,9 +44,9 @@ namespace gr {
fft_vfc_fftw::fft_vfc_fftw(int fft_size, bool forward,
const std::vector<float> &window,
int nthreads)
- : gr_sync_block("fft_vfc_fftw",
- gr_make_io_signature(1, 1, fft_size * sizeof(float)),
- gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+ : sync_block("fft_vfc_fftw",
+ io_signature::make(1, 1, fft_size * sizeof(float)),
+ io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
d_fft_size(fft_size), d_forward(forward)
{
d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc
index ee214f24da..fd3755eeaa 100644
--- a/gr-fft/lib/goertzel_fc_impl.cc
+++ b/gr-fft/lib/goertzel_fc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "goertzel_fc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace fft {
@@ -36,9 +36,9 @@ namespace gr {
}
goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq)
- : gr_sync_decimator("goertzel_fc",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
+ : sync_decimator("goertzel_fc",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(gr_complex)),
len),
d_goertzel(rate, len, freq)
{
diff --git a/gr-filter/include/filter/adaptive_fir_ccc.h b/gr-filter/include/filter/adaptive_fir_ccc.h
index 2e674fad77..b7af985175 100644
--- a/gr-filter/include/filter/adaptive_fir_ccc.h
+++ b/gr-filter/include/filter/adaptive_fir_ccc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_ADAPTIVE_FIR_CCC_H
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -59,7 +59,7 @@ namespace gr {
* See digital::cma_equalizer_cc and digital::lms_dd_equalizer_cc
* for example usage.
*/
- class FILTER_API adaptive_fir_ccc : virtual public gr_sync_decimator
+ class FILTER_API adaptive_fir_ccc : virtual public sync_decimator
{
protected:
diff --git a/gr-filter/include/filter/adaptive_fir_ccf.h b/gr-filter/include/filter/adaptive_fir_ccf.h
index e296e42df1..c36fbec12b 100644
--- a/gr-filter/include/filter/adaptive_fir_ccf.h
+++ b/gr-filter/include/filter/adaptive_fir_ccf.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_ADAPTIVE_FIR_CCF_H
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -56,7 +56,7 @@ namespace gr {
* }
* \endcode
*/
- class FILTER_API adaptive_fir_ccf : virtual public gr_sync_decimator
+ class FILTER_API adaptive_fir_ccf : virtual public sync_decimator
{
public:
// gr::filter::adaptive_fir_ccf::sptr
diff --git a/gr-filter/include/filter/api.h b/gr-filter/include/filter/api.h
index 97f2d537a0..f54bb2a5e3 100644
--- a/gr-filter/include/filter/api.h
+++ b/gr-filter/include/filter/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_FILTER_API_H
#define INCLUDED_FILTER_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_filter_EXPORTS
# define FILTER_API __GR_ATTR_EXPORT
diff --git a/gr-filter/include/filter/dc_blocker_cc.h b/gr-filter/include/filter/dc_blocker_cc.h
index 5ef75b48e4..9deb78bcc6 100644
--- a/gr-filter/include/filter/dc_blocker_cc.h
+++ b/gr-filter/include/filter/dc_blocker_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_DC_BLOCKER_CC_H
#include <filter/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace filter {
@@ -54,7 +54,7 @@ namespace gr {
* <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine,
* Mar. 2008, pp 132-134.</EM></B>
*/
- class FILTER_API dc_blocker_cc : virtual public gr_sync_block
+ class FILTER_API dc_blocker_cc : virtual public sync_block
{
public:
diff --git a/gr-filter/include/filter/dc_blocker_ff.h b/gr-filter/include/filter/dc_blocker_ff.h
index 64f134e1ab..82808d6bf0 100644
--- a/gr-filter/include/filter/dc_blocker_ff.h
+++ b/gr-filter/include/filter/dc_blocker_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_DC_BLOCKER_FF_H
#include <filter/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace filter {
@@ -57,7 +57,7 @@ namespace gr {
* <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine,
* Mar. 2008, pp 132-134.</EM></B>
*/
- class FILTER_API dc_blocker_ff : virtual public gr_sync_block
+ class FILTER_API dc_blocker_ff : virtual public sync_block
{
public:
diff --git a/gr-filter/include/filter/fft_filter.h b/gr-filter/include/filter/fft_filter.h
index 8bab289dac..4be970e34f 100644
--- a/gr-filter/include/filter/fft_filter.h
+++ b/gr-filter/include/filter/fft_filter.h
@@ -25,7 +25,7 @@
#include <filter/api.h>
#include <vector>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <fft/fft.h>
namespace gr {
diff --git a/gr-filter/include/filter/fft_filter_ccc.h b/gr-filter/include/filter/fft_filter_ccc.h
index 38fef07f94..654eb2e051 100644
--- a/gr-filter/include/filter/fft_filter_ccc.h
+++ b/gr-filter/include/filter/fft_filter_ccc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_FFT_FILTER_CCC_H
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -52,7 +52,7 @@ namespace gr {
* of taps used is very large) if you have enough threads/cores to
* support it.
*/
- class FILTER_API fft_filter_ccc : virtual public gr_sync_decimator
+ class FILTER_API fft_filter_ccc : virtual public sync_decimator
{
public:
// gr::filter::fft_filter_ccc::sptr
diff --git a/gr-filter/include/filter/fft_filter_fff.h b/gr-filter/include/filter/fft_filter_fff.h
index 0183234380..762092b7e5 100644
--- a/gr-filter/include/filter/fft_filter_fff.h
+++ b/gr-filter/include/filter/fft_filter_fff.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_FFT_FILTER_FFF_H
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -52,7 +52,7 @@ namespace gr {
* of taps used is very large) if you have enough threads/cores to
* support it.
*/
- class FILTER_API fft_filter_fff : virtual public gr_sync_decimator
+ class FILTER_API fft_filter_fff : virtual public sync_decimator
{
public:
// gr::filter::fft_filter_fff::sptr
diff --git a/gr-filter/include/filter/filter_delay_fc.h b/gr-filter/include/filter/filter_delay_fc.h
index 1d2222a830..503ba93a37 100644
--- a/gr-filter/include/filter/filter_delay_fc.h
+++ b/gr-filter/include/filter/filter_delay_fc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_FILTER_DELAY_FC_H
#include <filter/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace filter {
@@ -49,7 +49,7 @@ namespace gr {
* introduced by the filter in the imaginary path. The filter taps
* needs to be calculated before initializing this block.
*/
- class FILTER_API filter_delay_fc : virtual public gr_sync_block
+ class FILTER_API filter_delay_fc : virtual public sync_block
{
public:
diff --git a/gr-filter/include/filter/fir_filter.h b/gr-filter/include/filter/fir_filter.h
index a54059463f..07dceab83d 100644
--- a/gr-filter/include/filter/fir_filter.h
+++ b/gr-filter/include/filter/fir_filter.h
@@ -25,7 +25,7 @@
#include <filter/api.h>
#include <vector>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/include/filter/fir_filter_XXX.h.t b/gr-filter/include/filter/fir_filter_XXX.h.t
index 0621bd978c..58dc77ea0b 100644
--- a/gr-filter/include/filter/fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/fir_filter_XXX.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -55,7 +55,7 @@ namespace gr {
* (or decimators) by specifying an integer value for \p
* decimation.
*/
- class FILTER_API @BASE_NAME@ : virtual public gr_sync_decimator
+ class FILTER_API @BASE_NAME@ : virtual public sync_decimator
{
public:
diff --git a/gr-filter/include/filter/fir_filter_with_buffer.h b/gr-filter/include/filter/fir_filter_with_buffer.h
index 007eae3fa6..d34eee752b 100644
--- a/gr-filter/include/filter/fir_filter_with_buffer.h
+++ b/gr-filter/include/filter/fir_filter_with_buffer.h
@@ -25,7 +25,7 @@
#include <filter/api.h>
#include <vector>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/include/filter/firdes.h b/gr-filter/include/filter/firdes.h
index 0ae5894b38..6269667fc7 100644
--- a/gr-filter/include/filter/firdes.h
+++ b/gr-filter/include/filter/firdes.h
@@ -26,7 +26,7 @@
#include <filter/api.h>
#include <vector>
#include <cmath>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/include/filter/fractional_interpolator_cc.h b/gr-filter/include/filter/fractional_interpolator_cc.h
index 90060817fc..bba40e5a95 100644
--- a/gr-filter/include/filter/fractional_interpolator_cc.h
+++ b/gr-filter/include/filter/fractional_interpolator_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FRACTIONAL_INTERPOLATOR_CC_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Interpolating MMSE filter with complex input, complex output
* \ingroup resamplers_blk
*/
- class FILTER_API fractional_interpolator_cc : virtual public gr_block
+ class FILTER_API fractional_interpolator_cc : virtual public block
{
public:
// gr::filter::fractional_interpolator_cc::sptr
diff --git a/gr-filter/include/filter/fractional_interpolator_ff.h b/gr-filter/include/filter/fractional_interpolator_ff.h
index 131e9e541d..41c10a0326 100644
--- a/gr-filter/include/filter/fractional_interpolator_ff.h
+++ b/gr-filter/include/filter/fractional_interpolator_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_FRACTIONAL_INTERPOLATOR_FF_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Interpolating MMSE filter with float input, float output
* \ingroup resamplers_blk
*/
- class FILTER_API fractional_interpolator_ff : virtual public gr_block
+ class FILTER_API fractional_interpolator_ff : virtual public block
{
public:
// gr::filter::fractional_interpolator_ff::sptr
diff --git a/gr-filter/include/filter/fractional_resampler_cc.h b/gr-filter/include/filter/fractional_resampler_cc.h
index ad4eee9494..550bf78b16 100644
--- a/gr-filter/include/filter/fractional_resampler_cc.h
+++ b/gr-filter/include/filter/fractional_resampler_cc.h
@@ -24,7 +24,7 @@
#define INCLUDED_FRACTIONAL_RESAMPLER_CC_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -33,7 +33,7 @@ namespace gr {
* \brief resampling MMSE filter with complex input, complex output
* \ingroup resamplers_blk
*/
- class FILTER_API fractional_resampler_cc : virtual public gr_block
+ class FILTER_API fractional_resampler_cc : virtual public block
{
public:
// gr::filter::fractional_resampler_cc::sptr
diff --git a/gr-filter/include/filter/fractional_resampler_ff.h b/gr-filter/include/filter/fractional_resampler_ff.h
index 53fba9f029..f5b7781686 100644
--- a/gr-filter/include/filter/fractional_resampler_ff.h
+++ b/gr-filter/include/filter/fractional_resampler_ff.h
@@ -24,7 +24,7 @@
#define INCLUDED_FRACTIONAL_RESAMPLER_FF_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -33,7 +33,7 @@ namespace gr {
* \brief Resampling MMSE filter with float input, float output
* \ingroup resamplers_blk
*/
- class FILTER_API fractional_resampler_ff : virtual public gr_block
+ class FILTER_API fractional_resampler_ff : virtual public block
{
public:
// gr::filter::fractional_resampler_ff::sptr
diff --git a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
index 2a62bdc3ba..58a0bb4a98 100644
--- a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
@@ -29,7 +29,7 @@
#define @GUARD_NAME@
#include <filter/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace filter {
@@ -50,7 +50,7 @@ namespace gr {
* Uses a single input array to produce a single output array.
* Additional inputs and/or outputs are ignored.
*/
- class FILTER_API @BASE_NAME@ : virtual public gr_sync_decimator
+ class FILTER_API @BASE_NAME@ : virtual public sync_decimator
{
public:
// gr::filter::@BASE_NAME@::sptr
diff --git a/gr-filter/include/filter/hilbert_fc.h b/gr-filter/include/filter/hilbert_fc.h
index c0973415f3..20e5fc08ff 100644
--- a/gr-filter/include/filter/hilbert_fc.h
+++ b/gr-filter/include/filter/hilbert_fc.h
@@ -24,8 +24,8 @@
#define INCLUDED_FILTER_HILBERT_FC_H
#include <filter/api.h>
-#include <gr_sync_block.h>
-#include <gr_types.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>
namespace gr {
namespace filter {
@@ -39,7 +39,7 @@ namespace gr {
* imaginary output is hilbert filtered (90 degree phase shift)
* version of input.
*/
- class FILTER_API hilbert_fc : virtual public gr_sync_block
+ class FILTER_API hilbert_fc : virtual public sync_block
{
public:
// gr::filter::hilbert_fc::sptr
diff --git a/gr-filter/include/filter/iir_filter_ffd.h b/gr-filter/include/filter/iir_filter_ffd.h
index 17bba0edca..1de953c560 100644
--- a/gr-filter/include/filter/iir_filter_ffd.h
+++ b/gr-filter/include/filter/iir_filter_ffd.h
@@ -24,7 +24,7 @@
#define INCLUDED_IIR_FILTER_FFD_H
#include <filter/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace filter {
@@ -67,7 +67,7 @@ namespace gr {
\endxmlonly
*/
- class FILTER_API iir_filter_ffd : virtual public gr_sync_block
+ class FILTER_API iir_filter_ffd : virtual public sync_block
{
public:
// gr::filter::iir_filter_ffd::sptr
diff --git a/gr-filter/include/filter/interp_fir_filter_XXX.h.t b/gr-filter/include/filter/interp_fir_filter_XXX.h.t
index 7deb269e3a..99ddad2ce8 100644
--- a/gr-filter/include/filter/interp_fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/interp_fir_filter_XXX.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <filter/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace filter {
@@ -56,7 +56,7 @@ namespace gr {
* interpolation.
*
*/
- class FILTER_API @BASE_NAME@ : virtual public gr_sync_interpolator
+ class FILTER_API @BASE_NAME@ : virtual public sync_interpolator
{
public:
// gr::filter::@BASE_NAME@::sptr
diff --git a/gr-filter/include/filter/mmse_fir_interpolator_cc.h b/gr-filter/include/filter/mmse_fir_interpolator_cc.h
index 0af52be552..8b51999257 100644
--- a/gr-filter/include/filter/mmse_fir_interpolator_cc.h
+++ b/gr-filter/include/filter/mmse_fir_interpolator_cc.h
@@ -24,7 +24,7 @@
#include <filter/api.h>
#include <filter/fir_filter.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <vector>
namespace gr {
diff --git a/gr-filter/include/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/filter/pfb_arb_resampler_ccf.h
index 1adf511a14..9b5b64fe11 100644
--- a/gr-filter/include/filter/pfb_arb_resampler_ccf.h
+++ b/gr-filter/include/filter/pfb_arb_resampler_ccf.h
@@ -25,7 +25,7 @@
#define INCLUDED_PFB_ARB_RESAMPLER_CCF_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -92,7 +92,7 @@ namespace gr {
* Systems", Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
*/
- class FILTER_API pfb_arb_resampler_ccf : virtual public gr_block
+ class FILTER_API pfb_arb_resampler_ccf : virtual public block
{
public:
// gr::filter::pfb_arb_resampler_ccf::sptr
diff --git a/gr-filter/include/filter/pfb_arb_resampler_fff.h b/gr-filter/include/filter/pfb_arb_resampler_fff.h
index 5e1be5c026..3390374dd7 100644
--- a/gr-filter/include/filter/pfb_arb_resampler_fff.h
+++ b/gr-filter/include/filter/pfb_arb_resampler_fff.h
@@ -25,7 +25,7 @@
#define INCLUDED_PFB_ARB_RESAMPLER_FFF_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -92,7 +92,7 @@ namespace gr {
* Systems", Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
*/
- class FILTER_API pfb_arb_resampler_fff : virtual public gr_block
+ class FILTER_API pfb_arb_resampler_fff : virtual public block
{
public:
// gr::filter::pfb_arb_resampler_fff::sptr
diff --git a/gr-filter/include/filter/pfb_channelizer_ccf.h b/gr-filter/include/filter/pfb_channelizer_ccf.h
index b1fb11372b..5f1ea669e6 100644
--- a/gr-filter/include/filter/pfb_channelizer_ccf.h
+++ b/gr-filter/include/filter/pfb_channelizer_ccf.h
@@ -25,7 +25,7 @@
#define INCLUDED_FILTER_PFB_CHANNELIZER_CCF_H
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace filter {
@@ -103,7 +103,7 @@ namespace gr {
*
*/
- class FILTER_API pfb_channelizer_ccf : virtual public gr_block
+ class FILTER_API pfb_channelizer_ccf : virtual public block
{
public:
// gr::filter::pfb_channelizer_ccf::sptr
diff --git a/gr-filter/include/filter/pfb_decimator_ccf.h b/gr-filter/include/filter/pfb_decimator_ccf.h
index 56d383dae7..c3714120bd 100644
--- a/gr-filter/include/filter/pfb_decimator_ccf.h
+++ b/gr-filter/include/filter/pfb_decimator_ccf.h
@@ -25,7 +25,7 @@
#define INCLUDED_PFB_DECIMATOR_CCF_H
#include <filter/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace filter {
@@ -88,7 +88,7 @@ namespace gr {
* Systems," Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
*/
- class FILTER_API pfb_decimator_ccf : virtual public gr_sync_block
+ class FILTER_API pfb_decimator_ccf : virtual public sync_block
{
public:
// gr::filter::pfb_decimator_ccf::sptr
diff --git a/gr-filter/include/filter/pfb_interpolator_ccf.h b/gr-filter/include/filter/pfb_interpolator_ccf.h
index de1b2b85f4..86e42160f0 100644
--- a/gr-filter/include/filter/pfb_interpolator_ccf.h
+++ b/gr-filter/include/filter/pfb_interpolator_ccf.h
@@ -25,7 +25,7 @@
#define INCLUDED_PFB_INTERPOLATOR_CCF_H
#include <filter/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace filter {
@@ -76,7 +76,7 @@ namespace gr {
* Inc. 2004.</EM></B>
*/
- class FILTER_API pfb_interpolator_ccf : virtual public gr_sync_interpolator
+ class FILTER_API pfb_interpolator_ccf : virtual public sync_interpolator
{
public:
// gr::filter::pfb_interpolator_ccf::sptr
diff --git a/gr-filter/include/filter/pfb_synthesizer_ccf.h b/gr-filter/include/filter/pfb_synthesizer_ccf.h
index d434776229..ef962f5618 100644
--- a/gr-filter/include/filter/pfb_synthesizer_ccf.h
+++ b/gr-filter/include/filter/pfb_synthesizer_ccf.h
@@ -25,7 +25,7 @@
#define INCLUDED_PFB_SYNTHESIZER_CCF_H
#include <filter/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace filter {
@@ -35,7 +35,7 @@ namespace gr {
* gr_complex input, gr_complex output and float taps
* \ingroup channelizers_blk
*/
- class FILTER_API pfb_synthesizer_ccf : virtual public gr_sync_interpolator
+ class FILTER_API pfb_synthesizer_ccf : virtual public sync_interpolator
{
public:
// gr::filter::pfb_synthesizer_ccf::sptr
diff --git a/gr-filter/include/filter/pm_remez.h b/gr-filter/include/filter/pm_remez.h
index 71283eec1c..09b42b7487 100644
--- a/gr-filter/include/filter/pm_remez.h
+++ b/gr-filter/include/filter/pm_remez.h
@@ -24,7 +24,7 @@
#define INCLUDED_FILTER_PM_REMEZ_H
#include <filter/api.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
#include <string>
#include <stdexcept>
diff --git a/gr-filter/include/filter/rational_resampler_base_XXX.h.t b/gr-filter/include/filter/rational_resampler_base_XXX.h.t
index 18398bbfe7..a61a02e845 100644
--- a/gr-filter/include/filter/rational_resampler_base_XXX.h.t
+++ b/gr-filter/include/filter/rational_resampler_base_XXX.h.t
@@ -26,7 +26,7 @@
#define @GUARD_NAME@
#include <filter/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
@@ -37,7 +37,7 @@ namespace gr {
* input, @O_TYPE@ output and @TAP_TYPE@ taps.
* \ingroup resamplers_blk
*/
- class FILTER_API @NAME@ : virtual public gr_block
+ class FILTER_API @NAME@ : virtual public block
{
public:
// gr::filter::@BASE_NAME@::sptr
diff --git a/gr-filter/include/filter/single_pole_iir.h b/gr-filter/include/filter/single_pole_iir.h
index 10d1b4791b..1b8cca9c9a 100644
--- a/gr-filter/include/filter/single_pole_iir.h
+++ b/gr-filter/include/filter/single_pole_iir.h
@@ -25,7 +25,7 @@
#include <filter/api.h>
#include <stdexcept>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/include/filter/single_pole_iir_filter_cc.h b/gr-filter/include/filter/single_pole_iir_filter_cc.h
index fd6f107b65..fd0052a190 100644
--- a/gr-filter/include/filter/single_pole_iir_filter_cc.h
+++ b/gr-filter/include/filter/single_pole_iir_filter_cc.h
@@ -25,8 +25,8 @@
#include <filter/api.h>
#include <filter/single_pole_iir.h>
-#include <gr_sync_block.h>
-#include <gr_complex.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
@@ -62,7 +62,7 @@ namespace gr {
* denominator. If you're using that convention, you'll need to
* negate the feedback tap.
*/
- class FILTER_API single_pole_iir_filter_cc : virtual public gr_sync_block
+ class FILTER_API single_pole_iir_filter_cc : virtual public sync_block
{
public:
// gr::filter::single_pole_iir_filter_cc::sptr
diff --git a/gr-filter/include/filter/single_pole_iir_filter_ff.h b/gr-filter/include/filter/single_pole_iir_filter_ff.h
index ae4792f3d6..a2f795efb3 100644
--- a/gr-filter/include/filter/single_pole_iir_filter_ff.h
+++ b/gr-filter/include/filter/single_pole_iir_filter_ff.h
@@ -25,8 +25,8 @@
#include <filter/api.h>
#include <filter/single_pole_iir.h>
-#include <gr_sync_block.h>
-#include <gr_complex.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/gr_complex.h>
namespace gr {
namespace filter {
@@ -62,7 +62,7 @@ namespace gr {
* denominator. If you're using that convention, you'll need to
* negate the feedback tap.
*/
- class FILTER_API single_pole_iir_filter_ff : virtual public gr_sync_block
+ class FILTER_API single_pole_iir_filter_ff : virtual public sync_block
{
public:
// gr::filter::single_pole_iir_filter_ff::sptr
diff --git a/gr-filter/lib/adaptive_fir.cc b/gr-filter/lib/adaptive_fir.cc
index b7d2262bb5..48b0809324 100644
--- a/gr-filter/lib/adaptive_fir.cc
+++ b/gr-filter/lib/adaptive_fir.cc
@@ -25,7 +25,7 @@
#endif
#include <filter/adaptive_fir.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/adaptive_fir_ccc_impl.cc b/gr-filter/lib/adaptive_fir_ccc_impl.cc
index a4304bcedb..93c7dea443 100644
--- a/gr-filter/lib/adaptive_fir_ccc_impl.cc
+++ b/gr-filter/lib/adaptive_fir_ccc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "adaptive_fir_ccc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -39,9 +39,9 @@ namespace gr {
adaptive_fir_ccc_impl::adaptive_fir_ccc_impl(const char *name, int decimation,
const std::vector<gr_complex> &taps)
- : gr_sync_decimator(name,
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator(name,
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
decimation),
kernel::adaptive_fir_ccc(decimation, taps),
d_updated(false)
diff --git a/gr-filter/lib/adaptive_fir_ccc_impl.h b/gr-filter/lib/adaptive_fir_ccc_impl.h
index 054cb4b53e..ef4861a8da 100644
--- a/gr-filter/lib/adaptive_fir_ccc_impl.h
+++ b/gr-filter/lib/adaptive_fir_ccc_impl.h
@@ -25,7 +25,7 @@
#include <filter/adaptive_fir_ccc.h>
#include <filter/adaptive_fir.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/adaptive_fir_ccf_impl.cc b/gr-filter/lib/adaptive_fir_ccf_impl.cc
index f07b697106..16d59f36f3 100644
--- a/gr-filter/lib/adaptive_fir_ccf_impl.cc
+++ b/gr-filter/lib/adaptive_fir_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "adaptive_fir_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -39,9 +39,9 @@ namespace gr {
adaptive_fir_ccf_impl::adaptive_fir_ccf_impl(const char *name, int decimation,
const std::vector<float> &taps)
- : gr_sync_decimator(name,
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_decimator(name,
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
decimation),
kernel::adaptive_fir_ccf(decimation, taps),
d_updated(false)
diff --git a/gr-filter/lib/adaptive_fir_ccf_impl.h b/gr-filter/lib/adaptive_fir_ccf_impl.h
index dc34185d68..2c16d2488c 100644
--- a/gr-filter/lib/adaptive_fir_ccf_impl.h
+++ b/gr-filter/lib/adaptive_fir_ccf_impl.h
@@ -25,7 +25,7 @@
#include <filter/adaptive_fir_ccf.h>
#include <filter/adaptive_fir.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/dc_blocker_cc_impl.cc b/gr-filter/lib/dc_blocker_cc_impl.cc
index 663ba94f1e..c5cf189cba 100644
--- a/gr-filter/lib/dc_blocker_cc_impl.cc
+++ b/gr-filter/lib/dc_blocker_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "dc_blocker_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -64,9 +64,9 @@ namespace gr {
dc_blocker_cc_impl::dc_blocker_cc_impl(int D, bool long_form)
- : gr_sync_block("dc_blocker_cc",
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
- gr_make_io_signature (1, 1, sizeof(gr_complex))),
+ : sync_block("dc_blocker_cc",
+ io_signature::make (1, 1, sizeof(gr_complex)),
+ io_signature::make (1, 1, sizeof(gr_complex))),
d_length(D), d_long_form(long_form)
{
if(d_long_form) {
diff --git a/gr-filter/lib/dc_blocker_ff_impl.cc b/gr-filter/lib/dc_blocker_ff_impl.cc
index 22822d1476..1e5b238a50 100644
--- a/gr-filter/lib/dc_blocker_ff_impl.cc
+++ b/gr-filter/lib/dc_blocker_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "dc_blocker_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -62,9 +62,9 @@ namespace gr {
}
dc_blocker_ff_impl::dc_blocker_ff_impl(int D, bool long_form)
- : gr_sync_block("dc_blocker_ff",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(float))),
+ : sync_block("dc_blocker_ff",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(float))),
d_length(D), d_long_form(long_form)
{
if(d_long_form) {
diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc
index 0a20029917..09077d2116 100644
--- a/gr-filter/lib/fft_filter_ccc_impl.cc
+++ b/gr-filter/lib/fft_filter_ccc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "fft_filter_ccc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
#include <assert.h>
@@ -45,9 +45,9 @@ namespace gr {
fft_filter_ccc_impl::fft_filter_ccc_impl(int decimation,
const std::vector<gr_complex> &taps,
int nthreads)
- : gr_sync_decimator("fft_filter_ccc",
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
- gr_make_io_signature (1, 1, sizeof(gr_complex)),
+ : sync_decimator("fft_filter_ccc",
+ io_signature::make (1, 1, sizeof(gr_complex)),
+ io_signature::make (1, 1, sizeof(gr_complex)),
decimation),
d_updated(false)
{
diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc
index 1d6eb02db1..9d6fa4a59a 100644
--- a/gr-filter/lib/fft_filter_fff_impl.cc
+++ b/gr-filter/lib/fft_filter_fff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "fft_filter_fff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <math.h>
#include <assert.h>
@@ -46,9 +46,9 @@ namespace gr {
fft_filter_fff_impl::fft_filter_fff_impl(int decimation,
const std::vector<float> &taps,
int nthreads)
- : gr_sync_decimator("fft_filter_fff",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(float)),
+ : sync_decimator("fft_filter_fff",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(float)),
decimation),
d_updated(false)
{
diff --git a/gr-filter/lib/filter_delay_fc_impl.cc b/gr-filter/lib/filter_delay_fc_impl.cc
index 3bb5508642..645cfdc67e 100644
--- a/gr-filter/lib/filter_delay_fc_impl.cc
+++ b/gr-filter/lib/filter_delay_fc_impl.cc
@@ -36,9 +36,9 @@ namespace gr {
}
filter_delay_fc_impl::filter_delay_fc_impl(const std::vector<float> &taps)
- : gr_sync_block("filter_delay_fc",
- gr_make_io_signature(1, 2, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("filter_delay_fc",
+ io_signature::make(1, 2, sizeof(float)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_update(false)
{
d_taps = taps;
diff --git a/gr-filter/lib/filter_delay_fc_impl.h b/gr-filter/lib/filter_delay_fc_impl.h
index 5157d6e022..df7e847067 100644
--- a/gr-filter/lib/filter_delay_fc_impl.h
+++ b/gr-filter/lib/filter_delay_fc_impl.h
@@ -25,7 +25,7 @@
#include <filter/filter_delay_fc.h>
#include <filter/fir_filter.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/fir_filter_XXX_impl.cc.t b/gr-filter/lib/fir_filter_XXX_impl.cc.t
index e48afe95f2..8b8938095f 100644
--- a/gr-filter/lib/fir_filter_XXX_impl.cc.t
+++ b/gr-filter/lib/fir_filter_XXX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -42,9 +42,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(int decimation, const std::vector<@TAP_TYPE@> &taps)
- : gr_sync_decimator("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@)),
+ : sync_decimator("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@)),
decimation)
{
d_fir = new kernel::@BASE_NAME@(decimation, taps);
diff --git a/gr-filter/lib/fractional_interpolator_cc_impl.cc b/gr-filter/lib/fractional_interpolator_cc_impl.cc
index 137f6ee9c4..06e823f75a 100644
--- a/gr-filter/lib/fractional_interpolator_cc_impl.cc
+++ b/gr-filter/lib/fractional_interpolator_cc_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "fractional_interpolator_cc_impl.h"
#include <stdexcept>
@@ -40,9 +40,9 @@ namespace gr {
fractional_interpolator_cc_impl::fractional_interpolator_cc_impl
(float phase_shift, float interp_ratio)
- : gr_block("fractional_interpolator_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : block("fractional_interpolator_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_mu (phase_shift), d_mu_inc (interp_ratio),
d_interp(new mmse_fir_interpolator_cc())
{
diff --git a/gr-filter/lib/fractional_interpolator_ff_impl.cc b/gr-filter/lib/fractional_interpolator_ff_impl.cc
index f9202166b0..8728a05241 100644
--- a/gr-filter/lib/fractional_interpolator_ff_impl.cc
+++ b/gr-filter/lib/fractional_interpolator_ff_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "fractional_interpolator_ff_impl.h"
#include <stdexcept>
@@ -40,9 +40,9 @@ namespace gr {
fractional_interpolator_ff_impl::fractional_interpolator_ff_impl
(float phase_shift, float interp_ratio)
- : gr_block("fractional_interpolator_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("fractional_interpolator_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_mu (phase_shift), d_mu_inc (interp_ratio),
d_interp(new mmse_fir_interpolator_ff())
{
diff --git a/gr-filter/lib/fractional_resampler_cc_impl.cc b/gr-filter/lib/fractional_resampler_cc_impl.cc
index 965241fdb3..27f139d813 100644
--- a/gr-filter/lib/fractional_resampler_cc_impl.cc
+++ b/gr-filter/lib/fractional_resampler_cc_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "fractional_resampler_cc_impl.h"
#include <stdexcept>
@@ -40,9 +40,9 @@ namespace gr {
fractional_resampler_cc_impl::fractional_resampler_cc_impl
(float phase_shift, float resamp_ratio)
- : gr_block("fractional_resampler_cc",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : block("fractional_resampler_cc",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_mu(phase_shift), d_mu_inc(resamp_ratio),
d_resamp(new mmse_fir_interpolator_cc())
{
diff --git a/gr-filter/lib/fractional_resampler_ff_impl.cc b/gr-filter/lib/fractional_resampler_ff_impl.cc
index cf7a9f462f..61950d92c0 100644
--- a/gr-filter/lib/fractional_resampler_ff_impl.cc
+++ b/gr-filter/lib/fractional_resampler_ff_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include "fractional_resampler_ff_impl.h"
#include <stdexcept>
@@ -40,9 +40,9 @@ namespace gr {
fractional_resampler_ff_impl::fractional_resampler_ff_impl
(float phase_shift, float resamp_ratio)
- : gr_block("fractional_resampler_ff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("fractional_resampler_ff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_mu (phase_shift), d_mu_inc (resamp_ratio),
d_resamp(new mmse_fir_interpolator_ff())
{
diff --git a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t
index a59fa12b36..72a2c0514e 100644
--- a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t
+++ b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t
@@ -30,7 +30,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -52,9 +52,9 @@ namespace gr {
const std::vector<@TAP_TYPE@> &taps,
double center_freq,
double sampling_freq)
- : gr_sync_decimator("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@)),
+ : sync_decimator("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@)),
decimation),
d_proto_taps(taps), d_center_freq(center_freq),
d_sampling_freq(sampling_freq),
diff --git a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t
index 00222cac00..d3871b7b7c 100644
--- a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t
+++ b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t
@@ -31,7 +31,7 @@
#include <filter/api.h>
#include <filter/fir_filter.h>
#include <filter/@BASE_NAME@.h>
-#include <blocks/rotator.h>
+#include <gnuradio/blocks/rotator.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/hilbert_fc_impl.cc b/gr-filter/lib/hilbert_fc_impl.cc
index 52b2dabae9..6691234ec5 100644
--- a/gr-filter/lib/hilbert_fc_impl.cc
+++ b/gr-filter/lib/hilbert_fc_impl.cc
@@ -26,7 +26,7 @@
#include "hilbert_fc_impl.h"
#include <filter/firdes.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
namespace gr {
@@ -38,9 +38,9 @@ namespace gr {
}
hilbert_fc_impl::hilbert_fc_impl(unsigned int ntaps)
- : gr_sync_block ("hilbert_fc",
- gr_make_io_signature (1, 1, sizeof(float)),
- gr_make_io_signature (1, 1, sizeof(gr_complex))),
+ : sync_block ("hilbert_fc",
+ io_signature::make (1, 1, sizeof(float)),
+ io_signature::make (1, 1, sizeof(gr_complex))),
d_ntaps(ntaps | 0x1) // ensure ntaps is odd
{
d_hilb = new kernel::fir_filter_fff(1, firdes::hilbert(d_ntaps));
diff --git a/gr-filter/lib/hilbert_fc_impl.h b/gr-filter/lib/hilbert_fc_impl.h
index d2b41b5732..645b7f6575 100644
--- a/gr-filter/lib/hilbert_fc_impl.h
+++ b/gr-filter/lib/hilbert_fc_impl.h
@@ -25,7 +25,7 @@
#include <filter/hilbert_fc.h>
#include <filter/fir_filter.h>
-#include <gr_types.h>
+#include <gnuradio/types.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/iir_filter_ffd_impl.cc b/gr-filter/lib/iir_filter_ffd_impl.cc
index 9a5d78b5c9..b61c80aabf 100644
--- a/gr-filter/lib/iir_filter_ffd_impl.cc
+++ b/gr-filter/lib/iir_filter_ffd_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "iir_filter_ffd_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -43,9 +43,9 @@ namespace gr {
const std::vector<double> &fbtaps,
bool oldstyle)
- : gr_sync_block("iir_filter_ffd",
- gr_make_io_signature(1, 1, sizeof (float)),
- gr_make_io_signature(1, 1, sizeof (float))),
+ : sync_block("iir_filter_ffd",
+ io_signature::make(1, 1, sizeof (float)),
+ io_signature::make(1, 1, sizeof (float))),
d_updated(false)
{
d_iir = new kernel::iir_filter<float,float,double>(fftaps, fbtaps, oldstyle);
diff --git a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t
index fea3b1c8e9..d9ba509dc3 100644
--- a/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t
+++ b/gr-filter/lib/interp_fir_filter_XXX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
#include <stdexcept>
@@ -44,9 +44,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(unsigned interpolation,
const std::vector<@TAP_TYPE@> &taps)
- : gr_sync_interpolator("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@)),
+ : sync_interpolator("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@)),
interpolation),
d_updated(false), d_firs(interpolation)
{
diff --git a/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc b/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc
index 71507a5aa5..135f6e4f05 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc
+++ b/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_arb_resampler_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
pfb_arb_resampler_ccf_impl::pfb_arb_resampler_ccf_impl(float rate,
const std::vector<float> &taps,
unsigned int filter_size)
- : gr_block("pfb_arb_resampler_ccf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : block("pfb_arb_resampler_ccf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
d_updated (false)
{
d_acc = 0; // start accumulator at 0
diff --git a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
index 71f8957421..d0ee7af2f0 100644
--- a/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_ccf_impl.h
@@ -26,7 +26,7 @@
#include <filter/pfb_arb_resampler_ccf.h>
#include <filter/fir_filter.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/pfb_arb_resampler_fff_impl.cc b/gr-filter/lib/pfb_arb_resampler_fff_impl.cc
index 2a60c1e2e2..c17f637776 100644
--- a/gr-filter/lib/pfb_arb_resampler_fff_impl.cc
+++ b/gr-filter/lib/pfb_arb_resampler_fff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_arb_resampler_fff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
pfb_arb_resampler_fff_impl::pfb_arb_resampler_fff_impl(float rate,
const std::vector<float> &taps,
unsigned int filter_size)
- : gr_block("pfb_arb_resampler_fff",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : block("pfb_arb_resampler_fff",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(float))),
d_updated(false)
{
d_acc = 0; // start accumulator at 0
diff --git a/gr-filter/lib/pfb_arb_resampler_fff_impl.h b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
index fb871d4d44..3b576c06cf 100644
--- a/gr-filter/lib/pfb_arb_resampler_fff_impl.h
+++ b/gr-filter/lib/pfb_arb_resampler_fff_impl.h
@@ -26,7 +26,7 @@
#include <filter/pfb_arb_resampler_fff.h>
#include <filter/fir_filter.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.cc b/gr-filter/lib/pfb_channelizer_ccf_impl.cc
index 53d5375bec..bb2aa07a54 100644
--- a/gr-filter/lib/pfb_channelizer_ccf_impl.cc
+++ b/gr-filter/lib/pfb_channelizer_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_channelizer_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -41,9 +41,9 @@ namespace gr {
pfb_channelizer_ccf_impl::pfb_channelizer_ccf_impl(unsigned int nfilts,
const std::vector<float> &taps,
float oversample_rate)
- : gr_block("pfb_channelizer_ccf",
- gr_make_io_signature(nfilts, nfilts, sizeof(gr_complex)),
- gr_make_io_signature(1, nfilts, sizeof(gr_complex))),
+ : block("pfb_channelizer_ccf",
+ io_signature::make(nfilts, nfilts, sizeof(gr_complex)),
+ io_signature::make(1, nfilts, sizeof(gr_complex))),
polyphase_filterbank(nfilts, taps),
d_updated(false), d_oversample_rate(oversample_rate)
{
diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.h b/gr-filter/lib/pfb_channelizer_ccf_impl.h
index 56f1103ca5..4c72ce4e25 100644
--- a/gr-filter/lib/pfb_channelizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_channelizer_ccf_impl.h
@@ -27,7 +27,7 @@
#include <filter/polyphase_filterbank.h>
#include <filter/fir_filter.h>
#include <fft/fft.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc
index 52c459f784..0010d6366c 100644
--- a/gr-filter/lib/pfb_decimator_ccf_impl.cc
+++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_decimator_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -43,9 +43,9 @@ namespace gr {
pfb_decimator_ccf_impl::pfb_decimator_ccf_impl(unsigned int decim,
const std::vector<float> &taps,
unsigned int channel)
- : gr_sync_block("pfb_decimator_ccf",
- gr_make_io_signature(decim, decim, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("pfb_decimator_ccf",
+ io_signature::make(decim, decim, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
polyphase_filterbank(decim, taps),
d_updated(false), d_chan(channel)
{
diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.h b/gr-filter/lib/pfb_decimator_ccf_impl.h
index 31b9910418..44e0c278e1 100644
--- a/gr-filter/lib/pfb_decimator_ccf_impl.h
+++ b/gr-filter/lib/pfb_decimator_ccf_impl.h
@@ -28,7 +28,7 @@
#include <filter/polyphase_filterbank.h>
#include <filter/fir_filter.h>
#include <fft/fft.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.cc b/gr-filter/lib/pfb_interpolator_ccf_impl.cc
index 042238ff48..fce5fb2e68 100644
--- a/gr-filter/lib/pfb_interpolator_ccf_impl.cc
+++ b/gr-filter/lib/pfb_interpolator_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_interpolator_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -41,9 +41,9 @@ namespace gr {
pfb_interpolator_ccf_impl::pfb_interpolator_ccf_impl(unsigned int interp,
const std::vector<float> &taps)
- : gr_sync_interpolator("pfb_interpolator_ccf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_interpolator("pfb_interpolator_ccf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
interp),
polyphase_filterbank(interp, taps),
d_updated (false), d_rate(interp)
diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.h b/gr-filter/lib/pfb_interpolator_ccf_impl.h
index fb54501b1a..3ee9276439 100644
--- a/gr-filter/lib/pfb_interpolator_ccf_impl.h
+++ b/gr-filter/lib/pfb_interpolator_ccf_impl.h
@@ -28,7 +28,7 @@
#include <filter/polyphase_filterbank.h>
#include <filter/fir_filter.h>
#include <fft/fft.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc
index 0968bbc6c3..49f45ab8cd 100644
--- a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc
+++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "pfb_synthesizer_ccf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
pfb_synthesizer_ccf_impl::pfb_synthesizer_ccf_impl(unsigned int numchans,
const std::vector<float> &taps,
bool twox)
- : gr_sync_interpolator("pfb_synthesizer_ccf",
- gr_make_io_signature(1, numchans, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ : sync_interpolator("pfb_synthesizer_ccf",
+ io_signature::make(1, numchans, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)),
(twox ? numchans/2 : numchans)),
d_updated(false), d_numchans(numchans), d_state(0)
{
diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.h b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
index b443773de3..efb0425a3a 100644
--- a/gr-filter/lib/pfb_synthesizer_ccf_impl.h
+++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.h
@@ -27,7 +27,7 @@
#include <filter/pfb_synthesizer_ccf.h>
#include <filter/fir_filter_with_buffer.h>
#include <fft/fft.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace filter {
diff --git a/gr-filter/lib/qa_filter.h b/gr-filter/lib/qa_filter.h
index d3bc0adecb..6ed698d738 100644
--- a/gr-filter/lib/qa_filter.h
+++ b/gr-filter/lib/qa_filter.h
@@ -23,7 +23,7 @@
#ifndef _QA_GR_FILTER_H_
#define _QA_GR_FILTER_H_
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the gr-filter directory
diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
index ab2958ed15..d9c82804c1 100644
--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
+++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
@@ -24,13 +24,13 @@
#include <config.h>
#endif
-#include <gr_types.h>
+#include <gnuradio/types.h>
#include <qa_fir_filter_with_buffer.h>
#include <filter/fir_filter_with_buffer.h>
#include <fft/fft.h>
#include <cppunit/TestAssert.h>
#include <cmath>
-#include <random.h>
+#include <gnuradio/random.h>
#include <cstring>
namespace gr {
@@ -42,7 +42,7 @@ namespace gr {
static float
uniform()
{
- return 2.0 * ((float) random() / RANDOM_MAX - 0.5); // uniformly (-1, 1)
+ return 2.0 * ((float)(::random()) / RANDOM_MAX - 0.5); // uniformly (-1, 1)
}
static void
diff --git a/gr-filter/lib/qa_firdes.cc b/gr-filter/lib/qa_firdes.cc
index c2fe399d5a..4e6176a4db 100644
--- a/gr-filter/lib/qa_firdes.cc
+++ b/gr-filter/lib/qa_firdes.cc
@@ -23,7 +23,7 @@
#include <qa_firdes.h>
#include <filter/firdes.h>
#include <cppunit/TestAssert.h>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <string.h>
#include <iostream>
#include <iomanip>
diff --git a/gr-filter/lib/rational_resampler_base_XXX_impl.cc.t b/gr-filter/lib/rational_resampler_base_XXX_impl.cc.t
index 2e9161eeb8..29f4e11c38 100644
--- a/gr-filter/lib/rational_resampler_base_XXX_impl.cc.t
+++ b/gr-filter/lib/rational_resampler_base_XXX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@IMPL_NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <volk/volk.h>
#include <stdexcept>
@@ -46,9 +46,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(unsigned interpolation,
unsigned decimation,
const std::vector<@TAP_TYPE@> &taps)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_history(1),
d_interpolation(interpolation),
d_decimation(decimation),
diff --git a/gr-filter/lib/single_pole_iir_filter_cc_impl.cc b/gr-filter/lib/single_pole_iir_filter_cc_impl.cc
index 9406f2c98a..ecfe8f05ee 100644
--- a/gr-filter/lib/single_pole_iir_filter_cc_impl.cc
+++ b/gr-filter/lib/single_pole_iir_filter_cc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "single_pole_iir_filter_cc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
@@ -40,9 +40,9 @@ namespace gr {
single_pole_iir_filter_cc_impl::single_pole_iir_filter_cc_impl
(double alpha, unsigned int vlen)
- : gr_sync_block("single_pole_iir_filter_cc",
- gr_make_io_signature(1, 1, sizeof (gr_complex) * vlen),
- gr_make_io_signature(1, 1, sizeof (gr_complex) * vlen)),
+ : sync_block("single_pole_iir_filter_cc",
+ io_signature::make(1, 1, sizeof (gr_complex) * vlen),
+ io_signature::make(1, 1, sizeof (gr_complex) * vlen)),
d_vlen(vlen), d_iir(vlen)
{
set_taps(alpha);
diff --git a/gr-filter/lib/single_pole_iir_filter_cc_impl.h b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
index fa627881e5..9d767df250 100644
--- a/gr-filter/lib/single_pole_iir_filter_cc_impl.h
+++ b/gr-filter/lib/single_pole_iir_filter_cc_impl.h
@@ -25,8 +25,8 @@
#include <filter/single_pole_iir.h>
#include <filter/single_pole_iir_filter_cc.h>
-#include <gr_sync_block.h>
-#include <gr_complex.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/gr_complex.h>
#include <stdexcept>
namespace gr {
diff --git a/gr-filter/lib/single_pole_iir_filter_ff_impl.cc b/gr-filter/lib/single_pole_iir_filter_ff_impl.cc
index 7e2bae5db7..23d9814eb4 100644
--- a/gr-filter/lib/single_pole_iir_filter_ff_impl.cc
+++ b/gr-filter/lib/single_pole_iir_filter_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "single_pole_iir_filter_ff_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace filter {
@@ -39,9 +39,9 @@ namespace gr {
single_pole_iir_filter_ff_impl::single_pole_iir_filter_ff_impl
(double alpha, unsigned int vlen)
- : gr_sync_block("single_pole_iir_filter_ff",
- gr_make_io_signature(1, 1, sizeof(float)*vlen),
- gr_make_io_signature(1, 1, sizeof(float)*vlen)),
+ : sync_block("single_pole_iir_filter_ff",
+ io_signature::make(1, 1, sizeof(float)*vlen),
+ io_signature::make(1, 1, sizeof(float)*vlen)),
d_vlen(vlen), d_iir(vlen)
{
set_taps(alpha);
diff --git a/gr-filter/lib/single_pole_iir_filter_ff_impl.h b/gr-filter/lib/single_pole_iir_filter_ff_impl.h
index cba9c188c2..8fef264149 100644
--- a/gr-filter/lib/single_pole_iir_filter_ff_impl.h
+++ b/gr-filter/lib/single_pole_iir_filter_ff_impl.h
@@ -25,7 +25,7 @@
#include <filter/single_pole_iir.h>
#include <filter/single_pole_iir_filter_ff.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <stdexcept>
namespace gr {
diff --git a/gr-filter/lib/test_gr_filter.cc b/gr-filter/lib/test_gr_filter.cc
index 32978bd317..b713aafaf7 100644
--- a/gr-filter/lib/test_gr_filter.cc
+++ b/gr-filter/lib/test_gr_filter.cc
@@ -27,7 +27,7 @@
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include <qa_filter.h>
#include <iostream>
diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/noaa/api.h
index 86bc8eb077..d30cbf4746 100644
--- a/gr-noaa/include/noaa/api.h
+++ b/gr-noaa/include/noaa/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_NOAA_API_H
#define INCLUDED_NOAA_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_noaa_EXPORTS
# define NOAA_API __GR_ATTR_EXPORT
diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/noaa/hrpt_decoder.h
index 0eab88375a..cdb9e4640f 100644
--- a/gr-noaa/include/noaa/hrpt_decoder.h
+++ b/gr-noaa/include/noaa/hrpt_decoder.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_DECODER_H
#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT Decoder
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_decoder : virtual public gr_sync_block
+ class NOAA_API hrpt_decoder : virtual public sync_block
{
public:
// gr::noaa::hrpt_decoder::sptr
diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/noaa/hrpt_deframer.h
index 4e319b9054..a8032a7879 100644
--- a/gr-noaa/include/noaa/hrpt_deframer.h
+++ b/gr-noaa/include/noaa/hrpt_deframer.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_DEFRAMER_H
#include <noaa/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT Deframer
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_deframer : virtual public gr_block
+ class NOAA_API hrpt_deframer : virtual public block
{
public:
// gr::noaa::hrpt_deframer::sptr
diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/noaa/hrpt_pll_cf.h
index b9d746b90c..469f426673 100644
--- a/gr-noaa/include/noaa/hrpt_pll_cf.h
+++ b/gr-noaa/include/noaa/hrpt_pll_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_PLL_CF_H
#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT PLL
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_pll_cf : virtual public gr_sync_block
+ class NOAA_API hrpt_pll_cf : virtual public sync_block
{
public:
// gr::noaa::hrpt_pll_cf::sptr
diff --git a/gr-noaa/lib/hrpt_decoder_impl.cc b/gr-noaa/lib/hrpt_decoder_impl.cc
index 76155ac547..2f84d464f4 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.cc
+++ b/gr-noaa/lib/hrpt_decoder_impl.cc
@@ -26,7 +26,7 @@
#include "hrpt_decoder_impl.h"
#include <noaa/hrpt.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -59,9 +59,9 @@ namespace gr {
}
hrpt_decoder_impl::hrpt_decoder_impl(bool verbose, bool output_files)
- : gr_sync_block("noaa_hrpt_decoder",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("noaa_hrpt_decoder",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(0, 0, 0)),
d_verbose(verbose),
d_output_files(output_files),
d_word_num(0),
diff --git a/gr-noaa/lib/hrpt_deframer_impl.cc b/gr-noaa/lib/hrpt_deframer_impl.cc
index cd6d0800db..e412a18b9b 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.cc
+++ b/gr-noaa/lib/hrpt_deframer_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "hrpt_deframer_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <noaa/hrpt.h>
#include <cstring>
#include <cstdio>
@@ -44,9 +44,9 @@ namespace gr {
}
hrpt_deframer_impl::hrpt_deframer_impl()
- : gr_block("noaa_hrpt_deframer",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : block("noaa_hrpt_deframer",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(short)))
{
set_output_multiple(6); // room for writing full sync when received
d_mid_bit = true;
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.cc b/gr-noaa/lib/hrpt_pll_cf_impl.cc
index 17114ef302..fc0d32408d 100644
--- a/gr-noaa/lib/hrpt_pll_cf_impl.cc
+++ b/gr-noaa/lib/hrpt_pll_cf_impl.cc
@@ -25,9 +25,9 @@
#endif
#include "hrpt_pll_cf_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
-#include <gr_sincos.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
namespace gr {
namespace noaa {
@@ -53,9 +53,9 @@ namespace gr {
}
hrpt_pll_cf_impl::hrpt_pll_cf_impl(float alpha, float beta, float max_offset)
- : gr_sync_block("noaa_hrpt_pll_cf",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(float))),
+ : sync_block("noaa_hrpt_pll_cf",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(float))),
d_alpha(alpha), d_beta(beta), d_max_offset(max_offset),
d_phase(0.0), d_freq(0.0)
{
@@ -77,12 +77,12 @@ namespace gr {
// Generate and mix out carrier
float re, im;
- gr_sincosf(d_phase, &im, &re);
+ gr::sincosf(d_phase, &im, &re);
out[i] = (in[i]*gr_complex(re, -im)).imag();
// Adjust PLL phase/frequency
- float error = phase_wrap(gr_fast_atan2f(in[i].imag(), in[i].real()) - d_phase);
- d_freq = gr_branchless_clip(d_freq + error*d_beta, d_max_offset);
+ float error = phase_wrap(gr::fast_atan2f(in[i].imag(), in[i].real()) - d_phase);
+ d_freq = gr::branchless_clip(d_freq + error*d_beta, d_max_offset);
d_phase = phase_wrap(d_phase + error*d_alpha + d_freq);
}
diff --git a/gr-pager/include/pager/api.h b/gr-pager/include/pager/api.h
index d14756277f..3d76e6761a 100644
--- a/gr-pager/include/pager/api.h
+++ b/gr-pager/include/pager/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_PAGER_API_H
#define INCLUDED_PAGER_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_pager_EXPORTS
# define PAGER_API __GR_ATTR_EXPORT
diff --git a/gr-pager/include/pager/flex_deinterleave.h b/gr-pager/include/pager/flex_deinterleave.h
index 75e1ec5f99..9b394d85cd 100644
--- a/gr-pager/include/pager/flex_deinterleave.h
+++ b/gr-pager/include/pager/flex_deinterleave.h
@@ -24,7 +24,7 @@
#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
#include <pager/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
* \brief flex deinterleave description
* \ingroup pager_blk
*/
- class PAGER_API flex_deinterleave : virtual public gr_sync_decimator
+ class PAGER_API flex_deinterleave : virtual public sync_decimator
{
public:
// gr::pager::flex_deinterleave::sptr
diff --git a/gr-pager/include/pager/flex_parse.h b/gr-pager/include/pager/flex_parse.h
index a8cd4c0f5c..9594528377 100644
--- a/gr-pager/include/pager/flex_parse.h
+++ b/gr-pager/include/pager/flex_parse.h
@@ -24,8 +24,8 @@
#define INCLUDED_PAGER_FLEX_PARSE_H
#include <pager/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
#include <sstream>
namespace gr {
@@ -37,13 +37,13 @@ namespace gr {
* \brief flex parse description
* \ingroup pager_blk
*/
- class PAGER_API flex_parse : virtual public gr_sync_block
+ class PAGER_API flex_parse : virtual public sync_block
{
public:
// gr::pager::flex_parse::sptr
typedef boost::shared_ptr<flex_parse> sptr;
- static sptr make(gr_msg_queue_sptr queue, float freq);
+ static sptr make(msg_queue::sptr queue, float freq);
};
} /* namespace pager */
diff --git a/gr-pager/include/pager/flex_sync.h b/gr-pager/include/pager/flex_sync.h
index fb1c7ca8b2..3d0f1dd5ff 100644
--- a/gr-pager/include/pager/flex_sync.h
+++ b/gr-pager/include/pager/flex_sync.h
@@ -24,7 +24,7 @@
#define INCLUDED_PAGER_FLEX_SYNC_H
#include <pager/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
* \brief flex sync description
* \ingroup pager_blk
*/
- class PAGER_API flex_sync : virtual public gr_block
+ class PAGER_API flex_sync : virtual public block
{
public:
// gr::pager::flex_sync::sptr
diff --git a/gr-pager/include/pager/slicer_fb.h b/gr-pager/include/pager/slicer_fb.h
index 452c0cbb92..66fcbd37e6 100644
--- a/gr-pager/include/pager/slicer_fb.h
+++ b/gr-pager/include/pager/slicer_fb.h
@@ -24,7 +24,7 @@
#define INCLUDED_PAGER_SLICER_FB_H
#include <pager/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
* \brief slicer description
* \ingroup pager_blk
*/
- class PAGER_API slicer_fb : virtual public gr_sync_block
+ class PAGER_API slicer_fb : virtual public sync_block
{
public:
// gr::pager::slicer_fb::sptr
diff --git a/gr-pager/lib/flex_deinterleave_impl.cc b/gr-pager/lib/flex_deinterleave_impl.cc
index 01557c49ed..08ced37119 100644
--- a/gr-pager/lib/flex_deinterleave_impl.cc
+++ b/gr-pager/lib/flex_deinterleave_impl.cc
@@ -27,7 +27,7 @@
#include "flex_deinterleave_impl.h"
#include "bch3221.h"
#include "util.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace pager {
@@ -40,9 +40,9 @@ namespace gr {
}
flex_deinterleave_impl::flex_deinterleave_impl() :
- gr_sync_decimator("flex_deinterleave",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(int)), 32)
+ sync_decimator("flex_deinterleave",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(int)), 32)
{
set_output_multiple(8); // One FLEX block at a time
}
diff --git a/gr-pager/lib/flex_deinterleave_impl.h b/gr-pager/lib/flex_deinterleave_impl.h
index 7cce86b6e9..defa83b395 100644
--- a/gr-pager/lib/flex_deinterleave_impl.h
+++ b/gr-pager/lib/flex_deinterleave_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H
#include <pager/flex_deinterleave.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace pager {
diff --git a/gr-pager/lib/flex_parse_impl.cc b/gr-pager/lib/flex_parse_impl.cc
index 8cf0503de7..425b51f026 100644
--- a/gr-pager/lib/flex_parse_impl.cc
+++ b/gr-pager/lib/flex_parse_impl.cc
@@ -26,7 +26,7 @@
#include "flex_parse_impl.h"
#include "bch3221.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <ctype.h>
#include <iostream>
#include <iomanip>
@@ -35,16 +35,16 @@ namespace gr {
namespace pager {
flex_parse::sptr
- flex_parse::make(gr_msg_queue_sptr queue, float freq)
+ flex_parse::make(msg_queue::sptr queue, float freq)
{
return gnuradio::get_initial_sptr
(new flex_parse_impl(queue, freq));
}
- flex_parse_impl::flex_parse_impl(gr_msg_queue_sptr queue, float freq) :
- gr_sync_block("flex_parse",
- gr_make_io_signature(1, 1, sizeof(gr_int32)),
- gr_make_io_signature(0, 0, 0)),
+ flex_parse_impl::flex_parse_impl(msg_queue::sptr queue, float freq) :
+ sync_block("flex_parse",
+ io_signature::make(1, 1, sizeof(gr_int32)),
+ io_signature::make(0, 0, 0)),
d_queue(queue),
d_freq(freq)
{
@@ -159,7 +159,7 @@ namespace gr {
else
parse_unknown(mw1, mw2);
- gr_message_sptr msg = gr_make_message_from_string(std::string(d_payload.str()));
+ message::sptr msg = message::make_from_string(std::string(d_payload.str()));
d_queue->handle(msg);
}
}
diff --git a/gr-pager/lib/flex_parse_impl.h b/gr-pager/lib/flex_parse_impl.h
index a4fcf03d42..f741957f90 100644
--- a/gr-pager/lib/flex_parse_impl.h
+++ b/gr-pager/lib/flex_parse_impl.h
@@ -24,8 +24,8 @@
#define INCLUDED_PAGER_FLEX_PARSE_IMPL_H
#include <pager/flex_parse.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
#include "flex_modes.h"
#include <sstream>
@@ -38,7 +38,7 @@ namespace gr {
{
private:
std::ostringstream d_payload;
- gr_msg_queue_sptr d_queue; // Destination for decoded pages
+ msg_queue::sptr d_queue; // Destination for decoded pages
int d_count; // Count of received codewords
int d_datawords[88]; // 11 blocks of 8 32-bit words
@@ -56,7 +56,7 @@ namespace gr {
void parse_unknown(int mw1, int mw2);
public:
- flex_parse_impl(gr_msg_queue_sptr queue, float freq);
+ flex_parse_impl(msg_queue::sptr queue, float freq);
~flex_parse_impl();
int work(int noutput_items,
diff --git a/gr-pager/lib/flex_sync_impl.cc b/gr-pager/lib/flex_sync_impl.cc
index 7701f56f7a..5124155d47 100644
--- a/gr-pager/lib/flex_sync_impl.cc
+++ b/gr-pager/lib/flex_sync_impl.cc
@@ -28,8 +28,8 @@
#include "flex_modes.h"
#include "bch3221.h"
#include "util.h"
-#include <gr_io_signature.h>
-#include <blocks/count_bits.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/count_bits.h>
#include <cstdio>
namespace gr {
@@ -50,9 +50,9 @@ namespace gr {
// get all zeros, which are considered idle code words.
flex_sync_impl::flex_sync_impl() :
- gr_block("flex_sync",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(4, 4, sizeof(unsigned char))),
+ block("flex_sync",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(4, 4, sizeof(unsigned char))),
d_sync(10) // Fixed at 10 samples per baud (@ 1600 baud)
{
enter_idle();
diff --git a/gr-pager/lib/slicer_fb_impl.cc b/gr-pager/lib/slicer_fb_impl.cc
index e6c5fcc1d5..7d570ebc70 100644
--- a/gr-pager/lib/slicer_fb_impl.cc
+++ b/gr-pager/lib/slicer_fb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "slicer_fb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace pager {
@@ -38,9 +38,9 @@ namespace gr {
}
slicer_fb_impl::slicer_fb_impl(float alpha) :
- gr_sync_block("slicer_fb",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ sync_block("slicer_fb",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
d_alpha = alpha;
d_beta = 1.0-alpha;
diff --git a/gr-qtgui/include/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/qtgui/SpectrumGUIClass.h
index ebe08bdb85..1fc5fa0f96 100644
--- a/gr-qtgui/include/qtgui/SpectrumGUIClass.h
+++ b/gr-qtgui/include/qtgui/SpectrumGUIClass.h
@@ -23,7 +23,7 @@
#ifndef SPECTRUM_GUI_CLASS_HPP
#define SPECTRUM_GUI_CLASS_HPP
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <qwidget.h>
#include <qapplication.h>
#include <qlabel.h>
diff --git a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h
index 9d89e0ffa4..f1936c1f53 100644
--- a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h
+++ b/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h
@@ -30,7 +30,7 @@
#include <qtgui/DisplayPlot.h>
#include <qtgui/timeRasterGlobalData.h>
#include <qtgui/plot_raster.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
#if QWT_VERSION < 0x060000
#include <qtgui/plot_waterfall.h>
diff --git a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h
index a31c5b9b21..cc9de56b39 100644
--- a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h
+++ b/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h
@@ -29,7 +29,7 @@
#include <qwt_plot_spectrogram.h>
#include <qtgui/DisplayPlot.h>
#include <qtgui/waterfallGlobalData.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
#if QWT_VERSION < 0x060000
#include <qtgui/plot_waterfall.h>
diff --git a/gr-qtgui/include/qtgui/api.h b/gr-qtgui/include/qtgui/api.h
index 888dd656c8..0a05544842 100644
--- a/gr-qtgui/include/qtgui/api.h
+++ b/gr-qtgui/include/qtgui/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_QTGUI_API_H
#define INCLUDED_QTGUI_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_qtgui_EXPORTS
# define QTGUI_API __GR_ATTR_EXPORT
diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/qtgui/const_sink_c.h
index ee92d6fe22..881e31517d 100644
--- a/gr-qtgui/include/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/qtgui/const_sink_c.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <filter/firdes.h>
@@ -41,7 +41,7 @@ namespace gr {
* This is a QT-based graphical sink the takes set of a complex
* streams and plots them on an IQ constellation plot.
*/
- class QTGUI_API const_sink_c : virtual public gr_sync_block
+ class QTGUI_API const_sink_c : virtual public sync_block
{
public:
// gr::qtgui::const_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/freq_sink_c.h b/gr-qtgui/include/qtgui/freq_sink_c.h
index c0b053060c..5337d6ae13 100644
--- a/gr-qtgui/include/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/qtgui/freq_sink_c.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <filter/firdes.h>
@@ -44,7 +44,7 @@ namespace gr {
* functions can be used to change the lable and color for a given
* input number.
*/
- class QTGUI_API freq_sink_c : virtual public gr_sync_block
+ class QTGUI_API freq_sink_c : virtual public sync_block
{
public:
// gr::qtgui::freq_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/freq_sink_f.h b/gr-qtgui/include/qtgui/freq_sink_f.h
index 501c377483..1d07cf004c 100644
--- a/gr-qtgui/include/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/qtgui/freq_sink_f.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <filter/firdes.h>
@@ -44,7 +44,7 @@ namespace gr {
* functions can be used to change the lable and color for a given
* input number.
*/
- class QTGUI_API freq_sink_f : virtual public gr_sync_block
+ class QTGUI_API freq_sink_f : virtual public sync_block
{
public:
// gr::qtgui::freq_sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/qtgui_types.h b/gr-qtgui/include/qtgui/qtgui_types.h
index 135350dbb8..f71ab9eda3 100644
--- a/gr-qtgui/include/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/qtgui/qtgui_types.h
@@ -25,7 +25,7 @@
#include <qwt_color_map.h>
#include <qwt_scale_draw.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
class FreqOffsetAndPrecisionClass
{
diff --git a/gr-qtgui/include/qtgui/sink_c.h b/gr-qtgui/include/qtgui/sink_c.h
index 8d8a1e97ab..6a3b641c38 100644
--- a/gr-qtgui/include/qtgui/sink_c.h
+++ b/gr-qtgui/include/qtgui/sink_c.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <qapplication.h>
#include <qwt_symbol.h>
@@ -46,7 +46,7 @@ namespace gr {
* appropriate boolean value in the constructor to False.
*/
- class QTGUI_API sink_c : virtual public gr_block
+ class QTGUI_API sink_c : virtual public block
{
public:
// gr::qtgui::sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/sink_f.h b/gr-qtgui/include/qtgui/sink_f.h
index 6a7783db50..8333e822a5 100644
--- a/gr-qtgui/include/qtgui/sink_f.h
+++ b/gr-qtgui/include/qtgui/sink_f.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <qapplication.h>
#include <qwt_symbol.h>
@@ -46,7 +46,7 @@ namespace gr {
* constructor to False.
*/
- class QTGUI_API sink_f : virtual public gr_block
+ class QTGUI_API sink_f : virtual public block
{
public:
// gr::qtgui::sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h
index df61f7fdb2..361610d095 100644
--- a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h
+++ b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h
@@ -28,7 +28,7 @@
#include <QString>
#include <complex>
#include <vector>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
static const int SpectrumUpdateEventType = 10005;
static const int SpectrumWindowCaptionEventType = 10008;
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_b.h b/gr-qtgui/include/qtgui/time_raster_sink_b.h
index 083a6a2d24..d232f8e933 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/qtgui/time_raster_sink_b.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <qwt_symbol.h>
@@ -46,7 +46,7 @@ namespace gr {
* byte). It will display packed bytes but the display will have
* to be autoscaled.
*/
- class QTGUI_API time_raster_sink_b : virtual public gr_sync_block
+ class QTGUI_API time_raster_sink_b : virtual public sync_block
{
public:
// gr::qtgui::time_raster_sink_b::sptr
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_f.h b/gr-qtgui/include/qtgui/time_raster_sink_f.h
index 07deb25fc0..288d970d78 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/qtgui/time_raster_sink_f.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <qwt_symbol.h>
@@ -43,7 +43,7 @@ namespace gr {
* point streams and plots a time_raster (spectrogram) plot.
*
*/
- class QTGUI_API time_raster_sink_f : virtual public gr_sync_block
+ class QTGUI_API time_raster_sink_f : virtual public sync_block
{
public:
// gr::qtgui::time_raster_sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/time_sink_c.h b/gr-qtgui/include/qtgui/time_sink_c.h
index d3234b94bb..4ac8640f7d 100644
--- a/gr-qtgui/include/qtgui/time_sink_c.h
+++ b/gr-qtgui/include/qtgui/time_sink_c.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
namespace gr {
@@ -44,7 +44,7 @@ namespace gr {
* functions can be used to change the lable and color for a given
* input number.
*/
- class QTGUI_API time_sink_c : virtual public gr_sync_block
+ class QTGUI_API time_sink_c : virtual public sync_block
{
public:
// gr::qtgui::time_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/time_sink_f.h b/gr-qtgui/include/qtgui/time_sink_f.h
index cf0df05337..56970ef721 100644
--- a/gr-qtgui/include/qtgui/time_sink_f.h
+++ b/gr-qtgui/include/qtgui/time_sink_f.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
namespace gr {
@@ -42,7 +42,7 @@ namespace gr {
* different color, and the \a set_title and \a set_color functions
* can be used to change the lable and color for a given input number.
*/
- class QTGUI_API time_sink_f : virtual public gr_sync_block
+ class QTGUI_API time_sink_f : virtual public sync_block
{
public:
// gr::qtgui::time_sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/waterfall_sink_c.h b/gr-qtgui/include/qtgui/waterfall_sink_c.h
index 060c0f14b6..2bdc9f93b7 100644
--- a/gr-qtgui/include/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/qtgui/waterfall_sink_c.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <filter/firdes.h>
@@ -50,7 +50,7 @@ namespace gr {
* here, it's probably best to sum the signals together and
* connect that here.
*/
- class QTGUI_API waterfall_sink_c : virtual public gr_sync_block
+ class QTGUI_API waterfall_sink_c : virtual public sync_block
{
public:
// gr::qtgui::waterfall_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/waterfall_sink_f.h b/gr-qtgui/include/qtgui/waterfall_sink_f.h
index a550d3d2d2..17685fc592 100644
--- a/gr-qtgui/include/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/qtgui/waterfall_sink_f.h
@@ -25,7 +25,7 @@
#include <Python.h>
#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <qapplication.h>
#include <filter/firdes.h>
@@ -50,7 +50,7 @@ namespace gr {
* here, it's probably best to sum the signals together and
* connect that here.
*/
- class QTGUI_API waterfall_sink_f : virtual public gr_sync_block
+ class QTGUI_API waterfall_sink_f : virtual public sync_block
{
public:
// gr::qtgui::waterfall_sink_f::sptr
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
index 9064be4ebe..0c9d90069e 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "const_sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <fft/fft.h>
@@ -48,9 +48,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("const_sink_c",
- gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("const_sink_c",
+ io_signature::make(nconnections, nconnections, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_size(size), d_name(name),
d_nconnections(nconnections), d_parent(parent)
{
diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h
index 02b25409e6..3a2bda242a 100644
--- a/gr-qtgui/lib/const_sink_c_impl.h
+++ b/gr-qtgui/lib/const_sink_c_impl.h
@@ -24,8 +24,8 @@
#define INCLUDED_QTGUI_CONST_SINK_C_IMPL_H
#include <qtgui/const_sink_c.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/constellationdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 4508750457..b0646904cf 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "freq_sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <qwt_symbol.h>
@@ -52,9 +52,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("freq_sink_c",
- gr_make_io_signature(1, -1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("freq_sink_c",
+ io_signature::make(1, -1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_fftsize(fftsize), d_fftavg(1.0),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h
index ef17079567..86a7657e78 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.h
+++ b/gr-qtgui/lib/freq_sink_c_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/freq_sink_c.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/freqdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 6028c8ec4e..2f9f1956f3 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "freq_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <qwt_symbol.h>
@@ -52,9 +52,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("freq_sink_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("freq_sink_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_fftsize(fftsize), d_fftavg(1.0),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h
index 6f4d9d2062..a11ceef88a 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.h
+++ b/gr-qtgui/lib/freq_sink_f_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/freq_sink_f.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/freqdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index aab5be54bf..b33853482d 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -54,9 +54,9 @@ namespace gr {
bool plotfreq, bool plotwaterfall,
bool plottime, bool plotconst,
QWidget *parent)
- : gr_block("sink_c",
- gr_make_io_signature(1, -1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : block("sink_c",
+ io_signature::make(1, -1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_fftsize(fftsize),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h
index 77ddf79a0e..dd17b8c900 100644
--- a/gr-qtgui/lib/sink_c_impl.h
+++ b/gr-qtgui/lib/sink_c_impl.h
@@ -26,7 +26,7 @@
#include <qtgui/sink_c.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
#include <qtgui/SpectrumGUIClass.h>
namespace gr {
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index 1fb2bbdbb7..679593b1ad 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -54,9 +54,9 @@ namespace gr {
bool plotfreq, bool plotwaterfall,
bool plottime, bool plotconst,
QWidget *parent)
- : gr_block("sink_f",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature (0, 0, 0)),
+ : block("sink_f",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make (0, 0, 0)),
d_fftsize(fftsize),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h
index 24dff8d6b3..a8214e5cce 100644
--- a/gr-qtgui/lib/sink_f_impl.h
+++ b/gr-qtgui/lib/sink_f_impl.h
@@ -26,7 +26,7 @@
#include <qtgui/sink_f.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
#include <qtgui/SpectrumGUIClass.h>
namespace gr {
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 6ec6c6075b..4b3d1594cd 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "time_raster_sink_b_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -57,9 +57,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("time_raster_sink_b",
- gr_make_io_signature(1, -1, sizeof(char)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("time_raster_sink_b",
+ io_signature::make(1, -1, sizeof(char)),
+ io_signature::make(0, 0, 0)),
d_name(name), d_nconnections(nconnections), d_parent(parent),
d_rows(rows), d_cols(cols),
d_mult(std::vector<float>(nconnections,1)),
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 09c471fcfc..9d1ffb8cbf 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/time_raster_sink_b.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/timerasterdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.cc b/gr-qtgui/lib/time_raster_sink_c_impl.cc
index 1c71258030..93eba63a3f 100644
--- a/gr-qtgui/lib/time_raster_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "time_raster_sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -47,9 +47,9 @@ namespace gr {
unsigned int cols,
const std::string &name,
QWidget *parent)
- : gr_sync_block("time_raster_sink_c",
- gr_make_io_signature(1, -1, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("time_raster_sink_c",
+ io_signature::make(1, -1, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_name(name), d_nconnections(1), d_parent(parent),
d_rows(rows), d_cols(cols)
{
diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h
index 9f8a463bf8..6824f0e40f 100644
--- a/gr-qtgui/lib/time_raster_sink_c_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_c_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/time_raster_sink_c.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/time_rasterdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index b6b0a1fc7d..0f60e45463 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "time_raster_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -57,9 +57,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("time_raster_sink_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("time_raster_sink_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_name(name), d_nconnections(nconnections), d_parent(parent),
d_rows(rows), d_cols(cols),
d_mult(std::vector<float>(nconnections,1)),
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h
index fad731570c..079e5382bf 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/time_raster_sink_f.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/timerasterdisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index f8ff758218..b19aa68b79 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "time_sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <fft/fft.h>
@@ -48,9 +48,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("time_sink_c",
- gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("time_sink_c",
+ io_signature::make(nconnections, nconnections, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_size(size), d_samp_rate(samp_rate), d_name(name),
d_nconnections(2*nconnections), d_parent(parent)
{
diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h
index 2f9765c2c5..d18c3e468d 100644
--- a/gr-qtgui/lib/time_sink_c_impl.h
+++ b/gr-qtgui/lib/time_sink_c_impl.h
@@ -25,8 +25,8 @@
#include <qtgui/time_sink_c.h>
#include <qtgui/timedisplayform.h>
-#include <thread/thread.h>
-#include <high_res_timer.h>
+#include <gnuradio/thread/thread.h>
+#include <gnuradio/high_res_timer.h>
namespace gr {
namespace qtgui {
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index 6011751b2b..68ebae4690 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "time_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <fft/fft.h>
@@ -48,9 +48,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("time_sink_f",
- gr_make_io_signature(nconnections, nconnections, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("time_sink_f",
+ io_signature::make(nconnections, nconnections, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_size(size), d_samp_rate(samp_rate), d_name(name),
d_nconnections(nconnections), d_parent(parent)
{
diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h
index 1012ffbd77..7fb6bacb95 100644
--- a/gr-qtgui/lib/time_sink_f_impl.h
+++ b/gr-qtgui/lib/time_sink_f_impl.h
@@ -25,8 +25,8 @@
#include <qtgui/time_sink_f.h>
#include <qtgui/timedisplayform.h>
-#include <thread/thread.h>
-#include <high_res_timer.h>
+#include <gnuradio/thread/thread.h>
+#include <gnuradio/high_res_timer.h>
namespace gr {
namespace qtgui {
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index 817a5a126e..34ad0de38d 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "waterfall_sink_c_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
#include <qwt_symbol.h>
@@ -52,9 +52,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("waterfall_sink_c",
- gr_make_io_signature(1, nconnections, sizeof(gr_complex)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("waterfall_sink_c",
+ io_signature::make(1, nconnections, sizeof(gr_complex)),
+ io_signature::make(0, 0, 0)),
d_fftsize(fftsize), d_fftavg(1.0),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h
index 7483989c00..baa793eec9 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/waterfall_sink_c.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/waterfalldisplayform.h>
namespace gr {
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index aad2ffe5c7..d226ca6a96 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "waterfall_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
#include <volk/volk.h>
@@ -51,9 +51,9 @@ namespace gr {
const std::string &name,
int nconnections,
QWidget *parent)
- : gr_sync_block("waterfall_sink_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("waterfall_sink_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_fftsize(fftsize), d_fftavg(1.0),
d_wintype((filter::firdes::win_type)(wintype)),
d_center_freq(fc), d_bandwidth(bw), d_name(name),
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h
index 02556fd9d6..9d4d43b26c 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.h
@@ -26,8 +26,8 @@
#include <qtgui/waterfall_sink_f.h>
#include <filter/firdes.h>
#include <fft/fft.h>
-#include <high_res_timer.h>
-#include <thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+#include <gnuradio/thread/thread.h>
#include <qtgui/waterfalldisplayform.h>
namespace gr {
diff --git a/gr-shd/include/gr_shd_smini_sink.h b/gr-shd/include/gr_shd_smini_sink.h
index b807e5c878..48389a8c7b 100644
--- a/gr-shd/include/gr_shd_smini_sink.h
+++ b/gr-shd/include/gr_shd_smini_sink.h
@@ -23,7 +23,7 @@
#define INCLUDED_GR_SHD_SMINI_SINK_H
#include <gr_shd_api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <shd/xmini/multi_xmini.hpp>
class shd_smini_sink;
@@ -34,7 +34,7 @@ GR_SHD_API boost::shared_ptr<shd_smini_sink> shd_make_smini_sink(
size_t num_channels
);
-class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
+class GR_SHD_API shd_smini_sink : virtual public sync_block
{
public:
diff --git a/gr-shd/include/gr_shd_smini_source.h b/gr-shd/include/gr_shd_smini_source.h
index 11c8563fe2..a397a3b302 100644
--- a/gr-shd/include/gr_shd_smini_source.h
+++ b/gr-shd/include/gr_shd_smini_source.h
@@ -23,7 +23,7 @@
#define INCLUDED_GR_SHD_SMINI_SOURCE_H
#include <gr_shd_api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <shd/xmini/multi_xmini.hpp>
class shd_smini_source;
@@ -34,7 +34,7 @@ GR_SHD_API boost::shared_ptr<shd_smini_source> shd_make_smini_source(
size_t num_channels
);
-class GR_SHD_API shd_smini_source : virtual public gr_sync_block
+class GR_SHD_API shd_smini_source : virtual public sync_block
{
public:
diff --git a/gr-shd/lib/gr_shd_smini_sink.cc b/gr-shd/lib/gr_shd_smini_sink.cc
index 658f5719ef..c471873d73 100644
--- a/gr-shd/lib/gr_shd_smini_sink.cc
+++ b/gr-shd/lib/gr_shd_smini_sink.cc
@@ -20,7 +20,7 @@
*/
#include <gr_shd_smini_sink.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
/*********************************************************************
@@ -32,9 +32,9 @@ public:
shd_smini_sink_impl(const shd::device_addr_t &device_addr,
const shd::io_type_t &io_type,
size_t num_channels):
- gr_sync_block("gr shd smini sink",
- gr_make_io_signature(num_channels, num_channels, io_type.size),
- gr_make_io_signature(0, 0, 0)),
+ sync_block("gr shd smini sink",
+ io_signature::make(num_channels, num_channels, io_type.size),
+ io_signature::make(0, 0, 0)),
_type(io_type),
_nchan(num_channels),
_has_time_spec(_nchan > 1)
diff --git a/gr-shd/lib/gr_shd_smini_source.cc b/gr-shd/lib/gr_shd_smini_source.cc
index 58559a6239..684eb343b6 100644
--- a/gr-shd/lib/gr_shd_smini_source.cc
+++ b/gr-shd/lib/gr_shd_smini_source.cc
@@ -20,7 +20,7 @@
*/
#include <gr_shd_smini_source.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <iostream>
#include <boost/format.hpp>
@@ -36,10 +36,10 @@ public:
const shd::io_type_t &io_type,
size_t num_channels
):
- gr_sync_block(
+ sync_block(
"gr shd smini source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(num_channels, num_channels, io_type.size)
+ io_signature::make(0, 0, 0),
+ io_signature::make(num_channels, num_channels, io_type.size)
),
_type(io_type),
_nchan(num_channels),
diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/trellis/api.h
index 8b85addd96..bdf5842864 100644
--- a/gr-trellis/include/trellis/api.h
+++ b/gr-trellis/include/trellis/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_TRELLIS_API_H
#define INCLUDED_TRELLIS_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_trellis_EXPORTS
# define TRELLIS_API __GR_ATTR_EXPORT
diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/trellis/calc_metric.h
index b39267dc84..46d83c301f 100644
--- a/gr-trellis/include/trellis/calc_metric.h
+++ b/gr-trellis/include/trellis/calc_metric.h
@@ -24,7 +24,7 @@
#define INCLUDED_CALC_METRIC_H
#include <vector>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <digital/metric_type.h>
namespace gr {
diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/trellis/constellation_metrics_cf.h
index f4b94223c7..5a728ad96c 100644
--- a/gr-trellis/include/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/trellis/constellation_metrics_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
#include <trellis/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <digital/constellation.h>
#include <digital/metric_type.h>
@@ -35,7 +35,7 @@ namespace gr {
* \brief Evaluate metrics for use by the Viterbi algorithm.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API constellation_metrics_cf : virtual public gr_block
+ class TRELLIS_API constellation_metrics_cf : virtual public block
{
public:
// gr::trellis::constellation_metrics_cf::sptr
diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/trellis/encoder_XX.h.t
index 9ca7cb30ce..3901797204 100644
--- a/gr-trellis/include/trellis/encoder_XX.h.t
+++ b/gr-trellis/include/trellis/encoder_XX.h.t
@@ -27,7 +27,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
* \brief Convolutional encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/trellis/metrics_X.h.t
index dab7924a8b..d0b8806b62 100644
--- a/gr-trellis/include/trellis/metrics_X.h.t
+++ b/gr-trellis/include/trellis/metrics_X.h.t
@@ -27,7 +27,7 @@
#include <trellis/api.h>
#include <trellis/calc_metric.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
* \brief Evaluate metrics for use by the Viterbi algorithm.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/trellis/pccc_decoder_X.h.t
index d5b6af7b87..7f87250bec 100644
--- a/gr-trellis/include/trellis/pccc_decoder_X.h.t
+++ b/gr-trellis/include/trellis/pccc_decoder_X.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
index 87b110a945..be9db5a146 100644
--- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
@@ -30,7 +30,7 @@
#include <trellis/interleaver.h>
#include <trellis/calc_metric.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/trellis/pccc_encoder_XX.h.t
index 2a62b7520f..c5d4a2f253 100644
--- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t
+++ b/gr-trellis/include/trellis/pccc_encoder_XX.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
* \brief PCCC encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/trellis/permutation.h
index 0f974abb97..7bac7340d9 100644
--- a/gr-trellis/include/trellis/permutation.h
+++ b/gr-trellis/include/trellis/permutation.h
@@ -25,7 +25,7 @@
#include <trellis/api.h>
#include <vector>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace trellis {
@@ -34,7 +34,7 @@ namespace gr {
* \brief Permutation.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API permutation : virtual public gr_sync_block
+ class TRELLIS_API permutation : virtual public sync_block
{
public:
// gr::trellis::permutation::sptr
diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/trellis/sccc_decoder_X.h.t
index 1a63facad9..1e19bbe950 100644
--- a/gr-trellis/include/trellis/sccc_decoder_X.h.t
+++ b/gr-trellis/include/trellis/sccc_decoder_X.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
index f5f9bef464..a7c7c4c723 100644
--- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
@@ -30,7 +30,7 @@
#include <trellis/interleaver.h>
#include <trellis/calc_metric.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/trellis/sccc_encoder_XX.h.t
index f62a1e7cfb..3c1d334d08 100644
--- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t
+++ b/gr-trellis/include/trellis/sccc_encoder_XX.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
* \brief SCCC encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/trellis/siso_combined_f.h
index 48089f86e4..0997b3fdfa 100644
--- a/gr-trellis/include/trellis/siso_combined_f.h
+++ b/gr-trellis/include/trellis/siso_combined_f.h
@@ -28,7 +28,7 @@
#include <trellis/siso_type.h>
#include <trellis/calc_metric.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API siso_combined_f : virtual public gr_block
+ class TRELLIS_API siso_combined_f : virtual public block
{
public:
// gr::trellis::siso_combined_f::sptr
diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/trellis/siso_f.h
index 6d4d414f38..7b5351a838 100644
--- a/gr-trellis/include/trellis/siso_f.h
+++ b/gr-trellis/include/trellis/siso_f.h
@@ -27,7 +27,7 @@
#include <trellis/fsm.h>
#include <trellis/siso_type.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -35,7 +35,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API siso_f : virtual public gr_block
+ class TRELLIS_API siso_f : virtual public block
{
public:
// gr::trellis::siso_f::sptr
diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/trellis/viterbi_X.h.t
index 817c98508a..574888ec12 100644
--- a/gr-trellis/include/trellis/viterbi_X.h.t
+++ b/gr-trellis/include/trellis/viterbi_X.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/trellis/viterbi_combined_XX.h.t
index a2cc4b946c..465b5f518f 100644
--- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t
+++ b/gr-trellis/include/trellis/viterbi_combined_XX.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/calc_metric.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -37,7 +37,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index 18d3095802..6aa7dce6c8 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.cc
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "constellation_metrics_cf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
#include <stdexcept>
#include <iostream>
@@ -43,9 +43,9 @@ namespace gr {
constellation_metrics_cf_impl::constellation_metrics_cf_impl(digital::constellation_sptr constellation,
digital::trellis_metric_type_t TYPE)
- : gr_block("constellation_metrics_cf",
- gr_make_io_signature(1, -1, sizeof(gr_complex)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("constellation_metrics_cf",
+ io_signature::make(1, -1, sizeof(gr_complex)),
+ io_signature::make(1, -1, sizeof(float))),
d_constellation(constellation),
d_TYPE(TYPE),
d_O(constellation->arity()),
diff --git a/gr-trellis/lib/encoder_XX_impl.cc.t b/gr-trellis/lib/encoder_XX_impl.cc.t
index fdda593d45..4b11e3c06d 100644
--- a/gr-trellis/lib/encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int ST)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_FSM(FSM),
d_ST(ST)
{
diff --git a/gr-trellis/lib/metrics_X_impl.cc.t b/gr-trellis/lib/metrics_X_impl.cc.t
index c74051c53e..499bd8b9cd 100644
--- a/gr-trellis/lib/metrics_X_impl.cc.t
+++ b/gr-trellis/lib/metrics_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
#include <stdexcept>
#include <iostream>
@@ -45,9 +45,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(int O, int D, const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof (float))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof (@I_TYPE@)),
+ io_signature::make(1, -1, sizeof (float))),
d_O(O), d_D(D), d_TYPE(TYPE), d_TABLE(TABLE)
{
set_relative_rate (1.0 * d_O / ((double) d_D));
diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t
index 9bf85bc614..1d5e14ca25 100644
--- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t
+++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -59,9 +59,9 @@ namespace gr {
int blocklength,
int repetitions,
siso_type_t SISO_TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSM1(FSM1), d_ST10(ST10), d_ST1K(ST1K),
d_FSM2(FSM2), d_ST20(ST20), d_ST2K(ST2K),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
index 21a5c0b3ae..f5f5a9311c 100644
--- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -64,9 +64,9 @@ namespace gr {
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
index 4e804729a2..119bff6ddb 100644
--- a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -47,9 +47,9 @@ namespace gr {
const fsm &FSM2, int ST2,
const interleaver &INTERLEAVER,
int blocklength)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSM1(FSM1), d_ST1(ST1),
d_FSM2(FSM2), d_ST2(ST2),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc
index da82e46832..06bba1e11f 100644
--- a/gr-trellis/lib/permutation_impl.cc
+++ b/gr-trellis/lib/permutation_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "permutation_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <string.h>
@@ -42,9 +42,9 @@ namespace gr {
permutation_impl::permutation_impl(int K, const std::vector<int> &TABLE,
int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL)
- : gr_sync_block("permutation",
- gr_make_io_signature(1, -1, BYTES_PER_SYMBOL),
- gr_make_io_signature(1, -1, BYTES_PER_SYMBOL)),
+ : sync_block("permutation",
+ io_signature::make(1, -1, BYTES_PER_SYMBOL),
+ io_signature::make(1, -1, BYTES_PER_SYMBOL)),
d_K(K), d_TABLE(TABLE),
d_SYMS_PER_BLOCK(SYMS_PER_BLOCK),
d_BYTES_PER_SYMBOL(BYTES_PER_SYMBOL)
diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t
index 6eef46518d..c45f14bfdb 100644
--- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t
+++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -56,9 +56,9 @@ namespace gr {
int blocklength,
int repetitions,
siso_type_t SISO_TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
index 717f2c8e49..6d3ecf6aea 100644
--- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -64,9 +64,9 @@ namespace gr {
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
index 390e65c4f3..9924b3c7d2 100644
--- a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -47,9 +47,9 @@ namespace gr {
const fsm &FSMi, int STi,
const interleaver &INTERLEAVER,
int blocklength)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo(STo),
d_FSMi(FSMi), d_STi(STi),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc
index 7514d46747..d30f5cc4bb 100644
--- a/gr-trellis/lib/siso_combined_f_impl.cc
+++ b/gr-trellis/lib/siso_combined_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "siso_combined_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
#include <iostream>
@@ -54,9 +54,9 @@ namespace gr {
siso_type_t SISO_TYPE,
int D, const std::vector<float> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("siso_combined_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("siso_combined_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(float))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK),
d_POSTI(POSTI), d_POSTO(POSTO),
d_SISO_TYPE(SISO_TYPE),
diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc
index b0484f6f37..d699cecaec 100644
--- a/gr-trellis/lib/siso_f_impl.cc
+++ b/gr-trellis/lib/siso_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "siso_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
#include <iostream>
@@ -49,9 +49,9 @@ namespace gr {
int S0, int SK,
bool POSTI, bool POSTO,
siso_type_t SISO_TYPE)
- : gr_block("siso_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("siso_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(float))),
d_FSM(FSM), d_K(K),
d_S0(S0),d_SK(SK),
d_POSTI(POSTI), d_POSTO(POSTO),
diff --git a/gr-trellis/lib/viterbi_X_impl.cc.t b/gr-trellis/lib/viterbi_X_impl.cc.t
index 5097cc2053..247424b3f3 100644
--- a/gr-trellis/lib/viterbi_X_impl.cc.t
+++ b/gr-trellis/lib/viterbi_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int K,
int S0, int SK)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(@TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(@TYPE@))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK)//,
//d_trace(FSM.S()*K)
{
diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
index 95175bef95..c7cf10e567 100644
--- a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -49,9 +49,9 @@ namespace gr {
int S0, int SK, int D,
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK), d_D(D),
d_TABLE(TABLE), d_TYPE(TYPE)//,
//d_trace(FSM.S()*K)
diff --git a/gr-uhd/examples/c++/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h
index 676005e06c..e96cd9ec3c 100644
--- a/gr-uhd/examples/c++/tag_sink_demo.h
+++ b/gr-uhd/examples/c++/tag_sink_demo.h
@@ -19,21 +19,22 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gr_sync_block.h>
-#include <gr_io_signature.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/io_signature.h>
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <iostream>
#include <complex>
-class tag_sink_demo : public gr_sync_block{
+class tag_sink_demo : public gr::sync_block
+{
public:
tag_sink_demo(void):
- gr_sync_block(
+ sync_block(
"uhd tag sink demo",
- gr_make_io_signature(1, 1, sizeof(std::complex<float>)),
- gr_make_io_signature(0, 0, 0)
+ gr::io_signature::make(1, 1, sizeof(std::complex<float>)),
+ gr::io_signature::make(0, 0, 0)
)
{
//NOP
@@ -46,11 +47,11 @@ public:
){
//grab all "rx time" tags in this work call
const uint64_t samp0_count = this->nitems_read(0);
- std::vector<gr_tag_t> rx_time_tags;
+ std::vector<gr::tag_t> rx_time_tags;
get_tags_in_range(rx_time_tags, 0, samp0_count, samp0_count + ninput_items, pmt::string_to_symbol("rx_time"));
//print all tags
- BOOST_FOREACH(const gr_tag_t &rx_time_tag, rx_time_tags){
+ BOOST_FOREACH(const gr::tag_t &rx_time_tag, rx_time_tags){
const uint64_t offset = rx_time_tag.offset;
const pmt::pmt_t &value = rx_time_tag.value;
diff --git a/gr-uhd/examples/c++/tag_source_demo.h b/gr-uhd/examples/c++/tag_source_demo.h
index 6efe4667e5..71fb94482a 100644
--- a/gr-uhd/examples/c++/tag_source_demo.h
+++ b/gr-uhd/examples/c++/tag_source_demo.h
@@ -19,14 +19,15 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gr_sync_block.h>
-#include <gr_io_signature.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/io_signature.h>
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <iostream>
#include <complex>
-class tag_source_demo : public gr_sync_block{
+class tag_source_demo : public gr::sync_block
+{
public:
tag_source_demo(
@@ -36,10 +37,10 @@ public:
const double idle_duration,
const double burst_duration
):
- gr_sync_block(
+ sync_block(
"uhd tag source demo",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(1, 1, sizeof(std::complex<float>))
+ gr::io_signature::make(0, 0, 0),
+ gr::io_signature::make(1, 1, sizeof(std::complex<float>))
),
_time_secs(start_secs),
_time_fracs(start_fracs),
@@ -52,7 +53,8 @@ public:
//NOP
}
- void make_time_tag(const uint64_t tag_count){;
+ void make_time_tag(const uint64_t tag_count)
+ {
const pmt::pmt_t key = pmt::string_to_symbol("tx_time");
const pmt::pmt_t value = pmt::make_tuple(
pmt::from_uint64(_time_secs),
@@ -62,14 +64,16 @@ public:
this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid);
}
- void make_sob_tag(const uint64_t tag_count){
+ void make_sob_tag(const uint64_t tag_count)
+ {
const pmt::pmt_t key = pmt::string_to_symbol("tx_sob");
const pmt::pmt_t value = pmt::PMT_T;
const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid);
}
- void make_eob_tag(const uint64_t tag_count){;
+ void make_eob_tag(const uint64_t tag_count)
+ {
const pmt::pmt_t key = pmt::string_to_symbol("tx_eob");
const pmt::pmt_t value = pmt::PMT_T;
const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
@@ -79,8 +83,8 @@ public:
int work(
int noutput_items,
gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items
- ){
+ gr_vector_void_star &output_items)
+ {
//load the output with a constant
std::complex<float> *output = reinterpret_cast<std::complex<float> *>(output_items[0]);
for (size_t i = 0; i < size_t(noutput_items); i++){
diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc
index 890cc12dea..aa0f0c8ecf 100644
--- a/gr-uhd/examples/c++/tags_demo.cc
+++ b/gr-uhd/examples/c++/tags_demo.cc
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gr_top_block.h>
+#include <gnuradio/top_block.h>
#include <uhd/usrp_source.h>
#include <uhd/usrp_sink.h>
#include <tag_source_demo.h>
@@ -74,7 +74,7 @@ int main(int argc, char *argv[]){
//------------------------------------------------------------------
//-- make a top block
//------------------------------------------------------------------
- gr_top_block_sptr tb = gr_make_top_block("tags_demo");
+ gr::top_block_sptr tb = gr::make_top_block("tags_demo");
//------------------------------------------------------------------
//-- make the usrp source test blocks
diff --git a/gr-uhd/include/uhd/amsg_source.h b/gr-uhd/include/uhd/amsg_source.h
index 819f6edad2..cf5c2e7628 100644
--- a/gr-uhd/include/uhd/amsg_source.h
+++ b/gr-uhd/include/uhd/amsg_source.h
@@ -25,7 +25,7 @@
#include <uhd/api.h>
#include <uhd/usrp/multi_usrp.hpp>
-#include <gr_msg_queue.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace uhd {
@@ -43,14 +43,14 @@ namespace gr {
* \ingroup uhd_blk
*/
static sptr make(const ::uhd::device_addr_t &device_addr,
- gr_msg_queue_sptr msgq);
+ msg_queue::sptr msgq);
/*!
* Convert a raw asynchronous message to an asynchronous metatdata object.
* \return The asynchronous metadata object.
*/
static ::uhd::async_metadata_t
- msg_to_async_metadata_t(const gr_message_sptr msg);
+ msg_to_async_metadata_t(const message::sptr msg);
};
} /* namespace uhd */
diff --git a/gr-uhd/include/uhd/usrp_sink.h b/gr-uhd/include/uhd/usrp_sink.h
index c54689241b..2d7c014f6b 100644
--- a/gr-uhd/include/uhd/usrp_sink.h
+++ b/gr-uhd/include/uhd/usrp_sink.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_UHD_USRP_SINK_H
#include <uhd/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <uhd/usrp/multi_usrp.hpp>
#ifndef INCLUDED_UHD_STREAM_HPP
@@ -53,7 +53,7 @@ namespace gr {
class uhd_usrp_sink;
- class GR_UHD_API usrp_sink : virtual public gr_sync_block
+ class GR_UHD_API usrp_sink : virtual public sync_block
{
public:
// gr::uhd::usrp_sink::sptr
diff --git a/gr-uhd/include/uhd/usrp_source.h b/gr-uhd/include/uhd/usrp_source.h
index 2348e73ed4..127e588a82 100644
--- a/gr-uhd/include/uhd/usrp_source.h
+++ b/gr-uhd/include/uhd/usrp_source.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_UHD_USRP_SOURCE_H
#include <uhd/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <uhd/usrp/multi_usrp.hpp>
#ifndef INCLUDED_UHD_STREAM_HPP
@@ -53,7 +53,7 @@ namespace gr {
class uhd_usrp_source;
- class GR_UHD_API usrp_source : virtual public gr_sync_block
+ class GR_UHD_API usrp_source : virtual public sync_block
{
public:
// gr::uhd::usrp_source::sptr
diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc
index cf344db202..deaff232d1 100644
--- a/gr-uhd/lib/amsg_source_impl.cc
+++ b/gr-uhd/lib/amsg_source_impl.cc
@@ -29,7 +29,7 @@ namespace gr {
amsg_source::sptr
amsg_source::make(const ::uhd::device_addr_t &device_addr,
- gr_msg_queue_sptr msgq)
+ msg_queue::sptr msgq)
{
check_abi();
return amsg_source::sptr
@@ -37,13 +37,13 @@ namespace gr {
}
::uhd::async_metadata_t
- amsg_source::msg_to_async_metadata_t(const gr_message_sptr msg)
+ amsg_source::msg_to_async_metadata_t(const message::sptr msg)
{
return *(::uhd::async_metadata_t *)msg->msg();
}
amsg_source_impl::amsg_source_impl(const ::uhd::device_addr_t &device_addr,
- gr_msg_queue_sptr msgq)
+ msg_queue::sptr msgq)
: _msgq(msgq), _running(true)
{
_dev = ::uhd::usrp::multi_usrp::make(device_addr);
@@ -60,11 +60,11 @@ namespace gr {
void
amsg_source_impl::recv_loop()
{
- gr_message_sptr msg;
+ message::sptr msg;
::uhd::async_metadata_t *md;
while(_running) {
- msg = gr_make_message(0, 0.0, 0.0, sizeof(::uhd::async_metadata_t));
+ msg = message::make(0, 0.0, 0.0, sizeof(::uhd::async_metadata_t));
md = (::uhd::async_metadata_t*) msg->msg();
while(!_dev->get_device()->recv_async_msg(*md, 0.1)) {
@@ -77,7 +77,7 @@ namespace gr {
}
void
- amsg_source_impl::post(gr_message_sptr msg)
+ amsg_source_impl::post(message::sptr msg)
{
_msgq->insert_tail(msg);
}
diff --git a/gr-uhd/lib/amsg_source_impl.h b/gr-uhd/lib/amsg_source_impl.h
index f0f3d4bfb1..bb7326a80f 100644
--- a/gr-uhd/lib/amsg_source_impl.h
+++ b/gr-uhd/lib/amsg_source_impl.h
@@ -21,7 +21,7 @@
*/
#include <uhd/amsg_source.h>
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
namespace gr {
namespace uhd {
@@ -30,16 +30,16 @@ namespace gr {
{
public:
amsg_source_impl(const ::uhd::device_addr_t &device_addr,
- gr_msg_queue_sptr msgq);
+ msg_queue::sptr msgq);
~amsg_source_impl();
void recv_loop();
- void post(gr_message_sptr msg);
+ void post(message::sptr msg);
protected:
::uhd::usrp::multi_usrp::sptr _dev;
gr::thread::thread _amsg_thread;
- gr_msg_queue_sptr _msgq;
+ msg_queue::sptr _msgq;
bool _running;
};
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc
index a049e79d8f..349271f720 100644
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@ -22,7 +22,7 @@
#include "usrp_sink_impl.h"
#include "gr_uhd_common.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <boost/make_shared.hpp>
#include <stdexcept>
@@ -60,9 +60,9 @@ namespace gr {
usrp_sink_impl::usrp_sink_impl(const ::uhd::device_addr_t &device_addr,
const ::uhd::stream_args_t &stream_args)
- : gr_sync_block("gr uhd usrp sink",
+ : sync_block("gr uhd usrp sink",
args_to_io_sig(stream_args),
- gr_make_io_signature(0, 0, 0)),
+ io_signature::make(0, 0, 0)),
_stream_args(stream_args),
_nchan(std::max<size_t>(1, stream_args.channels.size())),
_stream_now(_nchan == 1),
@@ -461,10 +461,10 @@ namespace gr {
usrp_sink_impl::tag_work(int &ninput_items)
{
//the for loop below assumes tags sorted by count low -> high
- std::sort(_tags.begin(), _tags.end(), gr_tag_t::offset_compare);
+ std::sort(_tags.begin(), _tags.end(), tag_t::offset_compare);
//extract absolute sample counts
- const gr_tag_t &tag0 = _tags.front();
+ const tag_t &tag0 = _tags.front();
const uint64_t tag0_count = tag0.offset;
const uint64_t samp0_count = this->nitems_read(0);
@@ -479,7 +479,7 @@ namespace gr {
_metadata.has_time_spec = false;
//process all of the tags found with the same count as tag0
- BOOST_FOREACH(const gr_tag_t &my_tag, _tags) {
+ BOOST_FOREACH(const tag_t &my_tag, _tags) {
const uint64_t my_tag_count = my_tag.offset;
const pmt::pmt_t &key = my_tag.key;
const pmt::pmt_t &value = my_tag.value;
diff --git a/gr-uhd/lib/usrp_sink_impl.h b/gr-uhd/lib/usrp_sink_impl.h
index d2058fb4a8..d573b3e881 100644
--- a/gr-uhd/lib/usrp_sink_impl.h
+++ b/gr-uhd/lib/usrp_sink_impl.h
@@ -30,7 +30,7 @@ static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("tx_time");
namespace gr {
namespace uhd {
- inline gr_io_signature_sptr
+ inline io_signature::sptr
args_to_io_sig(const ::uhd::stream_args_t &args)
{
const size_t nchan = std::max<size_t>(args.channels.size(), 1);
@@ -43,7 +43,7 @@ namespace gr {
if(args.cpu_format == "sc16")
size = 4;
#endif
- return gr_make_io_signature(nchan, nchan, size);
+ return io_signature::make(nchan, nchan, size);
}
/***********************************************************************
@@ -132,7 +132,7 @@ namespace gr {
bool _start_time_set;
//stream tags related stuff
- std::vector<gr_tag_t> _tags;
+ std::vector<tag_t> _tags;
};
} /* namespace uhd */
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
index ad3ffef2ad..813f707178 100644
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@ -22,7 +22,7 @@
#include "usrp_source_impl.h"
#include "gr_uhd_common.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <boost/format.hpp>
#include <boost/thread/thread.hpp>
#include <boost/make_shared.hpp>
@@ -63,8 +63,8 @@ namespace gr {
usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t &device_addr,
const ::uhd::stream_args_t &stream_args):
- gr_sync_block("gr uhd usrp source",
- gr_make_io_signature(0, 0, 0),
+ sync_block("gr uhd usrp source",
+ io_signature::make(0, 0, 0),
args_to_io_sig(stream_args)),
_stream_args(stream_args),
_nchan(std::max<size_t>(1, stream_args.channels.size())),
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h
index e31263bda0..baff2cd76a 100644
--- a/gr-uhd/lib/usrp_source_impl.h
+++ b/gr-uhd/lib/usrp_source_impl.h
@@ -30,7 +30,7 @@ static const pmt::pmt_t FREQ_KEY = pmt::string_to_symbol("rx_freq");
namespace gr {
namespace uhd {
- inline gr_io_signature_sptr
+ inline io_signature::sptr
args_to_io_sig(const ::uhd::stream_args_t &args)
{
const size_t nchan = std::max<size_t>(args.channels.size(), 1);
@@ -43,7 +43,7 @@ namespace gr {
if(args.cpu_format == "sc16")
size = 4;
#endif
- return gr_make_io_signature(nchan, nchan, size);
+ return io_signature::make(nchan, nchan, size);
}
/***********************************************************************
diff --git a/gr-utils/python/modtool/gr-newmod/include/howto/api.h b/gr-utils/python/modtool/gr-newmod/include/howto/api.h
index 0c20712786..db5f81f394 100644
--- a/gr-utils/python/modtool/gr-newmod/include/howto/api.h
+++ b/gr-utils/python/modtool/gr-newmod/include/howto/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_HOWTO_API_H
#define INCLUDED_HOWTO_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_howto_EXPORTS
# define HOWTO_API __GR_ATTR_EXPORT
diff --git a/gr-utils/python/modtool/gr-newmod/lib/qa_howto.h b/gr-utils/python/modtool/gr-newmod/lib/qa_howto.h
index 069afd38ae..23f0f7f33e 100644
--- a/gr-utils/python/modtool/gr-newmod/lib/qa_howto.h
+++ b/gr-utils/python/modtool/gr-newmod/lib/qa_howto.h
@@ -23,7 +23,7 @@
#ifndef _QA_HOWTO_H_
#define _QA_HOWTO_H_
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#include <cppunit/TestSuite.h>
//! collect all the tests for the gr-filter directory
diff --git a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc
index 9c5faa0eba..f01bd5a064 100644
--- a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc
+++ b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc
@@ -27,7 +27,7 @@
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
-#include <gr_unittests.h>
+#include <gnuradio/unittests.h>
#include "qa_howto.h"
#include <iostream>
diff --git a/gr-video-sdl/include/video_sdl/api.h b/gr-video-sdl/include/video_sdl/api.h
index 981292658c..b9df5fd060 100644
--- a/gr-video-sdl/include/video_sdl/api.h
+++ b/gr-video-sdl/include/video_sdl/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_VIDEO_SDL_API_H
#define INCLUDED_VIDEO_SDL_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_video_sdl_EXPORTS
# define VIDEO_SDL_API __GR_ATTR_EXPORT
diff --git a/gr-video-sdl/include/video_sdl/sink_s.h b/gr-video-sdl/include/video_sdl/sink_s.h
index 2e2a9085e4..076f065f07 100644
--- a/gr-video-sdl/include/video_sdl/sink_s.h
+++ b/gr-video-sdl/include/video_sdl/sink_s.h
@@ -24,7 +24,7 @@
#define INCLUDED_VIDEO_SDL_SINK_S_H
#include <video_sdl/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace video_sdl {
@@ -38,7 +38,7 @@ namespace gr {
* Three streams: first is grey (Y), second is U, third is V
* Input samples must be in the range [0,255].
*/
- class VIDEO_SDL_API sink_s : virtual public gr_sync_block
+ class VIDEO_SDL_API sink_s : virtual public sync_block
{
public:
// gr::video_sdl::sink_s::sptr
diff --git a/gr-video-sdl/include/video_sdl/sink_uc.h b/gr-video-sdl/include/video_sdl/sink_uc.h
index 215847fc0b..5db316a21f 100644
--- a/gr-video-sdl/include/video_sdl/sink_uc.h
+++ b/gr-video-sdl/include/video_sdl/sink_uc.h
@@ -24,7 +24,7 @@
#define INCLUDED_VIDEO_SDL_SINK_UC_H
#include <video_sdl/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace video_sdl {
@@ -38,7 +38,7 @@ namespace gr {
* Three streams: first is grey (Y), second is U, third is V
* Input samples must be in the range [0,255].
*/
- class VIDEO_SDL_API sink_uc : virtual public gr_sync_block
+ class VIDEO_SDL_API sink_uc : virtual public sync_block
{
public:
// gr::video_sdl::sink_uc::sptr
diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc
index 2da9442d63..3ca19840ba 100644
--- a/gr-video-sdl/lib/sink_s_impl.cc
+++ b/gr-video-sdl/lib/sink_s_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "sink_s_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -50,9 +50,9 @@ namespace gr {
sink_s_impl::sink_s_impl(double framerate, int width, int height,
unsigned int format, int dst_width, int dst_height)
- : gr_sync_block("video_sdl_sink_s",
- gr_make_io_signature(1, 3, sizeof(short)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("video_sdl_sink_s",
+ io_signature::make(1, 3, sizeof(short)),
+ io_signature::make(0, 0, 0)),
d_chunk_size(width*height), d_framerate(framerate),
d_wanted_frametime_ms(0), d_width(width), d_height(height),
d_dst_width(dst_width), d_dst_height(dst_height),
diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc
index 28333e2413..85176704f9 100644
--- a/gr-video-sdl/lib/sink_uc_impl.cc
+++ b/gr-video-sdl/lib/sink_uc_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "sink_uc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -49,9 +49,9 @@ namespace gr {
sink_uc_impl::sink_uc_impl(double framerate, int width, int height,
unsigned int format, int dst_width, int dst_height)
- : gr_sync_block("video_sdl_sink_uc",
- gr_make_io_signature(1, 3, sizeof(unsigned char)),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("video_sdl_sink_uc",
+ io_signature::make(1, 3, sizeof(unsigned char)),
+ io_signature::make(0, 0, 0)),
d_chunk_size(width*height), d_framerate(framerate),
d_wanted_frametime_ms(0), d_width(width), d_height(height),
d_dst_width(dst_width), d_dst_height(dst_height),
diff --git a/gr-vocoder/include/vocoder/alaw_decode_bs.h b/gr-vocoder/include/vocoder/alaw_decode_bs.h
index 9966512c2a..f1860c6f77 100644
--- a/gr-vocoder/include/vocoder/alaw_decode_bs.h
+++ b/gr-vocoder/include/vocoder/alaw_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_ALAW_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs alaw audio decoding.
* \ingroup audio_blk
*/
- class VOCODER_API alaw_decode_bs : virtual public gr_sync_block
+ class VOCODER_API alaw_decode_bs : virtual public sync_block
{
public:
// gr::vocoder::alaw_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/alaw_encode_sb.h b/gr-vocoder/include/vocoder/alaw_encode_sb.h
index e944a93455..dc09c072af 100644
--- a/gr-vocoder/include/vocoder/alaw_encode_sb.h
+++ b/gr-vocoder/include/vocoder/alaw_encode_sb.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_ALAW_ENCODER_SB_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g.711 alaw audio encoding.
* \ingroup audio_blk
*/
- class VOCODER_API alaw_encode_sb : virtual public gr_sync_block
+ class VOCODER_API alaw_encode_sb : virtual public sync_block
{
public:
// gr::vocoder::alaw_encode_sb::sptr
diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/vocoder/api.h
index 613a19f4bc..425e397b9d 100644
--- a/gr-vocoder/include/vocoder/api.h
+++ b/gr-vocoder/include/vocoder/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_VOCODER_API_H
#define INCLUDED_VOCODER_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_vocoder_EXPORTS
# define VOCODER_API __GR_ATTR_EXPORT
diff --git a/gr-vocoder/include/vocoder/codec2_decode_ps.h b/gr-vocoder/include/vocoder/codec2_decode_ps.h
index 9c0d1526b8..471e7add81 100644
--- a/gr-vocoder/include/vocoder/codec2_decode_ps.h
+++ b/gr-vocoder/include/vocoder/codec2_decode_ps.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
#include <vocoder/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief CODEC2 Vocoder Decoder
* \ingroup audio_blk
*/
- class VOCODER_API codec2_decode_ps : virtual public gr_sync_interpolator
+ class VOCODER_API codec2_decode_ps : virtual public sync_interpolator
{
public:
// gr::vocoder::codec2_decode_ps::sptr
diff --git a/gr-vocoder/include/vocoder/codec2_encode_sp.h b/gr-vocoder/include/vocoder/codec2_encode_sp.h
index 2960bee04b..525fee5daf 100644
--- a/gr-vocoder/include/vocoder/codec2_encode_sp.h
+++ b/gr-vocoder/include/vocoder/codec2_encode_sp.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
#include <vocoder/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief CODEC2 Vocoder Encoder
* \ingroup audio_blk
*/
- class VOCODER_API codec2_encode_sp : virtual public gr_sync_decimator
+ class VOCODER_API codec2_encode_sp : virtual public sync_decimator
{
public:
// gr::vocoder::codec2_encode_sp::sptr
diff --git a/gr-vocoder/include/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/vocoder/cvsd_decode_bs.h
index 03dedffbbd..882e5e7ddc 100644
--- a/gr-vocoder/include/vocoder/cvsd_decode_bs.h
+++ b/gr-vocoder/include/vocoder/cvsd_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_CVSD_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace vocoder {
@@ -83,7 +83,7 @@ namespace gr {
* Bluetooth Voice Simulink� Model, Available:
* http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
*/
- class VOCODER_API cvsd_decode_bs : virtual public gr_sync_interpolator
+ class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator
{
public:
// gr::vocoder::cvsd_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/vocoder/cvsd_encode_sb.h
index c12269562e..40f2eb2a6c 100644
--- a/gr-vocoder/include/vocoder/cvsd_encode_sb.h
+++ b/gr-vocoder/include/vocoder/cvsd_encode_sb.h
@@ -23,7 +23,7 @@
#define INCLUDED_VOCODER_CVSD_ENCODER_SB_H
#include <vocoder/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace vocoder {
@@ -84,7 +84,7 @@ namespace gr {
* Bluetooth Voice Simulink� Model, Available:
* http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
*/
- class VOCODER_API cvsd_encode_sb : virtual public gr_sync_decimator
+ class VOCODER_API cvsd_encode_sb : virtual public sync_decimator
{
public:
// gr::vocoder::cvsd_encode_sb::sptr
diff --git a/gr-vocoder/include/vocoder/g721_decode_bs.h b/gr-vocoder/include/vocoder/g721_decode_bs.h
index 05459ccb3d..ab72240df1 100644
--- a/gr-vocoder/include/vocoder/g721_decode_bs.h
+++ b/gr-vocoder/include/vocoder/g721_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G721_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g721 audio decoding.
* \ingroup audio_blk
*/
- class VOCODER_API g721_decode_bs : virtual public gr_sync_block
+ class VOCODER_API g721_decode_bs : virtual public sync_block
{
public:
// gr::vocoder::g721_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/g721_encode_sb.h b/gr-vocoder/include/vocoder/g721_encode_sb.h
index af03b855c3..1445a36c60 100644
--- a/gr-vocoder/include/vocoder/g721_encode_sb.h
+++ b/gr-vocoder/include/vocoder/g721_encode_sb.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G721_ENCODE_SB_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g721 audio encoding.
* \ingroup audio_blk
*/
- class VOCODER_API g721_encode_sb : virtual public gr_sync_block
+ class VOCODER_API g721_encode_sb : virtual public sync_block
{
public:
// gr::vocoder::g721_encode_sb::sptr
diff --git a/gr-vocoder/include/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/vocoder/g723_24_decode_bs.h
index e91354071d..0d64946058 100644
--- a/gr-vocoder/include/vocoder/g723_24_decode_bs.h
+++ b/gr-vocoder/include/vocoder/g723_24_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G723_24_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g723_24 audio decoding.
* \ingroup audio_blk
*/
- class VOCODER_API g723_24_decode_bs : virtual public gr_sync_block
+ class VOCODER_API g723_24_decode_bs : virtual public sync_block
{
public:
// gr::vocoder::g723_24_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/vocoder/g723_24_encode_sb.h
index c63a9ec84b..4528a4a6ea 100644
--- a/gr-vocoder/include/vocoder/g723_24_encode_sb.h
+++ b/gr-vocoder/include/vocoder/g723_24_encode_sb.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g723_24 audio encoding.
* \ingroup audio_blk
*/
- class VOCODER_API g723_24_encode_sb : virtual public gr_sync_block
+ class VOCODER_API g723_24_encode_sb : virtual public sync_block
{
public:
// gr::vocoder::g723_24_encode_sb::sptr
diff --git a/gr-vocoder/include/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/vocoder/g723_40_decode_bs.h
index 433e74149c..39d58413e7 100644
--- a/gr-vocoder/include/vocoder/g723_40_decode_bs.h
+++ b/gr-vocoder/include/vocoder/g723_40_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G723_40_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g723_40 audio decoding.
* \ingroup audio_blk
*/
- class VOCODER_API g723_40_decode_bs : virtual public gr_sync_block
+ class VOCODER_API g723_40_decode_bs : virtual public sync_block
{
public:
// gr::vocoder::g723_40_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/vocoder/g723_40_encode_sb.h
index af28996412..c3aa78345c 100644
--- a/gr-vocoder/include/vocoder/g723_40_encode_sb.h
+++ b/gr-vocoder/include/vocoder/g723_40_encode_sb.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g723_40 audio encoding.
* \ingroup audio_blk
*/
- class VOCODER_API g723_40_encode_sb : virtual public gr_sync_block
+ class VOCODER_API g723_40_encode_sb : virtual public sync_block
{
public:
// gr::vocoder::g723_40_encode_sb::sptr
diff --git a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h
index cda62f19db..2068a02645 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
#include <vocoder/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/sync_interpolator.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief GSM 06.10 Full Rate Vocoder Decoder
* \ingroup audio_blk
*/
- class VOCODER_API gsm_fr_decode_ps : virtual public gr_sync_interpolator
+ class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator
{
public:
// gr::vocoder::gsm_fr_decode_ps::sptr
diff --git a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h
index 798e99a3b1..2c9c73d611 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
#include <vocoder/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
namespace gr {
namespace vocoder {
@@ -35,7 +35,7 @@ namespace gr {
*
* shorts in; 33 byte packets out
*/
- class VOCODER_API gsm_fr_encode_sp : virtual public gr_sync_decimator
+ class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator
{
public:
// gr::vocoder::gsm_fr_encode_sp::sptr
diff --git a/gr-vocoder/include/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/vocoder/ulaw_decode_bs.h
index 74c15531c0..d9fa106705 100644
--- a/gr-vocoder/include/vocoder/ulaw_decode_bs.h
+++ b/gr-vocoder/include/vocoder/ulaw_decode_bs.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_ULAW_DECODE_BS_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs ulaw audio decoding.
* \ingroup audio_blk
*/
- class VOCODER_API ulaw_decode_bs : virtual public gr_sync_block
+ class VOCODER_API ulaw_decode_bs : virtual public sync_block
{
public:
// gr::vocoder::ulaw_decode_bs::sptr
diff --git a/gr-vocoder/include/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/vocoder/ulaw_encode_sb.h
index 8d18d00138..f9ce9c8a8a 100644
--- a/gr-vocoder/include/vocoder/ulaw_encode_sb.h
+++ b/gr-vocoder/include/vocoder/ulaw_encode_sb.h
@@ -24,7 +24,7 @@
#define INCLUDED_VOCODER_ULAW_ENCODER_SB_H
#include <vocoder/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace vocoder {
@@ -33,7 +33,7 @@ namespace gr {
* \brief This block performs g.711 ulaw audio encoding.
* \ingroup audio_blk
*/
- class VOCODER_API ulaw_encode_sb : virtual public gr_sync_block
+ class VOCODER_API ulaw_encode_sb : virtual public sync_block
{
public:
// gr::vocoder::ulaw_encode_sb::sptr
diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.cc b/gr-vocoder/lib/alaw_decode_bs_impl.cc
index abea694da9..2f43304578 100644
--- a/gr-vocoder/lib/alaw_decode_bs_impl.cc
+++ b/gr-vocoder/lib/alaw_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "alaw_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
alaw_decode_bs_impl::alaw_decode_bs_impl()
- : gr_sync_block("vocoder_alaw_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_alaw_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
}
diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.cc b/gr-vocoder/lib/alaw_encode_sb_impl.cc
index 4b316f2e14..9c941e790d 100644
--- a/gr-vocoder/lib/alaw_encode_sb_impl.cc
+++ b/gr-vocoder/lib/alaw_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "alaw_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
alaw_encode_sb_impl::alaw_encode_sb_impl()
- : gr_sync_block("avocoder_law_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("avocoder_law_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
}
diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc
index cd47c9e702..57ab62422e 100644
--- a/gr-vocoder/lib/codec2_decode_ps_impl.cc
+++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc
@@ -30,7 +30,7 @@ extern "C" {
#include "codec2/codec2.h"
}
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
@@ -46,9 +46,9 @@ namespace gr {
codec2_decode_ps_impl::codec2_decode_ps_impl ()
- : gr_sync_interpolator("vocoder_codec2_decode_ps",
- gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
- gr_make_io_signature (1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_codec2_decode_ps",
+ io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
+ io_signature::make (1, 1, sizeof(short)),
CODEC2_SAMPLES_PER_FRAME)
{
if((d_codec2 = codec2_create()) == 0)
diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.cc b/gr-vocoder/lib/codec2_encode_sp_impl.cc
index 0217fbd424..3f79e06409 100644
--- a/gr-vocoder/lib/codec2_encode_sp_impl.cc
+++ b/gr-vocoder/lib/codec2_encode_sp_impl.cc
@@ -30,7 +30,7 @@ extern "C" {
#include "codec2/codec2.h"
}
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
}
codec2_encode_sp_impl::codec2_encode_sp_impl()
- : gr_sync_decimator("vocoder_codec2_encode_sp",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
+ : sync_decimator("vocoder_codec2_encode_sp",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
CODEC2_SAMPLES_PER_FRAME)
{
if((d_codec2 = codec2_create()) == 0)
diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc
index e7f284adda..57379b2162 100644
--- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc
+++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "cvsd_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
cvsd_decode_bs_impl::cvsd_decode_bs_impl(short min_step, short max_step, double step_decay,
double accum_decay, int K, int J,
short pos_accum_max, short neg_accum_max)
- : gr_sync_interpolator("vocoder_cvsd_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_cvsd_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)),
8),
d_min_step(min_step), d_max_step(max_step), d_step_decay(step_decay),
d_accum_decay(accum_decay), d_K(K), d_J(J),
diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc
index 74ecdb25e1..b567f7868c 100644
--- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc
+++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "cvsd_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
cvsd_encode_sb_impl::cvsd_encode_sb_impl(short min_step, short max_step, double step_decay,
double accum_decay, int K, int J,
short pos_accum_max, short neg_accum_max)
- : gr_sync_decimator("vocoder_cvsd_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
+ : sync_decimator("vocoder_cvsd_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)),
8),
d_min_step (min_step), d_max_step(max_step), d_step_decay(step_decay),
d_accum_decay(accum_decay), d_K(K), d_J(J),
diff --git a/gr-vocoder/lib/g721_decode_bs_impl.cc b/gr-vocoder/lib/g721_decode_bs_impl.cc
index 143bbc514d..db23ffa677 100644
--- a/gr-vocoder/lib/g721_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g721_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g721_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g721_decode_bs_impl::g721_decode_bs_impl()
- : gr_sync_block("vocoder_g721_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g721_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g721_encode_sb_impl.cc b/gr-vocoder/lib/g721_encode_sb_impl.cc
index a961b0efeb..9293c46a83 100644
--- a/gr-vocoder/lib/g721_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g721_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g721_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g721_encode_sb_impl::g721_encode_sb_impl()
- : gr_sync_block("vocoder_g721_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g721_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.cc b/gr-vocoder/lib/g723_24_decode_bs_impl.cc
index f7a8b59a08..c78229c4f3 100644
--- a/gr-vocoder/lib/g723_24_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g723_24_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_24_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_24_decode_bs_impl::g723_24_decode_bs_impl()
- : gr_sync_block("vocoder_g723_24_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g723_24_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.cc b/gr-vocoder/lib/g723_24_encode_sb_impl.cc
index 8b168197b5..cf721e3580 100644
--- a/gr-vocoder/lib/g723_24_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g723_24_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_24_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_24_encode_sb_impl::g723_24_encode_sb_impl()
- : gr_sync_block("vocoder_g723_24_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g723_24_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.cc b/gr-vocoder/lib/g723_40_decode_bs_impl.cc
index 0790c9481c..4302583200 100644
--- a/gr-vocoder/lib/g723_40_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g723_40_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_40_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_40_decode_bs_impl::g723_40_decode_bs_impl()
- : gr_sync_block("vocoder_g723_40_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g723_40_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.cc b/gr-vocoder/lib/g723_40_encode_sb_impl.cc
index 54dd052637..ff1910c55f 100644
--- a/gr-vocoder/lib/g723_40_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g723_40_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_40_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_40_encode_sb_impl::g723_40_encode_sb_impl()
- : gr_sync_block("vocoder_g723_40_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g723_40_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
index 2b3d11135c..e318a60668 100644
--- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
+++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "gsm_fr_decode_ps_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
@@ -40,9 +40,9 @@ namespace gr {
}
gsm_fr_decode_ps_impl::gsm_fr_decode_ps_impl()
- : gr_sync_interpolator("vocoder_gsm_fr_decode_ps",
- gr_make_io_signature(1, 1, sizeof(gsm_frame)),
- gr_make_io_signature(1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_gsm_fr_decode_ps",
+ io_signature::make(1, 1, sizeof(gsm_frame)),
+ io_signature::make(1, 1, sizeof(short)),
GSM_SAMPLES_PER_FRAME)
{
if((d_gsm = gsm_create()) == 0)
diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
index c7b10089fb..143a73bce7 100644
--- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
+++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "gsm_fr_encode_sp_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
gsm_fr_encode_sp_impl::gsm_fr_encode_sp_impl()
- : gr_sync_decimator("vocoder_gsm_fr_encode_sp",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(gsm_frame)),
+ : sync_decimator("vocoder_gsm_fr_encode_sp",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(gsm_frame)),
GSM_SAMPLES_PER_FRAME)
{
if((d_gsm = gsm_create ()) == 0)
diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.cc b/gr-vocoder/lib/ulaw_decode_bs_impl.cc
index d0c99b70a0..bbf58a54da 100644
--- a/gr-vocoder/lib/ulaw_decode_bs_impl.cc
+++ b/gr-vocoder/lib/ulaw_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ulaw_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
ulaw_decode_bs_impl::ulaw_decode_bs_impl()
- : gr_sync_block("vocoder_ulaw_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_ulaw_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
}
diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.cc b/gr-vocoder/lib/ulaw_encode_sb_impl.cc
index a49df12b59..83d3864965 100644
--- a/gr-vocoder/lib/ulaw_encode_sb_impl.cc
+++ b/gr-vocoder/lib/ulaw_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ulaw_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
ulaw_encode_sb_impl::ulaw_encode_sb_impl()
- : gr_sync_block("vocoder_ulaw_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_ulaw_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
}
diff --git a/gr-wavelet/include/wavelet/api.h b/gr-wavelet/include/wavelet/api.h
index f1b281440d..371ac24d54 100644
--- a/gr-wavelet/include/wavelet/api.h
+++ b/gr-wavelet/include/wavelet/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_WAVELET_API_H
#define INCLUDED_WAVELET_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_wavelet_EXPORTS
# define WAVELET_API __GR_ATTR_EXPORT
diff --git a/gr-wavelet/include/wavelet/squash_ff.h b/gr-wavelet/include/wavelet/squash_ff.h
index f546148581..1635829a6c 100644
--- a/gr-wavelet/include/wavelet/squash_ff.h
+++ b/gr-wavelet/include/wavelet/squash_ff.h
@@ -24,12 +24,12 @@
#define INCLUDED_WAVELET_SQUASH_FF_H
#include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace wavelet {
- class WAVELET_API squash_ff : virtual public gr_sync_block
+ class WAVELET_API squash_ff : virtual public sync_block
{
public:
diff --git a/gr-wavelet/include/wavelet/wavelet_ff.h b/gr-wavelet/include/wavelet/wavelet_ff.h
index 67bb6b19f8..1cae092e46 100644
--- a/gr-wavelet/include/wavelet/wavelet_ff.h
+++ b/gr-wavelet/include/wavelet/wavelet_ff.h
@@ -24,12 +24,12 @@
#define INCLUDED_WAVELET_WAVELET_FF_H
#include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace wavelet {
- class WAVELET_API wavelet_ff : virtual public gr_sync_block
+ class WAVELET_API wavelet_ff : virtual public sync_block
{
public:
diff --git a/gr-wavelet/include/wavelet/wvps_ff.h b/gr-wavelet/include/wavelet/wvps_ff.h
index 7f1965a6e7..6a799b0bbb 100644
--- a/gr-wavelet/include/wavelet/wvps_ff.h
+++ b/gr-wavelet/include/wavelet/wvps_ff.h
@@ -24,14 +24,14 @@
#define INCLUDED_WAVELET_WVPS_FF_H
#include <wavelet/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
class wavelet_wvps_ff;
namespace gr {
namespace wavelet {
- class WAVELET_API wvps_ff : virtual public gr_sync_block
+ class WAVELET_API wvps_ff : virtual public sync_block
{
public:
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc
index 081ac900f5..47f8c616d5 100644
--- a/gr-wavelet/lib/squash_ff_impl.cc
+++ b/gr-wavelet/lib/squash_ff_impl.cc
@@ -26,7 +26,7 @@
#include <stdexcept>
#include <squash_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
// expect input vector of igrid.size y-values,
// produce output vector of ogrid.size y-values
@@ -42,9 +42,9 @@ namespace gr {
squash_ff_impl::squash_ff_impl(const std::vector<float> &igrid,
const std::vector<float> &ogrid)
- : gr_sync_block("squash_ff",
- gr_make_io_signature(1, 1, sizeof(float) * igrid.size()),
- gr_make_io_signature(1, 1, sizeof(float) * ogrid.size()))
+ : sync_block("squash_ff",
+ io_signature::make(1, 1, sizeof(float) * igrid.size()),
+ io_signature::make(1, 1, sizeof(float) * ogrid.size()))
{
d_inum = igrid.size();
d_onum = ogrid.size();
diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc
index 73fc8c5440..6b313574b3 100644
--- a/gr-wavelet/lib/wavelet_ff_impl.cc
+++ b/gr-wavelet/lib/wavelet_ff_impl.cc
@@ -26,7 +26,7 @@
#include <stdexcept>
#include <wavelet_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdio.h>
@@ -46,9 +46,9 @@ namespace gr {
wavelet_ff_impl::wavelet_ff_impl(int size,
int order,
bool forward)
- : gr_sync_block("wavelet_ff",
- gr_make_io_signature(1, 1, size * sizeof(float)),
- gr_make_io_signature(1, 1, size * sizeof(float))),
+ : sync_block("wavelet_ff",
+ io_signature::make(1, 1, size * sizeof(float)),
+ io_signature::make(1, 1, size * sizeof(float))),
d_size(size),
d_order(order),
d_forward(forward)
diff --git a/gr-wavelet/lib/wvps_ff_impl.cc b/gr-wavelet/lib/wvps_ff_impl.cc
index 6e886bff4e..3dd6bf4ba9 100644
--- a/gr-wavelet/lib/wvps_ff_impl.cc
+++ b/gr-wavelet/lib/wvps_ff_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <wvps_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <string.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
}
wvps_ff_impl::wvps_ff_impl(int ilen)
- : gr_sync_block("wvps_ff",
- gr_make_io_signature(1, 1, sizeof(float) * ilen),
- gr_make_io_signature(1, 1, sizeof(float) * ceil_log2(ilen))),
+ : sync_block("wvps_ff",
+ io_signature::make(1, 1, sizeof(float) * ilen),
+ io_signature::make(1, 1, sizeof(float) * ceil_log2(ilen))),
d_ilen(ilen), d_olen(ceil_log2(ilen))
{
}
diff --git a/gr-wxgui/include/wxgui/api.h b/gr-wxgui/include/wxgui/api.h
index cf9e980a9c..6439c8e591 100644
--- a/gr-wxgui/include/wxgui/api.h
+++ b/gr-wxgui/include/wxgui/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_WXGUI_API_H
#define INCLUDED_WXGUI_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_wxgui_EXPORTS
# define WXGUI_API __GR_ATTR_EXPORT
diff --git a/gr-wxgui/include/wxgui/histo_sink_f.h b/gr-wxgui/include/wxgui/histo_sink_f.h
index f65517ca35..351f629460 100644
--- a/gr-wxgui/include/wxgui/histo_sink_f.h
+++ b/gr-wxgui/include/wxgui/histo_sink_f.h
@@ -24,8 +24,8 @@
#define INCLUDED_GR_HISTO_SINK_F_H
#include <wxgui/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace wxgui {
@@ -34,13 +34,13 @@ namespace gr {
* \brief Histogram module.
* \ingroup sink_blk
*/
- class WXGUI_API histo_sink_f : virtual public gr_sync_block
+ class WXGUI_API histo_sink_f : virtual public sync_block
{
public:
// gr::blocks::histo_sink_f::sptr
typedef boost::shared_ptr<histo_sink_f> sptr;
- static sptr make(gr_msg_queue_sptr msgq);
+ static sptr make(msg_queue::sptr msgq);
virtual unsigned int get_frame_size(void) = 0;
virtual unsigned int get_num_bins(void) = 0;
diff --git a/gr-wxgui/include/wxgui/oscope_guts.h b/gr-wxgui/include/wxgui/oscope_guts.h
index a6abd81539..6ba23a6587 100644
--- a/gr-wxgui/include/wxgui/oscope_guts.h
+++ b/gr-wxgui/include/wxgui/oscope_guts.h
@@ -26,7 +26,7 @@
#include <wxgui/api.h>
#include <wxgui/trigger_mode.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace wxgui {
@@ -54,7 +54,7 @@ namespace gr {
enum scope_state { HOLD_OFF, LOOK_FOR_TRIGGER, POST_TRIGGER };
int d_nchannels; // how many channels
- gr_msg_queue_sptr d_msgq; // message queue we stuff output records into
+ msg_queue::sptr d_msgq; // message queue we stuff output records into
trigger_mode d_trigger_mode;
trigger_slope d_trigger_slope;
int d_trigger_channel; // which channel to watch for trigger condition
@@ -90,7 +90,7 @@ namespace gr {
public:
// CREATORS
- oscope_guts(double sample_rate, gr_msg_queue_sptr msgq);
+ oscope_guts(double sample_rate, msg_queue::sptr msgq);
~oscope_guts();
// MANIPULATORS
diff --git a/gr-wxgui/include/wxgui/oscope_sink_f.h b/gr-wxgui/include/wxgui/oscope_sink_f.h
index a7c7657d40..544c580ca7 100644
--- a/gr-wxgui/include/wxgui/oscope_sink_f.h
+++ b/gr-wxgui/include/wxgui/oscope_sink_f.h
@@ -25,7 +25,7 @@
#include <wxgui/api.h>
#include <wxgui/oscope_sink_x.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/msg_queue.h>
namespace gr {
namespace wxgui {
@@ -43,7 +43,7 @@ namespace gr {
// gr::blocks::oscope_sink_f::sptr
typedef boost::shared_ptr<oscope_sink_f> sptr;
- static sptr make(double sampling_rate, gr_msg_queue_sptr msgq);
+ static sptr make(double sampling_rate, msg_queue::sptr msgq);
};
} /* namespace wxgui */
diff --git a/gr-wxgui/include/wxgui/oscope_sink_x.h b/gr-wxgui/include/wxgui/oscope_sink_x.h
index 17fa9a0f5a..41d1376811 100644
--- a/gr-wxgui/include/wxgui/oscope_sink_x.h
+++ b/gr-wxgui/include/wxgui/oscope_sink_x.h
@@ -26,7 +26,7 @@
#include <wxgui/api.h>
#include <wxgui/trigger_mode.h>
#include <wxgui/oscope_guts.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace wxgui {
@@ -37,7 +37,7 @@ namespace gr {
*
* Don't instantiate this. Use gr::blocks::oscope_sink_f instead.
*/
- class WXGUI_API oscope_sink_x : public gr_sync_block
+ class WXGUI_API oscope_sink_x : public sync_block
{
protected:
double d_sampling_rate;
@@ -45,7 +45,7 @@ namespace gr {
oscope_sink_x() {};
oscope_sink_x(const std::string name,
- gr_io_signature_sptr input_sig,
+ gr::io_signature::sptr input_sig,
double sampling_rate);
public:
virtual ~oscope_sink_x();
@@ -54,7 +54,7 @@ namespace gr {
//typedef boost::shared_ptr<oscope_sink_x> sptr;
//
//static sptr make(const std::string name,
- // gr_io_signature_sptr input_sig,
+ // gnuradio/io_signature.h_sptr input_sig,
// double sampling_rate);
bool set_update_rate(double update_rate);
diff --git a/gr-wxgui/lib/histo_sink_f_impl.cc b/gr-wxgui/lib/histo_sink_f_impl.cc
index 9b168de547..f10540fa36 100644
--- a/gr-wxgui/lib/histo_sink_f_impl.cc
+++ b/gr-wxgui/lib/histo_sink_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "histo_sink_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <boost/math/special_functions/round.hpp>
namespace gr {
@@ -50,16 +50,16 @@ namespace gr {
}
histo_sink_f::sptr
- histo_sink_f::make(gr_msg_queue_sptr msgq)
+ histo_sink_f::make(msg_queue::sptr msgq)
{
return gnuradio::get_initial_sptr
(new histo_sink_f_impl(msgq));
}
- histo_sink_f_impl::histo_sink_f_impl(gr_msg_queue_sptr msgq)
- : gr_sync_block("histo_sink_f",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(0, 0, 0)),
+ histo_sink_f_impl::histo_sink_f_impl(msg_queue::sptr msgq)
+ : sync_block("histo_sink_f",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
d_msgq(msgq), d_num_bins(11), d_frame_size(1000),
d_sample_count(0), d_bins(NULL), d_samps(NULL)
{
@@ -123,7 +123,7 @@ namespace gr {
d_bins[index]++;
}
/* Build a message to hold the output records */
- gr_message_sptr msg = gr_make_message(0, minimum, maximum, d_num_bins*sizeof(float));
+ message::sptr msg = message::make(0, minimum, maximum, d_num_bins*sizeof(float));
float *out = (float *)msg->msg(); // get pointer to raw message buffer
/* normalize the bins and put into message */
for(unsigned int i = 0; i < d_num_bins; i++) {
diff --git a/gr-wxgui/lib/histo_sink_f_impl.h b/gr-wxgui/lib/histo_sink_f_impl.h
index 98b0fe6706..64530dd19f 100644
--- a/gr-wxgui/lib/histo_sink_f_impl.h
+++ b/gr-wxgui/lib/histo_sink_f_impl.h
@@ -31,7 +31,7 @@ namespace gr {
class histo_sink_f_impl : public histo_sink_f
{
private:
- gr_msg_queue_sptr d_msgq;
+ msg_queue::sptr d_msgq;
unsigned int d_num_bins;
unsigned int d_frame_size;
unsigned int d_sample_count;
@@ -43,7 +43,7 @@ namespace gr {
void clear(void);
public:
- histo_sink_f_impl(gr_msg_queue_sptr msgq);
+ histo_sink_f_impl(msg_queue::sptr msgq);
~histo_sink_f_impl(void);
int work(int noutput_items,
diff --git a/gr-wxgui/lib/oscope_guts.cc b/gr-wxgui/lib/oscope_guts.cc
index 3d1f085a6f..5cec521023 100644
--- a/gr-wxgui/lib/oscope_guts.cc
+++ b/gr-wxgui/lib/oscope_guts.cc
@@ -68,7 +68,7 @@ namespace gr {
return wrap_bi(buffer_index - 1, mx);
}
- oscope_guts::oscope_guts(double sample_rate, gr_msg_queue_sptr msgq)
+ oscope_guts::oscope_guts(double sample_rate, msg_queue::sptr msgq)
: d_nchannels(1),
d_msgq(msgq),
d_trigger_mode(TRIG_MODE_AUTO),
@@ -251,8 +251,8 @@ namespace gr {
if(d_msgq->full_p())
return;
// Build a message to hold the output records
- gr_message_sptr msg =
- gr_make_message(0, // msg type
+ message::sptr msg =
+ message::make(0, // msg type
d_nchannels, // arg1 for other side
mx, // arg2 for other side
((d_nchannels * mx) + 1) * sizeof(float)); // sizeof payload
diff --git a/gr-wxgui/lib/oscope_sink_f_impl.cc b/gr-wxgui/lib/oscope_sink_f_impl.cc
index 5e578cb8e3..2436fa1c4d 100644
--- a/gr-wxgui/lib/oscope_sink_f_impl.cc
+++ b/gr-wxgui/lib/oscope_sink_f_impl.cc
@@ -27,21 +27,21 @@
#include "oscope_sink_f_impl.h"
#include <wxgui/oscope_sink_x.h>
#include <wxgui/oscope_guts.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace wxgui {
oscope_sink_f::sptr
- oscope_sink_f::make(double sampling_rate, gr_msg_queue_sptr msgq)
+ oscope_sink_f::make(double sampling_rate, msg_queue::sptr msgq)
{
return gnuradio::get_initial_sptr
(new oscope_sink_f_impl(sampling_rate, msgq));
}
- oscope_sink_f_impl::oscope_sink_f_impl(double sampling_rate, gr_msg_queue_sptr msgq)
+ oscope_sink_f_impl::oscope_sink_f_impl(double sampling_rate, msg_queue::sptr msgq)
: oscope_sink_x("oscope_sink_f",
- gr_make_io_signature(1, oscope_guts::MAX_CHANNELS,
+ io_signature::make(1, oscope_guts::MAX_CHANNELS,
sizeof(float)),
sampling_rate),
d_msgq(msgq)
diff --git a/gr-wxgui/lib/oscope_sink_f_impl.h b/gr-wxgui/lib/oscope_sink_f_impl.h
index 6ad28a885f..efab9fcec3 100644
--- a/gr-wxgui/lib/oscope_sink_f_impl.h
+++ b/gr-wxgui/lib/oscope_sink_f_impl.h
@@ -31,10 +31,10 @@ namespace gr {
class oscope_sink_f_impl : public oscope_sink_f
{
private:
- gr_msg_queue_sptr d_msgq;
+ msg_queue::sptr d_msgq;
public:
- oscope_sink_f_impl(double sampling_rate, gr_msg_queue_sptr msgq);
+ oscope_sink_f_impl(double sampling_rate, msg_queue::sptr msgq);
~oscope_sink_f_impl();
bool check_topology(int ninputs, int noutputs);
diff --git a/gr-wxgui/lib/oscope_sink_x.cc b/gr-wxgui/lib/oscope_sink_x.cc
index 417442979c..d8327beb98 100644
--- a/gr-wxgui/lib/oscope_sink_x.cc
+++ b/gr-wxgui/lib/oscope_sink_x.cc
@@ -26,16 +26,16 @@
#include <wxgui/oscope_sink_x.h>
#include <wxgui/oscope_guts.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
namespace gr {
namespace wxgui {
oscope_sink_x::oscope_sink_x(const std::string name,
- gr_io_signature_sptr input_sig,
+ gr::io_signature::sptr input_sig,
double sampling_rate)
- : gr_sync_block(name, input_sig,
- gr_make_io_signature(0, 0, 0)),
+ : sync_block(name, input_sig,
+ io_signature::make(0, 0, 0)),
d_sampling_rate(sampling_rate), d_guts(0)
{
}
--
cgit v1.2.3