Merge branch 'master' into port_config

3 files changed, 25 insertions, 0 deletions

diff --git a/include/gnuradio/block.hpp b/include/gnuradio/block.hpp
index a7744fd..d06c49c 100644
--- a/include/gnuradio/block.hpp
+++ b/include/gnuradio/block.hpp
@@ -249,6 +249,15 @@ struct GRAS_API Block : Element
     //! scheduler calls when the topology is updated, can be overloaded
     virtual bool check_topology(int ninputs, int noutputs);
 
+    /*!
+     * Set if the work call should be interruptible by stop().
+     * Some work implementations block with the expectation of
+     * getting a boost thread interrupt in a blocking call.
+     * Set set_interruptible_work(true) if this is the case.
+     * By default, work implementations are not interruptible.
+     */
+    void set_interruptible_work(const bool enb);
+
     /*******************************************************************
      * routines related to affinity and allocation
      ******************************************************************/
diff --git a/include/gnuradio/gr_block.h b/include/gnuradio/gr_block.h
index d46e252..317c207 100644
--- a/include/gnuradio/gr_block.h
+++ b/include/gnuradio/gr_block.h
@@ -118,6 +118,18 @@ struct GRAS_API gr_block : gnuradio::Block
 
     void set_decimation(const size_t);
 
+    ///////////// TODO //////////////////////
+    int max_noutput_items(){return 0;}
+    void set_max_noutput_items(int){}
+    void unset_max_noutput_items(){}
+    bool is_set_max_noutput_items(){return false;}
+    void set_max_output_buffer(long){}
+    void set_max_output_buffer(int, long){}
+    long max_output_buffer(size_t){return 0;}
+    void set_min_output_buffer(long){}
+    void set_min_output_buffer(int, long){}
+    long min_output_buffer(size_t){return 0;}
+
 };
 
 typedef boost::shared_ptr<gr_block> gr_block_sptr;
diff --git a/include/gnuradio/gr_top_block.h b/include/gnuradio/gr_top_block.h
index 65680f2..eb1a9aa 100644
--- a/include/gnuradio/gr_top_block.h
+++ b/include/gnuradio/gr_top_block.h
@@ -37,6 +37,10 @@ struct GRAS_API gr_top_block : gnuradio::TopBlock
         this->update();
     }
 
+    ///////////// TODO //////////////////////
+    int max_noutput_items(){return 0;}
+    void set_max_noutput_items(int){}
+
 };
 
 typedef boost::shared_ptr<gr_top_block> gr_top_block_sptr;