2 files changed, 82 insertions, 6 deletions

diff --git a/gnuradio-core/src/lib/io/gr_message_debug.cc b/gnuradio-core/src/lib/io/gr_message_debug.cc
index d98954576..7d28ff18e 100644
--- a/gnuradio-core/src/lib/io/gr_message_debug.cc
+++ b/gnuradio-core/src/lib/io/gr_message_debug.cc
@@ -43,20 +43,49 @@ gr_make_message_debug ()
   return gnuradio::get_initial_sptr(new gr_message_debug());
 }
 
-void gr_message_debug::print(pmt::pmt_t msg){
-    std::cout << "******* MESSAGE DEBUG PRINT ********\n";
-    pmt::pmt_print(msg);
-    std::cout << "************************************\n";
+void
+gr_message_debug::print(pmt::pmt_t msg)
+{
+  std::cout << "******* MESSAGE DEBUG PRINT ********\n";
+  pmt::pmt_print(msg);
+  std::cout << "************************************\n";
+}
+
+void
+gr_message_debug::store(pmt::pmt_t msg)
+{
+  gruel::scoped_lock guard(d_mutex);
+  d_messages.push_back(msg);
+}
+
+int
+gr_message_debug::num_messages()
+{
+  return (int)d_messages.size();
 }
 
+pmt::pmt_t
+gr_message_debug::get_message(int i)
+{
+  gruel::scoped_lock guard(d_mutex);
+
+  if((size_t)i >= d_messages.size()) {
+    throw std::runtime_error("gr_message_debug: index for message out of bounds.\n");
+  }
 
-gr_message_debug::gr_message_debug ()
+  return d_messages[i];
+}
+
+gr_message_debug::gr_message_debug()
   : gr_block("message_debug",
 	     gr_make_io_signature(0, 0, 0),
 	     gr_make_io_signature(0, 0, 0))
 {
     message_port_register_in(pmt::mp("print"));
     set_msg_handler(pmt::mp("print"), boost::bind(&gr_message_debug::print, this, _1));
+
+    message_port_register_in(pmt::mp("store"));
+    set_msg_handler(pmt::mp("store"), boost::bind(&gr_message_debug::store, this, _1));
 }
 
 gr_message_debug::~gr_message_debug()
diff --git a/gnuradio-core/src/lib/io/gr_message_debug.h b/gnuradio-core/src/lib/io/gr_message_debug.h
index 120694a91..1ffef1b02 100644
--- a/gnuradio-core/src/lib/io/gr_message_debug.h
+++ b/gnuradio-core/src/lib/io/gr_message_debug.h
@@ -27,11 +27,12 @@
 #include <gr_block.h>
 #include <gr_message.h>
 #include <gr_msg_queue.h>
+#include <gruel/thread.h>
 
 class gr_message_debug;
 typedef boost::shared_ptr<gr_message_debug> gr_message_debug_sptr;
 
-GR_CORE_API gr_message_debug_sptr gr_make_message_debug ();
+GR_CORE_API gr_message_debug_sptr gr_make_message_debug();
 
 /*!
  * \brief Print received messages to stdout
@@ -43,13 +44,59 @@ class GR_CORE_API gr_message_debug : public gr_block
   friend GR_CORE_API gr_message_debug_sptr
   gr_make_message_debug();
 
+  /*!
+   * \brief Messages received in this port are printed to stdout.
+   *
+   * This port receives messages from the scheduler's message handling
+   * mechanism and prints it to stdout. This message handler function
+   * is only meant to be used by the scheduler to handle messages
+   * posted to port 'print'.
+   *
+   * \param msg A pmt message passed from the scheduler's message handling.
+   */
   void print(pmt::pmt_t msg);
 
+  /*!
+   * \brief Messages received in this port are stored in a vector.
+   *
+   * This port receives messages from the scheduler's message handling
+   * mechanism and stores it in a vector. Messages can be retrieved
+   * later using the 'get_message' function. This message handler
+   * function is only meant to be used by the scheduler to handle
+   * messages posted to port 'store'.
+   *
+   * \param msg A pmt message passed from the scheduler's message handling.
+   */
+  void store(pmt::pmt_t msg);
+
+  gruel::mutex d_mutex;
+  std::vector<pmt::pmt_t> d_messages;
+
  protected:
   gr_message_debug ();
 
  public:
   ~gr_message_debug ();
+
+  /*! 
+   * \brief Reports the number of messages received by this block.
+   */
+  int num_messages();
+
+  /*!
+   * \brief Get a message (as a PMT) from the message vector at index \p i.
+   *
+   * Messages passed to the 'store' port will be stored in a
+   * vector. This function retrieves those messages by index. They are
+   * index in order of when they were received (all messages are just
+   * pushed onto the back of a vector). This is mostly useful in
+   * debugging message passing graphs and in QA code.
+   *
+   * \param i The index in the vector for the message to retrieve.
+   *
+   * \return a message at index \p i as a pmt_t.
+   */
+  pmt::pmt_t get_message(int i);
 };
 
 #endif /* INCLUDED_GR_MESSAGE_DEBUG_H */