summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-07-20 03:47:14 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-07-20 03:47:14 +0000
commit6f50256f958ac60d5fc9212b24d86777c1b2ec0d (patch)
treeafdde009cf81d93bcb84027937c62ef71194d9fd
parentaff2d8ad842994b1f58e0dc56b7d2fd6229377a9 (diff)
Merged r11452:11459 from jcorgan/pmt-gruel into trunk. Trunk passes distcheck.
* Merges libpmt into libgruel * Modifies libmblock to use libgruel gruel::pmt_t will be the fundamental msg content for the new message passing implemention for 3.3. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11460 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--Makefile.common2
-rw-r--r--config/Makefile.am3
-rw-r--r--config/grc_gruel.m44
-rw-r--r--config/grc_pmt.m452
-rw-r--r--configure.ac3
-rw-r--r--debian/control36
-rw-r--r--debian/libpmt-dev.install5
-rw-r--r--debian/libpmt.install2
-rw-r--r--gruel/src/Makefile.am3
-rw-r--r--gruel/src/include/gruel/Makefile.am5
-rw-r--r--gruel/src/include/gruel/pmt.h (renamed from pmt/src/lib/pmt.h)6
-rw-r--r--gruel/src/include/gruel/pmt_pool.h (renamed from pmt/src/lib/pmt_pool.h)4
-rw-r--r--gruel/src/lib/Makefile.am97
-rwxr-xr-xgruel/src/lib/generate_unv.py (renamed from pmt/src/lib/generate_unv.py)8
-rw-r--r--gruel/src/lib/pmt.cc (renamed from pmt/src/lib/pmt.cc)8
-rw-r--r--gruel/src/lib/pmt_int.h (renamed from pmt/src/lib/pmt_int.h)7
-rw-r--r--gruel/src/lib/pmt_io.cc (renamed from pmt/src/lib/pmt_io.cc)7
-rw-r--r--gruel/src/lib/pmt_pool.cc (renamed from pmt/src/lib/pmt_pool.cc)6
-rw-r--r--gruel/src/lib/pmt_serialize.cc (renamed from pmt/src/lib/pmt_serialize.cc)10
-rw-r--r--gruel/src/lib/qa_pmt.cc (renamed from pmt/src/lib/qa_pmt.cc)0
-rw-r--r--gruel/src/lib/qa_pmt.h (renamed from pmt/src/lib/qa_pmt.h)0
-rw-r--r--gruel/src/lib/qa_pmt_prims.cc (renamed from pmt/src/lib/qa_pmt_prims.cc)6
-rw-r--r--gruel/src/lib/qa_pmt_prims.h (renamed from pmt/src/lib/qa_pmt_prims.h)0
-rw-r--r--gruel/src/lib/test_pmt.cc (renamed from pmt/src/lib/test_pmt.cc)0
-rw-r--r--gruel/src/lib/unv_qa_template.cc.t (renamed from pmt/src/lib/unv_qa_template.cc.t)0
-rw-r--r--gruel/src/lib/unv_template.cc.t (renamed from pmt/src/lib/unv_template.cc.t)4
-rw-r--r--gruel/src/lib/unv_template.h.t (renamed from pmt/src/lib/unv_template.h.t)0
-rw-r--r--gruel/src/scheme/Makefile.am (renamed from pmt/src/scheme/Makefile.am)0
-rw-r--r--gruel/src/scheme/gnuradio/Makefile.am (renamed from pmt/src/scheme/gnuradio/Makefile.am)0
-rwxr-xr-xgruel/src/scheme/gnuradio/gen-serial-tags.scm (renamed from pmt/src/scheme/gnuradio/gen-serial-tags.scm)0
-rw-r--r--gruel/src/scheme/gnuradio/macros-etc.scm (renamed from pmt/src/scheme/gnuradio/macros-etc.scm)0
-rw-r--r--gruel/src/scheme/gnuradio/pmt-serial-tags.scm (renamed from pmt/src/scheme/gnuradio/pmt-serial-tags.scm)0
-rw-r--r--gruel/src/scheme/gnuradio/pmt-serialize.scm (renamed from pmt/src/scheme/gnuradio/pmt-serialize.scm)0
-rw-r--r--mblock/src/include/mblock/class_registry.h4
-rw-r--r--mblock/src/include/mblock/common.h4
-rw-r--r--mblock/src/include/mblock/mblock.h18
-rw-r--r--mblock/src/include/mblock/message.h30
-rw-r--r--mblock/src/include/mblock/msg_accepter.h4
-rw-r--r--mblock/src/include/mblock/port.h20
-rw-r--r--mblock/src/include/mblock/protocol_class.h12
-rw-r--r--mblock/src/include/mblock/runtime.h6
-rw-r--r--mblock/src/lib/Makefile.am4
-rw-r--r--mblock/src/lib/benchmark_send.cc2
-rw-r--r--mblock/src/lib/mb_endpoint.cc4
-rw-r--r--mblock/src/lib/mb_endpoint.h6
-rw-r--r--mblock/src/lib/mb_mblock.cc22
-rw-r--r--mblock/src/lib/mb_mblock_impl.cc14
-rw-r--r--mblock/src/lib/mb_mblock_impl.h10
-rw-r--r--mblock/src/lib/mb_message.cc10
-rw-r--r--mblock/src/lib/mb_msg_accepter_msgq.cc8
-rw-r--r--mblock/src/lib/mb_msg_accepter_msgq.h4
-rw-r--r--mblock/src/lib/mb_msg_accepter_smp.cc8
-rw-r--r--mblock/src/lib/mb_msg_accepter_smp.h8
-rw-r--r--mblock/src/lib/mb_port.cc10
-rw-r--r--mblock/src/lib/mb_port_simple.cc4
-rw-r--r--mblock/src/lib/mb_port_simple.h8
-rw-r--r--mblock/src/lib/mb_protocol_class.cc74
-rw-r--r--mblock/src/lib/mb_runtime_base.cc18
-rw-r--r--mblock/src/lib/mb_runtime_base.h16
-rw-r--r--mblock/src/lib/mb_runtime_nop.cc8
-rw-r--r--mblock/src/lib/mb_runtime_nop.h8
-rw-r--r--mblock/src/lib/mb_runtime_thread_per_block.cc82
-rw-r--r--mblock/src/lib/mb_runtime_thread_per_block.h26
-rw-r--r--mblock/src/lib/mb_timer_queue.cc14
-rw-r--r--mblock/src/lib/mb_timer_queue.h16
-rw-r--r--mblock/src/lib/mb_worker.cc8
-rw-r--r--mblock/src/lib/mb_worker.h6
-rw-r--r--mblock/src/lib/qa_bitset.cc2
-rw-r--r--mblock/src/lib/qa_disconnect.cc2
-rw-r--r--mblock/src/lib/qa_mblock_prims.cc2
-rw-r--r--mblock/src/lib/qa_mblock_send.cc2
-rw-r--r--mblock/src/lib/qa_mblock_sys.cc1
-rw-r--r--mblock/src/lib/qa_timeouts.cc1
-rw-r--r--pmt/Makefile.am30
-rw-r--r--pmt/README26
-rw-r--r--pmt/doc/Makefile.am44
-rw-r--r--pmt/pmt.pc.in11
-rw-r--r--pmt/src/Makefile.am22
-rw-r--r--pmt/src/lib/Makefile.am123
79 files changed, 416 insertions, 624 deletions
diff --git a/Makefile.common b/Makefile.common
index 138045353c..3f82d9f644 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -104,7 +104,7 @@ GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libto
# using AM_PATH_PROG, but now here have to add a -f to be like GNU make
RM=$(RM_PROG) -f
-RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
+RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/gruel/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
# Base directory for example applications
diff --git a/config/Makefile.am b/config/Makefile.am
index 881a64d8a6..b921ec5100 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -74,7 +74,6 @@ m4macros = \
gr_check_mc4020.m4 \
gr_check_shm_open.m4 \
gr_check_usrp.m4 \
- grc_pmt.m4 \
grc_usrp.m4 \
grc_usrp2.m4 \
grc_gr_msdd6000.m4 \
diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4
index 73e41be5f5..01d44feab8 100644
--- a/config/grc_gruel.m4
+++ b/config/grc_gruel.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -42,6 +42,8 @@ AC_DEFUN([GRC_GRUEL],[
gruel/src/include/gruel/Makefile \
gruel/src/include/gruel/inet.h \
gruel/src/lib/Makefile \
+ gruel/src/scheme/Makefile \
+ gruel/src/scheme/gnuradio/Makefile \
])
dnl Allow creating autoconf independent header files for bytesex routines
diff --git a/config/grc_pmt.m4 b/config/grc_pmt.m4
deleted file mode 100644
index 680acc9e42..0000000000
--- a/config/grc_pmt.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_PMT],[
- GRC_ENABLE(pmt)
- GRC_WITH(pmt)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Don't do pmt if guile not available
- GRC_CHECK_GUILE(pmt)
- fi
- if test $passed != with; then
- dnl how and where to find INCLUDES and LA
- pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
- pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
- fi
-
- AC_CONFIG_FILES([\
- pmt/Makefile \
- pmt/pmt.pc \
- pmt/doc/Makefile \
- pmt/src/Makefile \
- pmt/src/lib/Makefile \
- pmt/src/scheme/Makefile \
- pmt/src/scheme/gnuradio/Makefile \
- ])
-
- GRC_BUILD_CONDITIONAL(pmt,[
- dnl run_tests is created from run_tests.in. Make it executable.
- dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x pmt/src/python/run_tests])
- ])
-])
diff --git a/configure.ac b/configure.ac
index 92de3e95ef..25b1830277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,8 +335,7 @@ GRC_GRUEL dnl must come first
GRC_OMNITHREAD dnl must come before gnuradio-core and mblock
GRC_GCELL
GRC_GNURADIO_CORE
-GRC_PMT
-GRC_MBLOCK dnl this must come after GRC_PMT
+GRC_MBLOCK dnl this must come after GRC_GRUEL
GRC_USRP
GRC_USRP2
GRC_GR_USRP dnl this must come after GRC_USRP
diff --git a/debian/control b/debian/control
index 1f08f470aa..9cfd66a6bb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: comm
Priority: optional
Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.38), build-essential, python-central (>=0.5.6), automake, libtool, pkg-config, python-dev (>=2.6), python-dev (<2.7), swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev | libboost1.35-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libblas-dev, texlive-latex-base
+Build-Depends: debhelper (>= 5.0.38), build-essential, python-central (>=0.5.6), automake, libtool, pkg-config, python-dev (>=2.6), python-dev (<2.7), swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libblas-dev, texlive-latex-base
Standards-Version: 3.7.2
XS-Python-Version: =2.6
@@ -19,6 +19,8 @@ Package: libgruel
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libpmt
+Conflicts: libpmt
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -26,7 +28,9 @@ Description: GNU Radio Utility Etcetera Library
Package: libgruel-dev
Section: libdevel
Architecture: any
-Depends: libgruel (= ${binary:Version})
+Depends: libgruel (= ${binary:Version}), libboost1.37-dev, guile-1.8
+Replaces: libpmt-dev
+Conflicts: libpmt-dev
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -55,30 +59,6 @@ Description: GNU Radio Omnithreads Abstraction Library
.
This package contains header files needed by developers.
-Package: libpmt
-Section: libs
-Architecture: any
-Replaces: libpmt0c2a
-Conflicts: libpmt0c2a
-Depends: libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends}
-Description: GNU Radio Polymorphic Type Library
- This package implements polymorphic types. These are similar
- to lisp or Python data objects, and implement transparent
- reference counting using the boost shared_ptr templates.
-
-Package: libpmt-dev
-Section: libdevel
-Architecture: any
-Replaces: libpmt0-dev
-Conflicts: libpmt0-dev
-Depends: libpmt (= ${binary:Version}), libboost-thread1.37-dev
-Description: GNU Radio Polymorphic Type Library
- This package implements polymorphic types. These are similar
- to lisp or Python data objects, and implement transparent
- reference counting using the boost shared_ptr templates.
- .
- This package contains header files needed by developers.
-
################################################################################
# C++ M-Block library packages #
################################################################################
@@ -88,7 +68,7 @@ Section: libs
Architecture: any
Replaces: libmblock0c2a
Conflicts: libmblock0c2a
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends}, guile-1.8
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), libgruel (= ${binary:Version}), ${shlibs:Depends}
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
@@ -97,7 +77,7 @@ Section: libdevel
Architecture: any
Replaces: libmblock0-dev
Conflicts: libmblock0-dev
-Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev (= ${binary:Version}), libpmt-dev (= ${binary:Version})
+Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version})
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
.
diff --git a/debian/libpmt-dev.install b/debian/libpmt-dev.install
deleted file mode 100644
index 8b30e6eae5..0000000000
--- a/debian/libpmt-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/pmt.h
-usr/include/pmt_pool.h
-usr/include/pmt_serial_tags.h
-usr/lib/libpmt.so
-usr/lib/pkgconfig/pmt.pc
diff --git a/debian/libpmt.install b/debian/libpmt.install
deleted file mode 100644
index c6f0ba6663..0000000000
--- a/debian/libpmt.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libpmt.la
-usr/lib/libpmt.so.*
diff --git a/gruel/src/Makefile.am b/gruel/src/Makefile.am
index 90c0f88bdd..71bdd85732 100644
--- a/gruel/src/Makefile.am
+++ b/gruel/src/Makefile.am
@@ -19,4 +19,5 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = include lib
+SUBDIRS = lib include scheme
+
diff --git a/gruel/src/include/gruel/Makefile.am b/gruel/src/include/gruel/Makefile.am
index 648d53e205..d7354b8717 100644
--- a/gruel/src/include/gruel/Makefile.am
+++ b/gruel/src/include/gruel/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -28,6 +28,9 @@ gruelincludedir = $(prefix)/include/gruel
gruelinclude_HEADERS = \
$(BUILT_SOURCES) \
+ pmt.h \
+ pmt_pool.h \
+ pmt_serial_tags.h \
realtime.h \
sys_pri.h \
thread_body_wrapper.h \
diff --git a/pmt/src/lib/pmt.h b/gruel/src/include/gruel/pmt.h
index 24963fee71..6dc4508b11 100644
--- a/pmt/src/lib/pmt.h
+++ b/gruel/src/include/gruel/pmt.h
@@ -39,11 +39,13 @@
* exception that these objects are transparently reference counted.
*/
+namespace gruel {
+
/*!
* \brief base class of all pmt types
*/
class pmt_base;
-
+
/*!
* \brief typedef for shared pointer (transparent reference counting).
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
@@ -675,4 +677,6 @@ pmt_t pmt_deserialize(std::streambuf &source);
void pmt_dump_sizeof(); // debugging
+} /* namespace gruel */
+
#endif /* INCLUDED_PMT_H */
diff --git a/pmt/src/lib/pmt_pool.h b/gruel/src/include/gruel/pmt_pool.h
index 8004a65e48..18b498faa6 100644
--- a/pmt/src/lib/pmt_pool.h
+++ b/gruel/src/include/gruel/pmt_pool.h
@@ -25,6 +25,8 @@
#include <vector>
#include <boost/thread.hpp>
+namespace gruel {
+
/*!
* \brief very simple thread-safe fixed-size allocation pool
*
@@ -65,4 +67,6 @@ public:
void free(void *p);
};
+} /* namespace gruel */
+
#endif /* INCLUDED_PMT_POOL_H */
diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am
index c2a008e48a..2a968d25f2 100644
--- a/gruel/src/lib/Makefile.am
+++ b/gruel/src/lib/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,21 +21,100 @@
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
+
+TESTS = test_pmt
lib_LTLIBRARIES = libgruel.la
# magic flags
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)
+
+# ----------------------------------------------------------------
+
# These are the source files that go into the gruel shared library
-libgruel_la_SOURCES = \
- realtime.cc \
- sys_pri.cc \
- thread_body_wrapper.cc \
+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 \
thread_group.cc
-libgruel_la_LIBADD = \
- $(BOOST_THREAD_LIB)
+libgruel_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 = \
+ 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
-noinst_HEADERS =
+# 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/pmt/src/lib/generate_unv.py b/gruel/src/lib/generate_unv.py
index 2abafa4c17..3a7305b409 100755
--- a/pmt/src/lib/generate_unv.py
+++ b/gruel/src/lib/generate_unv.py
@@ -45,7 +45,7 @@ unv_types = (
header = """\
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -75,17 +75,17 @@ includes = """
#include <config.h>
#endif
#include <vector>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include "pmt_int.h"
-
"""
qa_includes = """
#include <qa_pmt_unv.h>
#include <cppunit/TestAssert.h>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include <stdio.h>
+using namespace gruel;
"""
diff --git a/pmt/src/lib/pmt.cc b/gruel/src/lib/pmt.cc
index b403c23279..8e0c016251 100644
--- a/pmt/src/lib/pmt.cc
+++ b/gruel/src/lib/pmt.cc
@@ -24,12 +24,14 @@
#include <config.h>
#endif
#include <vector>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include "pmt_int.h"
#include <stdio.h>
-#include <pmt_pool.h>
+#include <gruel/pmt_pool.h>
#include <string.h>
+namespace gruel {
+
static const int CACHE_LINE_SIZE = 64; // good guess
# if (PMT_LOCAL_ALLOCATOR)
@@ -1035,3 +1037,5 @@ pmt_dump_sizeof()
printf("sizeof(pmt_dict) = %3zd\n", sizeof(pmt_dict));
printf("sizeof(pmt_uniform_vector) = %3zd\n", sizeof(pmt_uniform_vector));
}
+
+} /* namespace gruel */
diff --git a/pmt/src/lib/pmt_int.h b/gruel/src/lib/pmt_int.h
index a973d30d9e..03f0e555c4 100644
--- a/pmt/src/lib/pmt_int.h
+++ b/gruel/src/lib/pmt_int.h
@@ -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
*
@@ -22,7 +22,7 @@
#ifndef INCLUDED_PMT_INT_H
#define INCLUDED_PMT_INT_H
-#include <pmt.h>
+#include <gruel/pmt.h>
#include <boost/utility.hpp>
/*
@@ -32,6 +32,7 @@
*/
#define PMT_LOCAL_ALLOCATOR 0 // define to 0 or 1
+namespace gruel {
class pmt_base : boost::noncopyable {
protected:
@@ -221,4 +222,6 @@ public:
#include "pmt_unv_int.h"
+} /* namespace gruel */
+
#endif /* INCLUDED_PMT_INT_H */
diff --git a/pmt/src/lib/pmt_io.cc b/gruel/src/lib/pmt_io.cc
index 3bbf430e2b..e10ea78146 100644
--- a/pmt/src/lib/pmt_io.cc
+++ b/gruel/src/lib/pmt_io.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
*
@@ -23,10 +23,12 @@
#include <config.h>
#endif
#include <vector>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include "pmt_int.h"
#include <sstream>
+namespace gruel {
+
static void
pmt_write_list_tail(pmt_t obj, std::ostream &port)
{
@@ -136,3 +138,4 @@ pmt_deserialize(std::istream &source)
throw pmt_notimplemented("notimplemented: pmt_deserialize", PMT_NIL);
}
+} /* namespace gruel */
diff --git a/pmt/src/lib/pmt_pool.cc b/gruel/src/lib/pmt_pool.cc
index 05a7f59002..79a22ea73e 100644
--- a/pmt/src/lib/pmt_pool.cc
+++ b/gruel/src/lib/pmt_pool.cc
@@ -22,10 +22,12 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <pmt_pool.h>
+#include <gruel/pmt_pool.h>
#include <algorithm>
#include <stdint.h>
+namespace gruel {
+
static inline size_t
ROUNDUP(size_t x, size_t stride)
{
@@ -106,3 +108,5 @@ pmt_pool::free(void *foo)
if (d_max_items != 0)
d_cond.notify_one();
}
+
+} /* namespace gruel */
diff --git a/pmt/src/lib/pmt_serialize.cc b/gruel/src/lib/pmt_serialize.cc
index 1f1b57c891..b7193e8111 100644
--- a/pmt/src/lib/pmt_serialize.cc
+++ b/gruel/src/lib/pmt_serialize.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
*
@@ -23,9 +23,11 @@
#include <config.h>
#endif
#include <vector>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include "pmt_int.h"
-#include "pmt_serial_tags.h"
+#include "gruel/pmt_serial_tags.h"
+
+namespace gruel {
static pmt_t parse_pair(std::streambuf &sb);
@@ -351,3 +353,5 @@ parse_pair(std::streambuf &sb)
pmt_set_cdr(lastnptr, expr);
return val;
}
+
+} /* namespace gruel */
diff --git a/pmt/src/lib/qa_pmt.cc b/gruel/src/lib/qa_pmt.cc
index 250befafab..250befafab 100644
--- a/pmt/src/lib/qa_pmt.cc
+++ b/gruel/src/lib/qa_pmt.cc
diff --git a/pmt/src/lib/qa_pmt.h b/gruel/src/lib/qa_pmt.h
index 43a6dbf67c..43a6dbf67c 100644
--- a/pmt/src/lib/qa_pmt.h
+++ b/gruel/src/lib/qa_pmt.h
diff --git a/pmt/src/lib/qa_pmt_prims.cc b/gruel/src/lib/qa_pmt_prims.cc
index 39cf9ce46a..ac93f80635 100644
--- a/pmt/src/lib/qa_pmt_prims.cc
+++ b/gruel/src/lib/qa_pmt_prims.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
*
@@ -22,10 +22,12 @@
#include <qa_pmt_prims.h>
#include <cppunit/TestAssert.h>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include <stdio.h>
#include <sstream>
+using namespace gruel;
+
void
qa_pmt_prims::test_symbols()
{
diff --git a/pmt/src/lib/qa_pmt_prims.h b/gruel/src/lib/qa_pmt_prims.h
index effb3a097a..effb3a097a 100644
--- a/pmt/src/lib/qa_pmt_prims.h
+++ b/gruel/src/lib/qa_pmt_prims.h
diff --git a/pmt/src/lib/test_pmt.cc b/gruel/src/lib/test_pmt.cc
index 034785f4e5..034785f4e5 100644
--- a/pmt/src/lib/test_pmt.cc
+++ b/gruel/src/lib/test_pmt.cc
diff --git a/pmt/src/lib/unv_qa_template.cc.t b/gruel/src/lib/unv_qa_template.cc.t
index 1e2c8e8eb5..1e2c8e8eb5 100644
--- a/pmt/src/lib/unv_qa_template.cc.t
+++ b/gruel/src/lib/unv_qa_template.cc.t
diff --git a/pmt/src/lib/unv_template.cc.t b/gruel/src/lib/unv_template.cc.t
index 1e86caeac6..b19e32d272 100644
--- a/pmt/src/lib/unv_template.cc.t
+++ b/gruel/src/lib/unv_template.cc.t
@@ -2,6 +2,8 @@
// pmt_@TAG@vector
////////////////////////////////////////////////////////////////////////////
+namespace gruel {
+
static pmt_@TAG@vector *
_@TAG@vector(pmt_t x)
{
@@ -116,3 +118,5 @@ pmt_@TAG@vector_writable_elements(pmt_t vector, size_t &len)
throw pmt_wrong_type("pmt_@TAG@vector_writable_elements", vector);
return _@TAG@vector(vector)->writable_elements(len);
}
+
+} /* namespace gruel */
diff --git a/pmt/src/lib/unv_template.h.t b/gruel/src/lib/unv_template.h.t
index 83ba0be0f4..83ba0be0f4 100644
--- a/pmt/src/lib/unv_template.h.t
+++ b/gruel/src/lib/unv_template.h.t
diff --git a/pmt/src/scheme/Makefile.am b/gruel/src/scheme/Makefile.am
index 4980063d70..4980063d70 100644
--- a/pmt/src/scheme/Makefile.am
+++ b/gruel/src/scheme/Makefile.am
diff --git a/pmt/src/scheme/gnuradio/Makefile.am b/gruel/src/scheme/gnuradio/Makefile.am
index 0ce01f6f85..0ce01f6f85 100644
--- a/pmt/src/scheme/gnuradio/Makefile.am
+++ b/gruel/src/scheme/gnuradio/Makefile.am
diff --git a/pmt/src/scheme/gnuradio/gen-serial-tags.scm b/gruel/src/scheme/gnuradio/gen-serial-tags.scm
index 7b90872288..7b90872288 100755
--- a/pmt/src/scheme/gnuradio/gen-serial-tags.scm
+++ b/gruel/src/scheme/gnuradio/gen-serial-tags.scm
diff --git a/pmt/src/scheme/gnuradio/macros-etc.scm b/gruel/src/scheme/gnuradio/macros-etc.scm
index ac2a4a342a..ac2a4a342a 100644
--- a/pmt/src/scheme/gnuradio/macros-etc.scm
+++ b/gruel/src/scheme/gnuradio/macros-etc.scm
diff --git a/pmt/src/scheme/gnuradio/pmt-serial-tags.scm b/gruel/src/scheme/gnuradio/pmt-serial-tags.scm
index 646a751ea4..646a751ea4 100644
--- a/pmt/src/scheme/gnuradio/pmt-serial-tags.scm
+++ b/gruel/src/scheme/gnuradio/pmt-serial-tags.scm
diff --git a/pmt/src/scheme/gnuradio/pmt-serialize.scm b/gruel/src/scheme/gnuradio/pmt-serialize.scm
index c1d32d75b1..c1d32d75b1 100644
--- a/pmt/src/scheme/gnuradio/pmt-serialize.scm
+++ b/gruel/src/scheme/gnuradio/pmt-serialize.scm
diff --git a/mblock/src/include/mblock/class_registry.h b/mblock/src/include/mblock/class_registry.h
index b94a7cbc19..8528b88758 100644
--- a/mblock/src/include/mblock/class_registry.h
+++ b/mblock/src/include/mblock/class_registry.h
@@ -26,7 +26,7 @@
//! conceptually, pointer to constructor
typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime,
const std::string &instance_name,
- pmt_t user_arg);
+ gruel::pmt_t user_arg);
/*
* \brief Maintain mapping between mblock class_name and factory (maker)
@@ -40,7 +40,7 @@ public:
template<class mblock>
mb_mblock_sptr mb_mblock_maker(mb_runtime *runtime,
const std::string &instance_name,
- pmt_t user_arg)
+ gruel::pmt_t user_arg)
{
return mb_mblock_sptr(new mblock(runtime, instance_name, user_arg));
}
diff --git a/mblock/src/include/mblock/common.h b/mblock/src/include/mblock/common.h
index 2507d053ea..054b9987eb 100644
--- a/mblock/src/include/mblock/common.h
+++ b/mblock/src/include/mblock/common.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006,2007,2008 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -21,7 +21,7 @@
#ifndef INCLUDED_MB_COMMON_H
#define INCLUDED_MB_COMMON_H
-#include <pmt.h>
+#include <gruel/pmt.h>
#include <vector>
#include <stdexcept>
#include <boost/utility.hpp>
diff --git a/mblock/src/include/mblock/mblock.h b/mblock/src/include/mblock/mblock.h
index bbc40f1ef5..92b0b32844 100644
--- a/mblock/src/include/mblock/mblock.h
+++ b/mblock/src/include/mblock/mblock.h
@@ -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
*
@@ -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, pmt_t user_arg);
+ mb_mblock(mb_runtime *runtime, const std::string &instance_name, gruel::pmt_t user_arg);
public:
/*!
@@ -128,7 +128,7 @@ protected:
void
define_component(const std::string &component_name,
const std::string &class_name,
- pmt_t user_arg = PMT_NIL);
+ gruel::pmt_t user_arg = gruel::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(pmt_t result);
+ void shutdown_all(gruel::pmt_t result);
/*!
* \brief main event dispatching loop
@@ -259,8 +259,8 @@ public:
*
* To cancel a pending timeout, call cancel_timeout.
*/
- pmt_t
- schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data);
+ gruel::pmt_t
+ schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data);
/*!
* \brief Schedule a periodic timeout.
@@ -281,10 +281,10 @@ public:
*
* To cancel a pending timeout, call cancel_timeout.
*/
- pmt_t
+ gruel::pmt_t
schedule_periodic_timeout(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data);
+ gruel::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(pmt_t handle);
+ void cancel_timeout(gruel::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 8fbee2ff08..443684fd63 100644
--- a/mblock/src/include/mblock/message.h
+++ b/mblock/src/include/mblock/message.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006,2007,2008 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -38,37 +38,37 @@ typedef boost::shared_ptr<mb_message> mb_message_sptr;
* \param priority urgency
*/
mb_message_sptr
-mb_make_message(pmt_t signal,
- pmt_t data = PMT_NIL,
- pmt_t metadata = PMT_NIL,
+mb_make_message(gruel::pmt_t signal,
+ gruel::pmt_t data = gruel::PMT_NIL,
+ gruel::pmt_t metadata = gruel::PMT_NIL,
mb_pri_t priority = MB_PRI_DEFAULT);
class mb_message {
mb_message_sptr d_next; // link field for msg queue
- pmt_t d_signal;
- pmt_t d_data;
- pmt_t d_metadata;
+ gruel::pmt_t d_signal;
+ gruel::pmt_t d_data;
+ gruel::pmt_t d_metadata;
mb_pri_t d_priority;
- pmt_t d_port_id; // name of port msg was rcvd on (symbol)
+ gruel::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(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority);
+ mb_make_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority);
// private constructor
- mb_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority);
+ mb_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority);
public:
~mb_message();
- pmt_t signal() const { return d_signal; }
- pmt_t data() const { return d_data; }
- pmt_t metadata() const { return d_metadata; }
+ gruel::pmt_t signal() const { return d_signal; }
+ gruel::pmt_t data() const { return d_data; }
+ gruel::pmt_t metadata() const { return d_metadata; }
mb_pri_t priority() const { return d_priority; }
- pmt_t port_id() const { return d_port_id; }
+ gruel::pmt_t port_id() const { return d_port_id; }
- void set_port_id(pmt_t port_id){ d_port_id = port_id; }
+ void set_port_id(gruel::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 69be13111b..7ce1705a64 100644
--- a/mblock/src/include/mblock/msg_accepter.h
+++ b/mblock/src/include/mblock/msg_accepter.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
*
@@ -42,7 +42,7 @@ public:
mb_msg_accepter(){};
virtual ~mb_msg_accepter();
- virtual void operator()(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) = 0;
+ virtual void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::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 782bb1285a..02d81d67b0 100644
--- a/mblock/src/include/mblock/port.h
+++ b/mblock/src/include/mblock/port.h
@@ -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
*
@@ -40,8 +40,8 @@ public:
private:
std::string d_port_name;
- pmt_t d_port_symbol; // the port_name as a pmt symbol
- pmt_t d_protocol_class;
+ gruel::pmt_t d_port_symbol; // the port_name as a gruel::pmt symbol
+ gruel::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; }
- pmt_t port_symbol() const { return d_port_symbol; }
- pmt_t protocol_class() const { return d_protocol_class; }
+ gruel::pmt_t port_symbol() const { return d_port_symbol; }
+ gruel::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; }
- pmt_t incoming_message_set() const;
- pmt_t outgoing_message_set() const;
+ gruel::pmt_t incoming_message_set() const;
+ gruel::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(pmt_t signal,
- pmt_t data = PMT_F,
- pmt_t metadata = PMT_F,
+ send(gruel::pmt_t signal,
+ gruel::pmt_t data = gruel::PMT_F,
+ gruel::pmt_t metadata = gruel::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 33c5d7116d..4267a912e6 100644
--- a/mblock/src/include/mblock/protocol_class.h
+++ b/mblock/src/include/mblock/protocol_class.h
@@ -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
*
@@ -30,14 +30,14 @@
* \param incoming incoming message set (list of symbols)
* \param outgoing outgoing message set (list of symbols)
*/
-pmt_t mb_make_protocol_class(pmt_t name, pmt_t incoming, pmt_t outgoing);
+gruel::pmt_t mb_make_protocol_class(gruel::pmt_t name, gruel::pmt_t incoming, gruel::pmt_t outgoing);
// Accessors
-pmt_t mb_protocol_class_name(pmt_t pc); //< return name of protocol class
-pmt_t mb_protocol_class_incoming(pmt_t pc); //< return incoming message set
-pmt_t mb_protocol_class_outgoing(pmt_t pc); //< return outgoing message set
+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_t mb_protocol_class_lookup(pmt_t name); //< lookup an existing protocol class by name
+gruel::pmt_t mb_protocol_class_lookup(gruel::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 866875715f..69f49a40f0 100644
--- a/mblock/src/include/mblock/runtime.h
+++ b/mblock/src/include/mblock/runtime.h
@@ -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
*
@@ -59,8 +59,8 @@ public:
*/
virtual bool run(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg,
- pmt_t *result = 0) = 0;
+ gruel::pmt_t user_arg,
+ gruel::pmt_t *result = 0) = 0;
// QA only...
mb_mblock_sptr top() { return d_top; }
diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am
index 81079f032a..dbdfcdd9d5 100644
--- a/mblock/src/lib/Makefile.am
+++ b/mblock/src/lib/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(GRUEL_INCLUDES) \
$(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \
$(MBLOCK_INCLUDES)
@@ -73,7 +73,7 @@ libmblock_la_LDFLAGS = $(NO_UNDEFINED)
# link the library against the c++ standard library
libmblock_la_LIBADD = \
$(OMNITHREAD_LA) \
- $(PMT_LA) \
+ $(GRUEL_LA) \
-lstdc++
noinst_HEADERS = \
diff --git a/mblock/src/lib/benchmark_send.cc b/mblock/src/lib/benchmark_send.cc
index fe873a69a1..7055e7851c 100644
--- a/mblock/src/lib/benchmark_send.cc
+++ b/mblock/src/lib/benchmark_send.cc
@@ -22,6 +22,8 @@
#include <mblock/runtime.h>
#include <iostream>
+using namespace gruel;
+
int
main(int argc, char **argv)
{
diff --git a/mblock/src/lib/mb_endpoint.cc b/mblock/src/lib/mb_endpoint.cc
index 80e05f50bf..883ab3604b 100644
--- a/mblock/src/lib/mb_endpoint.cc
+++ b/mblock/src/lib/mb_endpoint.cc
@@ -30,7 +30,7 @@ mb_endpoint::inside_of_relay_port_p() const
return d_port->port_type() == mb_port::RELAY && d_component_name == "self";
}
-pmt_t
+gruel::pmt_t
mb_endpoint::incoming_message_set() const
{
if (inside_of_relay_port_p()) // swap incoming and outgoing
@@ -39,7 +39,7 @@ mb_endpoint::incoming_message_set() const
return port()->incoming_message_set();
}
-pmt_t
+gruel::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 aae376a5d5..96ff0de40a 100644
--- a/mblock/src/lib/mb_endpoint.h
+++ b/mblock/src/lib/mb_endpoint.h
@@ -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
*
@@ -51,8 +51,8 @@ public:
//! Does this endpoint represent the inside of a relay port
bool inside_of_relay_port_p() const;
- pmt_t incoming_message_set() const;
- pmt_t outgoing_message_set() const;
+ gruel::pmt_t incoming_message_set() const;
+ gruel::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 b2f763623c..77216ccb6e 100644
--- a/mblock/src/lib/mb_mblock.cc
+++ b/mblock/src/lib/mb_mblock.cc
@@ -30,8 +30,8 @@
#include <iostream>
-static pmt_t s_sys_port = pmt_intern("%sys-port");
-static pmt_t s_halt = pmt_intern("%halt");
+static gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port");
+static gruel::pmt_t s_halt = gruel::pmt_intern("%halt");
mb_visitor::~mb_visitor()
{
@@ -41,7 +41,7 @@ mb_visitor::~mb_visitor()
mb_mblock::mb_mblock(mb_runtime *runtime,
const std::string &instance_name,
- pmt_t user_arg)
+ gruel::pmt_t user_arg)
: d_impl(mb_mblock_impl_sptr(
new mb_mblock_impl(dynamic_cast<mb_runtime_base*>(runtime),
this, instance_name)))
@@ -82,7 +82,7 @@ mb_mblock::main_loop()
handle_message(msg);
}
}
- catch (pmt_exception e){
+ catch (gruel::pmt_exception e){
std::cerr << "\nmb_mblock::main_loop: ignored pmt_exception: "
<< e.what()
<< "\nin mblock instance \"" << instance_name()
@@ -112,7 +112,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,
- pmt_t user_arg)
+ gruel::pmt_t user_arg)
{
d_impl->define_component(component_name, class_name, user_arg);
@@ -196,23 +196,23 @@ mb_mblock::exit()
}
void
-mb_mblock::shutdown_all(pmt_t result)
+mb_mblock::shutdown_all(gruel::pmt_t result)
{
d_impl->runtime()->request_shutdown(result);
}
-pmt_t
-mb_mblock::schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data)
+gruel::pmt_t
+mb_mblock::schedule_one_shot_timeout(const mb_time &abs_time, gruel::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);
}
-pmt_t
+gruel::pmt_t
mb_mblock::schedule_periodic_timeout(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data)
+ gruel::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 +222,7 @@ mb_mblock::schedule_periodic_timeout(const mb_time &first_abs_time,
}
void
-mb_mblock::cancel_timeout(pmt_t handle)
+mb_mblock::cancel_timeout(gruel::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 e11b008983..b57ac5d003 100644
--- a/mblock/src/lib/mb_mblock_impl.cc
+++ b/mblock/src/lib/mb_mblock_impl.cc
@@ -34,7 +34,7 @@
#include <iostream>
-static pmt_t s_self = pmt_intern("self");
+static gruel::pmt_t s_self = gruel::pmt_intern("self");
////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,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,
- pmt_t user_arg)
+ gruel::pmt_t user_arg)
{
{
mbi_runtime_lock l(this);
@@ -226,11 +226,11 @@ bool
mb_mblock_impl::endpoints_are_compatible(const mb_endpoint &ep0,
const mb_endpoint &ep1)
{
- pmt_t p0_outgoing = ep0.outgoing_message_set();
- pmt_t p0_incoming = ep0.incoming_message_set();
+ gruel::pmt_t p0_outgoing = ep0.outgoing_message_set();
+ gruel::pmt_t p0_incoming = ep0.incoming_message_set();
- pmt_t p1_outgoing = ep1.outgoing_message_set();
- pmt_t p1_incoming = ep1.incoming_message_set();
+ gruel::pmt_t p1_outgoing = ep1.outgoing_message_set();
+ gruel::pmt_t p1_incoming = ep1.incoming_message_set();
return (pmt_subsetp(p0_outgoing, p1_incoming)
&& pmt_subsetp(p1_outgoing, p0_incoming));
@@ -251,7 +251,7 @@ mb_mblock_impl::walk_tree(mb_visitor *visitor)
}
mb_msg_accepter_sptr
-mb_mblock_impl::make_accepter(pmt_t port_name)
+mb_mblock_impl::make_accepter(gruel::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 9914579124..fa982cbabc 100644
--- a/mblock/src/lib/mb_mblock_impl.h
+++ b/mblock/src/lib/mb_mblock_impl.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006,2007,2008 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -87,7 +87,7 @@ public:
void
define_component(const std::string &component_name,
const std::string &class_name,
- pmt_t user_arg);
+ gruel::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(pmt_t port_name);
+ make_accepter(gruel::pmt_t port_name);
mb_msg_queue &
msgq() { return d_msgq; }
@@ -196,9 +196,9 @@ public:
* Our implementation methods
*/
private:
- //bool port_is_defined(pmt_t name);
+ //bool port_is_defined(gruel::pmt_t name);
bool port_is_defined(const std::string &name);
- //bool comp_is_defined(pmt_t name);
+ //bool comp_is_defined(gruel::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 664e369fa5..729ff078f1 100644
--- a/mblock/src/lib/mb_message.cc
+++ b/mblock/src/lib/mb_message.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
*
@@ -24,7 +24,7 @@
#endif
#include <mblock/message.h>
#include <stdio.h>
-#include <pmt_pool.h>
+#include <gruel/pmt_pool.h>
static const int CACHE_LINE_SIZE = 64; // good guess
static const int MAX_MESSAGES = 1024; // KLUDGE max number of messages in sys
@@ -54,14 +54,14 @@ mb_message::operator delete(void *p, size_t size)
mb_message_sptr
-mb_make_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority)
+mb_make_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority)
{
return mb_message_sptr(new mb_message(signal, data, metadata, priority));
}
-mb_message::mb_message(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority)
+mb_message::mb_message(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority)
: d_signal(signal), d_data(data), d_metadata(metadata), d_priority(priority),
- d_port_id(PMT_NIL)
+ d_port_id(gruel::PMT_NIL)
{
}
diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc
index fb97914e5b..e13ec5aa43 100644
--- a/mblock/src/lib/mb_msg_accepter_msgq.cc
+++ b/mblock/src/lib/mb_msg_accepter_msgq.cc
@@ -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
*
@@ -25,7 +25,7 @@
#include <mb_msg_accepter_msgq.h>
#include <mblock/message.h>
-pmt_t s_sys_port = pmt_intern("%sys-port");
+gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port");
mb_msg_accepter_msgq::mb_msg_accepter_msgq(mb_msg_queue *msgq)
: d_msgq(msgq)
@@ -37,8 +37,8 @@ mb_msg_accepter_msgq::~mb_msg_accepter_msgq()
}
void
-mb_msg_accepter_msgq::operator()(pmt_t signal, pmt_t data,
- pmt_t metadata, mb_pri_t priority)
+mb_msg_accepter_msgq::operator()(gruel::pmt_t signal, gruel::pmt_t data,
+ gruel::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 6c743bb4ba..e196d49b0a 100644
--- a/mblock/src/lib/mb_msg_accepter_msgq.h
+++ b/mblock/src/lib/mb_msg_accepter_msgq.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
*
@@ -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()(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority);
+ void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::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 3b392a8c1b..5d2872b05a 100644
--- a/mblock/src/lib/mb_msg_accepter_smp.cc
+++ b/mblock/src/lib/mb_msg_accepter_smp.cc
@@ -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
*
@@ -28,7 +28,7 @@
#include <mb_mblock_impl.h>
#include <mblock/message.h>
-mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name)
+mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, gruel::pmt_t port_name)
: d_mb(mblock), d_port_name(port_name)
{
}
@@ -39,8 +39,8 @@ mb_msg_accepter_smp::~mb_msg_accepter_smp()
}
void
-mb_msg_accepter_smp::operator()(pmt_t signal, pmt_t data,
- pmt_t metadata, mb_pri_t priority)
+mb_msg_accepter_smp::operator()(gruel::pmt_t signal, gruel::pmt_t data,
+ gruel::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 0e0cd7c643..4e190410bd 100644
--- a/mblock/src/lib/mb_msg_accepter_smp.h
+++ b/mblock/src/lib/mb_msg_accepter_smp.h
@@ -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
*
@@ -29,13 +29,13 @@
class mb_msg_accepter_smp : public mb_msg_accepter
{
mb_mblock_sptr d_mb;
- pmt_t d_port_name;
+ gruel::pmt_t d_port_name;
public:
- mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name);
+ mb_msg_accepter_smp(mb_mblock_sptr mblock, gruel::pmt_t port_name);
~mb_msg_accepter_smp();
- void operator()(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority);
+ void operator()(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority);
};
diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc
index a13f49f2c6..abf909fd33 100644
--- a/mblock/src/lib/mb_port.cc
+++ b/mblock/src/lib/mb_port.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
*
@@ -31,11 +31,11 @@ mb_port::mb_port(mb_mblock *mblock,
const std::string &protocol_class_name,
bool conjugated,
mb_port::port_type_t port_type)
- : d_port_name(port_name), d_port_symbol(pmt_intern(port_name)),
+ : d_port_name(port_name), d_port_symbol(gruel::pmt_intern(port_name)),
d_conjugated(conjugated), d_port_type(port_type),
d_mblock(mblock)
{
- pmt_t pc = mb_protocol_class_lookup(pmt_intern(protocol_class_name));
+ gruel::pmt_t pc = mb_protocol_class_lookup(gruel::pmt_intern(protocol_class_name));
if (pmt_is_null(pc)){
throw std::runtime_error("mb_port: unknown protocol class '"
+ protocol_class_name + "'");
@@ -48,7 +48,7 @@ mb_port::~mb_port()
// nop
}
-pmt_t
+gruel::pmt_t
mb_port::incoming_message_set() const
{
if (!conjugated())
@@ -57,7 +57,7 @@ mb_port::incoming_message_set() const
return mb_protocol_class_outgoing(protocol_class());
}
-pmt_t
+gruel::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 1b4b35cbf1..3005932f13 100644
--- a/mblock/src/lib/mb_port_simple.cc
+++ b/mblock/src/lib/mb_port_simple.cc
@@ -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
*
@@ -48,7 +48,7 @@ mb_port_simple::~mb_port_simple()
}
void
-mb_port_simple::send(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority)
+mb_port_simple::send(gruel::pmt_t signal, gruel::pmt_t data, gruel::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 87b7654b0d..a2136ed0aa 100644
--- a/mblock/src/lib/mb_port_simple.h
+++ b/mblock/src/lib/mb_port_simple.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
*
@@ -56,9 +56,9 @@ public:
* \param priority the urgency at which the message is sent
*/
void
- send(pmt_t signal,
- pmt_t data = PMT_NIL,
- pmt_t metadata = PMT_NIL,
+ send(gruel::pmt_t signal,
+ gruel::pmt_t data = gruel::PMT_NIL,
+ gruel::pmt_t metadata = gruel::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 f076909e1c..6492c15516 100644
--- a/mblock/src/lib/mb_protocol_class.cc
+++ b/mblock/src/lib/mb_protocol_class.cc
@@ -26,60 +26,60 @@
#include <mblock/protocol_class.h>
#include <iostream>
-static pmt_t s_ALL_PROTOCOL_CLASSES = PMT_NIL;
+static gruel::pmt_t s_ALL_PROTOCOL_CLASSES = gruel::PMT_NIL;
-pmt_t
-mb_make_protocol_class(pmt_t name, pmt_t incoming, pmt_t outgoing)
+gruel::pmt_t
+mb_make_protocol_class(gruel::pmt_t name, gruel::pmt_t incoming, gruel::pmt_t outgoing)
{
// (protocol-class <name> <incoming> <outgoing>)
- 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);
+ 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);
- pmt_t t = pmt_cons(pmt_intern("protocol-class"),
- pmt_cons(name,
- pmt_cons(incoming,
- pmt_cons(outgoing, PMT_NIL))));
+ 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))));
// Remember this protocol class.
- s_ALL_PROTOCOL_CLASSES = pmt_cons(t, s_ALL_PROTOCOL_CLASSES);
+ s_ALL_PROTOCOL_CLASSES = gruel::pmt_cons(t, s_ALL_PROTOCOL_CLASSES);
return t;
}
-pmt_t
-mb_protocol_class_name(pmt_t pc)
+gruel::pmt_t
+mb_protocol_class_name(gruel::pmt_t pc)
{
- return pmt_nth(1, pc);
+ return gruel::pmt_nth(1, pc);
}
-pmt_t
-mb_protocol_class_incoming(pmt_t pc)
+gruel::pmt_t
+mb_protocol_class_incoming(gruel::pmt_t pc)
{
- return pmt_nth(2, pc);
+ return gruel::pmt_nth(2, pc);
}
-pmt_t
-mb_protocol_class_outgoing(pmt_t pc)
+gruel::pmt_t
+mb_protocol_class_outgoing(gruel::pmt_t pc)
{
- return pmt_nth(3, pc);
+ return gruel::pmt_nth(3, pc);
}
-pmt_t
-mb_protocol_class_lookup(pmt_t name)
+gruel::pmt_t
+mb_protocol_class_lookup(gruel::pmt_t name)
{
- pmt_t lst = s_ALL_PROTOCOL_CLASSES;
+ gruel::pmt_t lst = s_ALL_PROTOCOL_CLASSES;
- while (pmt_is_pair(lst)){
- if (pmt_eq(name, mb_protocol_class_name(pmt_car(lst))))
- return pmt_car(lst);
- lst = pmt_cdr(lst);
+ 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);
}
- return PMT_NIL;
+ return gruel::PMT_NIL;
}
mb_protocol_class_init::mb_protocol_class_init(const char *data, size_t len)
@@ -88,18 +88,18 @@ mb_protocol_class_init::mb_protocol_class_init(const char *data, size_t len)
sb.str(std::string(data, len));
while (1){
- pmt_t obj = pmt_deserialize(sb);
+ gruel::pmt_t obj = gruel::pmt_deserialize(sb);
if (0){
- pmt_write(obj, std::cout);
+ gruel::pmt_write(obj, std::cout);
std::cout << std::endl;
}
- if (pmt_is_eof_object(obj))
+ if (gruel::pmt_is_eof_object(obj))
return;
- 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
+ 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
}
}
diff --git a/mblock/src/lib/mb_runtime_base.cc b/mblock/src/lib/mb_runtime_base.cc
index 1dea4d46ec..872cf336e6 100644
--- a/mblock/src/lib/mb_runtime_base.cc
+++ b/mblock/src/lib/mb_runtime_base.cc
@@ -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
*
@@ -29,29 +29,29 @@
*/
void
-mb_runtime_base::request_shutdown(pmt_t result)
+mb_runtime_base::request_shutdown(gruel::pmt_t result)
{
}
-pmt_t
+gruel::pmt_t
mb_runtime_base::schedule_one_shot_timeout(const mb_time &abs_time,
- pmt_t user_data,
+ gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter)
{
- return PMT_F;
+ return gruel::PMT_F;
}
-pmt_t
+gruel::pmt_t
mb_runtime_base::schedule_periodic_timeout(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data,
+ gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter)
{
- return PMT_F;
+ return gruel::PMT_F;
}
void
-mb_runtime_base::cancel_timeout(pmt_t handle)
+mb_runtime_base::cancel_timeout(gruel::pmt_t handle)
{
}
diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h
index 98b5f3e0a8..d5ec29c21e 100644
--- a/mblock/src/lib/mb_runtime_base.h
+++ b/mblock/src/lib/mb_runtime_base.h
@@ -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
*
@@ -50,24 +50,24 @@ public:
*/
inline void unlock() { d_brl.unlock(); }
- virtual void request_shutdown(pmt_t result);
+ virtual void request_shutdown(gruel::pmt_t result);
virtual mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg) = 0;
+ gruel::pmt_t user_arg) = 0;
- virtual pmt_t
- schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data,
+ virtual gruel::pmt_t
+ schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter);
- virtual pmt_t
+ virtual gruel::pmt_t
schedule_periodic_timeout(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data,
+ gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter);
virtual void
- cancel_timeout(pmt_t handle);
+ cancel_timeout(gruel::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 603d5addb1..3ea6d093b6 100644
--- a/mblock/src/lib/mb_runtime_nop.cc
+++ b/mblock/src/lib/mb_runtime_nop.cc
@@ -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
*
@@ -48,7 +48,7 @@ mb_runtime_nop::~mb_runtime_nop()
bool
mb_runtime_nop::run(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg, pmt_t *result)
+ gruel::pmt_t user_arg, gruel::pmt_t *result)
{
class initial_visitor : public mb_visitor
{
@@ -63,7 +63,7 @@ mb_runtime_nop::run(const std::string &instance_name,
initial_visitor visitor;
if (result)
- *result = PMT_T;
+ *result = gruel::PMT_T;
d_top = create_component(instance_name, class_name, user_arg);
d_top->walk_tree(&visitor);
@@ -74,7 +74,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,
- pmt_t user_arg)
+ gruel::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 9d1f574d7b..a57d0b604b 100644
--- a/mblock/src/lib/mb_runtime_nop.h
+++ b/mblock/src/lib/mb_runtime_nop.h
@@ -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
*
@@ -39,14 +39,14 @@ public:
bool run(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg,
- pmt_t *result);
+ gruel::pmt_t user_arg,
+ gruel::pmt_t *result);
protected:
mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg);
+ gruel::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 ed292ee7c9..f92b98f765 100644
--- a/mblock/src/lib/mb_runtime_thread_per_block.cc
+++ b/mblock/src/lib/mb_runtime_thread_per_block.cc
@@ -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
*
@@ -33,20 +33,20 @@
#include <mb_msg_accepter_msgq.h>
-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 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");
static void
-send_sys_msg(mb_msg_queue &msgq, pmt_t signal,
- pmt_t data = PMT_F, pmt_t metadata = PMT_F,
+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,
mb_pri_t priority = MB_PRI_BEST)
{
mb_message_sptr msg = mb_make_message(signal, data, metadata, priority);
@@ -57,7 +57,7 @@ send_sys_msg(mb_msg_queue &msgq, pmt_t signal,
mb_runtime_thread_per_block::mb_runtime_thread_per_block()
: d_shutdown_in_progress(false),
- d_shutdown_result(PMT_T)
+ d_shutdown_result(gruel::PMT_T)
{
d_accepter = mb_msg_accepter_sptr(new mb_msg_accepter_msgq(&d_msgq));
}
@@ -72,22 +72,22 @@ mb_runtime_thread_per_block::~mb_runtime_thread_per_block()
}
void
-mb_runtime_thread_per_block::request_shutdown(pmt_t result)
+mb_runtime_thread_per_block::request_shutdown(gruel::pmt_t result)
{
- (*accepter())(s_request_shutdown, result, PMT_F, MB_PRI_BEST);
+ (*accepter())(s_request_shutdown, result, gruel::PMT_F, MB_PRI_BEST);
}
bool
mb_runtime_thread_per_block::run(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg, pmt_t *result)
+ gruel::pmt_t user_arg, gruel::pmt_t *result)
{
if (result) // set it to something now, in case we throw
- *result = PMT_F;
+ *result = gruel::PMT_F;
// reset the shutdown state
d_shutdown_in_progress = false;
- d_shutdown_result = PMT_T;
+ d_shutdown_result = gruel::PMT_T;
assert(d_workers.empty());
@@ -144,15 +144,15 @@ mb_runtime_thread_per_block::run_loop()
}
}
- pmt_t signal = msg->signal();
+ gruel::pmt_t signal = msg->signal();
- if (pmt_eq(signal, s_worker_state_changed)){ // %worker-state-changed
+ if (gruel::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 (pmt_eq(signal, s_request_shutdown)){ // %request-shutdown
+ else if (gruel::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 +162,23 @@ mb_runtime_thread_per_block::run_loop()
send_all_sys_msg(s_shutdown);
}
}
- else if (pmt_eq(signal, s_request_timeout)){ // %request-timeout
+ else if (gruel::pmt_eq(signal, s_request_timeout)){ // %request-timeout
mb_timeout_sptr to =
- boost::any_cast<mb_timeout_sptr>(pmt_any_ref(msg->data()));
+ boost::any_cast<mb_timeout_sptr>(gruel::pmt_any_ref(msg->data()));
d_timer_queue.push(to);
}
- else if (pmt_eq(signal, s_cancel_timeout)){ // %cancel-timeout
+ else if (gruel::pmt_eq(signal, s_cancel_timeout)){ // %cancel-timeout
d_timer_queue.cancel(msg->data());
}
- else if (pmt_eq(signal, s_timeout)
- && pmt_eq(msg->data(), s_send_halt)){ // %timeout, send-halt
+ else if (gruel::pmt_eq(signal, s_timeout)
+ && gruel::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 (pmt_eq(signal, s_timeout)
- && pmt_eq(msg->data(), s_exit_now)){ // %timeout, exit-now
+ else if (gruel::pmt_eq(signal, s_timeout)
+ && gruel::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 +234,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,
- pmt_t user_arg)
+ gruel::pmt_t user_arg)
{
mb_mblock_maker_t maker;
if (!mb_class_registry::lookup_maker(class_name, &maker))
@@ -293,9 +293,9 @@ mb_runtime_thread_per_block::create_component(const std::string &instance_name,
}
void
-mb_runtime_thread_per_block::send_all_sys_msg(pmt_t signal,
- pmt_t data,
- pmt_t metadata,
+mb_runtime_thread_per_block::send_all_sys_msg(gruel::pmt_t signal,
+ gruel::pmt_t data,
+ gruel::pmt_t metadata,
mb_pri_t priority)
{
omni_mutex_lock l1(d_workers_mutex);
@@ -310,14 +310,14 @@ mb_runtime_thread_per_block::send_all_sys_msg(pmt_t signal,
// Can be invoked from any thread.
// Sends a message to the runtime.
//
-pmt_t
+gruel::pmt_t
mb_runtime_thread_per_block::schedule_one_shot_timeout
(const mb_time &abs_time,
- pmt_t user_data,
+ gruel::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, pmt_make_any(to), PMT_F, MB_PRI_BEST);
+ (*d_accepter)(s_request_timeout, gruel::pmt_make_any(to), gruel::PMT_F, MB_PRI_BEST);
return to->handle();
}
@@ -325,16 +325,16 @@ mb_runtime_thread_per_block::schedule_one_shot_timeout
// Can be invoked from any thread.
// Sends a message to the runtime.
//
-pmt_t
+gruel::pmt_t
mb_runtime_thread_per_block::schedule_periodic_timeout
(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data,
+ gruel::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, pmt_make_any(to), PMT_F, MB_PRI_BEST);
+ (*d_accepter)(s_request_timeout, gruel::pmt_make_any(to), gruel::PMT_F, MB_PRI_BEST);
return to->handle();
}
@@ -343,7 +343,7 @@ mb_runtime_thread_per_block::schedule_periodic_timeout
// Sends a message to the runtime.
//
void
-mb_runtime_thread_per_block::cancel_timeout(pmt_t handle)
+mb_runtime_thread_per_block::cancel_timeout(gruel::pmt_t handle)
{
- (*d_accepter)(s_cancel_timeout, handle, PMT_F, MB_PRI_BEST);
+ (*d_accepter)(s_cancel_timeout, handle, gruel::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 185ed32b5b..b448667862 100644
--- a/mblock/src/lib/mb_runtime_thread_per_block.h
+++ b/mblock/src/lib/mb_runtime_thread_per_block.h
@@ -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
*
@@ -38,7 +38,7 @@ public:
omni_mutex d_workers_mutex; // hold while manipulating d_workers
std::vector<mb_worker*> d_workers;
bool d_shutdown_in_progress;
- pmt_t d_shutdown_result;
+ gruel::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,
- pmt_t user_arg,
- pmt_t *result);
+ gruel::pmt_t user_arg,
+ gruel::pmt_t *result);
- void request_shutdown(pmt_t result);
+ void request_shutdown(gruel::pmt_t result);
protected:
mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t user_arg);
+ gruel::pmt_t user_arg);
- pmt_t
- schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data,
+ gruel::pmt_t
+ schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter);
- pmt_t
+ gruel::pmt_t
schedule_periodic_timeout(const mb_time &first_abs_time,
const mb_time &delta_time,
- pmt_t user_data,
+ gruel::pmt_t user_data,
mb_msg_accepter_sptr accepter);
void
- cancel_timeout(pmt_t handle);
+ cancel_timeout(gruel::pmt_t handle);
private:
void reap_dead_workers();
void run_loop();
- void send_all_sys_msg(pmt_t signal, pmt_t data = PMT_F,
- pmt_t metadata = PMT_F,
+ void send_all_sys_msg(gruel::pmt_t signal, gruel::pmt_t data = gruel::PMT_F,
+ gruel::pmt_t metadata = gruel::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 1293e8a4cc..dbdcc4ce12 100644
--- a/mblock/src/lib/mb_timer_queue.cc
+++ b/mblock/src/lib/mb_timer_queue.cc
@@ -24,17 +24,17 @@
#endif
#include <mb_timer_queue.h>
-static pmt_t
+static gruel::pmt_t
make_handle()
{
static long counter = 0;
- pmt_t n = pmt_from_long(counter++);
- return pmt_list1(n); // guaranteed to be a unique object
+ gruel::pmt_t n = gruel::pmt_from_long(counter++);
+ return gruel::pmt_list1(n); // guaranteed to be a unique object
}
// one-shot constructor
mb_timeout::mb_timeout(const mb_time &abs_time,
- pmt_t user_data, mb_msg_accepter_sptr accepter)
+ gruel::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 +42,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,
- pmt_t user_data, mb_msg_accepter_sptr accepter)
+ gruel::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(pmt_t handle)
+mb_timer_queue::cancel(gruel::pmt_t handle)
{
container_type::iterator it;
for (it = c.begin(); it != c.end();){
- if (pmt_equal((*it)->handle(), handle))
+ if (gruel::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 e8b8e1b641..8dcf533836 100644
--- a/mblock/src/lib/mb_timer_queue.h
+++ b/mblock/src/lib/mb_timer_queue.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
*
@@ -25,7 +25,7 @@
#include <mblock/time.h>
#include <vector>
#include <queue>
-#include <pmt.h>
+#include <gruel/pmt.h>
#include <mblock/msg_accepter.h>
class mb_timeout {
@@ -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
- pmt_t d_user_data; // data from %timeout msg
- pmt_t d_handle; // handle for cancellation
+ gruel::pmt_t d_user_data; // data from %timeout msg
+ gruel::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,
- pmt_t user_data, mb_msg_accepter_sptr accepter);
+ gruel::pmt_t user_data, mb_msg_accepter_sptr accepter);
// periodic constructor
mb_timeout(const mb_time &first_abs_time, const mb_time &delta_time,
- pmt_t user_data, mb_msg_accepter_sptr accepter);
+ gruel::pmt_t user_data, mb_msg_accepter_sptr accepter);
- pmt_t handle() const { return d_handle; }
+ gruel::pmt_t handle() const { return d_handle; }
};
typedef boost::shared_ptr<mb_timeout> mb_timeout_sptr;
@@ -67,7 +67,7 @@ class mb_timer_queue : public std::priority_queue<mb_timeout_sptr,
timeout_later>
{
public:
- void cancel(pmt_t handle);
+ void cancel(gruel::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 3b984875ff..a553198ea9 100644
--- a/mblock/src/lib/mb_worker.cc
+++ b/mblock/src/lib/mb_worker.cc
@@ -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
*
@@ -37,13 +37,13 @@
#define VERBOSE 0 // define to 0 or 1
-static pmt_t s_worker_state_changed = pmt_intern("%worker-state-changed");
+static gruel::pmt_t s_worker_state_changed = gruel::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,
- pmt_t user_arg)
+ gruel::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 +95,7 @@ mb_worker::set_state(worker_state_t state)
}
// send msg to runtime, telling it something changed.
- (*d_runtime->accepter())(s_worker_state_changed, PMT_F, PMT_F, MB_PRI_BEST);
+ (*d_runtime->accepter())(s_worker_state_changed, gruel::PMT_F, gruel::PMT_F, MB_PRI_BEST);
}
void *
diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h
index 59d12545ca..0bd2fcaeb1 100644
--- a/mblock/src/lib/mb_worker.h
+++ b/mblock/src/lib/mb_worker.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
*
@@ -62,7 +62,7 @@ public:
mb_runtime_thread_per_block *d_runtime;
mb_mblock_maker_t d_maker;
std::string d_instance_name;
- pmt_t d_user_arg;
+ gruel::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,
- pmt_t user_arg);
+ gruel::pmt_t user_arg);
// ~mb_worker();
diff --git a/mblock/src/lib/qa_bitset.cc b/mblock/src/lib/qa_bitset.cc
index 0ed78d9f9a..1b47251236 100644
--- a/mblock/src/lib/qa_bitset.cc
+++ b/mblock/src/lib/qa_bitset.cc
@@ -31,6 +31,8 @@
#include <sstream>
#include <bitset>
+using namespace gruel;
+
static pmt_t s_in = pmt_intern("in");
static pmt_t s_out = pmt_intern("out");
static pmt_t s_data = pmt_intern("data");
diff --git a/mblock/src/lib/qa_disconnect.cc b/mblock/src/lib/qa_disconnect.cc
index 3f44bb5f42..09bdf2e6ae 100644
--- a/mblock/src/lib/qa_disconnect.cc
+++ b/mblock/src/lib/qa_disconnect.cc
@@ -31,6 +31,8 @@
#include <sstream>
#include <bitset>
+using namespace gruel;
+
static pmt_t s_in = pmt_intern("in");
static pmt_t s_out = pmt_intern("out");
static pmt_t s_data = pmt_intern("data");
diff --git a/mblock/src/lib/qa_mblock_prims.cc b/mblock/src/lib/qa_mblock_prims.cc
index 2eed3afde3..6e0d553130 100644
--- a/mblock/src/lib/qa_mblock_prims.cc
+++ b/mblock/src/lib/qa_mblock_prims.cc
@@ -37,6 +37,8 @@
#include <mblock/class_registry.h>
#include <stdio.h>
+using namespace gruel;
+
static pmt_t s_cs = pmt_intern("cs");
static pmt_t s_debug = pmt_intern("debug");
static pmt_t s_in = pmt_intern("in");
diff --git a/mblock/src/lib/qa_mblock_send.cc b/mblock/src/lib/qa_mblock_send.cc
index 114dbdc4eb..e9c91499a2 100644
--- a/mblock/src/lib/qa_mblock_send.cc
+++ b/mblock/src/lib/qa_mblock_send.cc
@@ -38,6 +38,8 @@
#include <mblock/class_registry.h>
#include <stdio.h>
+using namespace gruel;
+
static pmt_t s_data = pmt_intern("data");
static pmt_t s_status = pmt_intern("status");
static pmt_t s_control = pmt_intern("control");
diff --git a/mblock/src/lib/qa_mblock_sys.cc b/mblock/src/lib/qa_mblock_sys.cc
index 58e48f715f..e8ff780ac3 100644
--- a/mblock/src/lib/qa_mblock_sys.cc
+++ b/mblock/src/lib/qa_mblock_sys.cc
@@ -40,6 +40,7 @@
#include <string.h>
#include <iostream>
+using namespace gruel;
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 2505635c1d..39761c0b15 100644
--- a/mblock/src/lib/qa_timeouts.cc
+++ b/mblock/src/lib/qa_timeouts.cc
@@ -34,6 +34,7 @@
#include <string.h>
#include <iostream>
+using namespace gruel;
static pmt_t s_timeout = pmt_intern("%timeout");
static pmt_t s_done = pmt_intern("done");
diff --git a/pmt/Makefile.am b/pmt/Makefile.am
deleted file mode 100644
index 758eb1d986..0000000000
--- a/pmt/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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.
-#
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST = pmt.pc.in
-
-SUBDIRS = src
-DIST_SUBDIRS = src doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pmt.pc
diff --git a/pmt/README b/pmt/README
deleted file mode 100644
index 59a1f4ac3d..0000000000
--- a/pmt/README
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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.
-#
-
-This directory hierarchy contains an implementation of
-polymorphic types. These are similar to lisp or python data objects,
-and implement transparent reference counting using the boost shared_ptr
-templates.
-
diff --git a/pmt/doc/Makefile.am b/pmt/doc/Makefile.am
deleted file mode 100644
index a806b25cf0..0000000000
--- a/pmt/doc/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright 2004,2005,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.
-#
-
-TARGETS =
-
-
-# To avoid build problems for folks who don't have xmlto installed, we
-# don't build the docs by default.
-
-# html: $(TARGETS)
-all: $(TARGETS)
-
-
-EXTRA_DIST =
-
-BUILT_XML_FILES =
-
-
-# ----------------------------------------------------------------
-
-clean:
- -rm -f $(TARGETS) $(BUILT_XML_FILES)
-
-# This is non-portable pattern rule.
-#%.html : %.xml
-# xmlto html-nochunks $<
diff --git a/pmt/pmt.pc.in b/pmt/pmt.pc.in
deleted file mode 100644
index b2f86ea650..0000000000
--- a/pmt/pmt.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: pmt
-Description: The GNU Radio Polymorphic Type library
-Requires:
-Version: @VERSION@
-Libs: -L${libdir} -lpmt
-Cflags: -I${includedir}
diff --git a/pmt/src/Makefile.am b/pmt/src/Makefile.am
deleted file mode 100644
index 8ce9b3d02f..0000000000
--- a/pmt/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-SUBDIRS = lib scheme
diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am
deleted file mode 100644
index a510f4e0be..0000000000
--- a/pmt/src/lib/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright 2006,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) $(WITH_INCLUDES)
-
-TESTS = test_pmt
-
-lib_LTLIBRARIES = libpmt.la libpmt-qa.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_I) $(GENERATED_CC)
-
-BUILT_SOURCES = $(python_built_sources) pmt_serial_tags.h
-
-# ----------------------------------------------------------------
-
-EXTRA_DIST = \
- $(code_generator)
-
-# These are the source files that go into the pmt shared library
-libpmt_la_SOURCES = \
- pmt.cc \
- pmt_io.cc \
- pmt_pool.cc \
- pmt_serialize.cc \
- pmt_unv.cc
-
-# magic flags
-libpmt_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS)
-
-# link the library against the c++ standard library
-libpmt_la_LIBADD = \
- $(BOOST_THREAD_LIB) \
- -lstdc++
-
-include_HEADERS = \
- pmt.h \
- pmt_pool.h \
- pmt_serial_tags.h
-
-noinst_HEADERS = \
- $(GENERATED_H) \
- pmt_int.h \
- qa_pmt.h \
- qa_pmt_prims.h
-
-
-# Build the qa code into its own library
-
-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
-
-
-LIBPMT = libpmt.la
-LIBPMTQA = libpmt-qa.la $(LIBPMT)
-
-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)/pmt/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