[Commit-gnuradio] r3871 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-10-26 21:44:28 -0600 (Thu, 26 Oct 2006)
New Revision: 3871

Added:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
Log:
Work in progress. Added gr_tier_block skeleton.

This will be renamed to gr_hier_block when done,
eliminating the hier_block.py implementation.


Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
 2006-10-27 01:47:44 UTC (rev 3870)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
 2006-10-27 03:44:28 UTC (rev 3871)
@@ -33,6 +33,7 @@
        gr_basic_block.cc                       \
        gr_block.cc                             \
        gr_block_detail.cc                      \
+       gr_tier_block.cc                        \
        gr_buffer.cc                            \
        gr_dispatcher.cc                        \
        gr_error_handler.cc                     \
@@ -64,6 +65,7 @@
        gr_basic_block.h                        \
        gr_block.h                              \
        gr_block_detail.h                       \
+       gr_tier_block.h                         \
        gr_buffer.h                             \
        gr_complex.h                            \
        gr_dispatcher.h                         \
@@ -99,6 +101,7 @@
        gr_basic_block.i                \
        gr_block.i                      \
        gr_block_detail.i               \
+       gr_tier_block.i                 \
        gr_buffer.i                     \
        gr_dispatcher.i                 \
        gr_error_handler.i              \

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
        2006-10-27 01:47:44 UTC (rev 3870)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
        2006-10-27 03:44:28 UTC (rev 3871)
@@ -32,6 +32,7 @@
 class gr_basic_block;
 class gr_block;
 class gr_block_detail;
+class gr_tier_block;
 class gr_io_signature;
 class gr_buffer;
 class gr_buffer_reader;
@@ -39,6 +40,7 @@
 typedef boost::shared_ptr<gr_basic_block>      gr_basic_block_sptr;
 typedef boost::shared_ptr<gr_block>            gr_block_sptr;
 typedef boost::shared_ptr<gr_block_detail>     gr_block_detail_sptr;
+typedef boost::shared_ptr<gr_tier_block>       gr_tier_block_sptr;
 typedef boost::shared_ptr<gr_io_signature>     gr_io_signature_sptr;
 typedef boost::shared_ptr<gr_buffer>           gr_buffer_sptr;
 typedef boost::shared_ptr<gr_buffer_reader>    gr_buffer_reader_sptr;

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
    2006-10-27 03:44:28 UTC (rev 3871)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_tier_block.h>
+
+gr_tier_block_sptr gr_make_tier_block(std::string name, 
+                                     gr_io_signature_sptr input_signature,
+                                     gr_io_signature_sptr output_signature)
+{
+    return gr_tier_block_sptr(new gr_tier_block(name, input_signature, 
output_signature));
+}
+
+gr_tier_block::gr_tier_block(std::string name,
+                            gr_io_signature_sptr input_signature,
+                            gr_io_signature_sptr output_signature)
+  : gr_basic_block(name, input_signature, output_signature)
+{
+}
+
+gr_tier_block::~gr_tier_block ()
+{
+}


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.cc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
     2006-10-27 03:44:28 UTC (rev 3871)
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef INCLUDED_GR_TIER_BLOCK_H
+#define INCLUDED_GR_TIER_BLOCK_H
+
+#include <gr_basic_block.h>
+
+/*!
+ * \brief public constructor for gr_tier_block
+ */
+gr_tier_block_sptr gr_make_tier_block(std::string name,
+                                     gr_io_signature_sptr input_signature,
+                                     gr_io_signature_sptr output_signature);
+
+/*!
+ * \brief gr_tier_block - Hierarchical container class for gr_block's
+ *
+ */
+class gr_tier_block : public gr_basic_block 
+{
+private: 
+    gr_tier_block(std::string name,
+                 gr_io_signature_sptr input_signature,
+                 gr_io_signature_sptr output_signature);
+
+    friend gr_tier_block_sptr gr_make_tier_block(std::string name,
+                                                gr_io_signature_sptr 
input_signature,
+                                                gr_io_signature_sptr 
output_signature);
+
+public:
+    ~gr_tier_block();
+};
+
+#endif /* INCLUDED_GR_TIER_BLOCK_H */


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.h
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
     2006-10-27 03:44:28 UTC (rev 3871)
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+class gr_tier_block;
+typedef boost::shared_ptr<gr_tier_block> gr_tier_block_sptr;
+%template(gr_tier_block_sptr) boost::shared_ptr<gr_tier_block>;
+
+%rename(tier_block) gr_make_tier_block;
+gr_tier_block_sptr gr_make_tier_block(std::string name,
+                                     gr_io_signature_sptr input_signature,
+                                     gr_io_signature_sptr output_signature);
+
+/*!
+ * \brief gr_tier_block - Container class for tree of gr_block's
+ *
+ */
+class gr_tier_block 
+{
+    gr_tier_block(std::string name,
+                 gr_io_signature_sptr input_signature,
+                 gr_io_signature_sptr output_signature);
+
+public:
+    ~gr_tier_block ();
+};


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_tier_block.i
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
   2006-10-27 01:47:44 UTC (rev 3870)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
   2006-10-27 03:44:28 UTC (rev 3871)
@@ -26,6 +26,7 @@
 #include <gr_buffer.h>
 #include <gr_block.h>
 #include <gr_block_detail.h>
+#include <gr_tier_block.h>
 #include <gr_single_threaded_scheduler.h>
 #include <gr_message.h>
 #include <gr_msg_handler.h>
@@ -40,6 +41,7 @@
 %include <gr_basic_block.i>
 %include <gr_block.i>
 %include <gr_block_detail.i>
+%include <gr_tier_block.i>
 %include <gr_swig_block_magic.i>
 %include <gr_single_threaded_scheduler.i>
 %include <gr_message.i>