1 files changed, 160 insertions, 200 deletions
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
index 8ebbbda587..4c6414c465 100644
--- a/gnuradio-runtime/lib/hier_block2.cc
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -34,251 +34,211 @@ namespace gr {
 
 #define GR_HIER_BLOCK2_DEBUG 0
 
-  hier_block2_sptr
-  make_hier_block2(const std::string &name,
-                   gr::io_signature::sptr input_signature,
-                   gr::io_signature::sptr output_signature)
-  {
-    return gnuradio::get_initial_sptr
-      (new hier_block2(name, input_signature, output_signature));
-  }
-
-  hier_block2::hier_block2(const std::string &name,
-                           gr::io_signature::sptr input_signature,
-                           gr::io_signature::sptr output_signature)
+hier_block2_sptr make_hier_block2(const std::string& name,
+                                  gr::io_signature::sptr input_signature,
+                                  gr::io_signature::sptr output_signature)
+{
+    return gnuradio::get_initial_sptr(
+        new hier_block2(name, input_signature, output_signature));
+}
+
+hier_block2::hier_block2(const std::string& name,
+                         gr::io_signature::sptr input_signature,
+                         gr::io_signature::sptr output_signature)
     : basic_block(name, input_signature, output_signature),
       d_detail(new hier_block2_detail(this)),
       hier_message_ports_in(pmt::PMT_NIL),
       hier_message_ports_out(pmt::PMT_NIL)
-  {
+{
     // This bit of magic ensures that self() works in the constructors of derived classes.
     gnuradio::detail::sptr_magic::create_and_stash_initial_sptr(this);
-  }
+}
 
-  hier_block2::~hier_block2()
-  {
+hier_block2::~hier_block2()
+{
     disconnect_all();
     gnuradio::detail::sptr_magic::cancel_initial_sptr(this);
     delete d_detail;
-  }
+}
 
-  hier_block2::opaque_self
-  hier_block2::self()
-  {
-    return shared_from_this();
-  }
+hier_block2::opaque_self hier_block2::self() { return shared_from_this(); }
 
-  hier_block2_sptr
-  hier_block2::to_hier_block2()
-  {
+hier_block2_sptr hier_block2::to_hier_block2()
+{
     return cast_to_hier_block2_sptr(shared_from_this());
-  }
-
-  void
-  hier_block2::connect(basic_block_sptr block)
-  {
-    d_detail->connect(block);
-  }
-
-  void
-  hier_block2::connect(basic_block_sptr src, int src_port,
-                       basic_block_sptr dst, int dst_port)
-  {
+}
+
+void hier_block2::connect(basic_block_sptr block) { d_detail->connect(block); }
+
+void hier_block2::connect(basic_block_sptr src,
+                          int src_port,
+                          basic_block_sptr dst,
+                          int dst_port)
+{
     d_detail->connect(src, src_port, dst, dst_port);
-  }
-
-  void
-  hier_block2::msg_connect(basic_block_sptr src, pmt::pmt_t srcport,
-                           basic_block_sptr dst, pmt::pmt_t dstport)
-  {
-    if(!pmt::is_symbol(srcport)) {
-      throw std::runtime_error("bad port id");
+}
+
+void hier_block2::msg_connect(basic_block_sptr src,
+                              pmt::pmt_t srcport,
+                              basic_block_sptr dst,
+                              pmt::pmt_t dstport)
+{
+    if (!pmt::is_symbol(srcport)) {
+        throw std::runtime_error("bad port id");
     }
     d_detail->msg_connect(src, srcport, dst, dstport);
-  }
+}
 
-  void
-  hier_block2::msg_connect(basic_block_sptr src, std::string srcport,
-                           basic_block_sptr dst, std::string dstport)
-  {
+void hier_block2::msg_connect(basic_block_sptr src,
+                              std::string srcport,
+                              basic_block_sptr dst,
+                              std::string dstport)
+{
     d_detail->msg_connect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
-  }
-
-  void
-  hier_block2::msg_disconnect(basic_block_sptr src, pmt::pmt_t srcport,
-                              basic_block_sptr dst, pmt::pmt_t dstport)
-  {
-    if(!pmt::is_symbol(srcport)) {
-      throw std::runtime_error("bad port id");
+}
+
+void hier_block2::msg_disconnect(basic_block_sptr src,
+                                 pmt::pmt_t srcport,
+                                 basic_block_sptr dst,
+                                 pmt::pmt_t dstport)
+{
+    if (!pmt::is_symbol(srcport)) {
+        throw std::runtime_error("bad port id");
     }
     d_detail->msg_disconnect(src, srcport, dst, dstport);
-  }
+}
 
-  void
-  hier_block2::msg_disconnect(basic_block_sptr src, std::string srcport,
-                              basic_block_sptr dst, std::string dstport)
-  {
+void hier_block2::msg_disconnect(basic_block_sptr src,
+                                 std::string srcport,
+                                 basic_block_sptr dst,
+                                 std::string dstport)
+{
     d_detail->msg_disconnect(src, pmt::mp(srcport), dst, pmt::mp(dstport));
-  }
-
-  void
-  hier_block2::disconnect(basic_block_sptr block)
-  {
-    d_detail->disconnect(block);
-  }
-
-  void
-  hier_block2::disconnect(basic_block_sptr src, int src_port,
-                          basic_block_sptr dst, int dst_port)
-  {
+}
+
+void hier_block2::disconnect(basic_block_sptr block) { d_detail->disconnect(block); }
+
+void hier_block2::disconnect(basic_block_sptr src,
+                             int src_port,
+                             basic_block_sptr dst,
+                             int dst_port)
+{
     d_detail->disconnect(src, src_port, dst, dst_port);
-  }
-
-  void
-  hier_block2::disconnect_all()
-  {
-    d_detail->disconnect_all();
-  }
-
-  void
-  hier_block2::lock()
-  {
-    d_detail->lock();
-  }
-
-  void
-  hier_block2::unlock()
-  {
-    d_detail->unlock();
-  }
-
-  flat_flowgraph_sptr
-  hier_block2::flatten() const
-  {
+}
+
+void hier_block2::disconnect_all() { d_detail->disconnect_all(); }
+
+void hier_block2::lock() { d_detail->lock(); }
+
+void hier_block2::unlock() { d_detail->unlock(); }
+
+flat_flowgraph_sptr hier_block2::flatten() const
+{
     flat_flowgraph_sptr new_ffg = make_flat_flowgraph();
     d_detail->flatten_aux(new_ffg);
     return new_ffg;
-  }
+}
 
-  void
-  hier_block2::set_processor_affinity(const std::vector<int> &mask)
-  {
+void hier_block2::set_processor_affinity(const std::vector<int>& mask)
+{
     d_detail->set_processor_affinity(mask);
-  }
+}
 
-  void
-  hier_block2::unset_processor_affinity()
-  {
-    d_detail->unset_processor_affinity();
-  }
+void hier_block2::unset_processor_affinity() { d_detail->unset_processor_affinity(); }
 
-  std::vector<int>
-  hier_block2::processor_affinity()
-  {
+std::vector<int> hier_block2::processor_affinity()
+{
     return d_detail->processor_affinity();
-  }
-
-  void
-  hier_block2::set_log_level(std::string level)
-  {
-    d_detail->set_log_level(level);
-  }
-
-  std::string
-  hier_block2::log_level()
-  {
-    return d_detail->log_level();
-  }
-
-  std::string
-  dot_graph(hier_block2_sptr hierblock2)
-  {
+}
+
+void hier_block2::set_log_level(std::string level) { d_detail->set_log_level(level); }
+
+std::string hier_block2::log_level() { return d_detail->log_level(); }
+
+std::string dot_graph(hier_block2_sptr hierblock2)
+{
     return dot_graph_fg(hierblock2->flatten());
-  }
+}
 
-  int
-  hier_block2::max_output_buffer(size_t port)
-  {
-    if(port >= d_detail->d_max_output_buffer.size())
-      throw std::invalid_argument("hier_block2::max_output_buffer(int): port out of range.");
+int hier_block2::max_output_buffer(size_t port)
+{
+    if (port >= d_detail->d_max_output_buffer.size())
+        throw std::invalid_argument(
+            "hier_block2::max_output_buffer(int): port out of range.");
     return d_detail->d_max_output_buffer[port];
-  }
-
-  void
-  hier_block2::set_max_output_buffer(int max_output_buffer)
-  {
-    if(output_signature()->max_streams()>0)
-    {
-      if(d_detail->d_max_output_buffer.size() == 0)
-        throw std::length_error("hier_block2::set_max_output_buffer(int): out_sig greater than zero, buff_vect isn't");
-      for(int idx = 0; idx < output_signature()->max_streams(); idx++){
-        d_detail->d_max_output_buffer[idx] = max_output_buffer;
-      }
+}
+
+void hier_block2::set_max_output_buffer(int max_output_buffer)
+{
+    if (output_signature()->max_streams() > 0) {
+        if (d_detail->d_max_output_buffer.size() == 0)
+            throw std::length_error("hier_block2::set_max_output_buffer(int): out_sig "
+                                    "greater than zero, buff_vect isn't");
+        for (int idx = 0; idx < output_signature()->max_streams(); idx++) {
+            d_detail->d_max_output_buffer[idx] = max_output_buffer;
+        }
     }
-  }
-
-  void
-  hier_block2::set_max_output_buffer(size_t port, int max_output_buffer)
-  {
-    if(port >= d_detail->d_max_output_buffer.size())
-      throw std::invalid_argument("hier_block2::set_max_output_buffer(size_t,int): port out of range.");
-    else{
-      d_detail->d_max_output_buffer[port] = max_output_buffer;
+}
+
+void hier_block2::set_max_output_buffer(size_t port, int max_output_buffer)
+{
+    if (port >= d_detail->d_max_output_buffer.size())
+        throw std::invalid_argument(
+            "hier_block2::set_max_output_buffer(size_t,int): port out of range.");
+    else {
+        d_detail->d_max_output_buffer[port] = max_output_buffer;
     }
-  }
+}
 
-  int
-  hier_block2::min_output_buffer(size_t port)
-  {
-    if(port >= d_detail->d_min_output_buffer.size())
-      throw std::invalid_argument("hier_block2::min_output_buffer(size_t): port out of range.");
+int hier_block2::min_output_buffer(size_t port)
+{
+    if (port >= d_detail->d_min_output_buffer.size())
+        throw std::invalid_argument(
+            "hier_block2::min_output_buffer(size_t): port out of range.");
     return d_detail->d_min_output_buffer[port];
-  }
-
-  void
-  hier_block2::set_min_output_buffer(int min_output_buffer)
-  {
-    if(output_signature()->max_streams()>0)
-    {
-      if(d_detail->d_min_output_buffer.size() == 0)
-        throw std::length_error("hier_block2::set_min_output_buffer(int): out_sig greater than zero, buff_vect isn't");
-      for(int idx = 0; idx < output_signature()->max_streams(); idx++){
-        d_detail->d_min_output_buffer[idx] = min_output_buffer;
-      }
+}
+
+void hier_block2::set_min_output_buffer(int min_output_buffer)
+{
+    if (output_signature()->max_streams() > 0) {
+        if (d_detail->d_min_output_buffer.size() == 0)
+            throw std::length_error("hier_block2::set_min_output_buffer(int): out_sig "
+                                    "greater than zero, buff_vect isn't");
+        for (int idx = 0; idx < output_signature()->max_streams(); idx++) {
+            d_detail->d_min_output_buffer[idx] = min_output_buffer;
+        }
     }
-  }
-
-  void
-  hier_block2::set_min_output_buffer(size_t port, int min_output_buffer)
-  {
-    if(port >= d_detail->d_min_output_buffer.size())
-      throw std::invalid_argument("hier_block2::set_min_output_buffer(size_t,int): port out of range.");
-    else{
-      d_detail->d_min_output_buffer[port] = min_output_buffer;
+}
+
+void hier_block2::set_min_output_buffer(size_t port, int min_output_buffer)
+{
+    if (port >= d_detail->d_min_output_buffer.size())
+        throw std::invalid_argument(
+            "hier_block2::set_min_output_buffer(size_t,int): port out of range.");
+    else {
+        d_detail->d_min_output_buffer[port] = min_output_buffer;
     }
-  }
-
-  bool
-  hier_block2::all_min_output_buffer_p(void)
-  {
-    if(!d_detail->d_min_output_buffer.size())
-      return false;
-    for(size_t idx = 1; idx < d_detail->d_min_output_buffer.size(); idx++){
-      if(d_detail->d_min_output_buffer[0] != d_detail->d_min_output_buffer[idx])
+}
+
+bool hier_block2::all_min_output_buffer_p(void)
+{
+    if (!d_detail->d_min_output_buffer.size())
         return false;
+    for (size_t idx = 1; idx < d_detail->d_min_output_buffer.size(); idx++) {
+        if (d_detail->d_min_output_buffer[0] != d_detail->d_min_output_buffer[idx])
+            return false;
     }
     return true;
-  }
-  bool
-  hier_block2::all_max_output_buffer_p(void)
-  {
-    if(!d_detail->d_max_output_buffer.size())
-      return false;
-    for(size_t idx = 1; idx < d_detail->d_max_output_buffer.size(); idx++){
-      if(d_detail->d_max_output_buffer[0] != d_detail->d_max_output_buffer[idx])
+}
+bool hier_block2::all_max_output_buffer_p(void)
+{
+    if (!d_detail->d_max_output_buffer.size())
         return false;
+    for (size_t idx = 1; idx < d_detail->d_max_output_buffer.size(); idx++) {
+        if (d_detail->d_max_output_buffer[0] != d_detail->d_max_output_buffer[idx])
+            return false;
     }
     return true;
-  }
+}
 
 } /* namespace gr */