[Commit-gnuradio] r6183 - gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2007-08-27 00:30:09 -0600 (Mon, 27 Aug 2007)
New Revision: 6183

Modified:
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
Log:
Revert experimental bug fix code that didn't work.

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
  2007-08-27 06:29:43 UTC (rev 6182)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
  2007-08-27 06:30:09 UTC (rev 6183)
@@ -100,8 +100,6 @@
 void
 gr_top_block_impl::start_threads()
 {
-  omni_mutex_lock lock(d_threads_mutex);
-
   if (GR_TOP_BLOCK_IMPL_DEBUG)
     std::cout << "start_threads: entered" << std::endl;
 
@@ -121,8 +119,6 @@
 void
 gr_top_block_impl::stop()
 {
-  omni_mutex_lock lock(d_threads_mutex);
-
   if (GR_TOP_BLOCK_IMPL_DEBUG)
     std::cout << "stop: entered" << std::endl;
 
@@ -138,8 +134,6 @@
 void
 gr_top_block_impl::wait()
 {
-  omni_mutex_lock lock(d_threads_mutex);
-
   if (GR_TOP_BLOCK_IMPL_DEBUG)
     std::cout << "wait: entered" << std::endl;
 

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
   2007-08-27 06:29:43 UTC (rev 6182)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
   2007-08-27 06:30:09 UTC (rev 6183)
@@ -23,8 +23,6 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
 #define INCLUDED_GR_TOP_BLOCK_IMPL_H
 
-//#include <gr_runtime_types.h>
-//#include <gr_block.h>
 #include <gr_scheduler_thread.h>
 
 /*!
@@ -59,7 +57,6 @@
     
   bool                           d_running;
   gr_flat_flowgraph_sptr         d_ffg;
-  omni_mutex                     d_threads_mutex;
   gr_scheduler_thread_vector_t   d_threads;
   gr_top_block                  *d_owner;
   int                            d_lock_count;
@@ -69,9 +66,6 @@
 
   void start_threads();
   void restart();
-
-public:
-
 };
 
 #endif /* INCLUDED_GR_TOP_BLOCK_IMPL_H */