commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r11456 - in gnuradio/branches/developers/jcorgan/pmt-g


From: jcorgan
Subject: [Commit-gnuradio] r11456 - in gnuradio/branches/developers/jcorgan/pmt-gruel: . config mblock/src/include/mblock mblock/src/lib
Date: Sun, 19 Jul 2009 19:29:06 -0600 (MDT)

Author: jcorgan
Date: 2009-07-19 19:29:06 -0600 (Sun, 19 Jul 2009)
New Revision: 11456

Removed:
   gnuradio/branches/developers/jcorgan/pmt-gruel/config/grc_pmt.m4
   gnuradio/branches/developers/jcorgan/pmt-gruel/pmt/
Modified:
   gnuradio/branches/developers/jcorgan/pmt-gruel/Makefile.common
   gnuradio/branches/developers/jcorgan/pmt-gruel/config/Makefile.am
   gnuradio/branches/developers/jcorgan/pmt-gruel/configure.ac
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/class_registry.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/common.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/mblock.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/message.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/msg_accepter.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/port.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/protocol_class.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/runtime.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/benchmark_send.cc
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.cc
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_message.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_protocol_class.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.h
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.cc
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.h
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_bitset.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_disconnect.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_prims.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_send.cc
   
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_sys.cc
   gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_timeouts.cc
Log:
Removes pmt, mblock now uses gruel.

Modified: gnuradio/branches/developers/jcorgan/pmt-gruel/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/Makefile.common      
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/Makefile.common      
2009-07-20 01:29:06 UTC (rev 11456)
@@ -104,7 +104,7 @@
 # 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

Modified: gnuradio/branches/developers/jcorgan/pmt-gruel/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/config/Makefile.am   
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/config/Makefile.am   
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
        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 \

Modified: gnuradio/branches/developers/jcorgan/pmt-gruel/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/configure.ac 2009-07-20 
00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/configure.ac 2009-07-20 
01:29:06 UTC (rev 11456)
@@ -335,8 +335,7 @@
 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

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/class_registry.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/class_registry.h
   2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/class_registry.h
   2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 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));
 }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/common.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/common.h
   2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/common.h
   2009-07-20 01:29:06 UTC (rev 11456)
@@ -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>

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/mblock.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/mblock.h
   2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/mblock.h
   2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
    * \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 @@
   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 @@
    *
    * 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 @@
    *
    * 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 @@
    *
    * 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 @@
    *
    * \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.

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/message.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/message.h
  2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/message.h
  2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
  * \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);

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/msg_accepter.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/msg_accepter.h
     2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/msg_accepter.h
     2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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 */

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/port.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/port.h 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/port.h 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 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 @@
 
 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 @@
    * \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;
 
   /*

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/protocol_class.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/protocol_class.h
   2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/protocol_class.h
   2009-07-20 01:29:06 UTC (rev 11456)
@@ -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
 
 
 /*!

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/runtime.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/runtime.h
  2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/include/mblock/runtime.h
  2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
    */
   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; }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/Makefile.am   
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/Makefile.am   
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 # link the library against the c++ standard library
 libmblock_la_LIBADD =                  \
        $(OMNITHREAD_LA)                \
-       $(PMT_LA)                       \
+       $(GRUEL_LA)                     \
        -lstdc++                        
 
 noinst_HEADERS =                       \

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/benchmark_send.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/benchmark_send.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/benchmark_send.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -22,6 +22,8 @@
 #include <mblock/runtime.h>
 #include <iostream>
 
+using namespace gruel;
+
 int
 main(int argc, char **argv)
 {

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.cc    
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.cc    
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -30,7 +30,7 @@
   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 @@
     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

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.h
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.h 
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_endpoint.h 
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   //! 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 */

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock.cc  
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock.cc  
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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_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 @@
        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 @@
 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 @@
 }
 
 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 @@
 }
 
 void
-mb_mblock::cancel_timeout(pmt_t handle)
+mb_mblock::cancel_timeout(gruel::pmt_t handle)
 {
   d_impl->runtime()->cancel_timeout(handle);
 }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 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 @@
 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_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 =

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.h  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_mblock_impl.h  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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 @@
   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 @@
    * 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 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_message.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_message.cc 
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_message.cc 
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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_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)
 {
 }
 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.cc
       2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.cc
       2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 }
 
 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);

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.h
        2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_msgq.h
        2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 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 */

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.cc
        2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.cc
        2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 }
 
 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);

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.h
 2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_msg_accepter_smp.h
 2009-07-20 01:29:06 UTC (rev 11456)
@@ -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);
 };
 
 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port.cc    
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port.cc    
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
                 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 @@
   // nop
 }
 
-pmt_t
+gruel::pmt_t
 mb_port::incoming_message_set() const
 {
   if (!conjugated())
@@ -57,7 +57,7 @@
     return mb_protocol_class_outgoing(protocol_class());
 }
 
-pmt_t
+gruel::pmt_t
 mb_port::outgoing_message_set() const
 {
   if (!conjugated())

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 }
 
 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());

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.h  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_port_simple.h  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
    * \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);
 
   /*

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_protocol_class.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_protocol_class.cc
  2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_protocol_class.cc
  2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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
   }
 }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.cc
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.cc
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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)
 {
 }
 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.h 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_base.h 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
    */
   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; }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 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 @@
   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_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))

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.h  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_nop.h  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 
   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 */

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.cc
        2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.cc
        2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 
 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 @@
 }
 
 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 @@
       }
     }
 
-    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 @@
        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_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 @@
 }
 
 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 @@
 // 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 @@
 // 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 @@
 // 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);
 }

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.h
 2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_runtime_thread_per_block.h
 2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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 @@
 
   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);
 };
 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
 
 // 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;

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.h  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_timer_queue.h  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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 @@
                                                  timeout_later>
 {
 public:
-  void cancel(pmt_t handle);
+  void cancel(gruel::pmt_t handle);
 };
 
 #endif /* INCLUDED_MB_TIMER_QUEUE_H */

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.cc  
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.cc  
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   }
 
   // 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 *

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.h
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.h   
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/mb_worker.h   
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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 @@
   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 @@
   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();
 

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_bitset.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_bitset.cc  
2009-07-20 00:12:05 UTC (rev 11455)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_bitset.cc  
2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_disconnect.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_disconnect.cc  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_disconnect.cc  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_prims.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_prims.cc
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_prims.cc
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_send.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_send.cc 
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_send.cc 
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_sys.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_sys.cc  
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_mblock_sys.cc  
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_timeouts.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_timeouts.cc    
    2009-07-20 00:12:05 UTC (rev 11455)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/mblock/src/lib/qa_timeouts.cc    
    2009-07-20 01:29:06 UTC (rev 11456)
@@ -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");





reply via email to

[Prev in Thread] Current Thread [Next in Thread]