[Commit-gnuradio] r4124 - in gnuradio/branches/developers/jcorgan/sfg: gnuradio-core/src/lib/runtime gnuradio-examples/c++/dialtone gr-audio-alsa/src

[jcorgan]

Author: jcorgan
Date: 2006-12-17 19:11:34 -0700 (Sun, 17 Dec 2006)
New Revision: 4124

Removed:
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/test_head.cc
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/test_head.h
Modified:
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime.cc
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
   
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/Makefile.am
   gnuradio/branches/developers/jcorgan/sfg/gr-audio-alsa/src/audio_alsa_sink.cc
Log:
Clean up in prep for trunk merge.

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime.cc
        2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime.cc
        2006-12-18 02:11:34 UTC (rev 4124)
@@ -29,7 +29,6 @@
 #include <gr_local_sighandler.h>
 #include <iostream>
 
-static char *hitmsg = "SIGINT handler hit\n";
 static gr_runtime *s_runtime = 0;
 
 gr_runtime_sptr 
@@ -50,11 +49,11 @@
     delete d_impl;
 }
 
-// FIXME: This forces there to be only one runtime instance
+// HACK: This forces there to be only one runtime instance
 static void 
 runtime_sigint_handler(int signum)
 {
-    write(2, hitmsg, strlen(hitmsg));
+
     if (s_runtime)
         s_runtime->stop();
 }

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
   2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
   2006-12-18 02:11:34 UTC (rev 4124)
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#define GR_RUNTIME_IMPL_DEBUG 1
+#define GR_RUNTIME_IMPL_DEBUG 0
 
 #include <gr_runtime_impl.h>
 #include <gr_simple_flowgraph.h>
@@ -37,8 +37,7 @@
 gr_runtime_impl::gr_runtime_impl(gr_hier_block2_sptr top_block) 
   : d_running(false),
     d_top_block(top_block),
-    d_sfg(gr_make_simple_flowgraph()),
-    d_graphs()
+    d_sfg(gr_make_simple_flowgraph())
 {
 }
 

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
        2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
        2006-12-18 02:11:34 UTC (rev 4124)
@@ -32,7 +32,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#define GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG 1
+#define GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG 0
 
 gr_edge_sptr
 gr_make_edge(const std::string &src_name, int src_port,
@@ -110,8 +110,8 @@
     gr_block_sptr dst_block = lookup_block(dst_name);
 
     if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-       std::cout << "Connecting " << src_name << ":" << src_port << "->"
-              << dst_name << ":" << dst_port << std::endl;
+        std::cout << "Connecting " << src_name << ":" << src_port << "->"
+                  << dst_name << ":" << dst_port << std::endl;
 
     if (!src_block)
         throw std::invalid_argument("unknown src name");
@@ -485,33 +485,12 @@
     return result;
 }
 
-void
-gr_simple_flowgraph_detail::dump_block_vector(gr_block_vector_t blocks)
-{
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-        for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
-            std::cout << (*p) << std::endl;
-        }
-}
-
 gr_block_vector_t
 gr_simple_flowgraph_detail::topological_sort(gr_block_vector_t &blocks)
 {
     gr_block_vector_t result, tmp;
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG) {
-        std::cout << "Before source sort: " << std::endl;
-        dump_block_vector(blocks);
-        std::cout << std::endl;
-    }
-
     tmp = sort_sources_first(blocks);
 
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG) {
-        std::cout << "After source sort: " << std::endl;
-        dump_block_vector(tmp);
-        std::cout << std::endl;
-    }
-
     // Start 'em all white
     for (gr_block_viter_t p = tmp.begin(); p != tmp.end(); p++)
         (*p)->detail()->set_color(gr_block_detail::WHITE);
@@ -523,12 +502,6 @@
 
     reverse(result.begin(), result.end());
 
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG) {
-        std::cout << "After dfs: " << std::endl;
-        dump_block_vector(result);
-        std::cout << std::endl;
-    }
-
     return result;
 }
 
@@ -564,18 +537,15 @@
 {
     block->detail()->set_color(gr_block_detail::GREY);
 
-    gr_block_vector_t ds_blocks = calc_downstream_blocks(lookup_name(block));
-    std::cout << "Downstream blocks of " << block << ":" << std::endl;
-    dump_block_vector(ds_blocks);
+    gr_block_vector_t blocks(calc_downstream_blocks(lookup_name(block)));
 
-    gr_block_vector_t blocks(ds_blocks);
     for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
         switch ((*p)->detail()->color()) {
-            case gr_block_detail::WHITE:            // (u, v) is a tree edge
+            case gr_block_detail::WHITE:           
                 topological_dfs_visit(*p, output);
                 break;
 
-            case gr_block_detail::GREY:             // (u, v) is a back edge - 
not a DAG
+            case gr_block_detail::GREY:            
                 throw std::runtime_error("flow graph has loops!");
 
             case gr_block_detail::BLACK:
@@ -584,7 +554,6 @@
             default:
                 throw std::runtime_error("invalid color on block!");
         }
-
     }
 
     block->detail()->set_color(gr_block_detail::BLACK);

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
 2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
 2006-12-18 02:11:34 UTC (rev 4124)
@@ -113,7 +113,6 @@
     bool source_p(gr_block_sptr block);
     gr_block_vector_t sort_sources_first(gr_block_vector_t &blocks);
     void topological_dfs_visit(gr_block_sptr block, gr_block_vector_t &output);
-    void dump_block_vector(gr_block_vector_t blocks);
         
 public:
     ~gr_simple_flowgraph_detail();

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/Makefile.am
 2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/Makefile.am
 2006-12-18 02:11:34 UTC (rev 4124)
@@ -32,11 +32,10 @@
 # GNURADIO_CORE_LIBS = -lgnuradio-core
 # GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
 
-noinst_PROGRAMS = dialtone test_head
+noinst_PROGRAMS = dialtone
     
 noinst_HEADERS = \
-    dialtone.h \
-    test_head.h
+    dialtone.h
         
 dialtone_SOURCES = \
     dialtone.cc           \
@@ -46,10 +45,4 @@
     $(GNURADIO_CORE_LIBS) \
     $(GR_AUDIO_ALSA_LIBS)
 
-test_head_SOURCES = \
-    test_head.cc
-
-test_head_LDADD = \
-    $(GNURADIO_CORE_LIBS) 
-
 MOSTLYCLEANFILES = *~

Deleted: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/test_head.cc

Deleted: 
gnuradio/branches/developers/jcorgan/sfg/gnuradio-examples/c++/dialtone/test_head.h

Modified: 
gnuradio/branches/developers/jcorgan/sfg/gr-audio-alsa/src/audio_alsa_sink.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sfg/gr-audio-alsa/src/audio_alsa_sink.cc   
    2006-12-18 01:56:05 UTC (rev 4123)
+++ 
gnuradio/branches/developers/jcorgan/sfg/gr-audio-alsa/src/audio_alsa_sink.cc   
    2006-12-18 02:11:34 UTC (rev 4124)
@@ -32,10 +32,7 @@
 #include <stdexcept>
 #include <gri_alsa.h>
 
-// FIXME remove
-#include <omnithread.h>
 
-
 static bool CHATTY_DEBUG = false;
 
 
@@ -515,9 +512,6 @@
 
     else if (r < 0){
       output_error_msg ("snd_pcm_writei failed", r);
-      fprintf(stderr, "thread_id = %p\n",
-             omni_thread::self());
-
       return false;
     }