diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-09-06 11:58:30 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-09-06 11:58:30 -0400 |
| commit | c451fff54cccd141b9cb296468e9609035325a88 (patch) | |
| tree | 70bb91b8c3d00f489967cdf8cb85b040d03a7fed | |
| parent | 5441b7ff44aae1200e98462377c84926d6d22773 (diff) | |
| parent | 641335d52f850084735278cbfeca9091190cb4cd (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/swig/block.i | 7 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/top_block.i | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i index 0ad5825bbe..7b7ac8ee43 100644 --- a/gnuradio-runtime/swig/block.i +++ b/gnuradio-runtime/swig/block.i @@ -69,18 +69,25 @@ class gr::block : public gr::basic_block // Methods to access performance counters float pc_noutput_items(); + float pc_noutput_items_avg(); float pc_noutput_items_var(); float pc_nproduced(); + float pc_nproduced_avg(); float pc_nproduced_var(); float pc_input_buffers_full(int which); + float pc_input_buffers_full_avg(int which); float pc_input_buffers_full_var(int which); std::vector<float> pc_input_buffers_full(); + std::vector<float> pc_input_buffers_full_avg(); std::vector<float> pc_input_buffers_full_var(); float pc_output_buffers_full(int which); + float pc_output_buffers_full_avg(int which); float pc_output_buffers_full_var(int which); std::vector<float> pc_output_buffers_full(); + std::vector<float> pc_output_buffers_full_avg(); std::vector<float> pc_output_buffers_full_var(); float pc_work_time(); + float pc_work_time_avg(); float pc_work_time_var(); // Methods to manage processor affinity. diff --git a/gnuradio-runtime/swig/top_block.i b/gnuradio-runtime/swig/top_block.i index f5c5819ab9..485159972b 100644 --- a/gnuradio-runtime/swig/top_block.i +++ b/gnuradio-runtime/swig/top_block.i @@ -44,6 +44,7 @@ namespace gr { void lock(); void unlock() throw (std::runtime_error); std::string edge_list(); + std::string msg_edge_list(); void dump(); int max_noutput_items(); |