diff options
Diffstat (limited to 'mblock/src')
50 files changed, 209 insertions, 161 deletions
diff --git a/mblock/src/Makefile.am b/mblock/src/Makefile.am index 52f60f476..60995c972 100644 --- a/mblock/src/Makefile.am +++ b/mblock/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,4 +19,4 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib scheme +SUBDIRS = include lib scheme diff --git a/mblock/src/include/Makefile.am b/mblock/src/include/Makefile.am new file mode 100644 index 000000000..d5672989c --- /dev/null +++ b/mblock/src/include/Makefile.am @@ -0,0 +1,24 @@ +# +# Copyright 2008 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +SUBDIRS = mblock diff --git a/mblock/src/include/mblock/Makefile.am b/mblock/src/include/mblock/Makefile.am new file mode 100644 index 000000000..e36215aa4 --- /dev/null +++ b/mblock/src/include/mblock/Makefile.am @@ -0,0 +1,37 @@ +# +# Copyright 2008 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +mbincludedir = $(includedir)/mblock + +mbinclude_HEADERS = \ + common.h \ + class_registry.h \ + exception.h \ + mblock.h \ + message.h \ + msg_accepter.h \ + msg_queue.h \ + port.h \ + protocol_class.h \ + runtime.h \ + time.h diff --git a/mblock/src/lib/mb_class_registry.h b/mblock/src/include/mblock/class_registry.h index 713cc1e26..b94a7cbc1 100644 --- a/mblock/src/lib/mb_class_registry.h +++ b/mblock/src/include/mblock/class_registry.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_CLASS_REGISTRY_H #define INCLUDED_MB_CLASS_REGISTRY_H -#include <mb_common.h> +#include <mblock/common.h> //! conceptually, pointer to constructor typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime, diff --git a/mblock/src/lib/mb_common.h b/mblock/src/include/mblock/common.h index 1f78d5a40..2507d053e 100644 --- a/mblock/src/lib/mb_common.h +++ b/mblock/src/include/mblock/common.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_exception.h b/mblock/src/include/mblock/exception.h index 837e49f42..6cc456656 100644 --- a/mblock/src/lib/mb_exception.h +++ b/mblock/src/include/mblock/exception.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_mblock.h b/mblock/src/include/mblock/mblock.h index 146e28008..14517ffcc 100644 --- a/mblock/src/lib/mb_mblock.h +++ b/mblock/src/include/mblock/mblock.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,10 +21,10 @@ #ifndef INCLUDED_MB_MBLOCK_H #define INCLUDED_MB_MBLOCK_H -#include <mb_common.h> -#include <mb_message.h> -#include <mb_port.h> -#include <mb_time.h> +#include <mblock/common.h> +#include <mblock/message.h> +#include <mblock/port.h> +#include <mblock/time.h> /*! diff --git a/mblock/src/lib/mb_message.h b/mblock/src/include/mblock/message.h index f5e465530..8fbee2ff0 100644 --- a/mblock/src/lib/mb_message.h +++ b/mblock/src/include/mblock/message.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MESSAGE_H #define INCLUDED_MB_MESSAGE_H -#include <mb_common.h> +#include <mblock/common.h> #include <iosfwd> #define MB_MESSAGE_LOCAL_ALLOCATOR 0 // define to 0 or 1 diff --git a/mblock/src/lib/mb_msg_accepter.h b/mblock/src/include/mblock/msg_accepter.h index 254b3b044..69be13111 100644 --- a/mblock/src/lib/mb_msg_accepter.h +++ b/mblock/src/include/mblock/msg_accepter.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_H #define INCLUDED_MB_MSG_ACCEPTER_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief Abstract class that accepts messages diff --git a/mblock/src/lib/mb_msg_queue.h b/mblock/src/include/mblock/msg_queue.h index a1cd43f14..31ff65a51 100644 --- a/mblock/src/lib/mb_msg_queue.h +++ b/mblock/src/include/mblock/msg_queue.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,9 +21,9 @@ #ifndef INCLUDED_MB_MSG_QUEUE_H #define INCLUDED_MB_MSG_QUEUE_H -#include <mb_common.h> +#include <mblock/common.h> #include <omnithread.h> -#include <mb_time.h> +#include <mblock/time.h> /*! * \brief priority queue for mblock messages diff --git a/mblock/src/lib/mb_port.h b/mblock/src/include/mblock/port.h index 0e9898bc4..892a1dd97 100644 --- a/mblock/src/lib/mb_port.h +++ b/mblock/src/include/mblock/port.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PORT_H #define INCLUDED_MB_PORT_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief Abstract port characteristics diff --git a/mblock/src/lib/mb_protocol_class.h b/mblock/src/include/mblock/protocol_class.h index 7a1d9afb6..33c5d7116 100644 --- a/mblock/src/lib/mb_protocol_class.h +++ b/mblock/src/include/mblock/protocol_class.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PROTOCOL_CLASS_H #define INCLUDED_MB_PROTOCOL_CLASS_H -#include <mb_common.h> +#include <mblock/common.h> /*! * \brief construct a protocol_class diff --git a/mblock/src/lib/mb_runtime.h b/mblock/src/include/mblock/runtime.h index 1c9ebcab0..4236e346f 100644 --- a/mblock/src/lib/mb_runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_RUNTIME_H #define INCLUDED_MB_RUNTIME_H -#include <mb_common.h> +#include <mblock/common.h> #include <omnithread.h> /*! diff --git a/mblock/src/lib/mb_time.h b/mblock/src/include/mblock/time.h index cba6be785..cba6be785 100644 --- a/mblock/src/lib/mb_time.h +++ b/mblock/src/include/mblock/time.h diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am index e8e5f59af..269c8ae22 100644 --- a/mblock/src/lib/Makefile.am +++ b/mblock/src/lib/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \ - $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) + $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \ + $(MBLOCK_INCLUDES) # disable test until we fix ticket:180 # TESTS = test_mblock @@ -75,25 +76,11 @@ libmblock_la_LIBADD = \ $(PMT_LA) \ -lstdc++ -include_HEADERS = \ - mb_class_registry.h \ - mb_common.h \ - mb_exception.h \ +noinst_HEADERS = \ mb_gettid.h \ - mb_mblock.h \ - mb_message.h \ - mb_msg_accepter.h \ mb_msg_accepter_msgq.h \ - mb_msg_queue.h \ - mb_port.h \ mb_port_simple.h \ - mb_protocol_class.h \ - mb_runtime.h \ - mb_time.h \ - mb_util.h - - -noinst_HEADERS = \ + mb_util.h \ mb_connection.h \ mb_endpoint.h \ mb_mblock_impl.h \ diff --git a/mblock/src/lib/benchmark_send.cc b/mblock/src/lib/benchmark_send.cc index 7b8f7cb76..fe873a69a 100644 --- a/mblock/src/lib/benchmark_send.cc +++ b/mblock/src/lib/benchmark_send.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <iostream> int diff --git a/mblock/src/lib/mb_class_registry.cc b/mblock/src/lib/mb_class_registry.cc index 77cec8de6..7ccee2969 100644 --- a/mblock/src/lib/mb_class_registry.cc +++ b/mblock/src/lib/mb_class_registry.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_class_registry.h> +#include <mblock/class_registry.h> #include <map> static std::map<std::string, mb_mblock_maker_t> s_registry; diff --git a/mblock/src/lib/mb_endpoint.h b/mblock/src/lib/mb_endpoint.h index db55b3f44..aae376a5d 100644 --- a/mblock/src/lib/mb_endpoint.h +++ b/mblock/src/lib/mb_endpoint.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #define INCLUDED_MB_ENDPOINT_H #include <string> -#include <mb_port.h> +#include <mblock/port.h> /*! * \brief Endpoint specification for connection diff --git a/mblock/src/lib/mb_exception.cc b/mblock/src/lib/mb_exception.cc index 3c08a01d0..810131840 100644 --- a/mblock/src/lib/mb_exception.cc +++ b/mblock/src/lib/mb_exception.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #include <config.h> #endif -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_util.h> diff --git a/mblock/src/lib/mb_mblock.cc b/mblock/src/lib/mb_mblock.cc index 38d216ad4..b2f763623 100644 --- a/mblock/src/lib/mb_mblock.cc +++ b/mblock/src/lib/mb_mblock.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_runtime.h> -#include <mb_exception.h> +#include <mblock/runtime.h> +#include <mblock/exception.h> #include <iostream> diff --git a/mblock/src/lib/mb_mblock_impl.cc b/mblock/src/lib/mb_mblock_impl.cc index 90868cf4c..e11b00898 100644 --- a/mblock/src/lib/mb_mblock_impl.cc +++ b/mblock/src/lib/mb_mblock_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,11 +23,11 @@ #include <config.h> #endif #include <mb_mblock_impl.h> -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_port.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/port.h> #include <mb_port_simple.h> -#include <mb_exception.h> +#include <mblock/exception.h> #include <mb_util.h> #include <mb_msg_accepter_smp.h> #include <mbi_runtime_lock.h> diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h index 374ee8fe0..ed8059b00 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 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,10 +21,10 @@ #ifndef INCLUDED_MB_MBLOCK_IMPL_H #define INCLUDED_MB_MBLOCK_IMPL_H -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_runtime_base.h> #include <mb_connection.h> -#include <mb_msg_queue.h> +#include <mblock/msg_queue.h> #include <list> #include <map> diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc index ce98a931e..664e369fa 100644 --- a/mblock/src/lib/mb_message.cc +++ b/mblock/src/lib/mb_message.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_message.h> +#include <mblock/message.h> #include <stdio.h> #include <pmt_pool.h> diff --git a/mblock/src/lib/mb_msg_accepter.cc b/mblock/src/lib/mb_msg_accepter.cc index 001b1f11e..88b92394c 100644 --- a/mblock/src/lib/mb_msg_accepter.cc +++ b/mblock/src/lib/mb_msg_accepter.cc @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> mb_msg_accepter::~mb_msg_accepter() { diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc index 8220dbfee..fb97914e5 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 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif #include <mb_msg_accepter_msgq.h> -#include <mb_message.h> +#include <mblock/message.h> pmt_t s_sys_port = pmt_intern("%sys-port"); diff --git a/mblock/src/lib/mb_msg_accepter_msgq.h b/mblock/src/lib/mb_msg_accepter_msgq.h index 1436e8c04..6c743bb4b 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 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,8 +21,8 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_MSGQ_H #define INCLUDED_MB_MSG_ACCEPTER_MSGQ_H -#include <mb_msg_accepter.h> -#include <mb_msg_queue.h> +#include <mblock/msg_accepter.h> +#include <mblock/msg_queue.h> /*! * \brief Concrete class that accepts messages and inserts them into a message queue. diff --git a/mblock/src/lib/mb_msg_accepter_smp.cc b/mblock/src/lib/mb_msg_accepter_smp.cc index ac3b4cfdb..3b392a8c1 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 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif #include <mb_msg_accepter_smp.h> -#include <mb_common.h> -#include <mb_mblock.h> +#include <mblock/common.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_message.h> +#include <mblock/message.h> mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name) : d_mb(mblock), d_port_name(port_name) diff --git a/mblock/src/lib/mb_msg_accepter_smp.h b/mblock/src/lib/mb_msg_accepter_smp.h index 39eedf8f0..0e0cd7c64 100644 --- a/mblock/src/lib/mb_msg_accepter_smp.h +++ b/mblock/src/lib/mb_msg_accepter_smp.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_MSG_ACCEPTER_SMP_H #define INCLUDED_MB_MSG_ACCEPTER_SMP_H -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> /*! * \brief Concrete message acceptor that does an mb_msg_queue insertion diff --git a/mblock/src/lib/mb_msg_queue.cc b/mblock/src/lib/mb_msg_queue.cc index c5dd72fb5..c68c5fd64 100644 --- a/mblock/src/lib/mb_msg_queue.cc +++ b/mblock/src/lib/mb_msg_queue.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,8 +22,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> mb_msg_queue::mb_msg_queue() diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc index 959e89c72..a13f49f2c 100644 --- a/mblock/src/lib/mb_port.cc +++ b/mblock/src/lib/mb_port.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #include <config.h> #endif -#include <mb_port.h> -#include <mb_protocol_class.h> +#include <mblock/port.h> +#include <mblock/protocol_class.h> mb_port::mb_port(mb_mblock *mblock, const std::string &port_name, diff --git a/mblock/src/lib/mb_port_simple.cc b/mblock/src/lib/mb_port_simple.cc index 24a01b562..1b4b35cbf 100644 --- a/mblock/src/lib/mb_port_simple.cc +++ b/mblock/src/lib/mb_port_simple.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,9 +24,9 @@ #endif #include <mb_port_simple.h> -#include <mb_msg_accepter.h> -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/msg_accepter.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> #include <assert.h> #include <mbi_runtime_lock.h> diff --git a/mblock/src/lib/mb_port_simple.h b/mblock/src/lib/mb_port_simple.h index db9e226e6..3041239ad 100644 --- a/mblock/src/lib/mb_port_simple.h +++ b/mblock/src/lib/mb_port_simple.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_PORT_SIMPLE_H #define INCLUDED_MB_PORT_SIMPLE_H -#include <mb_port.h> +#include <mblock/port.h> /*! * \brief Concrete port realization diff --git a/mblock/src/lib/mb_protocol_class.cc b/mblock/src/lib/mb_protocol_class.cc index fb1f6531c..f076909e1 100644 --- a/mblock/src/lib/mb_protocol_class.cc +++ b/mblock/src/lib/mb_protocol_class.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_protocol_class.h> +#include <mblock/protocol_class.h> #include <iostream> static pmt_t s_ALL_PROTOCOL_CLASSES = PMT_NIL; diff --git a/mblock/src/lib/mb_runtime.cc b/mblock/src/lib/mb_runtime.cc index 56ae2869c..57a05c416 100644 --- a/mblock/src/lib/mb_runtime.cc +++ b/mblock/src/lib/mb_runtime.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <mb_runtime_thread_per_block.h> mb_runtime_sptr diff --git a/mblock/src/lib/mb_runtime_base.cc b/mblock/src/lib/mb_runtime_base.cc index c10c3168a..1dea4d46e 100644 --- a/mblock/src/lib/mb_runtime_base.cc +++ b/mblock/src/lib/mb_runtime_base.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h index 4872bd81e..019662bc2 100644 --- a/mblock/src/lib/mb_runtime_base.h +++ b/mblock/src/lib/mb_runtime_base.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_MB_RUNTIME_BASE_H #define INCLUDED_MB_RUNTIME_BASE_H -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <omnithread.h> -#include <mb_time.h> +#include <mblock/time.h> /* * \brief This is the runtime class used by the implementation. diff --git a/mblock/src/lib/mb_runtime_nop.cc b/mblock/src/lib/mb_runtime_nop.cc index 78bc0a1aa..603d5addb 100644 --- a/mblock/src/lib/mb_runtime_nop.cc +++ b/mblock/src/lib/mb_runtime_nop.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,9 +23,9 @@ #include <config.h> #endif #include <mb_runtime_nop.h> -#include <mb_mblock.h> -#include <mb_class_registry.h> -#include <mb_exception.h> +#include <mblock/mblock.h> +#include <mblock/class_registry.h> +#include <mblock/exception.h> mb_runtime_sptr mb_make_runtime_nop() diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index f1e4d10af..d12014a16 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 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,10 +23,10 @@ #include <config.h> #endif #include <mb_runtime_thread_per_block.h> -#include <mb_mblock.h> +#include <mblock/mblock.h> #include <mb_mblock_impl.h> -#include <mb_class_registry.h> -#include <mb_exception.h> +#include <mblock/class_registry.h> +#include <mblock/exception.h> #include <mb_worker.h> #include <omnithread.h> #include <iostream> diff --git a/mblock/src/lib/mb_runtime_thread_per_block.h b/mblock/src/lib/mb_runtime_thread_per_block.h index ed2dc046c..ef962911e 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.h +++ b/mblock/src/lib/mb_runtime_thread_per_block.h @@ -23,7 +23,7 @@ #include <mb_runtime_base.h> #include <mb_worker.h> -#include <mb_msg_queue.h> +#include <mblock/msg_queue.h> #include <mb_timer_queue.h> /*! diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h index 208e37d51..e8b8e1b64 100644 --- a/mblock/src/lib/mb_timer_queue.h +++ b/mblock/src/lib/mb_timer_queue.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,11 +22,11 @@ #ifndef INCLUDED_MB_TIMER_QUEUE_H #define INCLUDED_MB_TIMER_QUEUE_H -#include <mb_time.h> +#include <mblock/time.h> #include <vector> #include <queue> #include <pmt.h> -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> class mb_timeout { public: diff --git a/mblock/src/lib/mb_worker.cc b/mblock/src/lib/mb_worker.cc index 4ac161e9d..e7ac6a9b4 100644 --- a/mblock/src/lib/mb_worker.cc +++ b/mblock/src/lib/mb_worker.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,10 +24,10 @@ #endif #include <mb_worker.h> #include <mb_runtime_thread_per_block.h> -#include <mb_exception.h> -#include <mb_mblock.h> +#include <mblock/exception.h> +#include <mblock/mblock.h> #include <mb_gettid.h> -#include <mb_msg_accepter.h> +#include <mblock/msg_accepter.h> #include <iostream> #ifdef HAVE_SCHED_H #include <sched.h> diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index d5937144c..b840ae557 100644 --- a/mblock/src/lib/mb_worker.h +++ b/mblock/src/lib/mb_worker.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,8 +23,8 @@ #define INCLUDED_MB_WORKER_H #include <omnithread.h> -#include <mb_common.h> -#include <mb_class_registry.h> +#include <mblock/common.h> +#include <mblock/class_registry.h> class mb_worker; diff --git a/mblock/src/lib/mbi_runtime_lock.h b/mblock/src/lib/mbi_runtime_lock.h index a4dec76f5..020cd733c 100644 --- a/mblock/src/lib/mbi_runtime_lock.h +++ b/mblock/src/lib/mbi_runtime_lock.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_MBI_RUNTIME_LOCK_H #define INCLUDED_MBI_RUNTIME_LOCK_H -#include <mb_runtime.h> +#include <mblock/runtime.h> #include <mb_mblock_impl.h> #include <boost/utility.hpp> diff --git a/mblock/src/lib/qa_bitset.cc b/mblock/src/lib/qa_bitset.cc index 85f388fc2..bc42ac8b0 100644 --- a/mblock/src/lib/qa_bitset.cc +++ b/mblock/src/lib/qa_bitset.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,10 +22,10 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/class_registry.h> #include <iostream> #include <sstream> #include <bitset> diff --git a/mblock/src/lib/qa_disconnect.cc b/mblock/src/lib/qa_disconnect.cc index ff263da84..e098e8b29 100644 --- a/mblock/src/lib/qa_disconnect.cc +++ b/mblock/src/lib/qa_disconnect.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,10 +22,10 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <mb_mblock.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/class_registry.h> #include <iostream> #include <sstream> #include <bitset> diff --git a/mblock/src/lib/qa_mblock_prims.cc b/mblock/src/lib/qa_mblock_prims.cc index 6802986fa..2eed3afde 100644 --- a/mblock/src/lib/qa_mblock_prims.cc +++ b/mblock/src/lib/qa_mblock_prims.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,15 +26,15 @@ #include <qa_mblock_prims.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> static pmt_t s_cs = pmt_intern("cs"); diff --git a/mblock/src/lib/qa_mblock_send.cc b/mblock/src/lib/qa_mblock_send.cc index b9db971c7..114dbdc4e 100644 --- a/mblock/src/lib/qa_mblock_send.cc +++ b/mblock/src/lib/qa_mblock_send.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,16 +26,16 @@ #include <qa_mblock_send.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> static pmt_t s_data = pmt_intern("data"); diff --git a/mblock/src/lib/qa_mblock_sys.cc b/mblock/src/lib/qa_mblock_sys.cc index 5991b7ffc..58e48f715 100644 --- a/mblock/src/lib/qa_mblock_sys.cc +++ b/mblock/src/lib/qa_mblock_sys.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007 Free Software Foundation, Inc. + * Copyright 2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,16 +26,16 @@ #include <qa_mblock_sys.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> #include <mb_runtime_nop.h> // QA only -#include <mb_protocol_class.h> -#include <mb_exception.h> -#include <mb_msg_queue.h> -#include <mb_message.h> +#include <mblock/protocol_class.h> +#include <mblock/exception.h> +#include <mblock/msg_queue.h> +#include <mblock/message.h> #include <mb_mblock_impl.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <stdio.h> #include <string.h> #include <iostream> diff --git a/mblock/src/lib/qa_timeouts.cc b/mblock/src/lib/qa_timeouts.cc index 4f1eb46ee..2505635c1 100644 --- a/mblock/src/lib/qa_timeouts.cc +++ b/mblock/src/lib/qa_timeouts.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,12 +24,12 @@ #endif #include <qa_timeouts.h> #include <cppunit/TestAssert.h> -#include <mb_mblock.h> -#include <mb_runtime.h> -#include <mb_protocol_class.h> -#include <mb_message.h> -#include <mb_msg_accepter.h> -#include <mb_class_registry.h> +#include <mblock/mblock.h> +#include <mblock/runtime.h> +#include <mblock/protocol_class.h> +#include <mblock/message.h> +#include <mblock/msg_accepter.h> +#include <mblock/class_registry.h> #include <mb_timer_queue.h> #include <string.h> #include <iostream> diff --git a/mblock/src/scheme/gnuradio/compile-mbh.scm b/mblock/src/scheme/gnuradio/compile-mbh.scm index a16e14c58..30085340f 100755 --- a/mblock/src/scheme/gnuradio/compile-mbh.scm +++ b/mblock/src/scheme/gnuradio/compile-mbh.scm @@ -3,7 +3,7 @@ !# ;; -*-scheme-*- ;; -;; Copyright 2007 Free Software Foundation, Inc. +;; Copyright 2007,2008 Free Software Foundation, Inc. ;; ;; This file is part of GNU Radio ;; @@ -180,7 +180,7 @@ (format o-port "// protocol-classes: ~{~a ~}~%" (map car protocol-classes)) (format o-port "//~%") - (format o-port "#include <mb_protocol_class.h>~%") + (format o-port "#include <mblock/protocol_class.h>~%") (format o-port "#include <unistd.h>~%") (format o-port "static const char~%protocol_class_init_data[~d] = {~% " |