[Commit-gnuradio] r6191 - gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime

[eb]

Author: eb
Date: 2007-08-27 22:55:38 -0600 (Mon, 27 Aug 2007)
New Revision: 6191

Modified:
   
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
   
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
   
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
Log:
kludged around hang problem

Modified: 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
===================================================================
--- 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
     2007-08-27 22:08:44 UTC (rev 6190)
+++ 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
     2007-08-28 04:55:38 UTC (rev 6191)
@@ -31,7 +31,7 @@
 #include <signal.h>
 #endif
 
-#define GR_SCHEDULER_THREAD_DEBUG 1
+#define GR_SCHEDULER_THREAD_DEBUG 0
 
 gr_scheduler_thread::gr_scheduler_thread(gr_block_vector_t graph) :
   omni_thread(NULL, PRIORITY_NORMAL),

Modified: 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
===================================================================
--- 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
    2007-08-27 22:08:44 UTC (rev 6190)
+++ 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
    2007-08-28 04:55:38 UTC (rev 6191)
@@ -82,14 +82,14 @@
 void
 gr_single_threaded_scheduler::run ()
 {
-  d_enabled = true;
+  // d_enabled = true;         // KLUDGE
   main_loop ();
 }
 
 void
 gr_single_threaded_scheduler::stop ()
 { 
-  if (1)
+  if (0)
     std::cout << "gr_singled_threaded_scheduler::stop() "
              << this << std::endl;
   d_enabled = false;

Modified: 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
===================================================================
--- 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
       2007-08-27 22:08:44 UTC (rev 6190)
+++ 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
       2007-08-28 04:55:38 UTC (rev 6191)
@@ -33,7 +33,7 @@
 #include <stdexcept>
 #include <iostream>
 
-#define GR_TOP_BLOCK_IMPL_DEBUG 1
+#define GR_TOP_BLOCK_IMPL_DEBUG 0
 
 static gr_top_block_impl *s_impl = 0;
 

Modified: 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
===================================================================
--- 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
 2007-08-27 22:08:44 UTC (rev 6190)
+++ 
gnuradio/branches/developers/eb/fg/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
 2007-08-28 04:55:38 UTC (rev 6191)
@@ -29,13 +29,10 @@
 #include <gr_head.h>
 #include <gr_null_source.h>
 #include <gr_null_sink.h>
-
-#define VERBOSE 1
-
-#if (VERBOSE)
 #include <iostream>
-#endif
 
+#define VERBOSE 0
+
 void qa_gr_top_block::t0()
 {
   if (VERBOSE) std::cout << "qa_gr_top_block::t0()\n";
@@ -52,7 +49,7 @@
   gr_top_block_sptr tb = gr_make_top_block("top");
 
   gr_block_sptr src = gr_make_null_source(sizeof(int));
-  gr_block_sptr head = gr_make_head(sizeof(int), 1000000);
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
   gr_block_sptr dst = gr_make_null_sink(sizeof(int));
 
   tb->connect(src, 0, head, 0);
@@ -67,7 +64,7 @@
   gr_top_block_sptr tb = gr_make_top_block("top");
 
   gr_block_sptr src = gr_make_null_source(sizeof(int));
-  gr_block_sptr head = gr_make_head(sizeof(int), 1000000);
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
   gr_block_sptr dst = gr_make_null_sink(sizeof(int));
 
   tb->connect(src, 0, head, 0);
@@ -78,13 +75,6 @@
   tb->wait();
 }
 
-#if 0
-/*
- * This test case is indeterminate.  There is a race.
- * There is no guarantee that the graph hasn't already
- * completed (because of the head) before the lock/unlock
- * sequence is executed.
- */
 void qa_gr_top_block::t3_lock_unlock()
 {
   if (VERBOSE) std::cout << "qa_gr_top_block::t3()\n";
@@ -92,32 +82,8 @@
   gr_top_block_sptr tb = gr_make_top_block("top");
 
   gr_block_sptr src = gr_make_null_source(sizeof(int));
-  gr_block_sptr head = gr_make_head(sizeof(int), 1000000);
   gr_block_sptr dst = gr_make_null_sink(sizeof(int));
 
-  tb->connect(src, 0, head, 0);
-  tb->connect(head, 0, dst, 0);
-
-  tb->start();
-
-  tb->lock();
-  tb->unlock();
-
-  // tb->stop();
-  tb->wait();
-}
-
-#else
-
-void qa_gr_top_block::t3_lock_unlock()
-{
-  if (VERBOSE) std::cout << "qa_gr_top_block::t3()\n";
-
-  gr_top_block_sptr tb = gr_make_top_block("top");
-
-  gr_block_sptr src = gr_make_null_source(sizeof(int));
-  gr_block_sptr dst = gr_make_null_sink(sizeof(int));
-
   tb->connect(src, 0, dst, 0);
 
   tb->start();
@@ -128,9 +94,7 @@
   tb->stop();
   tb->wait();
 }
-#endif
 
-
 void qa_gr_top_block::t4_reconfigure()
 {
   if (VERBOSE) std::cout << "qa_gr_top_block::t4()\n";
@@ -138,7 +102,7 @@
   gr_top_block_sptr tb = gr_make_top_block("top");
 
   gr_block_sptr src = gr_make_null_source(sizeof(int));
-  gr_block_sptr head = gr_make_head(sizeof(int), 1);
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
   gr_block_sptr dst = gr_make_null_sink(sizeof(int));
 
   // Start infinite flowgraph