Merge branch 'next'

8 files changed, 5 insertions, 270 deletions

diff --git a/gnuradio-core/src/lib/runtime/.gitignore b/gnuradio-core/src/lib/runtime/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/lib/runtime/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am
deleted file mode 100644
index 38da3d5fd..000000000
--- a/gnuradio-core/src/lib/runtime/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright 2003,2004,2007,2008,2009,2010,2011 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 3, 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(GRUEL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
-
-libruntime_la_LIBADD =		\
-	$(SHM_OPEN_LIBS)
-
-
-libruntime_la_SOURCES = 			\
-	gr_basic_block.cc			\
-	gr_flowgraph.cc				\
-	gr_flat_flowgraph.cc			\
-	gr_block.cc				\
-	gr_block_detail.cc			\
-	gr_block_executor.cc			\
-	gr_hier_block2.cc			\
-	gr_hier_block2_detail.cc		\
-	gr_buffer.cc				\
-	gr_dispatcher.cc			\
-	gr_error_handler.cc			\
-	gr_io_signature.cc			\
-	gr_local_sighandler.cc			\
-	gr_message.cc				\
-	gr_msg_accepter.cc			\
-	gr_msg_handler.cc			\
-	gr_msg_queue.cc				\
-	gr_pagesize.cc				\
-	gr_preferences.cc			\
-	gr_realtime.cc				\
-	gr_scheduler.cc				\
-	gr_scheduler_sts.cc			\
-	gr_scheduler_tpb.cc			\
-	gr_single_threaded_scheduler.cc		\
-	gr_sptr_magic.cc			\
-	gr_sync_block.cc			\
-	gr_sync_decimator.cc			\
-	gr_sync_interpolator.cc			\
-	gr_sys_paths.cc				\
-	gr_top_block.cc				\
-	gr_top_block_impl.cc			\
-	gr_tpb_detail.cc			\
-	gr_tpb_thread_body.cc			\
-	gr_vmcircbuf.cc				\
-	gr_vmcircbuf_mmap_shm_open.cc		\
-	gr_vmcircbuf_mmap_tmpfile.cc		\
-	gr_vmcircbuf_createfilemapping.cc	\
-	gr_vmcircbuf_sysv_shm.cc		\
-	gr_select_handler.cc
-
-libruntime_qa_la_SOURCES = 			\
-	qa_gr_block.cc				\
-	qa_gr_hier_block2.cc			\
-	qa_gr_hier_block2_derived.cc		\
-	qa_gr_buffer.cc				\
-	qa_gr_flowgraph.cc			\
-	qa_gr_top_block.cc			\
-	qa_gr_io_signature.cc			\
-	qa_gr_vmcircbuf.cc			\
-	qa_block_tags.cc			\
-	qa_set_msg_handler.cc			\
-	qa_runtime.cc				
-
-grinclude_HEADERS = 				\
-	gr_basic_block.h			\
-	gr_flowgraph.h				\
-	gr_flat_flowgraph.h			\
-	gr_block.h				\
-	gr_block_detail.h			\
-	gr_block_executor.h			\
-	gr_hier_block2.h			\
-	gr_hier_block2_detail.h			\
-	gr_buffer.h				\
-	gr_complex.h				\
-	gr_dispatcher.h				\
-	gr_error_handler.h			\
-	gr_io_signature.h			\
-	gr_local_sighandler.h			\
-	gr_message.h				\
-	gr_msg_accepter.h			\
-	gr_msg_handler.h			\
-	gr_msg_queue.h				\
-	gr_pagesize.h				\
-	gr_preferences.h			\
-	gr_realtime.h				\
-	gr_runtime_types.h			\
-	gr_scheduler.h				\
-	gr_scheduler_sts.h			\
-	gr_scheduler_tpb.h			\
-	gr_select_handler.h			\
-	gr_single_threaded_scheduler.h		\
-	gr_sptr_magic.h				\
-	gr_sync_block.h				\
-	gr_sync_decimator.h			\
-	gr_sync_interpolator.h			\
-	gr_top_block.h				\
-	gr_top_block_impl.h			\
-	gr_tpb_detail.h				\
-	gr_tpb_thread_body.h			\
-	gr_timer.h				\
-	gr_sys_paths.h				\
-	gr_types.h				\
-	gr_unittests.h				\
-	gr_vmcircbuf.h				\
-	gr_tags.h
-
-noinst_HEADERS = 				\
-	gr_vmcircbuf_mmap_shm_open.h		\
-	gr_vmcircbuf_mmap_tmpfile.h		\
-	gr_vmcircbuf_sysv_shm.h			\
-	gr_vmcircbuf_createfilemapping.h	\
-	qa_gr_block.h				\
-	qa_gr_flowgraph.h			\
-	qa_gr_hier_block2.h			\
-	qa_gr_hier_block2_derived.h		\
-	qa_gr_buffer.h				\
-	qa_gr_io_signature.h			\
-	qa_gr_top_block.h			\
-	qa_gr_vmcircbuf.h			\
-	qa_block_tags.h				\
-	qa_set_msg_handler.h			\
-	qa_runtime.h				
-
-swiginclude_HEADERS =			\
-	gr_basic_block.i		\
-	gr_block.i			\
-	gr_block_detail.i		\
-	gr_hier_block2.i		\
-	gr_buffer.i			\
-	gr_dispatcher.i			\
-	gr_error_handler.i		\
-	gr_io_signature.i		\
-	gr_message.i			\
-	gr_msg_handler.i		\
-	gr_msg_queue.i			\
-	gr_realtime.i			\
-	gr_single_threaded_scheduler.i	\
-	gr_sync_block.i			\
-	gr_sync_decimator.i		\
-	gr_sync_interpolator.i		\
-	gr_tags.i				\
-	gr_top_block.i			\
-	runtime.i
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index 2adca8ccb..7e95509e2 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -103,7 +103,7 @@ public:
     std::string name() const { return d_name; }
     gr_io_signature_sptr input_signature() const  { return d_input_signature; }
     gr_io_signature_sptr output_signature() const { return d_output_signature; }
-    gr_basic_block_sptr to_basic_block(); // Needed for Python/Guile type coercion
+    gr_basic_block_sptr to_basic_block(); // Needed for Python type coercion
 
     /*!
      * \brief Confirm that ninputs and noutputs is an acceptable combination.
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
index 9652f6bf4..12bcf10e7 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
@@ -150,7 +150,7 @@ public:
   // ignored by the user.
   gr_flat_flowgraph_sptr flatten() const;
 
-  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
 };
 
 inline gr_hier_block2_sptr cast_to_hier_block2_sptr(gr_basic_block_sptr block) {
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.i b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
index 32b656e24..4fa7c3bc0 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.i
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
@@ -63,5 +63,5 @@ public:
   void lock();
   void unlock();
 
-  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
 };
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
index 0a4eda78a..2a78253b3 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i
+++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
@@ -105,64 +105,3 @@ gr_msg_queue_sptr.insert_tail = gr_py_msg_queue__insert_tail
 gr_msg_queue_sptr.handle = gr_py_msg_queue__insert_tail
 %}
 #endif	// SWIGPYTHON
-
-/*
- * Similar trickery as above, only this time for Guile
- */
-#ifdef SWIGGUILE
-
-%{
-  struct arg_holder {
-    gr_msg_queue_sptr	q;
-    gr_message_sptr	msg;
-  };
-
-  static void *
-  insert_tail_shim(void *arg)
-  {
-    arg_holder *a = (arg_holder *)arg;
-    a->q->insert_tail(a->msg);
-    return 0;
-  }
-
-  static void *
-  delete_head_shim(void *arg)
-  {
-    arg_holder *a = (arg_holder *)arg;
-    a->msg = a->q->delete_head();
-    return 0;
-  }
-%}
-
-%inline %{
-
-  // handle and insert_tail are equivalent
-  static void
-  handle(gr_msg_queue_sptr q, gr_message_sptr msg)
-  {
-    arg_holder	a;
-    a.q = q;
-    a.msg = msg;
-    scm_without_guile(insert_tail_shim, (void *) &a);
-  }
-
-  static void
-  insert_tail(gr_msg_queue_sptr q, gr_message_sptr msg)
-  {
-    arg_holder	a;
-    a.q = q;
-    a.msg = msg;
-    scm_without_guile(insert_tail_shim, (void *) &a);
-  }
-
-  static gr_message_sptr
-  delete_head(gr_msg_queue_sptr q)
-  {
-    arg_holder	a;
-    a.q = q;
-    scm_without_guile(delete_head_shim, (void *) &a);
-    return a.msg;
-  }
-%}
-
-#endif	// SWIGGUILE
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h
index 9d01ba3ef..e837700c3 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.h
@@ -122,7 +122,7 @@ public:
   //! Set the maximum number of noutput_items in the flowgraph
   void set_max_noutput_items(int nmax);
 
-  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
+  gr_top_block_sptr to_top_block(); // Needed for Python type coercion
 };
 
 inline gr_top_block_sptr cast_to_top_block_sptr(gr_basic_block_sptr block) {
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-core/src/lib/runtime/gr_top_block.i
index 70c627ffd..ea5534c17 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.i
@@ -51,7 +51,7 @@ public:
   int max_noutput_items();
   void set_max_noutput_items(int nmax);
 
-  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
+  gr_top_block_sptr to_top_block(); // Needed for Python type coercion
 };
 
 #ifdef SWIGPYTHON
@@ -73,34 +73,3 @@ void top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
 %}
 
 #endif
-
-#ifdef SWIGGUILE
-
-%{
-  struct tb_arg_holder {
-    gr_top_block_sptr	tb;
-  };
-
-  static void *
-  tb_wait_shim(void *arg)
-  {
-    tb_arg_holder *a = (tb_arg_holder *)arg;
-    a->tb->wait();
-    return 0;
-  }
-
-%}
-
-%inline %{
-
-  static void
-  top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
-  {
-    tb_arg_holder a;
-    a.tb = r;
-    scm_without_guile(tb_wait_shim, (void *) &a);
-  }
-
-%}
-
-#endif