diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-12 21:07:33 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-12 21:07:33 -0800 |
| commit | af7d55fda43746ae187bc520952eacf420f8363f (patch) | |
| tree | 89dc0783c1af3b0672d1789868f8d5f4d00198a5 /gnuradio-core/src/lib/runtime | |
| parent | 2e22fb2905273cfa27ac89465366272057f206ac (diff) | |
| parent | 54a850f1612537e6cd5a7e7d415bc28b959cb295 (diff) | |
Merge branch 'master' into next
Adjusted pmt usage for naming
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_basic_block.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h index d4f5cb5941..de56954c54 100644 --- a/gnuradio-core/src/lib/runtime/gr_basic_block.h +++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h @@ -58,18 +58,6 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_ typedef boost::function<void(pmt::pmt_t)> msg_handler_t; private: - /* - * This function is called by the runtime system to dispatch messages. - * - * The thread-safety guarantees mentioned in set_msg_handler are implemented - * by the callers of this method. - */ - void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg) - { - // AA Update this - if (d_msg_handlers.find(which_port) != d_msg_handlers.end()) // Is there a handler? - d_msg_handlers[which_port](msg); // Yes, invoke it. - }; //msg_handler_t d_msg_handler; typedef std::map<pmt::pmt_t , msg_handler_t, pmt::comperator> d_msg_handlers_t; @@ -124,6 +112,19 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_ */ void set_color(vcolor color) { d_color = color; } vcolor color() const { return d_color; } + + /* + * This function is called by the runtime system to dispatch messages. + * + * The thread-safety guarantees mentioned in set_msg_handler are implemented + * by the callers of this method. + */ + virtual void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg) + { + // AA Update this + if (d_msg_handlers.find(which_port) != d_msg_handlers.end()) // Is there a handler? + d_msg_handlers[which_port](msg); // Yes, invoke it. + }; // Message passing interface pmt::pmt_t message_subscribers; |