From 2bf2a8f2d2a4477818bfa91cae64fb663fdf88c3 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sun, 26 Jul 2009 20:01:02 +0000 Subject: [PATCH] Merged r11491:11494 from jcorgan/pmt into trunk. Moves pmt types functions into pmt:: from gruel:: Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11495 221aa14e-8319-0410-a670-987f0aec2ac5 --- config/grc_gruel.m4 | 1 + gruel/src/include/gruel/pmt.h | 4 +- gruel/src/include/gruel/pmt_pool.h | 4 +- gruel/src/lib/Makefile.am | 79 +------------ gruel/src/lib/pmt/Makefile.am | 111 ++++++++++++++++++ gruel/src/lib/{ => pmt}/generate_unv.py | 4 +- gruel/src/lib/{ => pmt}/pmt.cc | 6 +- gruel/src/lib/{ => pmt}/pmt_int.h | 4 +- gruel/src/lib/{ => pmt}/pmt_io.cc | 4 +- gruel/src/lib/{ => pmt}/pmt_pool.cc | 4 +- gruel/src/lib/{ => pmt}/pmt_serialize.cc | 4 +- gruel/src/lib/{ => pmt}/qa_pmt.cc | 0 gruel/src/lib/{ => pmt}/qa_pmt.h | 0 gruel/src/lib/{ => pmt}/qa_pmt_prims.cc | 2 +- gruel/src/lib/{ => pmt}/qa_pmt_prims.h | 0 gruel/src/lib/{ => pmt}/test_pmt.cc | 0 gruel/src/lib/{ => pmt}/unv_qa_template.cc.t | 0 gruel/src/lib/{ => pmt}/unv_template.cc.t | 4 +- gruel/src/lib/{ => pmt}/unv_template.h.t | 0 mblock/src/include/mblock/class_registry.h | 6 +- mblock/src/include/mblock/mblock.h | 16 +-- mblock/src/include/mblock/message.h | 28 ++--- mblock/src/include/mblock/msg_accepter.h | 2 +- mblock/src/include/mblock/port.h | 18 +-- mblock/src/include/mblock/protocol_class.h | 10 +- mblock/src/include/mblock/runtime.h | 4 +- mblock/src/lib/benchmark_send.cc | 2 +- mblock/src/lib/mb_endpoint.cc | 6 +- mblock/src/lib/mb_endpoint.h | 4 +- mblock/src/lib/mb_mblock.cc | 23 ++-- mblock/src/lib/mb_mblock_impl.cc | 17 +-- mblock/src/lib/mb_mblock_impl.h | 8 +- mblock/src/lib/mb_message.cc | 8 +- mblock/src/lib/mb_msg_accepter_msgq.cc | 8 +- mblock/src/lib/mb_msg_accepter_msgq.h | 2 +- mblock/src/lib/mb_msg_accepter_smp.cc | 8 +- mblock/src/lib/mb_msg_accepter_smp.h | 6 +- mblock/src/lib/mb_port.cc | 10 +- mblock/src/lib/mb_port_simple.cc | 3 +- mblock/src/lib/mb_port_simple.h | 6 +- mblock/src/lib/mb_protocol_class.cc | 78 ++++++------ mblock/src/lib/mb_runtime_base.cc | 18 +-- mblock/src/lib/mb_runtime_base.h | 14 +-- mblock/src/lib/mb_runtime_nop.cc | 8 +- mblock/src/lib/mb_runtime_nop.h | 6 +- mblock/src/lib/mb_runtime_thread_per_block.cc | 83 ++++++------- mblock/src/lib/mb_runtime_thread_per_block.h | 24 ++-- mblock/src/lib/mb_timer_queue.cc | 18 +-- mblock/src/lib/mb_timer_queue.h | 12 +- mblock/src/lib/mb_worker.cc | 7 +- mblock/src/lib/mb_worker.h | 4 +- mblock/src/lib/qa_bitset.cc | 2 +- mblock/src/lib/qa_disconnect.cc | 2 +- mblock/src/lib/qa_mblock_prims.cc | 2 +- mblock/src/lib/qa_mblock_send.cc | 2 +- mblock/src/lib/qa_mblock_sys.cc | 2 +- mblock/src/lib/qa_timeouts.cc | 2 +- 57 files changed, 387 insertions(+), 323 deletions(-) create mode 100644 gruel/src/lib/pmt/Makefile.am rename gruel/src/lib/{ => pmt}/generate_unv.py (98%) rename gruel/src/lib/{ => pmt}/pmt.cc (99%) rename gruel/src/lib/{ => pmt}/pmt_int.h (99%) rename gruel/src/lib/{ => pmt}/pmt_io.cc (98%) rename gruel/src/lib/{ => pmt}/pmt_pool.cc (98%) rename gruel/src/lib/{ => pmt}/pmt_serialize.cc (99%) rename gruel/src/lib/{ => pmt}/qa_pmt.cc (100%) rename gruel/src/lib/{ => pmt}/qa_pmt.h (100%) rename gruel/src/lib/{ => pmt}/qa_pmt_prims.cc (99%) rename gruel/src/lib/{ => pmt}/qa_pmt_prims.h (100%) rename gruel/src/lib/{ => pmt}/test_pmt.cc (100%) rename gruel/src/lib/{ => pmt}/unv_qa_template.cc.t (100%) rename gruel/src/lib/{ => pmt}/unv_template.cc.t (98%) rename gruel/src/lib/{ => pmt}/unv_template.h.t (100%) diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index 01d44fea..ae8fe81a 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -42,6 +42,7 @@ AC_DEFUN([GRC_GRUEL],[ gruel/src/include/gruel/Makefile \ gruel/src/include/gruel/inet.h \ gruel/src/lib/Makefile \ + gruel/src/lib/pmt/Makefile \ gruel/src/scheme/Makefile \ gruel/src/scheme/gnuradio/Makefile \ ]) diff --git a/gruel/src/include/gruel/pmt.h b/gruel/src/include/gruel/pmt.h index 6dc4508b..de0998b5 100644 --- a/gruel/src/include/gruel/pmt.h +++ b/gruel/src/include/gruel/pmt.h @@ -39,7 +39,7 @@ * exception that these objects are transparently reference counted. */ -namespace gruel { +namespace pmt { /*! * \brief base class of all pmt types @@ -677,6 +677,6 @@ pmt_t pmt_deserialize(std::streambuf &source); void pmt_dump_sizeof(); // debugging -} /* namespace gruel */ +} /* namespace pmt */ #endif /* INCLUDED_PMT_H */ diff --git a/gruel/src/include/gruel/pmt_pool.h b/gruel/src/include/gruel/pmt_pool.h index 18b498fa..b792523e 100644 --- a/gruel/src/include/gruel/pmt_pool.h +++ b/gruel/src/include/gruel/pmt_pool.h @@ -25,7 +25,7 @@ #include #include -namespace gruel { +namespace pmt { /*! * \brief very simple thread-safe fixed-size allocation pool @@ -67,6 +67,6 @@ public: void free(void *p); }; -} /* namespace gruel */ +} /* namespace pmt */ #endif /* INCLUDED_PMT_POOL_H */ diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index 2a968d25..bf1ae731 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -21,9 +21,9 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) +SUBDIRS = pmt -TESTS = test_pmt +AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) lib_LTLIBRARIES = libgruel.la @@ -31,38 +31,11 @@ lib_LTLIBRARIES = libgruel.la libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0 # ---------------------------------------------------------------- -# these scripts generate code - -code_generator = \ - generate_unv.py \ - unv_template.h.t \ - unv_template.cc.t \ - unv_qa_template.cc.t - -GENERATED_H = \ - pmt_unv_int.h \ - qa_pmt_unv.h - -GENERATED_CC = \ - pmt_unv.cc \ - qa_pmt_unv.cc - -python_built_sources = $(GENERATED_H) $(GENERATED_CC) -PMT_SERIAL_TAGS_H = $(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h -BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H) - -EXTRA_DIST = $(code_generator) - -# ---------------------------------------------------------------- +PMT_LIB = pmt/libpmt.la # These are the source files that go into the gruel shared library libgruel_la_SOURCES = \ - pmt.cc \ - pmt_io.cc \ - pmt_pool.cc \ - pmt_serialize.cc \ - pmt_unv.cc \ realtime.cc \ sys_pri.cc \ thread_body_wrapper.cc \ @@ -70,51 +43,7 @@ libgruel_la_SOURCES = \ libgruel_la_LIBADD = \ $(BOOST_THREAD_LIB) \ + $(PMT_LIB) \ -lstdc++ -noinst_HEADERS = \ - $(GENERATED_H) \ - pmt_int.h \ - qa_pmt.h \ - qa_pmt_prims.h - -# Build the qa code into its own library - -noinst_LTLIBRARIES = libpmt-qa.la - -libpmt_qa_la_SOURCES = \ - qa_pmt.cc \ - qa_pmt_prims.cc \ - qa_pmt_unv.cc - -# magic flags -libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid version - -libpmt_qa_la_LIBADD = \ - libgruel.la \ - $(CPPUNIT_LIBS) \ - -lstdc++ - -noinst_PROGRAMS = \ - test_pmt - - -LIBGRUEL = libgruel.la -LIBPMTQA = libpmt-qa.la $(LIBGRUEL) - -test_pmt_SOURCES = test_pmt.cc -test_pmt_LDADD = $(LIBPMTQA) - -# Do creation and inclusion of other Makefiles last - -# common way for generating sources from templates when using -# BUILT_SOURCES, using parallel build protection. -gen_sources = $(python_built_sources) -gen_sources_deps = $(core_generator) -par_gen_command = PYTHONPATH=$(top_srcdir)/gruel/src/lib srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_unv.py -include $(top_srcdir)/Makefile.par.gen -# Rule to create the build header file using GUILE -# Doesn't need parallel protections because there is a single target -$(PMT_SERIAL_TAGS_H): $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm $(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm - $(RUN_GUILE) $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm $(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm $(PMT_SERIAL_TAGS_H) diff --git a/gruel/src/lib/pmt/Makefile.am b/gruel/src/lib/pmt/Makefile.am new file mode 100644 index 00000000..5e9f2fac --- /dev/null +++ b/gruel/src/lib/pmt/Makefile.am @@ -0,0 +1,111 @@ +# +# 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) + +TESTS = test_pmt + +noinst_LTLIBRARIES = libpmt.la + +# ---------------------------------------------------------------- +# these scripts generate code + +code_generator = \ + generate_unv.py \ + unv_template.h.t \ + unv_template.cc.t \ + unv_qa_template.cc.t + +GENERATED_H = \ + pmt_unv_int.h \ + qa_pmt_unv.h + +GENERATED_CC = \ + pmt_unv.cc \ + qa_pmt_unv.cc + +python_built_sources = $(GENERATED_H) $(GENERATED_CC) + +PMT_SERIAL_TAGS_H = $(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h +BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H) + +EXTRA_DIST = $(code_generator) + +# ---------------------------------------------------------------- + +libpmt_la_SOURCES = \ + pmt.cc \ + pmt_io.cc \ + pmt_pool.cc \ + pmt_serialize.cc \ + pmt_unv.cc + +libpmt_la_LIBADD = \ + $(BOOST_THREAD_LIB) \ + -lstdc++ + +noinst_HEADERS = \ + $(GENERATED_H) \ + pmt_int.h \ + qa_pmt.h \ + qa_pmt_prims.h + +# Build the qa code into its own library + +noinst_LTLIBRARIES += libpmt-qa.la + +libpmt_qa_la_SOURCES = \ + qa_pmt.cc \ + qa_pmt_prims.cc \ + qa_pmt_unv.cc + +# magic flags +libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid version + +libpmt_qa_la_LIBADD = \ + libpmt.la \ + $(CPPUNIT_LIBS) \ + -lstdc++ + +noinst_PROGRAMS = \ + test_pmt + + +LIBPMTQA = libpmt-qa.la + +test_pmt_SOURCES = test_pmt.cc +test_pmt_LDADD = $(LIBPMTQA) + +# Do creation and inclusion of other Makefiles last + +# common way for generating sources from templates when using +# BUILT_SOURCES, using parallel build protection. +gen_sources = $(python_built_sources) +gen_sources_deps = $(core_generator) +par_gen_command = PYTHONPATH=$(top_srcdir)/gruel/src/lib/pmt srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_unv.py +include $(top_srcdir)/Makefile.par.gen + +# Rule to create the build header file using GUILE +# Doesn't need parallel protections because there is a single target +$(PMT_SERIAL_TAGS_H): $(srcdir)/../../scheme/gnuradio/gen-serial-tags.scm $(srcdir)/../../scheme/gnuradio/pmt-serial-tags.scm + $(RUN_GUILE) $(srcdir)/../../scheme/gnuradio/gen-serial-tags.scm $(srcdir)/../../scheme/gnuradio/pmt-serial-tags.scm $(PMT_SERIAL_TAGS_H) diff --git a/gruel/src/lib/generate_unv.py b/gruel/src/lib/pmt/generate_unv.py similarity index 98% rename from gruel/src/lib/generate_unv.py rename to gruel/src/lib/pmt/generate_unv.py index 3a7305b4..02aace25 100755 --- a/gruel/src/lib/generate_unv.py +++ b/gruel/src/lib/pmt/generate_unv.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -85,7 +85,7 @@ qa_includes = """ #include #include -using namespace gruel; +using namespace pmt; """ diff --git a/gruel/src/lib/pmt.cc b/gruel/src/lib/pmt/pmt.cc similarity index 99% rename from gruel/src/lib/pmt.cc rename to gruel/src/lib/pmt/pmt.cc index 8e0c0162..fbf557be 100644 --- a/gruel/src/lib/pmt.cc +++ b/gruel/src/lib/pmt/pmt.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -30,7 +30,7 @@ #include #include -namespace gruel { +namespace pmt { static const int CACHE_LINE_SIZE = 64; // good guess @@ -1038,4 +1038,4 @@ pmt_dump_sizeof() printf("sizeof(pmt_uniform_vector) = %3zd\n", sizeof(pmt_uniform_vector)); } -} /* namespace gruel */ +} /* namespace pmt */ diff --git a/gruel/src/lib/pmt_int.h b/gruel/src/lib/pmt/pmt_int.h similarity index 99% rename from gruel/src/lib/pmt_int.h rename to gruel/src/lib/pmt/pmt_int.h index 03f0e555..9aac322a 100644 --- a/gruel/src/lib/pmt_int.h +++ b/gruel/src/lib/pmt/pmt_int.h @@ -32,7 +32,7 @@ */ #define PMT_LOCAL_ALLOCATOR 0 // define to 0 or 1 -namespace gruel { +namespace pmt { class pmt_base : boost::noncopyable { protected: @@ -222,6 +222,6 @@ public: #include "pmt_unv_int.h" -} /* namespace gruel */ +} /* namespace pmt */ #endif /* INCLUDED_PMT_INT_H */ diff --git a/gruel/src/lib/pmt_io.cc b/gruel/src/lib/pmt/pmt_io.cc similarity index 98% rename from gruel/src/lib/pmt_io.cc rename to gruel/src/lib/pmt/pmt_io.cc index e10ea781..f5a82de0 100644 --- a/gruel/src/lib/pmt_io.cc +++ b/gruel/src/lib/pmt/pmt_io.cc @@ -27,7 +27,7 @@ #include "pmt_int.h" #include -namespace gruel { +namespace pmt { static void pmt_write_list_tail(pmt_t obj, std::ostream &port) @@ -138,4 +138,4 @@ pmt_deserialize(std::istream &source) throw pmt_notimplemented("notimplemented: pmt_deserialize", PMT_NIL); } -} /* namespace gruel */ +} /* namespace pmt */ diff --git a/gruel/src/lib/pmt_pool.cc b/gruel/src/lib/pmt/pmt_pool.cc similarity index 98% rename from gruel/src/lib/pmt_pool.cc rename to gruel/src/lib/pmt/pmt_pool.cc index 79a22ea7..731d28ca 100644 --- a/gruel/src/lib/pmt_pool.cc +++ b/gruel/src/lib/pmt/pmt_pool.cc @@ -26,7 +26,7 @@ #include #include -namespace gruel { +namespace pmt { static inline size_t ROUNDUP(size_t x, size_t stride) @@ -109,4 +109,4 @@ pmt_pool::free(void *foo) d_cond.notify_one(); } -} /* namespace gruel */ +} /* namespace pmt */ diff --git a/gruel/src/lib/pmt_serialize.cc b/gruel/src/lib/pmt/pmt_serialize.cc similarity index 99% rename from gruel/src/lib/pmt_serialize.cc rename to gruel/src/lib/pmt/pmt_serialize.cc index b7193e81..937423a9 100644 --- a/gruel/src/lib/pmt_serialize.cc +++ b/gruel/src/lib/pmt/pmt_serialize.cc @@ -27,7 +27,7 @@ #include "pmt_int.h" #include "gruel/pmt_serial_tags.h" -namespace gruel { +namespace pmt { static pmt_t parse_pair(std::streambuf &sb); @@ -354,4 +354,4 @@ parse_pair(std::streambuf &sb) return val; } -} /* namespace gruel */ +} /* namespace pmt */ diff --git a/gruel/src/lib/qa_pmt.cc b/gruel/src/lib/pmt/qa_pmt.cc similarity index 100% rename from gruel/src/lib/qa_pmt.cc rename to gruel/src/lib/pmt/qa_pmt.cc diff --git a/gruel/src/lib/qa_pmt.h b/gruel/src/lib/pmt/qa_pmt.h similarity index 100% rename from gruel/src/lib/qa_pmt.h rename to gruel/src/lib/pmt/qa_pmt.h diff --git a/gruel/src/lib/qa_pmt_prims.cc b/gruel/src/lib/pmt/qa_pmt_prims.cc similarity index 99% rename from gruel/src/lib/qa_pmt_prims.cc rename to gruel/src/lib/pmt/qa_pmt_prims.cc index ac93f806..b8135472 100644 --- a/gruel/src/lib/qa_pmt_prims.cc +++ b/gruel/src/lib/pmt/qa_pmt_prims.cc @@ -26,7 +26,7 @@ #include #include -using namespace gruel; +using namespace pmt; void qa_pmt_prims::test_symbols() diff --git a/gruel/src/lib/qa_pmt_prims.h b/gruel/src/lib/pmt/qa_pmt_prims.h similarity index 100% rename from gruel/src/lib/qa_pmt_prims.h rename to gruel/src/lib/pmt/qa_pmt_prims.h diff --git a/gruel/src/lib/test_pmt.cc b/gruel/src/lib/pmt/test_pmt.cc similarity index 100% rename from gruel/src/lib/test_pmt.cc rename to gruel/src/lib/pmt/test_pmt.cc diff --git a/gruel/src/lib/unv_qa_template.cc.t b/gruel/src/lib/pmt/unv_qa_template.cc.t similarity index 100% rename from gruel/src/lib/unv_qa_template.cc.t rename to gruel/src/lib/pmt/unv_qa_template.cc.t diff --git a/gruel/src/lib/unv_template.cc.t b/gruel/src/lib/pmt/unv_template.cc.t similarity index 98% rename from gruel/src/lib/unv_template.cc.t rename to gruel/src/lib/pmt/unv_template.cc.t index b19e32d2..148965c0 100644 --- a/gruel/src/lib/unv_template.cc.t +++ b/gruel/src/lib/pmt/unv_template.cc.t @@ -2,7 +2,7 @@ // pmt_@TAG@vector //////////////////////////////////////////////////////////////////////////// -namespace gruel { +namespace pmt { static pmt_@TAG@vector * _@TAG@vector(pmt_t x) @@ -119,4 +119,4 @@ pmt_@TAG@vector_writable_elements(pmt_t vector, size_t &len) return _@TAG@vector(vector)->writable_elements(len); } -} /* namespace gruel */ +} /* namespace pmt */ diff --git a/gruel/src/lib/unv_template.h.t b/gruel/src/lib/pmt/unv_template.h.t similarity index 100% rename from gruel/src/lib/unv_template.h.t rename to gruel/src/lib/pmt/unv_template.h.t diff --git a/mblock/src/include/mblock/class_registry.h b/mblock/src/include/mblock/class_registry.h index 8528b887..e4341f7d 100644 --- a/mblock/src/include/mblock/class_registry.h +++ b/mblock/src/include/mblock/class_registry.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2008 Free Software Foundation, Inc. + * Copyright 2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,7 +26,7 @@ //! conceptually, pointer to constructor typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime, const std::string &instance_name, - gruel::pmt_t user_arg); + pmt::pmt_t user_arg); /* * \brief Maintain mapping between mblock class_name and factory (maker) @@ -40,7 +40,7 @@ public: template mb_mblock_sptr mb_mblock_maker(mb_runtime *runtime, const std::string &instance_name, - gruel::pmt_t user_arg) + pmt::pmt_t user_arg) { return mb_mblock_sptr(new mblock(runtime, instance_name, user_arg)); } diff --git a/mblock/src/include/mblock/mblock.h b/mblock/src/include/mblock/mblock.h index 92b0b328..2f036e41 100644 --- a/mblock/src/include/mblock/mblock.h +++ b/mblock/src/include/mblock/mblock.h @@ -72,7 +72,7 @@ protected: * \param user_arg argument passed by user to constructor * (ignored by the mb_mblock base class) */ - mb_mblock(mb_runtime *runtime, const std::string &instance_name, gruel::pmt_t user_arg); + mb_mblock(mb_runtime *runtime, const std::string &instance_name, pmt::pmt_t user_arg); public: /*! @@ -128,7 +128,7 @@ protected: void define_component(const std::string &component_name, const std::string &class_name, - gruel::pmt_t user_arg = gruel::PMT_NIL); + pmt::pmt_t user_arg = pmt::PMT_NIL); /*! * \brief connect endpoint_1 to endpoint_2 @@ -217,7 +217,7 @@ protected: * * runtime->run(...) returns when all blocks have called exit. */ - void shutdown_all(gruel::pmt_t result); + void shutdown_all(pmt::pmt_t result); /*! * \brief main event dispatching loop @@ -259,8 +259,8 @@ public: * * To cancel a pending timeout, call cancel_timeout. */ - gruel::pmt_t - schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data); + pmt::pmt_t + schedule_one_shot_timeout(const mb_time &abs_time, pmt::pmt_t user_data); /*! * \brief Schedule a periodic timeout. @@ -281,10 +281,10 @@ public: * * To cancel a pending timeout, call cancel_timeout. */ - gruel::pmt_t + pmt::pmt_t schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data); + pmt::pmt_t user_data); /*! * \brief Attempt to cancel a pending timeout. @@ -296,7 +296,7 @@ public: * * \param handle returned from schedule_one_shot_timeout or schedule_periodic_timeout. */ - void cancel_timeout(gruel::pmt_t handle); + void cancel_timeout(pmt::pmt_t handle); /*! * \brief Perform a pre-order depth-first traversal of the hierarchy. diff --git a/mblock/src/include/mblock/message.h b/mblock/src/include/mblock/message.h index 443684fd..4051d0c8 100644 --- a/mblock/src/include/mblock/message.h +++ b/mblock/src/include/mblock/message.h @@ -38,37 +38,37 @@ typedef boost::shared_ptr mb_message_sptr; * \param priority urgency */ mb_message_sptr -mb_make_message(gruel::pmt_t signal, - gruel::pmt_t data = gruel::PMT_NIL, - gruel::pmt_t metadata = gruel::PMT_NIL, +mb_make_message(pmt::pmt_t signal, + pmt::pmt_t data = pmt::PMT_NIL, + pmt::pmt_t metadata = pmt::PMT_NIL, mb_pri_t priority = MB_PRI_DEFAULT); class mb_message { mb_message_sptr d_next; // link field for msg queue - gruel::pmt_t d_signal; - gruel::pmt_t d_data; - gruel::pmt_t d_metadata; + pmt::pmt_t d_signal; + pmt::pmt_t d_data; + pmt::pmt_t d_metadata; mb_pri_t d_priority; - gruel::pmt_t d_port_id; // name of port msg was rcvd on (symbol) + pmt::pmt_t d_port_id; // name of port msg was rcvd on (symbol) friend class mb_msg_queue; friend mb_message_sptr - mb_make_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); + mb_make_message(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority); // private constructor - mb_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); + mb_message(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority); public: ~mb_message(); - gruel::pmt_t signal() const { return d_signal; } - gruel::pmt_t data() const { return d_data; } - gruel::pmt_t metadata() const { return d_metadata; } + pmt::pmt_t signal() const { return d_signal; } + pmt::pmt_t data() const { return d_data; } + pmt::pmt_t metadata() const { return d_metadata; } mb_pri_t priority() const { return d_priority; } - gruel::pmt_t port_id() const { return d_port_id; } + pmt::pmt_t port_id() const { return d_port_id; } - void set_port_id(gruel::pmt_t port_id){ d_port_id = port_id; } + void set_port_id(pmt::pmt_t port_id){ d_port_id = port_id; } #if (MB_MESSAGE_LOCAL_ALLOCATOR) void *operator new(size_t); diff --git a/mblock/src/include/mblock/msg_accepter.h b/mblock/src/include/mblock/msg_accepter.h index 7ce1705a..7dc1e50c 100644 --- a/mblock/src/include/mblock/msg_accepter.h +++ b/mblock/src/include/mblock/msg_accepter.h @@ -42,7 +42,7 @@ public: mb_msg_accepter(){}; virtual ~mb_msg_accepter(); - virtual void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) = 0; + virtual void operator()(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority) = 0; }; #endif /* INCLUDED_MB_MSG_ACCEPTER_H */ diff --git a/mblock/src/include/mblock/port.h b/mblock/src/include/mblock/port.h index 02d81d67..1664765d 100644 --- a/mblock/src/include/mblock/port.h +++ b/mblock/src/include/mblock/port.h @@ -40,8 +40,8 @@ public: private: std::string d_port_name; - gruel::pmt_t d_port_symbol; // the port_name as a gruel::pmt symbol - gruel::pmt_t d_protocol_class; + pmt::pmt_t d_port_symbol; // the port_name as a pmt::pmt symbol + pmt::pmt_t d_protocol_class; bool d_conjugated; port_type_t d_port_type; @@ -59,13 +59,13 @@ protected: public: std::string port_name() const { return d_port_name; } - gruel::pmt_t port_symbol() const { return d_port_symbol; } - gruel::pmt_t protocol_class() const { return d_protocol_class; } + pmt::pmt_t port_symbol() const { return d_port_symbol; } + pmt::pmt_t protocol_class() const { return d_protocol_class; } bool conjugated() const { return d_conjugated; } port_type_t port_type() const { return d_port_type; } - gruel::pmt_t incoming_message_set() const; - gruel::pmt_t outgoing_message_set() const; + pmt::pmt_t incoming_message_set() const; + pmt::pmt_t outgoing_message_set() const; virtual ~mb_port(); @@ -78,9 +78,9 @@ public: * \param priority the urgency at which the message is sent */ virtual void - send(gruel::pmt_t signal, - gruel::pmt_t data = gruel::PMT_F, - gruel::pmt_t metadata = gruel::PMT_F, + send(pmt::pmt_t signal, + pmt::pmt_t data = pmt::PMT_F, + pmt::pmt_t metadata = pmt::PMT_F, mb_pri_t priority = MB_PRI_DEFAULT) = 0; /* diff --git a/mblock/src/include/mblock/protocol_class.h b/mblock/src/include/mblock/protocol_class.h index 4267a912..a01e68d8 100644 --- a/mblock/src/include/mblock/protocol_class.h +++ b/mblock/src/include/mblock/protocol_class.h @@ -30,14 +30,14 @@ * \param incoming incoming message set (list of symbols) * \param outgoing outgoing message set (list of symbols) */ -gruel::pmt_t mb_make_protocol_class(gruel::pmt_t name, gruel::pmt_t incoming, gruel::pmt_t outgoing); +pmt::pmt_t mb_make_protocol_class(pmt::pmt_t name, pmt::pmt_t incoming, pmt::pmt_t outgoing); // Accessors -gruel::pmt_t mb_protocol_class_name(gruel::pmt_t pc); //< return name of protocol class -gruel::pmt_t mb_protocol_class_incoming(gruel::pmt_t pc); //< return incoming message set -gruel::pmt_t mb_protocol_class_outgoing(gruel::pmt_t pc); //< return outgoing message set +pmt::pmt_t mb_protocol_class_name(pmt::pmt_t pc); //< return name of protocol class +pmt::pmt_t mb_protocol_class_incoming(pmt::pmt_t pc); //< return incoming message set +pmt::pmt_t mb_protocol_class_outgoing(pmt::pmt_t pc); //< return outgoing message set -gruel::pmt_t mb_protocol_class_lookup(gruel::pmt_t name); //< lookup an existing protocol class by name +pmt::pmt_t mb_protocol_class_lookup(pmt::pmt_t name); //< lookup an existing protocol class by name /*! diff --git a/mblock/src/include/mblock/runtime.h b/mblock/src/include/mblock/runtime.h index 69f49a40..9afc38b7 100644 --- a/mblock/src/include/mblock/runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -59,8 +59,8 @@ public: */ virtual bool run(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg, - gruel::pmt_t *result = 0) = 0; + pmt::pmt_t user_arg, + pmt::pmt_t *result = 0) = 0; // QA only... mb_mblock_sptr top() { return d_top; } diff --git a/mblock/src/lib/benchmark_send.cc b/mblock/src/lib/benchmark_send.cc index 7055e785..a02b37c0 100644 --- a/mblock/src/lib/benchmark_send.cc +++ b/mblock/src/lib/benchmark_send.cc @@ -22,7 +22,7 @@ #include #include -using namespace gruel; +using namespace pmt; int main(int argc, char **argv) diff --git a/mblock/src/lib/mb_endpoint.cc b/mblock/src/lib/mb_endpoint.cc index 883ab360..721c66b8 100644 --- a/mblock/src/lib/mb_endpoint.cc +++ b/mblock/src/lib/mb_endpoint.cc @@ -24,13 +24,15 @@ #endif #include +using namespace pmt; + bool mb_endpoint::inside_of_relay_port_p() const { return d_port->port_type() == mb_port::RELAY && d_component_name == "self"; } -gruel::pmt_t +pmt_t mb_endpoint::incoming_message_set() const { if (inside_of_relay_port_p()) // swap incoming and outgoing @@ -39,7 +41,7 @@ mb_endpoint::incoming_message_set() const return port()->incoming_message_set(); } -gruel::pmt_t +pmt_t mb_endpoint::outgoing_message_set() const { if (inside_of_relay_port_p()) // swap incoming and outgoing diff --git a/mblock/src/lib/mb_endpoint.h b/mblock/src/lib/mb_endpoint.h index 96ff0de4..c4d8b611 100644 --- a/mblock/src/lib/mb_endpoint.h +++ b/mblock/src/lib/mb_endpoint.h @@ -51,8 +51,8 @@ public: //! Does this endpoint represent the inside of a relay port bool inside_of_relay_port_p() const; - gruel::pmt_t incoming_message_set() const; - gruel::pmt_t outgoing_message_set() const; + pmt::pmt_t incoming_message_set() const; + pmt::pmt_t outgoing_message_set() const; }; #endif /* INCLUDED_MB_ENDPOINT_H */ diff --git a/mblock/src/lib/mb_mblock.cc b/mblock/src/lib/mb_mblock.cc index 77216ccb..2e77dc4a 100644 --- a/mblock/src/lib/mb_mblock.cc +++ b/mblock/src/lib/mb_mblock.cc @@ -29,9 +29,10 @@ #include #include +using namespace pmt; -static gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port"); -static gruel::pmt_t s_halt = gruel::pmt_intern("%halt"); +static pmt_t s_sys_port = pmt_intern("%sys-port"); +static pmt_t s_halt = pmt_intern("%halt"); mb_visitor::~mb_visitor() { @@ -41,7 +42,7 @@ mb_visitor::~mb_visitor() mb_mblock::mb_mblock(mb_runtime *runtime, const std::string &instance_name, - gruel::pmt_t user_arg) + pmt_t user_arg) : d_impl(mb_mblock_impl_sptr( new mb_mblock_impl(dynamic_cast(runtime), this, instance_name))) @@ -82,7 +83,7 @@ mb_mblock::main_loop() handle_message(msg); } } - catch (gruel::pmt_exception e){ + catch (pmt_exception e){ std::cerr << "\nmb_mblock::main_loop: ignored pmt_exception: " << e.what() << "\nin mblock instance \"" << instance_name() @@ -112,7 +113,7 @@ mb_mblock::define_port(const std::string &port_name_string, void mb_mblock::define_component(const std::string &component_name, const std::string &class_name, - gruel::pmt_t user_arg) + pmt_t user_arg) { d_impl->define_component(component_name, class_name, user_arg); @@ -196,23 +197,23 @@ mb_mblock::exit() } void -mb_mblock::shutdown_all(gruel::pmt_t result) +mb_mblock::shutdown_all(pmt_t result) { d_impl->runtime()->request_shutdown(result); } -gruel::pmt_t -mb_mblock::schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data) +pmt_t +mb_mblock::schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data) { mb_msg_accepter_sptr accepter = impl()->make_accepter(s_sys_port); return d_impl->runtime()->schedule_one_shot_timeout(abs_time, user_data, accepter); } -gruel::pmt_t +pmt_t mb_mblock::schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data) + pmt_t user_data) { mb_msg_accepter_sptr accepter = impl()->make_accepter(s_sys_port); return d_impl->runtime()->schedule_periodic_timeout(first_abs_time, @@ -222,7 +223,7 @@ mb_mblock::schedule_periodic_timeout(const mb_time &first_abs_time, } void -mb_mblock::cancel_timeout(gruel::pmt_t handle) +mb_mblock::cancel_timeout(pmt_t handle) { d_impl->runtime()->cancel_timeout(handle); } diff --git a/mblock/src/lib/mb_mblock_impl.cc b/mblock/src/lib/mb_mblock_impl.cc index b57ac5d0..8a1784f4 100644 --- a/mblock/src/lib/mb_mblock_impl.cc +++ b/mblock/src/lib/mb_mblock_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2008 Free Software Foundation, Inc. + * Copyright 2006,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,8 +33,9 @@ #include #include +using namespace pmt; -static gruel::pmt_t s_self = gruel::pmt_intern("self"); +static pmt_t s_self = pmt_intern("self"); //////////////////////////////////////////////////////////////////////// @@ -87,7 +88,7 @@ mb_mblock_impl::define_port(const std::string &port_name, void mb_mblock_impl::define_component(const std::string &name, const std::string &class_name, - gruel::pmt_t user_arg) + pmt_t user_arg) { { mbi_runtime_lock l(this); @@ -226,11 +227,11 @@ bool mb_mblock_impl::endpoints_are_compatible(const mb_endpoint &ep0, const mb_endpoint &ep1) { - gruel::pmt_t p0_outgoing = ep0.outgoing_message_set(); - gruel::pmt_t p0_incoming = ep0.incoming_message_set(); + pmt_t p0_outgoing = ep0.outgoing_message_set(); + pmt_t p0_incoming = ep0.incoming_message_set(); - gruel::pmt_t p1_outgoing = ep1.outgoing_message_set(); - gruel::pmt_t p1_incoming = ep1.incoming_message_set(); + pmt_t p1_outgoing = ep1.outgoing_message_set(); + pmt_t p1_incoming = ep1.incoming_message_set(); return (pmt_subsetp(p0_outgoing, p1_incoming) && pmt_subsetp(p1_outgoing, p0_incoming)); @@ -251,7 +252,7 @@ mb_mblock_impl::walk_tree(mb_visitor *visitor) } mb_msg_accepter_sptr -mb_mblock_impl::make_accepter(gruel::pmt_t port_name) +mb_mblock_impl::make_accepter(pmt_t port_name) { // FIXME this should probably use some kind of configurable factory mb_msg_accepter *ma = diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h index fa982cba..f460ecc5 100644 --- a/mblock/src/lib/mb_mblock_impl.h +++ b/mblock/src/lib/mb_mblock_impl.h @@ -87,7 +87,7 @@ public: void define_component(const std::string &component_name, const std::string &class_name, - gruel::pmt_t user_arg); + pmt::pmt_t user_arg); /*! * \brief connect endpoint_1 to endpoint_2 @@ -148,7 +148,7 @@ public: walk_tree(mb_visitor *visitor); mb_msg_accepter_sptr - make_accepter(gruel::pmt_t port_name); + make_accepter(pmt::pmt_t port_name); mb_msg_queue & msgq() { return d_msgq; } @@ -196,9 +196,9 @@ public: * Our implementation methods */ private: - //bool port_is_defined(gruel::pmt_t name); + //bool port_is_defined(pmt::pmt_t name); bool port_is_defined(const std::string &name); - //bool comp_is_defined(gruel::pmt_t name); + //bool comp_is_defined(pmt::pmt_t name); bool comp_is_defined(const std::string &name); mb_endpoint diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc index 729ff078..4daa3407 100644 --- a/mblock/src/lib/mb_message.cc +++ b/mblock/src/lib/mb_message.cc @@ -26,6 +26,8 @@ #include #include +using namespace pmt; + static const int CACHE_LINE_SIZE = 64; // good guess static const int MAX_MESSAGES = 1024; // KLUDGE max number of messages in sys // 0 -> no limit @@ -54,14 +56,14 @@ mb_message::operator delete(void *p, size_t size) mb_message_sptr -mb_make_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) +mb_make_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) { return mb_message_sptr(new mb_message(signal, data, metadata, priority)); } -mb_message::mb_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) +mb_message::mb_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) : d_signal(signal), d_data(data), d_metadata(metadata), d_priority(priority), - d_port_id(gruel::PMT_NIL) + d_port_id(PMT_NIL) { } diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc index e13ec5aa..6c74ac47 100644 --- a/mblock/src/lib/mb_msg_accepter_msgq.cc +++ b/mblock/src/lib/mb_msg_accepter_msgq.cc @@ -25,7 +25,9 @@ #include #include -gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port"); +using namespace pmt; + +pmt_t s_sys_port = pmt_intern("%sys-port"); mb_msg_accepter_msgq::mb_msg_accepter_msgq(mb_msg_queue *msgq) : d_msgq(msgq) @@ -37,8 +39,8 @@ mb_msg_accepter_msgq::~mb_msg_accepter_msgq() } void -mb_msg_accepter_msgq::operator()(gruel::pmt_t signal, gruel::pmt_t data, - gruel::pmt_t metadata, mb_pri_t priority) +mb_msg_accepter_msgq::operator()(pmt_t signal, pmt_t data, + pmt_t metadata, mb_pri_t priority) { mb_message_sptr msg = mb_make_message(signal, data, metadata, priority); msg->set_port_id(s_sys_port); diff --git a/mblock/src/lib/mb_msg_accepter_msgq.h b/mblock/src/lib/mb_msg_accepter_msgq.h index e196d49b..f84bca59 100644 --- a/mblock/src/lib/mb_msg_accepter_msgq.h +++ b/mblock/src/lib/mb_msg_accepter_msgq.h @@ -33,7 +33,7 @@ class mb_msg_accepter_msgq : public mb_msg_accepter { public: mb_msg_accepter_msgq(mb_msg_queue *msgq); ~mb_msg_accepter_msgq(); - void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); + void operator()(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority); }; #endif /* INCLUDED_MB_MSG_ACCEPTER_MSGQ_H */ diff --git a/mblock/src/lib/mb_msg_accepter_smp.cc b/mblock/src/lib/mb_msg_accepter_smp.cc index 5d2872b0..1ec8c5bf 100644 --- a/mblock/src/lib/mb_msg_accepter_smp.cc +++ b/mblock/src/lib/mb_msg_accepter_smp.cc @@ -28,7 +28,9 @@ #include #include -mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, gruel::pmt_t port_name) +using namespace pmt; + +mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name) : d_mb(mblock), d_port_name(port_name) { } @@ -39,8 +41,8 @@ mb_msg_accepter_smp::~mb_msg_accepter_smp() } void -mb_msg_accepter_smp::operator()(gruel::pmt_t signal, gruel::pmt_t data, - gruel::pmt_t metadata, mb_pri_t priority) +mb_msg_accepter_smp::operator()(pmt_t signal, pmt_t data, + pmt_t metadata, mb_pri_t priority) { mb_message_sptr msg = mb_make_message(signal, data, metadata, priority); msg->set_port_id(d_port_name); diff --git a/mblock/src/lib/mb_msg_accepter_smp.h b/mblock/src/lib/mb_msg_accepter_smp.h index 4e190410..3028484f 100644 --- a/mblock/src/lib/mb_msg_accepter_smp.h +++ b/mblock/src/lib/mb_msg_accepter_smp.h @@ -29,13 +29,13 @@ class mb_msg_accepter_smp : public mb_msg_accepter { mb_mblock_sptr d_mb; - gruel::pmt_t d_port_name; + pmt::pmt_t d_port_name; public: - mb_msg_accepter_smp(mb_mblock_sptr mblock, gruel::pmt_t port_name); + mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt::pmt_t port_name); ~mb_msg_accepter_smp(); - void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority); + void operator()(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority); }; diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc index abf909fd..a26a2c41 100644 --- a/mblock/src/lib/mb_port.cc +++ b/mblock/src/lib/mb_port.cc @@ -26,16 +26,18 @@ #include #include +using namespace pmt; + mb_port::mb_port(mb_mblock *mblock, const std::string &port_name, const std::string &protocol_class_name, bool conjugated, mb_port::port_type_t port_type) - : d_port_name(port_name), d_port_symbol(gruel::pmt_intern(port_name)), + : d_port_name(port_name), d_port_symbol(pmt_intern(port_name)), d_conjugated(conjugated), d_port_type(port_type), d_mblock(mblock) { - gruel::pmt_t pc = mb_protocol_class_lookup(gruel::pmt_intern(protocol_class_name)); + pmt_t pc = mb_protocol_class_lookup(pmt_intern(protocol_class_name)); if (pmt_is_null(pc)){ throw std::runtime_error("mb_port: unknown protocol class '" + protocol_class_name + "'"); @@ -48,7 +50,7 @@ mb_port::~mb_port() // nop } -gruel::pmt_t +pmt_t mb_port::incoming_message_set() const { if (!conjugated()) @@ -57,7 +59,7 @@ mb_port::incoming_message_set() const return mb_protocol_class_outgoing(protocol_class()); } -gruel::pmt_t +pmt_t mb_port::outgoing_message_set() const { if (!conjugated()) diff --git a/mblock/src/lib/mb_port_simple.cc b/mblock/src/lib/mb_port_simple.cc index 3005932f..235e59de 100644 --- a/mblock/src/lib/mb_port_simple.cc +++ b/mblock/src/lib/mb_port_simple.cc @@ -31,6 +31,7 @@ #include #include +using namespace pmt; mb_port_simple::mb_port_simple(mb_mblock *mblock, const std::string &port_name, @@ -48,7 +49,7 @@ mb_port_simple::~mb_port_simple() } void -mb_port_simple::send(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) +mb_port_simple::send(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) { if (port_type() == mb_port::RELAY) // Can't send directly to a RELAY port throw mbe_invalid_port_type(mblock(), mblock()->instance_name(), port_name()); diff --git a/mblock/src/lib/mb_port_simple.h b/mblock/src/lib/mb_port_simple.h index a2136ed0..485c809f 100644 --- a/mblock/src/lib/mb_port_simple.h +++ b/mblock/src/lib/mb_port_simple.h @@ -56,9 +56,9 @@ public: * \param priority the urgency at which the message is sent */ void - send(gruel::pmt_t signal, - gruel::pmt_t data = gruel::PMT_NIL, - gruel::pmt_t metadata = gruel::PMT_NIL, + send(pmt::pmt_t signal, + pmt::pmt_t data = pmt::PMT_NIL, + pmt::pmt_t metadata = pmt::PMT_NIL, mb_pri_t priority = MB_PRI_DEFAULT); /* diff --git a/mblock/src/lib/mb_protocol_class.cc b/mblock/src/lib/mb_protocol_class.cc index 6492c155..1c696fb7 100644 --- a/mblock/src/lib/mb_protocol_class.cc +++ b/mblock/src/lib/mb_protocol_class.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2008 Free Software Foundation, Inc. + * Copyright 2006,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,60 +26,62 @@ #include #include -static gruel::pmt_t s_ALL_PROTOCOL_CLASSES = gruel::PMT_NIL; +using namespace pmt; -gruel::pmt_t -mb_make_protocol_class(gruel::pmt_t name, gruel::pmt_t incoming, gruel::pmt_t outgoing) +static pmt_t s_ALL_PROTOCOL_CLASSES = PMT_NIL; + +pmt_t +mb_make_protocol_class(pmt_t name, pmt_t incoming, pmt_t outgoing) { // (protocol-class ) - if (!gruel::pmt_is_symbol(name)) - throw gruel::pmt_wrong_type("mb_make_protocol_class: NAME must be symbol", name); - if (!(gruel::pmt_is_pair(incoming) || gruel::pmt_is_null(incoming))) - throw gruel::pmt_wrong_type("mb_make_protocol_class: INCOMING must be a list", name); - if (!(gruel::pmt_is_pair(outgoing) || gruel::pmt_is_null(outgoing))) - throw gruel::pmt_wrong_type("mb_make_protocol_class: OUTGOING must be a list", name); + if (!pmt_is_symbol(name)) + throw pmt_wrong_type("mb_make_protocol_class: NAME must be symbol", name); + if (!(pmt_is_pair(incoming) || pmt_is_null(incoming))) + throw pmt_wrong_type("mb_make_protocol_class: INCOMING must be a list", name); + if (!(pmt_is_pair(outgoing) || pmt_is_null(outgoing))) + throw pmt_wrong_type("mb_make_protocol_class: OUTGOING must be a list", name); - gruel::pmt_t t = gruel::pmt_cons(gruel::pmt_intern("protocol-class"), - gruel::pmt_cons(name, - gruel::pmt_cons(incoming, - gruel::pmt_cons(outgoing, gruel::PMT_NIL)))); + pmt_t t = pmt_cons(pmt_intern("protocol-class"), + pmt_cons(name, + pmt_cons(incoming, + pmt_cons(outgoing, PMT_NIL)))); // Remember this protocol class. - s_ALL_PROTOCOL_CLASSES = gruel::pmt_cons(t, s_ALL_PROTOCOL_CLASSES); + s_ALL_PROTOCOL_CLASSES = pmt_cons(t, s_ALL_PROTOCOL_CLASSES); return t; } -gruel::pmt_t -mb_protocol_class_name(gruel::pmt_t pc) +pmt_t +mb_protocol_class_name(pmt_t pc) { - return gruel::pmt_nth(1, pc); + return pmt_nth(1, pc); } -gruel::pmt_t -mb_protocol_class_incoming(gruel::pmt_t pc) +pmt_t +mb_protocol_class_incoming(pmt_t pc) { - return gruel::pmt_nth(2, pc); + return pmt_nth(2, pc); } -gruel::pmt_t -mb_protocol_class_outgoing(gruel::pmt_t pc) +pmt_t +mb_protocol_class_outgoing(pmt_t pc) { - return gruel::pmt_nth(3, pc); + return pmt_nth(3, pc); } -gruel::pmt_t -mb_protocol_class_lookup(gruel::pmt_t name) +pmt_t +mb_protocol_class_lookup(pmt_t name) { - gruel::pmt_t lst = s_ALL_PROTOCOL_CLASSES; + pmt_t lst = s_ALL_PROTOCOL_CLASSES; - while (gruel::pmt_is_pair(lst)){ - if (gruel::pmt_eq(name, mb_protocol_class_name(gruel::pmt_car(lst)))) - return gruel::pmt_car(lst); - lst = gruel::pmt_cdr(lst); + while (pmt_is_pair(lst)){ + if (pmt_eq(name, mb_protocol_class_name(pmt_car(lst)))) + return pmt_car(lst); + lst = pmt_cdr(lst); } - return gruel::PMT_NIL; + return PMT_NIL; } mb_protocol_class_init::mb_protocol_class_init(const char *data, size_t len) @@ -88,18 +90,18 @@ mb_protocol_class_init::mb_protocol_class_init(const char *data, size_t len) sb.str(std::string(data, len)); while (1){ - gruel::pmt_t obj = gruel::pmt_deserialize(sb); + pmt_t obj = pmt_deserialize(sb); if (0){ - gruel::pmt_write(obj, std::cout); + pmt_write(obj, std::cout); std::cout << std::endl; } - if (gruel::pmt_is_eof_object(obj)) + if (pmt_is_eof_object(obj)) return; - mb_make_protocol_class(gruel::pmt_nth(0, obj), // protocol-class name - gruel::pmt_nth(1, obj), // list of incoming msg names - gruel::pmt_nth(2, obj)); // list of outgoing msg names + mb_make_protocol_class(pmt_nth(0, obj), // protocol-class name + pmt_nth(1, obj), // list of incoming msg names + pmt_nth(2, obj)); // list of outgoing msg names } } diff --git a/mblock/src/lib/mb_runtime_base.cc b/mblock/src/lib/mb_runtime_base.cc index 872cf336..f259a690 100644 --- a/mblock/src/lib/mb_runtime_base.cc +++ b/mblock/src/lib/mb_runtime_base.cc @@ -24,34 +24,36 @@ #endif #include +using namespace pmt; + /* * Default nop implementations... */ void -mb_runtime_base::request_shutdown(gruel::pmt_t result) +mb_runtime_base::request_shutdown(pmt_t result) { } -gruel::pmt_t +pmt_t mb_runtime_base::schedule_one_shot_timeout(const mb_time &abs_time, - gruel::pmt_t user_data, + pmt_t user_data, mb_msg_accepter_sptr accepter) { - return gruel::PMT_F; + return PMT_F; } -gruel::pmt_t +pmt_t mb_runtime_base::schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, + pmt_t user_data, mb_msg_accepter_sptr accepter) { - return gruel::PMT_F; + return PMT_F; } void -mb_runtime_base::cancel_timeout(gruel::pmt_t handle) +mb_runtime_base::cancel_timeout(pmt_t handle) { } diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h index d5ec29c2..78be2922 100644 --- a/mblock/src/lib/mb_runtime_base.h +++ b/mblock/src/lib/mb_runtime_base.h @@ -50,24 +50,24 @@ public: */ inline void unlock() { d_brl.unlock(); } - virtual void request_shutdown(gruel::pmt_t result); + virtual void request_shutdown(pmt::pmt_t result); virtual mb_mblock_sptr create_component(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg) = 0; + pmt::pmt_t user_arg) = 0; - virtual gruel::pmt_t - schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data, + virtual pmt::pmt_t + schedule_one_shot_timeout(const mb_time &abs_time, pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); - virtual gruel::pmt_t + virtual pmt::pmt_t schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, + pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); virtual void - cancel_timeout(gruel::pmt_t handle); + cancel_timeout(pmt::pmt_t handle); mb_msg_accepter_sptr accepter() { return d_accepter; } diff --git a/mblock/src/lib/mb_runtime_nop.cc b/mblock/src/lib/mb_runtime_nop.cc index 3ea6d093..8293e0c2 100644 --- a/mblock/src/lib/mb_runtime_nop.cc +++ b/mblock/src/lib/mb_runtime_nop.cc @@ -27,6 +27,8 @@ #include #include +using namespace pmt; + mb_runtime_sptr mb_make_runtime_nop() { @@ -48,7 +50,7 @@ mb_runtime_nop::~mb_runtime_nop() bool mb_runtime_nop::run(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg, gruel::pmt_t *result) + pmt_t user_arg, pmt_t *result) { class initial_visitor : public mb_visitor { @@ -63,7 +65,7 @@ mb_runtime_nop::run(const std::string &instance_name, initial_visitor visitor; if (result) - *result = gruel::PMT_T; + *result = PMT_T; d_top = create_component(instance_name, class_name, user_arg); d_top->walk_tree(&visitor); @@ -74,7 +76,7 @@ mb_runtime_nop::run(const std::string &instance_name, mb_mblock_sptr mb_runtime_nop::create_component(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg) + pmt_t user_arg) { mb_mblock_maker_t maker; if (!mb_class_registry::lookup_maker(class_name, &maker)) diff --git a/mblock/src/lib/mb_runtime_nop.h b/mblock/src/lib/mb_runtime_nop.h index a57d0b60..735c0405 100644 --- a/mblock/src/lib/mb_runtime_nop.h +++ b/mblock/src/lib/mb_runtime_nop.h @@ -39,14 +39,14 @@ public: bool run(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg, - gruel::pmt_t *result); + pmt::pmt_t user_arg, + pmt::pmt_t *result); protected: mb_mblock_sptr create_component(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg); + pmt::pmt_t user_arg); }; #endif /* INCLUDED_MB_RUNTIME_NOP_H */ diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index f92b98f7..b1600943 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.cc +++ b/mblock/src/lib/mb_runtime_thread_per_block.cc @@ -32,21 +32,22 @@ #include #include - -static gruel::pmt_t s_halt = gruel::pmt_intern("%halt"); -static gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port"); -static gruel::pmt_t s_shutdown = gruel::pmt_intern("%shutdown"); -static gruel::pmt_t s_request_shutdown = gruel::pmt_intern("%request-shutdown"); -static gruel::pmt_t s_worker_state_changed = gruel::pmt_intern("%worker-state-changed"); -static gruel::pmt_t s_timeout = gruel::pmt_intern("%timeout"); -static gruel::pmt_t s_request_timeout = gruel::pmt_intern("%request-timeout"); -static gruel::pmt_t s_cancel_timeout = gruel::pmt_intern("%cancel-timeout"); -static gruel::pmt_t s_send_halt = gruel::pmt_intern("send-halt"); -static gruel::pmt_t s_exit_now = gruel::pmt_intern("exit-now"); +using namespace pmt; + +static pmt_t s_halt = pmt_intern("%halt"); +static pmt_t s_sys_port = pmt_intern("%sys-port"); +static pmt_t s_shutdown = pmt_intern("%shutdown"); +static pmt_t s_request_shutdown = pmt_intern("%request-shutdown"); +static pmt_t s_worker_state_changed = pmt_intern("%worker-state-changed"); +static pmt_t s_timeout = pmt_intern("%timeout"); +static pmt_t s_request_timeout = pmt_intern("%request-timeout"); +static pmt_t s_cancel_timeout = pmt_intern("%cancel-timeout"); +static pmt_t s_send_halt = pmt_intern("send-halt"); +static pmt_t s_exit_now = pmt_intern("exit-now"); static void -send_sys_msg(mb_msg_queue &msgq, gruel::pmt_t signal, - gruel::pmt_t data = gruel::PMT_F, gruel::pmt_t metadata = gruel::PMT_F, +send_sys_msg(mb_msg_queue &msgq, pmt_t signal, + pmt_t data = PMT_F, pmt_t metadata = PMT_F, mb_pri_t priority = MB_PRI_BEST) { mb_message_sptr msg = mb_make_message(signal, data, metadata, priority); @@ -57,7 +58,7 @@ send_sys_msg(mb_msg_queue &msgq, gruel::pmt_t signal, mb_runtime_thread_per_block::mb_runtime_thread_per_block() : d_shutdown_in_progress(false), - d_shutdown_result(gruel::PMT_T) + d_shutdown_result(PMT_T) { d_accepter = mb_msg_accepter_sptr(new mb_msg_accepter_msgq(&d_msgq)); } @@ -72,22 +73,22 @@ mb_runtime_thread_per_block::~mb_runtime_thread_per_block() } void -mb_runtime_thread_per_block::request_shutdown(gruel::pmt_t result) +mb_runtime_thread_per_block::request_shutdown(pmt_t result) { - (*accepter())(s_request_shutdown, result, gruel::PMT_F, MB_PRI_BEST); + (*accepter())(s_request_shutdown, result, PMT_F, MB_PRI_BEST); } bool mb_runtime_thread_per_block::run(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg, gruel::pmt_t *result) + pmt_t user_arg, pmt_t *result) { if (result) // set it to something now, in case we throw - *result = gruel::PMT_F; + *result = PMT_F; // reset the shutdown state d_shutdown_in_progress = false; - d_shutdown_result = gruel::PMT_T; + d_shutdown_result = PMT_T; assert(d_workers.empty()); @@ -144,15 +145,15 @@ mb_runtime_thread_per_block::run_loop() } } - gruel::pmt_t signal = msg->signal(); + pmt_t signal = msg->signal(); - if (gruel::pmt_eq(signal, s_worker_state_changed)){ // %worker-state-changed + if (pmt_eq(signal, s_worker_state_changed)){ // %worker-state-changed omni_mutex_lock l1(d_workers_mutex); reap_dead_workers(); if (d_workers.empty()) // no work left to do... return; } - else if (gruel::pmt_eq(signal, s_request_shutdown)){ // %request-shutdown + else if (pmt_eq(signal, s_request_shutdown)){ // %request-shutdown if (!d_shutdown_in_progress){ d_shutdown_in_progress = true; d_shutdown_result = msg->data(); @@ -162,23 +163,23 @@ mb_runtime_thread_per_block::run_loop() send_all_sys_msg(s_shutdown); } } - else if (gruel::pmt_eq(signal, s_request_timeout)){ // %request-timeout + else if (pmt_eq(signal, s_request_timeout)){ // %request-timeout mb_timeout_sptr to = - boost::any_cast(gruel::pmt_any_ref(msg->data())); + boost::any_cast(pmt_any_ref(msg->data())); d_timer_queue.push(to); } - else if (gruel::pmt_eq(signal, s_cancel_timeout)){ // %cancel-timeout + else if (pmt_eq(signal, s_cancel_timeout)){ // %cancel-timeout d_timer_queue.cancel(msg->data()); } - else if (gruel::pmt_eq(signal, s_timeout) - && gruel::pmt_eq(msg->data(), s_send_halt)){ // %timeout, send-halt + else if (pmt_eq(signal, s_timeout) + && pmt_eq(msg->data(), s_send_halt)){ // %timeout, send-halt // schedule another timeout for ourselves... schedule_one_shot_timeout(mb_time::time(0.100), s_exit_now, d_accepter); send_all_sys_msg(s_halt); } - else if (gruel::pmt_eq(signal, s_timeout) - && gruel::pmt_eq(msg->data(), s_exit_now)){ // %timeout, exit-now + else if (pmt_eq(signal, s_timeout) + && pmt_eq(msg->data(), s_exit_now)){ // %timeout, exit-now // We only get here if we've sent all workers %shutdown followed // by %halt, and one or more of them is still alive. They must @@ -234,7 +235,7 @@ mb_runtime_thread_per_block::reap_dead_workers() mb_mblock_sptr mb_runtime_thread_per_block::create_component(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg) + pmt_t user_arg) { mb_mblock_maker_t maker; if (!mb_class_registry::lookup_maker(class_name, &maker)) @@ -293,9 +294,9 @@ mb_runtime_thread_per_block::create_component(const std::string &instance_name, } void -mb_runtime_thread_per_block::send_all_sys_msg(gruel::pmt_t signal, - gruel::pmt_t data, - gruel::pmt_t metadata, +mb_runtime_thread_per_block::send_all_sys_msg(pmt_t signal, + pmt_t data, + pmt_t metadata, mb_pri_t priority) { omni_mutex_lock l1(d_workers_mutex); @@ -310,14 +311,14 @@ mb_runtime_thread_per_block::send_all_sys_msg(gruel::pmt_t signal, // Can be invoked from any thread. // Sends a message to the runtime. // -gruel::pmt_t +pmt_t mb_runtime_thread_per_block::schedule_one_shot_timeout (const mb_time &abs_time, - gruel::pmt_t user_data, + pmt_t user_data, mb_msg_accepter_sptr accepter) { mb_timeout_sptr to(new mb_timeout(abs_time, user_data, accepter)); - (*d_accepter)(s_request_timeout, gruel::pmt_make_any(to), gruel::PMT_F, MB_PRI_BEST); + (*d_accepter)(s_request_timeout, pmt_make_any(to), PMT_F, MB_PRI_BEST); return to->handle(); } @@ -325,16 +326,16 @@ mb_runtime_thread_per_block::schedule_one_shot_timeout // Can be invoked from any thread. // Sends a message to the runtime. // -gruel::pmt_t +pmt_t mb_runtime_thread_per_block::schedule_periodic_timeout (const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, + pmt_t user_data, mb_msg_accepter_sptr accepter) { mb_timeout_sptr to(new mb_timeout(first_abs_time, delta_time, user_data, accepter)); - (*d_accepter)(s_request_timeout, gruel::pmt_make_any(to), gruel::PMT_F, MB_PRI_BEST); + (*d_accepter)(s_request_timeout, pmt_make_any(to), PMT_F, MB_PRI_BEST); return to->handle(); } @@ -343,7 +344,7 @@ mb_runtime_thread_per_block::schedule_periodic_timeout // Sends a message to the runtime. // void -mb_runtime_thread_per_block::cancel_timeout(gruel::pmt_t handle) +mb_runtime_thread_per_block::cancel_timeout(pmt_t handle) { - (*d_accepter)(s_cancel_timeout, handle, gruel::PMT_F, MB_PRI_BEST); + (*d_accepter)(s_cancel_timeout, handle, PMT_F, MB_PRI_BEST); } diff --git a/mblock/src/lib/mb_runtime_thread_per_block.h b/mblock/src/lib/mb_runtime_thread_per_block.h index b4486678..74ed6073 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.h +++ b/mblock/src/lib/mb_runtime_thread_per_block.h @@ -38,7 +38,7 @@ public: omni_mutex d_workers_mutex; // hold while manipulating d_workers std::vector d_workers; bool d_shutdown_in_progress; - gruel::pmt_t d_shutdown_result; + pmt::pmt_t d_shutdown_result; mb_msg_queue d_msgq; mb_timer_queue d_timer_queue; @@ -49,35 +49,35 @@ public: bool run(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg, - gruel::pmt_t *result); + pmt::pmt_t user_arg, + pmt::pmt_t *result); - void request_shutdown(gruel::pmt_t result); + void request_shutdown(pmt::pmt_t result); protected: mb_mblock_sptr create_component(const std::string &instance_name, const std::string &class_name, - gruel::pmt_t user_arg); + pmt::pmt_t user_arg); - gruel::pmt_t - schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data, + pmt::pmt_t + schedule_one_shot_timeout(const mb_time &abs_time, pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); - gruel::pmt_t + pmt::pmt_t schedule_periodic_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, + pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); void - cancel_timeout(gruel::pmt_t handle); + cancel_timeout(pmt::pmt_t handle); private: void reap_dead_workers(); void run_loop(); - void send_all_sys_msg(gruel::pmt_t signal, gruel::pmt_t data = gruel::PMT_F, - gruel::pmt_t metadata = gruel::PMT_F, + void send_all_sys_msg(pmt::pmt_t signal, pmt::pmt_t data = pmt::PMT_F, + pmt::pmt_t metadata = pmt::PMT_F, mb_pri_t priority = MB_PRI_BEST); }; diff --git a/mblock/src/lib/mb_timer_queue.cc b/mblock/src/lib/mb_timer_queue.cc index dbdcc4ce..411900c5 100644 --- a/mblock/src/lib/mb_timer_queue.cc +++ b/mblock/src/lib/mb_timer_queue.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,17 +24,19 @@ #endif #include -static gruel::pmt_t +using namespace pmt; + +static pmt_t make_handle() { static long counter = 0; - gruel::pmt_t n = gruel::pmt_from_long(counter++); - return gruel::pmt_list1(n); // guaranteed to be a unique object + pmt_t n = pmt_from_long(counter++); + return pmt_list1(n); // guaranteed to be a unique object } // one-shot constructor mb_timeout::mb_timeout(const mb_time &abs_time, - gruel::pmt_t user_data, mb_msg_accepter_sptr accepter) + pmt_t user_data, mb_msg_accepter_sptr accepter) : d_when(abs_time), d_is_periodic(false), d_user_data(user_data), d_handle(make_handle()), d_accepter(accepter) { @@ -42,19 +44,19 @@ mb_timeout::mb_timeout(const mb_time &abs_time, // periodic constructor mb_timeout::mb_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, mb_msg_accepter_sptr accepter) + pmt_t user_data, mb_msg_accepter_sptr accepter) : d_when(first_abs_time), d_delta(delta_time), d_is_periodic(true), d_user_data(user_data), d_handle(make_handle()), d_accepter(accepter) { } void -mb_timer_queue::cancel(gruel::pmt_t handle) +mb_timer_queue::cancel(pmt_t handle) { container_type::iterator it; for (it = c.begin(); it != c.end();){ - if (gruel::pmt_equal((*it)->handle(), handle)) + if (pmt_equal((*it)->handle(), handle)) it = c.erase(it); else ++it; diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h index 8dcf5338..7a1ad6fa 100644 --- a/mblock/src/lib/mb_timer_queue.h +++ b/mblock/src/lib/mb_timer_queue.h @@ -33,19 +33,19 @@ public: mb_time d_when; // absolute time to fire timeout mb_time d_delta; // if periodic, delta_t to next timeout bool d_is_periodic; // true iff this is a periodic timeout - gruel::pmt_t d_user_data; // data from %timeout msg - gruel::pmt_t d_handle; // handle for cancellation + pmt::pmt_t d_user_data; // data from %timeout msg + pmt::pmt_t d_handle; // handle for cancellation mb_msg_accepter_sptr d_accepter; // where to send the message // one-shot constructor mb_timeout(const mb_time &abs_time, - gruel::pmt_t user_data, mb_msg_accepter_sptr accepter); + pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); // periodic constructor mb_timeout(const mb_time &first_abs_time, const mb_time &delta_time, - gruel::pmt_t user_data, mb_msg_accepter_sptr accepter); + pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); - gruel::pmt_t handle() const { return d_handle; } + pmt::pmt_t handle() const { return d_handle; } }; typedef boost::shared_ptr mb_timeout_sptr; @@ -67,7 +67,7 @@ class mb_timer_queue : public std::priority_queue { public: - void cancel(gruel::pmt_t handle); + void cancel(pmt::pmt_t handle); }; #endif /* INCLUDED_MB_TIMER_QUEUE_H */ diff --git a/mblock/src/lib/mb_worker.cc b/mblock/src/lib/mb_worker.cc index a553198e..7d2896a1 100644 --- a/mblock/src/lib/mb_worker.cc +++ b/mblock/src/lib/mb_worker.cc @@ -36,14 +36,15 @@ #define VERBOSE 0 // define to 0 or 1 +using namespace pmt; -static gruel::pmt_t s_worker_state_changed = gruel::pmt_intern("%worker-state-changed"); +static pmt_t s_worker_state_changed = pmt_intern("%worker-state-changed"); mb_worker::mb_worker(mb_runtime_thread_per_block *runtime, mb_mblock_maker_t maker, const std::string &instance_name, - gruel::pmt_t user_arg) + pmt_t user_arg) : omni_thread((void *) 0, PRIORITY_NORMAL), d_runtime(runtime), d_maker(maker), d_instance_name(instance_name), d_user_arg(user_arg), @@ -95,7 +96,7 @@ mb_worker::set_state(worker_state_t state) } // send msg to runtime, telling it something changed. - (*d_runtime->accepter())(s_worker_state_changed, gruel::PMT_F, gruel::PMT_F, MB_PRI_BEST); + (*d_runtime->accepter())(s_worker_state_changed, PMT_F, PMT_F, MB_PRI_BEST); } void * diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index 0bd2fcae..0037d131 100644 --- a/mblock/src/lib/mb_worker.h +++ b/mblock/src/lib/mb_worker.h @@ -62,7 +62,7 @@ public: mb_runtime_thread_per_block *d_runtime; mb_mblock_maker_t d_maker; std::string d_instance_name; - gruel::pmt_t d_user_arg; + pmt::pmt_t d_user_arg; mb_mblock_sptr d_mblock; //< holds pointer to created mblock @@ -80,7 +80,7 @@ public: mb_worker(mb_runtime_thread_per_block *runtime, mb_mblock_maker_t maker, const std::string &instance_name, - gruel::pmt_t user_arg); + pmt::pmt_t user_arg); // ~mb_worker(); diff --git a/mblock/src/lib/qa_bitset.cc b/mblock/src/lib/qa_bitset.cc index 1b472512..7cfd8385 100644 --- a/mblock/src/lib/qa_bitset.cc +++ b/mblock/src/lib/qa_bitset.cc @@ -31,7 +31,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_in = pmt_intern("in"); static pmt_t s_out = pmt_intern("out"); diff --git a/mblock/src/lib/qa_disconnect.cc b/mblock/src/lib/qa_disconnect.cc index 09bdf2e6..c7619bfc 100644 --- a/mblock/src/lib/qa_disconnect.cc +++ b/mblock/src/lib/qa_disconnect.cc @@ -31,7 +31,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_in = pmt_intern("in"); static pmt_t s_out = pmt_intern("out"); diff --git a/mblock/src/lib/qa_mblock_prims.cc b/mblock/src/lib/qa_mblock_prims.cc index 6e0d5531..e49bd60d 100644 --- a/mblock/src/lib/qa_mblock_prims.cc +++ b/mblock/src/lib/qa_mblock_prims.cc @@ -37,7 +37,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_cs = pmt_intern("cs"); static pmt_t s_debug = pmt_intern("debug"); diff --git a/mblock/src/lib/qa_mblock_send.cc b/mblock/src/lib/qa_mblock_send.cc index e9c91499..53f93927 100644 --- a/mblock/src/lib/qa_mblock_send.cc +++ b/mblock/src/lib/qa_mblock_send.cc @@ -38,7 +38,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_data = pmt_intern("data"); static pmt_t s_status = pmt_intern("status"); diff --git a/mblock/src/lib/qa_mblock_sys.cc b/mblock/src/lib/qa_mblock_sys.cc index e8ff780a..8c8dbbf0 100644 --- a/mblock/src/lib/qa_mblock_sys.cc +++ b/mblock/src/lib/qa_mblock_sys.cc @@ -40,7 +40,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_data = pmt_intern("data"); static pmt_t s_status = pmt_intern("status"); diff --git a/mblock/src/lib/qa_timeouts.cc b/mblock/src/lib/qa_timeouts.cc index 39761c0b..b230f86d 100644 --- a/mblock/src/lib/qa_timeouts.cc +++ b/mblock/src/lib/qa_timeouts.cc @@ -34,7 +34,7 @@ #include #include -using namespace gruel; +using namespace pmt; static pmt_t s_timeout = pmt_intern("%timeout"); static pmt_t s_done = pmt_intern("done"); -- 2.30.2