diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lib/gras_impl/messages.hpp | 27 | ||||
| -rw-r--r-- | lib/register_messages.cpp | 39 |
3 files changed, 46 insertions, 25 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6081bb6..131c00a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,10 +11,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") add_definitions(-DGRAS_DEBUG) endif() -list(APPEND gnuradio_core_sources - ${CMAKE_CURRENT_SOURCE_DIR}/register_messages.cpp #exports messages, must be first -) - ######################################################################## # Setup Theron Deps ######################################################################## @@ -58,6 +54,7 @@ list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/register_messages.cpp ) #sources that are in tree that have not changed diff --git a/lib/gras_impl/messages.hpp b/lib/gras_impl/messages.hpp index ef87398..68c3392 100644 --- a/lib/gras_impl/messages.hpp +++ b/lib/gras_impl/messages.hpp @@ -139,4 +139,31 @@ struct UpdateInputsMessage } //namespace gnuradio +#include <Theron/Register.h> +#include <gnuradio/top_block.hpp> +#include <gras_impl/messages.hpp> +#include <gras_impl/interruptible_thread.hpp> + +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopAllocMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopActiveMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopInertMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::GlobalBlockConfig); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::SharedThreadGroup); + +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputTagMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputBufferMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputCheckMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputAllocMessage); + +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputBufferMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputCheckMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputHintMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputAllocMessage); + +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::SelfKickMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::UpdateInputsMessage); + #endif /*INCLUDED_LIBGRAS_IMPL_MESSAGES_HPP*/ diff --git a/lib/register_messages.cpp b/lib/register_messages.cpp index 7c894fa..4d774ea 100644 --- a/lib/register_messages.cpp +++ b/lib/register_messages.cpp @@ -14,31 +14,28 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#include <Theron/Register.h> #include <gnuradio/top_block.hpp> #include <gras_impl/messages.hpp> #include <gras_impl/interruptible_thread.hpp> -#include <Apology/Worker.hpp> -THERON_REGISTER_MESSAGE(Apology::WorkerTopologyMessage); -THERON_REGISTER_MESSAGE(gnuradio::TopAllocMessage); -THERON_REGISTER_MESSAGE(gnuradio::TopActiveMessage); -THERON_REGISTER_MESSAGE(gnuradio::TopInertMessage); -THERON_REGISTER_MESSAGE(gnuradio::TopTokenMessage); -THERON_REGISTER_MESSAGE(gnuradio::GlobalBlockConfig); -THERON_REGISTER_MESSAGE(gnuradio::SharedThreadGroup); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopAllocMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopActiveMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopInertMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopTokenMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::GlobalBlockConfig); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::SharedThreadGroup); -THERON_REGISTER_MESSAGE(gnuradio::InputTagMessage); -THERON_REGISTER_MESSAGE(gnuradio::InputBufferMessage); -THERON_REGISTER_MESSAGE(gnuradio::InputTokenMessage); -THERON_REGISTER_MESSAGE(gnuradio::InputCheckMessage); -THERON_REGISTER_MESSAGE(gnuradio::InputAllocMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputTagMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputBufferMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputTokenMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputCheckMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputAllocMessage); -THERON_REGISTER_MESSAGE(gnuradio::OutputBufferMessage); -THERON_REGISTER_MESSAGE(gnuradio::OutputTokenMessage); -THERON_REGISTER_MESSAGE(gnuradio::OutputCheckMessage); -THERON_REGISTER_MESSAGE(gnuradio::OutputHintMessage); -THERON_REGISTER_MESSAGE(gnuradio::OutputAllocMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputBufferMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputTokenMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputCheckMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputHintMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputAllocMessage); -THERON_REGISTER_MESSAGE(gnuradio::SelfKickMessage); -THERON_REGISTER_MESSAGE(gnuradio::UpdateInputsMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::SelfKickMessage); +THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::UpdateInputsMessage); |