Changeset 19897

Timestamp:

04/05/07 16:54:02 (2 years ago)

Author:

patrick

Message:

Added thread start/exit notification capabilities. It is now possible to
register callbacks that are invoked whenever a new thread starts its
execution (invoked just before the user-supplied thread functor starts) and
after a thread completes its execution (invoked just after the thread functor
returns). This is implemented using Boost.Signals for reasons outlined in a
post that I made to the vrjuggler-devel mailing list.

Bumped version to 1.1.44.

Files:

• juggler/trunk/modules/vapor/ChangeLog (modified) (1 diff)
• juggler/trunk/modules/vapor/Makefile.inc.in (modified) (1 diff)
• juggler/trunk/modules/vapor/Makefile.pre.in (modified) (2 diffs)
• juggler/trunk/modules/vapor/VERSION (modified) (1 diff)
• juggler/trunk/modules/vapor/boost_signals.fpc.in (copied) (copied from juggler/trunk/modules/vapor/boost_filesystem.fpc.in) (1 diff)
• juggler/trunk/modules/vapor/configure.ac (modified) (7 diffs)
• juggler/trunk/modules/vapor/vpr.fpc.in (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/Thread/BaseThread.cpp (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/Thread/BaseThread.h (modified) (2 diffs)
• juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.cpp (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.cpp (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.cpp (modified) (1 diff)

juggler/trunk/modules/vapor/ChangeLog

@@ -1 +1 @@
-DATE       AUTHOR   CHANGE
----------- -------- -----------------------------------------------------------
+2007-04-05 patrick  Added thread start/exit notification signals. Boost.Signals
+                    is now a required dependency.
+                    NEW VERSION: 1.1.44
-2007-03-03 patrick  Allow callers of vpr::InetAddr::getAllLocalAddrs() to
-                    indicate whether interfaces in the down state should be

juggler/trunk/modules/vapor/Makefile.inc.in

@@ -374 +374 @@
-          $(topdir)/boost_filesystem.fpc                                \
-          $(libdir)$(LIBBITSUF)/flagpoll/boost_filesystem-$(BOOST_VERSION).$(ISA).fpc
+        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \
+          $(topdir)/boost_signals.fpc                                   \
+          $(libdir)$(LIBBITSUF)/flagpoll/boost_signals-$(BOOST_VERSION).$(ISA).fpc
-ifeq ($(USE_NSPR), Y)
-        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \

juggler/trunk/modules/vapor/Makefile.pre.in

@@ -63 +63 @@
-boost.fpc.in: ;
-boost_filesystem.fpc.in: ;
+boost_signals.fpc.in: ;
-$(M4_DEPS): ;
-$(srcdir)/VERSION: ;
@@ -73 +74 @@
-Makefile: $(srcdir)/VERSION configure config.status Makefile.in         \
-          Makefile.inc.in make.defs.mk.in vpr.fpc.in boost.fpc.in       \
-
+ boost_signals.fpc.in
-        $(CFG_SHELL) $(srcdir)/configure $(CONFIGURE_ARGS)
-        @$(MAKE) -f Makefile cleandepend

juggler/trunk/modules/vapor/VERSION

@@ +1 @@
+1.1.44-0 @04/05/2007 21:55:00 UTC@
-1.1.43-0 @03/03/2007 17:10:00 UTC@
-1.1.42-0 @03/02/2007 17:55:00 UTC@

juggler/trunk/modules/vapor/boost_signals.fpc.in

@@ -3 +3 @@
-
-# Standard Flagpoll Variables
-Filesystem
-Filesystem Library provides portable facilities to query and manipulate paths, files, and directories
-libs/filesystem/doc/index.htm
+Signals
+Signals library is an implementation of a managed signals and slots system
+doc/html/signals.html
-Version: @BOOST_VERSION_DOT@
-Filesystem boost.filesystem
+Signals boost.signals
-Requires: boost = @BOOST_VERSION_DOT@
-Arch: @ISA@
-Cflags: @BOOST_INCLUDES@
-f
+signal

juggler/trunk/modules/vapor/configure.ac

@@ -145 +145 @@
-            [given_boost_fs_libname="$withval"], [given_boost_fs_libname=''])
-
+AC_ARG_WITH([boost-signals-lib],
+            [  --with-boost-signals-lib=<LIB NAME>
+                          The name of the Boost.Signals
+                          library suitable for the -l
+                          compiler option                 [default=Auto-detect]],
+            [given_boost_signals_libname="$withval"], [given_boost_signals_libname=''])
+
-# -----------------------------------------------------------------------------
-# System-dependent stuff.
@@ -618 +625 @@
-fi
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         toolset='-gcc'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      fi
+      ;;
+esac
+
+# A correct installation of Boost on Darwin does not include the toolset name
+# as part of the library file name.
+if test "x$PLATFORM" = "xDarwin" ; then
+   toolset=''
+   threading=''
+else
+   # We can only use multi-threading versions of Boost libraries if we are
+   # not using SPROC threads.  Boost does not support SPROC.
+   if test "x$SUBSYSTEM" != "xSPROC" -a "x$ABI" != "x64" ; then
+      threading='-mt'
-   fi
-
-
-
+
+
+
+
+
-   boost_fs_name="$given_boost_fs_libname"
+fi
+
+if test "x$given_boost_signals_libname" != "x" ; then
+   boost_signals_name="$given_boost_signals_libname"
-fi
-
@@ -733 +744 @@
-done
-
-DPP_LANG_RESTORE
-
-if test "x$vpr_have_boost_fs" != "xyes" ; then
-   AC_MSG_ERROR([*** Boost.Filesystem required by VPR ***])
-fi
+
+testBoostSignals ( )
+{
+   libname="$1"
+   orig_LIBS="$2"
+
+   # NOTE: We do not need $ABI_FLAGS in $LDFLAGS since $CXXFLAGS and $LDFLAGS
+   # are used together by AC_TRY_LINK().
+   LIBS="-l$libname $orig_LIBS"
+
+   AC_MSG_CHECKING([for boost::signal::operator()() in $libname])
+   AC_TRY_LINK([#include <boost/signal.hpp>],
+               [boost::signal<void ()> s; s();],
+               [vpr_have_boost_signals='yes'], [vpr_have_boost_signals='no'])
+   rm -rf ./ii_files
+   AC_MSG_RESULT([$vpr_have_boost_signals])
+
+   LIBS="$orig_LIBS"
+}
+
+LDFLAGS="-L$BOOST_LIBDIR $vprsave_LDFLAGS"
+
+if test "x$boost_signals_name" != "x" ; then
+   testBoostSignals $boost_signals_name $vprsave_LIBS
+else
+   # The extra empty string is to allow for no suffix to be used on the
+   # boost_signals library name.
+   for s in $boost_suffixes "" ; do
+      cur_boost_signals_name="boost_signals$s"
+
+      testBoostSignals $cur_boost_signals_name $vprsave_LIBS
+
+      if test "$vpr_have_boost_signals" = "yes" ; then
+         boost_signals_name="$cur_boost_signals_name"
+         break
+      fi
+   done
+fi
+
+if test "x$vpr_have_boost_signals" != "xyes" ; then
+   AC_MSG_ERROR([*** Boost.Signals required by VPR ***])
+fi
+
+DPP_LANG_RESTORE
-
-CXXFLAGS="$vprsave_CXXFLAGS"
@@ -909 +962 @@
-# Put together the basic information needed to compile VPR applications.
-if test "x$OS_TYPE" = "xWin32" ; then
-
+signals_name.lib $boost_
-else
-
+signals_name -l$boost_
-fi
-
@@ -953 +1006 @@
-# Dependencies for dynamic/shared libraries.
-if test "x$OS_TYPE" = "xWin32" ; then
-
+signals_name.lib $boost_
-else
-    DYLIB_DEPS="$APP_EXTRA_LIBS"
@@ -1078 +1131 @@
-AC_SUBST(BOOST_LIBDIR)
-AC_SUBST(boost_fs_name)
+AC_SUBST(boost_signals_name)
-AC_SUBST(subsystem_cxxflags)
-AC_SUBST(subsystem_libs)
@@ -1100 +1154 @@
-   boost.fpc
-   boost_filesystem.fpc
+   boost_signals.fpc
-   nspr.fpc
-   vpr.fpc

juggler/trunk/modules/vapor/vpr.fpc.in

@@ -65 +65 @@
-Version: ${vpr_version}
-Provides: vpr VPR
-
+Signals = @BOOST_VERSION_DOT@ Boost.
-Arch: ${ISA}
-Cflags: ${vpr_cxxflags} ${vpr_extra_cxxflags} ${subsystem_cxxflags} -I${includedir} ${ABI_FLAGS}

juggler/trunk/modules/vapor/vpr/Thread/BaseThread.cpp

@@ -36 +36 @@
-#include <vpr/vprConfig.h>
-
-
+
+
+
-#include <vpr/Thread/Thread.h>
-#include <vpr/Thread/ThreadManager.h>
-
+
+
-
-namespace vpr
-{
-
+BaseThread::state_signal_t BaseThread::sStartSignal;
+BaseThread::state_signal_t BaseThread::sExitSignal;
+vpr::Mutex sStartSignalLock;
+vpr::Mutex sExitSignalLock;
+
-vpr::Int32 BaseThread::mNextThreadId = 0;
-vpr::TSTable BaseThread::gTSTable;
+
+boost::signals::connection BaseThread::
+addThreadStartCallback(BaseThread::state_signal_t::slot_function_type slot)
+{
+   vpr::Guard<vpr::Mutex> g(sStartSignalLock);
+   return sStartSignal.connect(slot);
+}
+
+boost::signals::connection BaseThread::
+addThreadExitCallback(BaseThread::state_signal_t::slot_function_type slot)
+{
+   vpr::Guard<vpr::Mutex> g(sExitSignalLock);
+   return sExitSignal.connect(slot);
+}
-
-/**

juggler/trunk/modules/vapor/vpr/Thread/BaseThread.h

@@ -40 +40 @@
-
-#include <boost/function.hpp>
+#include <boost/signal.hpp>
-#include <vpr/vprTypes.h>
-#include <vpr/Thread/TSTable.h>            /* Needed to cache a copy here */
+
-
-namespace vpr
@@ -64 +66 @@
-class VPR_CLASS_API BaseThread
-{
+public:
+   /** @name Thread State Callback Handling */
+   //@{
+   /**
+    * The type for the thread start and exit signals.
+    *
+    * @since 1.1.44
+    */
+   typedef boost::signal<void (vpr::Thread*)> state_signal_t;
+
+   /**
+    * Connects the given slot to the signal emitted whenever a new thread
+    * begins its execution. The slot is invoked immediately before the thread
+    * functor is invoked.
+    *
+    * @post \p slot is connected to \c sStartSignal.
+    *
+    * @param slot The slot object to be connected to the thread start signal.
+    *
+    * @return The connection object that holds the association between the
+    *         start signal and the given slot.
+    *
+    * @since 1.1.44
+    */
+   static boost::signals::connection
+      addThreadStartCallback(state_signal_t::slot_function_type slot);
+
+   /**
+    * Connects the given slot to the signal emitted whenever a running thread
+    * completes its execution. The slot is invoked immediately after the
+    * thread functor returns.
+    *
+    * @post \p slot is connected to \c sExitSignal.
+    *
+    * @param slot The slot object to be connected to the thread exit signal.
+    *
+    * @return The connection object that holds the association between the
+    *         exit signal and the given slot.
+    *
+    * @since 1.1.44
+    */
+   static boost::signals::connection
+      addThreadExitCallback(state_signal_t::slot_function_type slot);
+   //@}
+
+protected:
+   /**
+    * Emits the thread start signal.
+    *
+    * @since 1.1.44
+    */
+   static void emitThreadStart(vpr::Thread* thread)
+   {
+      sStartSignal(thread);
+   }
+
+   /**
+    * Emits the thread exit signal.
+    *
+    * @since 1.1.44
+    */
+   static void emitThreadExit(vpr::Thread* thread)
+   {
+      sExitSignal(thread);
+   }
+
+private:
+   static state_signal_t sStartSignal;
+   static state_signal_t sExitSignal;
+
-public:
-   enum VPRThreadPriority

juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.cpp

@@ -247 +247 @@
-   try
-   {
+      emitThreadStart(this);
+
-      // --- CALL USER FUNCTOR --- //
-      mUserThreadFunctor();
+
+      emitThreadExit(this);
-   }
-   catch (std::exception& ex)

juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.cpp

@@ -276 +276 @@
-   try
-   {
+      emitThreadStart(this);
+
-      // --- CALL USER FUNCTOR --- //
-      mUserThreadFunctor();
+
+      emitThreadExit(this);
-   }
-   catch (std::exception& ex)

juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.cpp

@@ -219 +219 @@
-   try
-   {
+      emitThreadStart(this);
+
-      // --- CALL USER FUNCTOR --- //
-      mUserThreadFunctor();
+
+      emitThreadExit(this);
-   }
-   catch (std::exception& ex)