4 files changed, 29 insertions, 10 deletions
diff --git a/gruel/src/include/gruel/msg_accepter.h b/gruel/src/include/gruel/msg_accepter.h
index 2dc1a6859..45acb3c78 100644
--- a/gruel/src/include/gruel/msg_accepter.h
+++ b/gruel/src/include/gruel/msg_accepter.h
@@ -37,13 +37,13 @@ namespace gruel {
     virtual ~msg_accepter();
 
     /*!
-     * \brief send \p msg to \p msg_accepter
+     * \brief send \p msg to \p msg_accepter on port \p which_port
      *
      * Sending a message is an asynchronous operation.  The \p post
      * call will not wait for the message either to arrive at the
      * destination or to be received.
      */
-    virtual void post(pmt::pmt_t msg) = 0;
+    virtual void post(pmt::pmt_t which_port, pmt::pmt_t msg) = 0;
   };
 
   typedef boost::shared_ptr<msg_accepter> msg_accepter_sptr;
diff --git a/gruel/src/include/gruel/msg_passing.h b/gruel/src/include/gruel/msg_passing.h
index 0cc0cd111..7230dfc5b 100644
--- a/gruel/src/include/gruel/msg_passing.h
+++ b/gruel/src/include/gruel/msg_passing.h
@@ -45,9 +45,9 @@ namespace gruel {
    * \returns msg
    */
   static inline pmt::pmt_t
-  send(msg_accepter_sptr accepter, const pmt::pmt_t &msg)
+  send(msg_accepter_sptr accepter, const pmt::pmt_t &which_port, const pmt::pmt_t &msg)
   {
-    accepter->post(msg);
+    accepter->post(which_port, msg);
     return msg;
   }
 
@@ -64,9 +64,9 @@ namespace gruel {
    * \returns msg
    */
   static inline pmt::pmt_t
-  send(msg_accepter *accepter, const pmt::pmt_t &msg)
+  send(msg_accepter *accepter, const pmt::pmt_t &which_port, const pmt::pmt_t &msg)
   {
-    accepter->post(msg);
+    accepter->post(which_port, msg);
     return msg;
   }
 
@@ -83,9 +83,9 @@ namespace gruel {
    * \returns msg
    */
   static inline pmt::pmt_t
-  send(msg_accepter &accepter, const pmt::pmt_t &msg)
+  send(msg_accepter &accepter, const pmt::pmt_t &which_port, const pmt::pmt_t &msg)
   {
-    accepter.post(msg);
+    accepter.post(which_port, msg);
     return msg;
   }
 
@@ -102,9 +102,9 @@ namespace gruel {
    * \returns msg
    */
   static inline pmt::pmt_t
-  send(pmt::pmt_t accepter, const pmt::pmt_t &msg)
+  send(pmt::pmt_t accepter, const pmt::pmt_t &which_port, const pmt::pmt_t &msg)
   {
-    return send(pmt_msg_accepter_ref(accepter), msg);
+    return send(pmt_msg_accepter_ref(accepter), which_port, msg);
   }
 
 } /* namespace gruel */
diff --git a/gruel/src/include/gruel/pmt.h b/gruel/src/include/gruel/pmt.h
index 1e8b38627..a462155c5 100644
--- a/gruel/src/include/gruel/pmt.h
+++ b/gruel/src/include/gruel/pmt.h
@@ -729,6 +729,10 @@ GRUEL_API pmt_t pmt_list6(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, con
  */
 GRUEL_API pmt_t pmt_list_add(pmt_t list, const pmt_t& item);
 
+/*!
+ * \brief Return \p list with \p item removed from it.
+ */
+GRUEL_API pmt_t pmt_list_rm(pmt_t list, const pmt_t& item);
 
 /*
  * ------------------------------------------------------------------------
@@ -805,6 +809,15 @@ GRUEL_API std::string pmt_serialize_str(pmt_t obj);
  */
 GRUEL_API pmt_t pmt_deserialize_str(std::string str);
 
+/*!
+ * \brief Provide a comparator function object to allow pmt use in stl types
+ */
+class pmt_comperator {
+    public:
+        bool operator()(pmt::pmt_t const& p1, pmt::pmt_t const& p2) const
+            { return pmt::pmt_eqv(p1,p2)?false:p1.get()>p2.get(); }
+    };
+
 } /* namespace pmt */
 
 #include <gruel/pmt_sugar.h>
diff --git a/gruel/src/include/gruel/pmt_sugar.h b/gruel/src/include/gruel/pmt_sugar.h
index 1d2b38ff1..bde7f716d 100644
--- a/gruel/src/include/gruel/pmt_sugar.h
+++ b/gruel/src/include/gruel/pmt_sugar.h
@@ -50,6 +50,12 @@ namespace pmt {
 
   //! Make pmt long
   static inline pmt_t
+  mp(long long unsigned x){
+    return pmt_from_long(x);
+  }
+
+  //! Make pmt long
+  static inline pmt_t
   mp(int x){
     return pmt_from_long(x);
   }