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

[jcorgan]

Author: jcorgan
Date: 2006-11-03 12:28:37 -0700 (Fri, 03 Nov 2006)
New Revision: 3921

Added:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
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.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
Log:
Work in progress.  Added private implementation class for gr_runtime.


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-11-03 00:08:39 UTC (rev 3920)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
 2006-11-03 19:28:37 UTC (rev 3921)
@@ -47,6 +47,7 @@
        gr_preferences.cc                       \
        gr_realtime.cc                          \
        gr_runtime.cc                           \
+       gr_runtime_impl.cc                      \
        gr_single_threaded_scheduler.cc         \
        gr_tmp_path.cc                          \
        gr_vmcircbuf.cc                         \
@@ -83,6 +84,7 @@
        gr_preferences.h                        \
        gr_realtime.h                           \
        gr_runtime.h                            \
+       gr_runtime_impl.h                       \
        gr_runtime_types.h                      \
        gr_select_handler.h                     \
        gr_single_threaded_scheduler.h          \

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
       2006-11-03 00:08:39 UTC (rev 3920)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
       2006-11-03 19:28:37 UTC (rev 3921)
@@ -25,6 +25,7 @@
 #endif
 
 #include <gr_runtime.h>
+#include <gr_runtime_impl.h>
 #include <iostream.h>
 
 gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block)
@@ -33,12 +34,13 @@
 }
 
 gr_runtime::gr_runtime(gr_hier_block2_sptr top_block)
-  : d_top_block(top_block)
 {
+    d_impl = new gr_runtime_impl(top_block);
 }
   
 gr_runtime::~gr_runtime()
 {
+    delete d_impl;
 }
 
 void gr_runtime::run()

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-11-03 00:08:39 UTC (rev 3920)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
        2006-11-03 19:28:37 UTC (rev 3921)
@@ -23,11 +23,13 @@
 #ifndef INCLUDED_GR_RUNTIME_H
 #define INCLUDED_GR_RUNTIME_H
 
-#include <gr_runtime_types.h>
-
 // Define to 0 to eliminate runtime debugging
 #define GR_RUNTIME_DEBUG 1
 
+#include <gr_runtime_types.h>
+
+class gr_runtime_impl;
+
 gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
 
 class gr_runtime
@@ -36,7 +38,7 @@
     gr_runtime(gr_hier_block2_sptr top_block);
     friend gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
 
-    gr_hier_block2_sptr d_top_block;
+    gr_runtime_impl *d_impl;
     
 public:
     ~gr_runtime();

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
                          (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
  2006-11-03 19:28:37 UTC (rev 3921)
@@ -0,0 +1,37 @@
+/* -*- 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_runtime_impl.h>
+#include <iostream.h>
+
+gr_runtime_impl::gr_runtime_impl(gr_hier_block2_sptr top_block) :
+d_top_block(top_block)
+{
+}
+  
+gr_runtime_impl::~gr_runtime_impl()
+{
+}


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

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
                           (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
   2006-11-03 19:28:37 UTC (rev 3921)
@@ -0,0 +1,43 @@
+/* -*- 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_RUNTIME_IMPL_H
+#define INCLUDED_GR_RUNTIME_IMPL_H
+
+#include <gr_runtime_types.h>
+
+// Define to 0 to eliminate runtime debugging
+#define GR_RUNTIME_IMPL_DEBUG 1
+
+class gr_runtime_impl
+{
+private:
+    gr_runtime_impl(gr_hier_block2_sptr top_block);
+    friend class gr_runtime;
+    
+    gr_hier_block2_sptr d_top_block;
+    
+public:
+    ~gr_runtime_impl();
+};
+
+#endif /* INCLUDED_GR_RUNTIME_IMPL_H */


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