Merged features/mp-sched -r8915:9335 into the trunk. The trunk now

contains the SMP aware scheduler.  This changeset
introduces a dependency on boost 1.35 or later.
See source:gnuradio/trunk/README.building-boost for additional info.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9336 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 192 insertions, 6 deletions

diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am
index 972ff4ca9..7181c9418 100644
--- a/gruel/src/lib/Makefile.am
+++ b/gruel/src/lib/Makefile.am
@@ -21,19 +21,21 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(DEFINES) $(BOOST_CFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
 
 lib_LTLIBRARIES = libgruel.la
 
+# magic flags
+libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0
+
 # These are the source files that go into the gruel shared library
 libgruel_la_SOURCES = \
-	realtime.cc
-
-# magic flags
-libgruel_la_LDFLAGS = $(NO_UNDEFINED)
+	realtime.cc \
+	thread_body_wrapper.cc \
+	thread_group.cc
 
-# link the library against the c++ standard library
 libgruel_la_LIBADD = \
+	$(BOOST_THREAD_LIB)
 	-lstdc++			
 
 noinst_HEADERS =
diff --git a/gruel/src/lib/thread_body_wrapper.cc b/gruel/src/lib/thread_body_wrapper.cc
new file mode 100644
index 000000000..86c4edb5b
--- /dev/null
+++ b/gruel/src/lib/thread_body_wrapper.cc
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <gruel/thread_body_wrapper.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#include <stdio.h>
+
+namespace gruel {
+
+#if defined(HAVE_PTHREAD_SIGMASK) && defined(HAVE_SIGNAL_H)
+
+  void mask_signals()
+  {
+    sigset_t	new_set;
+    int r;
+
+    sigemptyset(&new_set);		
+    sigaddset(&new_set, SIGHUP);	// block these...
+    sigaddset(&new_set, SIGINT);
+    sigaddset(&new_set, SIGPIPE);
+    sigaddset(&new_set, SIGALRM);
+    sigaddset(&new_set, SIGTERM);
+    sigaddset(&new_set, SIGUSR1);
+    sigaddset(&new_set, SIGCHLD);
+#ifdef SIGPOLL
+    sigaddset(&new_set, SIGPOLL);
+#endif
+#ifdef SIGPROF
+    sigaddset(&new_set, SIGPROF);
+#endif
+#ifdef SIGSYS
+    sigaddset(&new_set, SIGSYS);
+#endif
+#ifdef SIGTRAP
+    sigaddset(&new_set, SIGTRAP);
+#endif
+#ifdef SIGURG
+    sigaddset(&new_set, SIGURG);
+#endif
+#ifdef SIGVTALRM
+    sigaddset(&new_set, SIGVTALRM);
+#endif
+#ifdef SIGXCPU
+    sigaddset(&new_set, SIGXCPU);
+#endif
+#ifdef SIGXFSZ
+    sigaddset(&new_set, SIGXFSZ);
+#endif
+    r = pthread_sigmask(SIG_BLOCK, &new_set, 0);
+    if (r != 0)
+      perror("pthread_sigmask");
+  }
+
+#else
+
+  void mask_signals()
+  {
+  }
+
+#endif
+
+};
diff --git a/gruel/src/lib/thread_group.cc b/gruel/src/lib/thread_group.cc
new file mode 100644
index 000000000..fa78567ec
--- /dev/null
+++ b/gruel/src/lib/thread_group.cc
@@ -0,0 +1,99 @@
+/* -*- c++ -*- */
+/*
+ * Copyright (C) 2001-2003 William E. Kempf
+ * Copyright (C) 2007 Anthony Williams
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+/*
+ * This was extracted from Boost 1.35.0 and fixed.
+ */
+
+#include <gruel/thread_group.h>
+
+namespace gruel
+{
+  thread_group::thread_group()
+  {
+  }
+
+  thread_group::~thread_group()
+  {
+    // We shouldn't have to scoped_lock here, since referencing this object
+    // from another thread while we're deleting it in the current thread is
+    // going to lead to undefined behavior any way.
+    for (std::list<boost::thread*>::iterator it = m_threads.begin();
+	 it != m_threads.end(); ++it)
+      {
+	delete (*it);
+      }
+  }
+
+  boost::thread* thread_group::create_thread(const boost::function0<void>& threadfunc)
+  {
+    // No scoped_lock required here since the only "shared data" that's
+    // modified here occurs inside add_thread which does scoped_lock.
+    std::auto_ptr<boost::thread> thrd(new boost::thread(threadfunc));
+    add_thread(thrd.get());
+    return thrd.release();
+  }
+
+  void thread_group::add_thread(boost::thread* thrd)
+  {
+    boost::lock_guard<boost::shared_mutex> guard(m_mutex);
+
+    // For now we'll simply ignore requests to add a thread object multiple
+    // times. Should we consider this an error and either throw or return an
+    // error value?
+    std::list<boost::thread*>::iterator it = std::find(m_threads.begin(),
+						       m_threads.end(), thrd);
+    BOOST_ASSERT(it == m_threads.end());
+    if (it == m_threads.end())
+      m_threads.push_back(thrd);
+  }
+
+  void thread_group::remove_thread(boost::thread* thrd)
+  {
+    boost::lock_guard<boost::shared_mutex> guard(m_mutex);
+
+    // For now we'll simply ignore requests to remove a thread object that's
+    // not in the group. Should we consider this an error and either throw or
+    // return an error value?
+    std::list<boost::thread*>::iterator it = std::find(m_threads.begin(),
+						       m_threads.end(), thrd);
+    BOOST_ASSERT(it != m_threads.end());
+    if (it != m_threads.end())
+      m_threads.erase(it);
+  }
+
+  void thread_group::join_all()
+  {
+    boost::shared_lock<boost::shared_mutex> guard(m_mutex);
+    for (std::list<boost::thread*>::iterator it = m_threads.begin();
+	 it != m_threads.end(); ++it)
+      {
+	(*it)->join();
+      }
+  }
+
+  void thread_group::interrupt_all()
+  {
+    boost::shared_lock<boost::shared_mutex> guard(m_mutex);
+    for(std::list<boost::thread*>::iterator it=m_threads.begin(),end=m_threads.end();
+	it!=end;
+	++it)
+      {
+	(*it)->interrupt();
+      }
+  }
+
+  size_t thread_group::size() const
+  {
+    boost::shared_lock<boost::shared_mutex> guard(m_mutex);
+    return m_threads.size();
+  }
+
+} // namespace gruel