declared _ReadWriteBarrier intrinsic; added explicit check for zero to ReleaseSemaphore call

[SVN r39700]

build/Jamfile

@@ -0,0 +1,122 @@
+# Copyright 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+
+subproject libs/thread/build ;
+
+import ./threads ;
+
+# pthreads is compiled on all platforms when available
+if [ threads::is-pthread-available ] {
+	
+	template pthread_base
+		: ## sources ##
+		  [ threads::cpp_source ../src/pthread :
+		    thread
+		    mutex
+		    recursive_mutex
+		    condition
+		    exceptions
+		    xtime
+		    once
+		    tss
+		  ]
+		: ## requirements ##
+		  threads::lib-pthread
+		  <sysinclude>$(BOOST_ROOT)
+		  <threading>multi
+		  <define>BOOST_THREAD_POSIX
+		  common-variant-tag
+		  <borland><*><cxxflags>-w-8004
+		  <borland><*><cxxflags>-w-8057
+		;
+
+	lib boost_thread_pthread
+		: <template>pthread_base
+		: ## requirements ##	
+	  	  <define>BOOST_THREAD_BUILD_LIB=1
+		;
+
+	dll boost_thread_pthread
+		: <template>pthread_base
+		: ## requirements ##
+          	  <runtime-link>dynamic
+	  	  <define>BOOST_THREAD_BUILD_DLL=1
+		;
+
+	stage bin-stage
+    		: <dll>boost_thread_pthread
+      		  <lib>boost_thread_pthread
+		;
+
+	install thread_pthread lib
+    		: <dll>boost_thread_pthread
+      		  <lib>boost_thread_pthread
+   		;
+
+	# the next is true on platforms where pthreads is native threading lib
+	if [ threads::is-native-on-build-os pthread ] {
+	
+		lib boost_thread
+			: <template>pthread_base
+			: ## requirements ##	
+	  	  	  <define>BOOST_THREAD_BUILD_LIB=1
+			;
+
+		dll boost_thread
+			: <template>pthread_base
+			: ## requirements ##
+          	  	  <runtime-link>dynamic
+	  	  	  <define>BOOST_THREAD_BUILD_DLL=1
+			;
+	}
+}
+
+if [ threads::is-native-on-build-os win32 ] {
+
+	template win32_base
+		: ## sources ##
+		  [ threads::cpp_source ../src/win32 :
+		    thread
+		    exceptions
+		    xtime
+		    tss
+		    tss_hooks
+		    tss_dll
+                    tss_pe
+		  ]
+		: ## requirements ##
+		  <sysinclude>$(BOOST_ROOT)
+		  <threading>multi
+		  common-variant-tag
+		  <borland><*><cxxflags>-w-8004
+		  <borland><*><cxxflags>-w-8057
+		;
+
+	lib boost_thread
+		: <template>win32_base
+		: ## requirements ##	
+  	  	  <define>BOOST_THREAD_BUILD_LIB=1
+		;
+
+	dll boost_thread
+		: <template>win32_base
+		: ## requirements ##
+       	  	  <runtime-link>dynamic
+  	  	  <define>BOOST_THREAD_BUILD_DLL=1
+		;
+}
+
+stage bin-stage
+	: <dll>boost_thread
+      	  <lib>boost_thread
+	;
+
+install thread lib
+	: <dll>boost_thread
+  	  <lib>boost_thread
+	;

build/Jamfile.v2

@@ -1,39 +1,61 @@
-# (C) Copyright Vladimir Prus, David Abrahams, Michael Stevens, Hartmut Kaiser, 
-# William E Kempf 2002-2006
-# Use, modification and distribution are subject to 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)
-
-import os ;
+# Copyright 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
 
+import thread ;
 
 project boost/thread
-    : source-location ../src 
-    : requirements <link>shared:<define>BOOST_THREAD_BUILD_DLL=1  <threading>multi 
-    : default-build <threading>multi
+    : source-location ../src
+    : requirements <threading>multi
+      <link>static:<define>BOOST_THREAD_BUILD_LIB=1
+      <link>shared:<define>BOOST_THREAD_BUILD_DLL=1
+    : default-build <threading>multi [ thread.default-api ]
     ;
 
-CPP_SOURCES =  
-#        barrier
-#        condition
-        exceptions
-#        mutex
-#        once
-#        recursive_mutex
-#        read_write_mutex
-        thread
-        tss_hooks
-        tss_dll
-        tss_pe
-        tss
-        xtime
-    ;
+# build the pthread based variant
+lib boost_thread_pthread
+	: ## sources ##
+	    pthread/thread.cpp
+	    pthread/mutex.cpp
+	    pthread/recursive_mutex.cpp
+	    pthread/condition.cpp
+	    pthread/exceptions.cpp
+	    pthread/xtime.cpp
+	    pthread/tss.cpp
+	: ## requirements ##
+	    <define>BOOST_THREAD_POSIX
+	    <thrd-api>pthread
+	;
 
+# use pthread on platforms where pthread is considered native
+lib boost_thread 
+	: ## sources ##
+	    pthread/thread.cpp
+	    pthread/mutex.cpp
+	    pthread/recursive_mutex.cpp
+	    pthread/condition.cpp
+	    pthread/exceptions.cpp
+	    pthread/xtime.cpp
+	    pthread/tss.cpp
+	: ## requirements ##
+	    <define>BOOST_THREAD_POSIX
+	    <thrd-api>pthread
+	;
+# the win32 native variant
 lib boost_thread
-   : $(CPP_SOURCES).cpp
-   : <link>shared:<define>BOOST_THREAD_BUILD_DLL=1
-     <link>static:<define>BOOST_THREAD_BUILD_LIB=1
-   : # default build
-   : <link>shared:<define>BOOST_THREAD_BUILD_DLL=1
-     <link>static:<define>BOOST_THREAD_BUILD_LIB=1
-   ;
+	: ## sources ##
+	  win32/thread.cpp
+	  win32/exceptions.cpp
+	  win32/xtime.cpp
+	  win32/tss.cpp
+	  win32/tss_hooks.cpp
+	  win32/tss_dll.cpp
+	  win32/tss_pe.cpp
+	: ## requirements ##
+	  <thrd-api>win32
+	;
+

build/thread.jam

@@ -0,0 +1,70 @@
+# Copyright 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+
+import modules ;
+import os ;
+import feature ;
+import property ;
+
+# supported threading api's
+feature.feature thrd-api : pthread win32 : symmetric ;
+
+# save a reference to the original lib rule
+IMPORT : lib : $(__name__) : type.lib ;
+
+# local override of the global lib rule
+rule lib ( name  : sources * : requirements * : default-build * : usage-requirements * )
+{
+	if <thrd-api>pthread in $(requirements) 
+	{
+		if [ os.name ] = "NT"
+		{
+			local PTW32_INCLUDE = [ modules.peek : PTW32_INCLUDE ] ;
+			local PTW32_LIB = [ modules.peek : PTW32_LIB ] ;
+			if $(PTW32_INCLUDE) && $(PTW32_LIB) 
+			{
+				requirements = 
+					[ property.refine $(requirements) : 
+						<define>BOOST_HAS_PTHREADS 
+						<include>$(PTW32_INCLUDE)
+						<library>$(PTW32_LIB)
+					] ;
+			}
+			else 
+			{
+				requirements += <build>no ;
+				# it would be nice if this message appears only once ...
+				# but I cannot figure out how to detectd the second phase.
+				echo "******************************************************" ;
+				echo "Building Boost.Thread without pthread support" ;
+				echo "If you need pthread you should specify the paths." ;
+				echo "For example:" ;
+				echo "PTW32_INCLUDE=C:\\Program Files\\ptw32\\Pre-built2\\include" ;
+				echo "PTW32_LIB=C:\\Program Files\\ptw32\\Pre-built2\\lib\\pthreadVC2.lib" ;
+				echo "******************************************************" ;
+			}	
+		}	
+	}
+
+	return [ type.lib $(name) : $(sources) : $(requirements) : $(default-build) : $(usage-requirements) ] ;
+}
+
+# auto export of rule lib to calling module only
+IMPORT $(__name__) : lib : [ CALLER_MODULE 1 ] : lib ;
+
+rule default-api
+{
+	if [ os.name ] = "NT"
+	{
+		return <thrd-api>win32 ;
+	}
+	else
+	{
+		return <thrd-api>pthread ;
+	}
+}

build/threads.jam

@@ -0,0 +1,65 @@
+# Copyright 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+
+# find out if pthread is available on current build platform
+rule threads::is-pthread-available
+{
+	if $(OS) = "NT" {
+		if $(PTW32_INCLUDE) && $(PTW32_LIB) {
+			return true ;
+		}
+		else {
+			ECHO "******************************************************" ;
+			ECHO "Building Boost.Thread without pthread support" ;
+			ECHO "If you need pthread you should specify the paths." ;
+			ECHO "For example:" ;
+			ECHO "PTW32_INCLUDE=C:\\Program Files\\ptw32\\Pre-built2\\include" ;
+			ECHO "PTW32_LIB=C:\\Program Files\\ptw32\\Pre-built2\\lib\\pthreadVC2.lib" ;
+			ECHO "******************************************************" ;
+		}
+	}
+	else if $(OS) = "LINUX" {
+		return true ;
+	}
+	else { ## assume pthread is available on unknown os for now
+		return true ;
+	}
+}
+
+# find the native library variant for current build os
+rule threads::is-native-on-build-os ( libvariant )
+{
+	if      $(OS) = "NT" {
+		if $(libvariant) = win32 { return true ; }
+	}
+	else if $(OS) = "LINUX" {
+		if $(libvariant) = pthread { return true ; }
+	}
+	else { ## assume pthread is native on others for now
+		if $(libvariant) = pthread { return true ; }
+	}
+}
+
+# utility to prepend the source path to the cpp sources
+rule threads::cpp_source ( path : sources * )
+{
+	return $(path)/$(sources).cpp ;
+}
+
+# impose the pthread library and include path on the requirements
+rule threads::lib-pthread ( toolset variant : subvariant-path properties * )
+{
+        if $(OS) = "NT" &&  $(PTW32_INCLUDE) && $(PTW32_LIB) {
+		properties = [ impose-requirements $(properties) :
+                	<define>BOOST_HAS_PTHREADS
+			<include>$(PTW32_INCLUDE)
+			<library-file>$(PTW32_LIB) ] ;
+        }
+        
+	return $(subvariant-path) $(properties) ;
+}

doc/Jamfile.v2

@@ -1,8 +1,3 @@
-# Copyright (C) 2001-2003
-# William E. Kempf
-#
-# 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)
 
 import toolset ;
 toolset.using doxygen ;

doc/acknowledgements.xml

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <section id="thread.acknowledgements"
 last-revision="$Date$">
   <title>Acknowledgements</title>
   <para>William E. Kempf was the architect, designer, and implementor of 
-  &Boost.Thread;.</para>
+  &Boost.Threads;.</para>
   <para>Mac OS Carbon implementation written by Mac Murrett.</para>
   <para>Dave Moore provided initial submissions and further comments on the 
   <code>barrier</code>
@@ -32,7 +28,7 @@ last-revision="$Date$">
   on the design), Paul Mclachlan, Thomas Matelich and Iain Hanson (for help
   in trying to get the build to work on other platforms), and Kevin S. Van
   Horn (for several updates/corrections to the documentation).</para>
-  <para>Mike Glassford finished changes to &Boost.Thread; that were begun
+  <para>Mike Glassford finished changes to &Boost.Threads; that were begun
   by William Kempf and moved them into the main CVS branch.
   He also addressed a number of issues that were brought up on the Boost
   developer's mailing list and provided some additions and changes to the 
@@ -42,7 +38,7 @@ last-revision="$Date$">
   Mike Glassford finished William Kempf's conversion of the documentation to 
   BoostBook format and added a number of new sections.</para>
   <para>Discussions on the boost.org mailing list were essential in the
-  development of &Boost.Thread;
+  development of &Boost.Threads;
   . As of August 1, 2001, participants included Alan Griffiths, Albrecht
   Fritzsche, Aleksey Gurtovoy, Alexander Terekhov, Andrew Green, Andy Sawyer,
   Asger Alstrup Nielsen, Beman Dawes, Bill Klein, Bill Rutiser, Bill Wade,
@@ -63,11 +59,6 @@ last-revision="$Date$">
   Steve Cleary, Steven Kirk, Thomas Holenstein, Thomas Matelich, Trevor
   Perrin, Valentin Bonnard, Vesa Karvonen, Wayne Miller, and William
   Kempf.</para>
-  <para>
-  As of February 2006 Anthony Williams and Roland Schwarz took over maintainance 
-  and further development of the library after it has been in an orphaned state
-  for a rather long period of time. 
-  </para>
   <para>Apologies for anyone inadvertently missed.</para>
 </section>
 

doc/barrier-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/barrier.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -36,9 +32,9 @@
 		and reset the barrier. This functionality allows the same set of N threads to re-use 
 		a barrier object to  synchronize their execution at multiple points during their 
 		execution.</para>
-		<para>See <xref linkend="thread.glossary"/> for definitions of thread 
-		states <link linkend="thread.glossary.thread-state">blocked</link>
-		and <link linkend="thread.glossary.thread-state">ready</link>.
+		<para>See <xref linkend="threads.glossary"/> for definitions of thread 
+		states <link linkend="threads.glossary.thread-state">blocked</link>
+		and <link linkend="threads.glossary.thread-state">ready</link>.
 		Note that "waiting" is a synonym for blocked.</para>
       </description>
       

doc/bibliography.xml

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<bibliography id="thread.bibliography"
+<bibliography id="threads.bibliography"
 last-revision="$Date$">
   <title>Bibliography</title>
-  <biblioentry id="thread.bib.AndrewsSchneider83">
-    <abbrev id="thread.bib.AndrewsSchneider83.abbrev">AndrewsSchnieder83</abbrev>
+  <biblioentry id="threads.bib.AndrewsSchneider83">
+    <abbrev id="threads.bib.AndrewsSchneider83.abbrev">AndrewsSchnieder83</abbrev>
     <biblioset relation="journal">
       <title>ACM Computing Surveys</title>
       <volumenum>Vol. 15</volumenum>
@@ -42,18 +38,18 @@ last-revision="$Date$">
     Expressions, Message Passing, and Remote Procedure Call in addition to the
     basics</para>
   </biblioentry>
-  <biblioentry id="thread.bib.Boost">
-    <abbrev id="thread.bib.Boost.abbrev">Boost</abbrev>
+  <biblioentry id="threads.bib.Boost">
+    <abbrev id="threads.bib.Boost.abbrev">Boost</abbrev>
     <bibliomisc>The <emphasis>Boost</emphasis> world wide web site.
 	<ulink url="http:/www.boost.org">http://www.boost.org</ulink></bibliomisc>
-	<para>&Boost.Thread; is one of many Boost libraries. The Boost web
+	<para>&Boost.Threads; is one of many Boost libraries. The Boost web
     site includes a great deal of documentation and general information which
     applies to all Boost libraries. Current copies of the libraries including
     documentation and test programs may be downloaded from the web
     site.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.Hansen73">
-    <abbrev id="thread.bib.Hansen73.abbrev">Hansen73</abbrev>
+  <biblioentry id="threads.bib.Hansen73">
+    <abbrev id="threads.bib.Hansen73.abbrev">Hansen73</abbrev>
     <biblioset relation="journal">
       <title>ACM Computing Surveys</title>
       <volumenum>Vol. 5</volumenum>
@@ -78,8 +74,8 @@ last-revision="$Date$">
     Brinch Hansen was years ahead of others in recognizing pattern concepts
     applied to software, too.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.Butenhof97">
-    <abbrev id="thread.bib.Butenhof97.abbrev">Butenhof97</abbrev>
+  <biblioentry id="threads.bib.Butenhof97">
+    <abbrev id="threads.bib.Butenhof97.abbrev">Butenhof97</abbrev>
 	<title>
 	  <ulink url="http://cseng.aw.com/book/0,3828,0201633922,00.html"
 	  >Programming with POSIX Threads </ulink>
@@ -96,8 +92,8 @@ last-revision="$Date$">
 	them. Many of the insights given apply to all multithreaded programming, not
 	just POSIX Threads</para>
   </biblioentry>
-  <biblioentry id="thread.bib.Hoare74">
-    <abbrev id="thread.bib.Hoare74.abbrev">Hoare74</abbrev>
+  <biblioentry id="threads.bib.Hoare74">
+    <abbrev id="threads.bib.Hoare74.abbrev">Hoare74</abbrev>
 	<biblioset relation="journal">
 	  <title>Communications of the ACM</title>
 	  <volumenum>Vol. 17</volumenum>
@@ -119,8 +115,8 @@ last-revision="$Date$">
 	multithreading patterns. This is one of the most often referenced papers in
 	all of computer science, and with good reason.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.ISO98">
-    <abbrev id="thread.bib.ISO98.abbrev">ISO98</abbrev>
+  <biblioentry id="threads.bib.ISO98">
+    <abbrev id="threads.bib.ISO98.abbrev">ISO98</abbrev>
 	<title>
 	  <ulink url="http://www.ansi.org">Programming Language C++</ulink>
 	</title>
@@ -129,8 +125,8 @@ last-revision="$Date$">
 	<para>This is the official C++ Standards document. Available from the ANSI
 	(American National Standards Institute) Electronic Standards Store.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.McDowellHelmbold89">
-    <abbrev id="thread.bib.McDowellHelmbold89.abbrev">McDowellHelmbold89</abbrev>
+  <biblioentry id="threads.bib.McDowellHelmbold89">
+    <abbrev id="threads.bib.McDowellHelmbold89.abbrev">McDowellHelmbold89</abbrev>
 	<biblioset relation="journal">
 	  <title>Communications of the ACM</title>
 	  <volumenum>Vol. 21</volumenum>
@@ -157,8 +153,8 @@ last-revision="$Date$">
 	<para>Identifies many of the unique failure modes and debugging difficulties
 	associated with concurrent programs.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.SchmidtPyarali">
-    <abbrev id="thread.bib.SchmidtPyarali.abbrev">SchmidtPyarali</abbrev>
+  <biblioentry id="threads.bib.SchmidtPyarali">
+    <abbrev id="threads.bib.SchmidtPyarali.abbrev">SchmidtPyarali</abbrev>
 	<title>
 	  <ulink url="http://www.cs.wustl.edu/~schmidt/win32-cv-1.html8"
 	  >Strategies for Implementing POSIX Condition Variables on Win32</ulink>
@@ -176,14 +172,14 @@ last-revision="$Date$">
 	</authorgroup>
 	<orgname>Department of Computer Science, Washington University, St. Louis,
 	Missouri</orgname>
-	<para>Rationale for understanding &Boost.Thread; condition
+	<para>Rationale for understanding &Boost.Threads; condition
 	variables. Note that Alexander Terekhov found some bugs in the
-	implementation given in this article, so pthreads-win32 and &Boost.Thread;
+	implementation given in this article, so pthreads-win32 and &Boost.Threads;
 	are even more complicated yet.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.SchmidtStalRohnertBuschmann">
+  <biblioentry id="threads.bib.SchmidtStalRohnertBuschmann">
     <abbrev
-	id="thread.bib.SchmidtStalRohnertBuschmann.abbrev">SchmidtStalRohnertBuschmann</abbrev>
+	id="threads.bib.SchmidtStalRohnertBuschmann.abbrev">SchmidtStalRohnertBuschmann</abbrev>
 	<title>
 	  <ulink
 	  url="http://www.wiley.com/Corporate/Website/Objects/Products/0,9049,104671,00.html"
@@ -214,11 +210,11 @@ last-revision="$Date$">
 	<copyright><year>2000</year></copyright>
 	<para>This is a very good explanation of how to apply several patterns
 	useful for concurrent programming. Among the patterns documented is the
-	Monitor Pattern mentioned frequently in the &Boost.Thread;
+	Monitor Pattern mentioned frequently in the &Boost.Threads;
 	documentation.</para>
   </biblioentry>
-  <biblioentry id="thread.bib.Stroustrup">
-    <abbrev id="thread.bib.Stroustrup.abbrev">Stroustrup</abbrev>
+  <biblioentry id="threads.bib.Stroustrup">
+    <abbrev id="threads.bib.Stroustrup.abbrev">Stroustrup</abbrev>
 	<title>
 	  <ulink url="http://cseng.aw.com/book/0,3828,0201700735,00.html"
 	  >The C++ Programming Language</ulink>

doc/build.xml

@@ -1,137 +1,58 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Copyright (c) 2007 Roland Schwarz
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <section id="thread.build" last-revision="$Date$">
 	<title>Build</title>
 	<para>
-	How you build the &Boost.Thread; libraries, and how you build your own applications
+	How you build the &Boost.Threads; libraries, and how you build your own applications
 	that use those libraries, are some of the most frequently asked questions. Build
 	processes are difficult to deal with in a portable manner. That's one reason
-	why &Boost.Thread; makes use of &Boost.Build;.
+	why &Boost.Threads; makes use of &Boost.Build;.
 	In general you should refer to the documentation for &Boost.Build;.
 	This document will only supply you with some simple usage examples for how to
-	use <emphasis>bjam</emphasis> to build and test &Boost.Thread;. In addition, this document
+	use <emphasis>bjam</emphasis> to build and test &Boost.Threads;. In addition, this document
 	will try to explain the build requirements so that users may create their own
 	build processes (for instance, create an IDE specific project), both for building
-	and testing &Boost.Thread;, as well as for building their own projects using
-	&Boost.Thread;.
+	and testing &Boost.Threads;, as well as for building their own projects using
+	&Boost.Threads;.
 	</para>
 	<section id="thread.build.building">
-		<title>Building the &Boost.Thread; Libraries</title>
-        <para>
-            Building the &Boost.Thread; Library depends on how you intend to use it. You have several options:
-            <itemizedlist>
-                <listitem>
-                    Using as a <link linkend="thread.build.precompiled">precompiled</link> library, possibly
-                    with auto-linking, or for use from within an IDE.
-                </listitem>
-                <listitem>
-                    Use from a <link linkend="thread.build.bjam">&Boost.Build;</link> project.
-                </listitem>
-                <listitem>
-                    Using in <link linkend="thread.build.source">source</link> form.
-                </listitem>
-            </itemizedlist>
-        </para>
-        <section id="thread.build.precompiled">
-            <title>Precompiled</title>
-            <para>
-                Using the &Boost.Thread; library in precompiled form is the way to go if you want to
-                install the library to a standard place, from where your linker is able to resolve code
-                in binary form. You also will want this option if compile time is a concern. Multiple 
-                variants are available, for different toolsets and build variants (debug/release).
-                The library files are named <emphasis>{lead}boost_thread{build-specific-tags}.{extension}</emphasis>,
-                where the build-specific-tags indicate the toolset used to build the library, whether it's
-                a debug or release build, what version of &Boost; was used, etc.; and the lead and extension
-                are the appropriate extensions for a dynamic link library or static library for the platform
-                for which &Boost.Thread; is being built.
-            	For instance, a debug build of the dynamic library built for Win32 with VC++ 7.1 using Boost 1.34 would
-            	be named <emphasis>boost_thread-vc71-mt-gd-1_34.dll</emphasis>.
-                More information on this should be available from the &Boost.Build; documentation.
-            </para>
-            <para>
-                Building should be possible with the default configuration. If you are running into problems,
-                it might be wise to adjust your local settings of &Boost.Build; though. Typically you will
-                need to get your user-config.jam file to reflect your environment, i.e. used toolsets. Please
-                refer to the &Boost.Build; documentation to learn how to do this.
-            </para>
-            <para>
-                To create the libraries you need to open a command shell and change to the 
-                <emphasis>boost_root</emphasis> directory. From there you give the command 
-                <programlisting>bjam --toolset=<emphasis>mytoolset</emphasis> stage --with-thread</programlisting>
-                Replace <emphasis>mytoolset</emphasis> with the name of your toolset, e.g. msvc-7.1 .
-                This will compile and put the libraries into the <emphasis>stage</emphasis> directory which is just below the
-                <emphasis>boost_root</emphasis> directory. &Boost.Build; by default will generate static and 
-                dynamic variants for debug and release.
-            </para>
-            <note>
-                Invoking the above command without the --with-thread switch &Boost.Build; will build all of 
-	            the Boost distribution, including &Boost.Thread;.
-            </note>
-            <para>
-                The next step is to copy your libraries to a place where your linker is able to pick them up.
-                It is also quite possible to leave them in the stage directory and instruct your IDE to take them
-                from there.
-            </para>
-            <para>
-                In your IDE you then need to add <emphasis>boost_root</emphasis>/boost to the paths where the compiler
-                expects to find files to be included. For toolsets that support <emphasis>auto-linking</emphasis>
-                it is not necessary to explicitly specify the name of the library to link against, it is sufficient
-                to specify the path of the stage directory. Typically this is true on Windows. For gcc you need 
-                to specify the exact library name (including all the tags). Please don't forget that threading
-                support must be turned on to be able to use the library. You should be able now to build your
-                project from the IDE.
-            </para>
-	    </section>
-        <section id="thread.build.bjam">
-            <title>&Boost.Build; Project</title>
-            <para>
-                If you have decided to use &Boost.Build; as a build environment for your application, you simply
-                need to add a single line to your <emphasis>Jamroot</emphasis> file:
-                <programlisting>use-project /boost : {path-to-boost-root} ;</programlisting>
-                where <emphasis>{path-to-boost-root}</emphasis> needs to be replaced with the location of
-                your copy of the boost tree.
-                Later when you specify a component that needs to link against &Boost.Thread; you specify this
-                as e.g.:
-                <programlisting>exe myapp : {myappsources} /boost//thread ;</programlisting>
-                and you are done.
-            </para>
-        </section>
-        <section id="thread.build.source">
-            <title>Source Form</title>
-            <para>
-                Of course it is also possible to use the &Boost.Thread; library in source form.
-                First you need to specify the <emphasis>boost_root</emphasis>/boost directory as
-                a path where your compiler expects to find files to include. It is not easy
-                to isolate the &Boost.Thread; include files from the rest of the boost 
-                library though. You would also need to isolate every include file that the thread
-                library depends on. Next you need to copy the files from 
-                <emphasis>boost_root</emphasis>/libs/thread/src to your project and instruct your
-                build system to compile them together with your project. Please look into the
-                <emphasis>Jamfile</emphasis> in <emphasis>boost_root</emphasis>/libs/thread/build
-                to find out which compiler options and defines you will need to get a clean compile.
-                Using the boost library in this way is the least recommended, and should only be
-                considered if avoiding dependency on &Boost.Build; is a requirement. Even if so
-                it might be a better option to use the library in it's precompiled form. 
-                Precompiled downloads are available from the boost consulting web site, or as
-                part of most linux distributions.
-            </para>
-        </section>
+		<title>Building the &Boost.Threads; Libraries</title>
+		<para>
+	To build the &Boost.Threads; libraries using &Boost.Build;, simply change to the
+	directory <emphasis>boost_root</emphasis>/libs/thread/build and execute the command:
+		<programlisting>bjam -sTOOLS=<emphasis>toolset</emphasis></programlisting>
+	This will create the debug and the release builds of the &Boost.Threads; library.
+	<note>Invoking the above command in <emphasis>boost_root</emphasis> will build all of 
+	the Boost distribution, including &Boost.Threads;.</note>
+		</para>
+		<para>
+	The Jamfile supplied with &Boost.Threads; produces a dynamic link library named
+	<emphasis>boost_thread{build-specific-tags}.{extension}</emphasis>, where the build-specific
+	tags indicate the toolset used to build the library, whether it's a debug or release
+	build, what version of Boost was used, etc.; and the extension is the appropriate extension
+	for a dynamic link library for the platform for which &Boost.Threads; is being built.
+	For instance, a debug library built for Win32 with VC++ 7.1 using Boost 1.31 would
+	be named <emphasis>boost_thread-vc71-mt-gd-1_31.dll</emphasis>.
+		</para>
+		<para>
+	The source files that are used to create the &Boost.Threads; library
+	are all of the *.cpp files found in <emphasis>boost_root</emphasis>/libs/thread/src.
+	These need to be built with the compiler's and linker's multi-threading support enabled.
+	If you want to create your own build solution you'll have to follow these same
+	guidelines. One of the most frequently reported problems when trying to do this
+	occurs from not enabling the compiler's and linker's support for multi-threading.
+		</para>
 	</section>
 	<section id="thread.build.testing">
-		<title>Testing the &Boost.Thread; Libraries</title>
+		<title>Testing the &Boost.Threads; Libraries</title>
 		<para>
-	        To test the &Boost.Thread; libraries using &Boost.Build;, simply change to the
-	        directory <emphasis>boost_root</emphasis>/libs/thread/test and execute the command:
-			<programlisting>bjam --toolset=<emphasis>mytoolset</emphasis> test</programlisting>
+	To test the &Boost.Threads; libraries using &Boost.Build;, simply change to the
+	directory <emphasis>boost_root</emphasis>/libs/thread/test and execute the command:
+			<programlisting>bjam -sTOOLS=<emphasis>toolset</emphasis> test</programlisting>
 		</para>
 	</section>
 </section>

doc/condition-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/condition.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -25,12 +21,12 @@
 
       <description>
         <para>A <classname>condition</classname> object is always used in
-          conjunction with a <link linkend="thread.concepts.mutexes">mutex</link>
+          conjunction with a <link linkend="threads.concepts.mutexes">mutex</link>
           object (an object whose type is a model of a <link
-            linkend="thread.concepts.Mutex">Mutex</link> or one of its
+            linkend="threads.concepts.Mutex">Mutex</link> or one of its
           refinements). The mutex object must be locked prior to waiting on the
           condition, which is verified by passing a lock object (an object whose
-          type is a model of <link linkend="thread.concepts.Lock">Lock</link> or
+          type is a model of <link linkend="threads.concepts.Lock">Lock</link> or
           one of its refinements) to the <classname>condition</classname> object's
           wait functions. Upon blocking on the <classname>condition</classname>
           object, the thread unlocks the mutex object. When the thread returns
@@ -43,8 +39,8 @@
           &cite.SchmidtStalRohnertBuschmann; and &cite.Hoare74;). Monitors are one
           of the most important patterns for creating reliable multithreaded
           programs.</para>
-        <para>See <xref linkend="thread.glossary"/> for definitions of <link
-            linkend="thread.glossary.thread-state">thread states</link>
+        <para>See <xref linkend="threads.glossary"/> for definitions of <link
+            linkend="threads.glossary.thread-state">thread states</link>
           blocked and ready. Note that "waiting" is a synonym for blocked.</para>
       </description>
 
@@ -91,10 +87,10 @@
           </parameter>
 
           <requires><simpara><code>ScopedLock</code> meets the <link
-                linkend="thread.concepts.ScopedLock">ScopedLock</link>
+                linkend="threads.concepts.ScopedLock">ScopedLock</link>
               requirements.</simpara></requires>
           <effects><simpara>Releases the lock on the <link
-                linkend="thread.concepts.mutexes">mutex object</link>
+                linkend="threads.concepts.mutexes">mutex object</link>
               associated with <code>lock</code>, blocks the current thread of execution
               until readied by a call to <code>this->notify_one()</code>
               or<code> this->notify_all()</code>, and then reacquires the
@@ -120,7 +116,7 @@
           </parameter>
 
           <requires><simpara><code>ScopedLock</code> meets the <link
-                linkend="thread.concepts.ScopedLock">ScopedLock</link>
+                linkend="threads.concepts.ScopedLock">ScopedLock</link>
               requirements and the return from <code>pred()</code> is
               convertible to <code>bool</code>.</simpara></requires>
           <effects><simpara>As if: <code>while (!pred())
@@ -145,10 +141,10 @@
           </parameter>
 
           <requires><simpara><code>ScopedLock</code> meets the <link
-                linkend="thread.concepts.ScopedLock">ScopedLock</link>
+                linkend="threads.concepts.ScopedLock">ScopedLock</link>
               requirements.</simpara></requires>
           <effects><simpara>Releases the lock on the <link
-                linkend="thread.concepts.mutexes">mutex object</link>
+                linkend="threads.concepts.mutexes">mutex object</link>
               associated with <code>lock</code>, blocks the current thread of execution
               until readied by a call to <code>this->notify_one()</code>
               or<code> this->notify_all()</code>, or until time <code>xt</code> 
@@ -171,16 +167,12 @@
             <paramtype>ScopedLock&amp;</paramtype>
           </parameter>
 
-          <parameter name="xt">
-            <paramtype>const <classname>boost::xtime</classname>&amp;</paramtype>
-          </parameter>
-
           <parameter name="pred">
             <paramtype>Pred</paramtype>
           </parameter>
 
           <requires><simpara><code>ScopedLock</code> meets the <link
-                linkend="thread.concepts.ScopedLock">ScopedLock</link>
+                linkend="threads.concepts.ScopedLock">ScopedLock</link>
               requirements and the return from <code>pred()</code> is
               convertible to <code>bool</code>.</simpara></requires>
           <effects><simpara>As if: <code>while (!pred()) { if (!timed_wait(lock,

doc/configuration.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <section id="thread.configuration" last-revision="$Date$">
 	<title>Configuration</title>
-	<para>&Boost.Thread; uses several configuration macros in &lt;boost/config.hpp&gt;,
+	<para>&Boost.Threads; uses several configuration macros in &lt;boost/config.hpp&gt;,
 	as well as configuration macros meant to be supplied by the application. These
 	macros are documented here.
 	</para>
 	<section id="thread.configuration.public">
 		<title>Library Defined Public Macros</title>
 		<para>
-	These macros are defined by &Boost.Thread; but are expected to be used
+	These macros are defined by &Boost.Threads; but are expected to be used
 	by application code.
 		</para>
 		<informaltable>
@@ -33,9 +29,9 @@
 						<entry>BOOST_HAS_THREADS</entry>
 						<entry>
 	Indicates that threading support is available. This means both that there
-	is a platform specific implementation for &Boost.Thread; and that
+	is a platform specific implementation for &Boost.Threads; and that
 	threading support has been enabled in a platform specific manner. For instance,
-	on the Win32 platform there&#39;s an implementation for &Boost.Thread;
+	on the Win32 platform there&#39;s an implementation for &Boost.Threads;
 	but unless the program is compiled against one of the multithreading runtimes
 	(often determined by the compiler predefining the macro _MT) the BOOST_HAS_THREADS
 	macro remains undefined.
@@ -48,7 +44,7 @@
 	<section id="thread.configuration.implementation">
 		<title>Library Defined Implementation Macros</title>
 		<para>
-	These macros are defined by &Boost.Thread; and are implementation details
+	These macros are defined by &Boost.Threads; and are implementation details
 	of interest only to implementors.
 		</para>
 		<informaltable>
@@ -64,14 +60,14 @@
 						<entry>BOOST_HAS_WINTHREADS</entry>
 						<entry>
 	Indicates that the platform has the Microsoft Win32 threading libraries,
-	and that they should be used to implement &Boost.Thread;.
+	and that they should be used to implement &Boost.Threads;.
 			            </entry>
 					</row>
 					<row>
 						<entry>BOOST_HAS_PTHREADS</entry>
 						<entry>
 	Indicates that the platform has the POSIX pthreads libraries, and that
-	they should be used to implement &Boost.Thread;.
+	they should be used to implement &Boost.Threads;.
 						</entry>
 					</row>
 					<row>

doc/design.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.design" last-revision="$Date$">
+<section id="threads.design" last-revision="$Date$">
   <title>Design</title>
   <para>With client/server and three-tier architectures becoming common place
   in today's world, it's becoming increasingly important for programs to be
@@ -19,18 +15,18 @@
   Further, these APIs are almost universally C APIs and fail to take
   advantage of C++'s strengths, or to address concepts unique to C++, such as
   exceptions.</para>
-  <para>The &Boost.Thread; library is an attempt to define a portable interface
+  <para>The &Boost.Threads; library is an attempt to define a portable interface
   for writing parallel processes in C++.</para>
-  <section id="thread.design.goals">
+  <section id="threads.design.goals">
     <title>Goals</title>
-    <para>The &Boost.Thread; library has several goals that should help to set
+    <para>The &Boost.Threads; library has several goals that should help to set
 	it apart from other solutions. These goals are listed in order of precedence
 	with full descriptions below.
     <variablelist>
 	  <varlistentry>
 	    <term>Portability</term>
 		<listitem>
-          <para>&Boost.Thread; was designed to be highly portable. The goal is
+          <para>&Boost.Threads; was designed to be highly portable. The goal is
 		  for the interface to be easily implemented on any platform that
 		  supports threads, and possibly even on platforms without native thread
 		  support.</para>
@@ -39,8 +35,8 @@
 	  <varlistentry>
         <term>Safety</term>
         <listitem>
-          <para>&Boost.Thread; was designed to be as safe as possible. Writing
-		  <link linkend="thread.glossary.thread-safe">thread-safe</link>
+          <para>&Boost.Threads; was designed to be as safe as possible. Writing
+		  <link linkend="threads.glossary.thread-safe">thread-safe</link>
 		  code is very difficult and successful libraries must strive to
 		  insulate the programmer from dangerous constructs as much as
 		  possible. This is accomplished in several ways:
@@ -49,14 +45,14 @@
               <para>C++ language features are used to make correct usage easy
 			  (if possible) and error-prone usage impossible or at least more
 			  difficult. For example, see the <link
-			  linkend="thread.concepts.Mutex">Mutex</link> and <link
-			  linkend="thread.concepts.Lock">Lock</link> designs, and note
+			  linkend="threads.concepts.Mutex">Mutex</link> and <link
+			  linkend="threads.concepts.Lock">Lock</link> designs, and note
 			  how they interact.</para>
             </listitem>
             <listitem>
               <para>Certain traditional concurrent programming features are
 			  considered so error-prone that they are not provided at all. For
-			  example, see <xref linkend="thread.rationale.events" />.</para>
+			  example, see <xref linkend="threads.rationale.events" />.</para>
             </listitem>
             <listitem>
               <para>Dangerous features, or features which may be misused, are
@@ -69,9 +65,9 @@
       <varlistentry>
 	    <term>Flexibility</term>
 		<listitem>
-		  <para>&Boost.Thread; was designed to be flexible. This goal is often
+		  <para>&Boost.Threads; was designed to be flexible. This goal is often
 		  at odds with <emphasis>safety</emphasis>. When functionality might be
-		  compromised by the desire to keep the interface safe, &Boost.Thread;
+		  compromised by the desire to keep the interface safe, &Boost.Threads;
 		  has been designed to provide the functionality, but to make it's use
 		  prohibitive for general use. In other words, the interfaces have been
 		  designed such that it's usually obvious when something is unsafe, and
@@ -81,11 +77,11 @@
       <varlistentry>
         <term>Efficiency</term>
 		<listitem>
-          <para>&Boost.Thread; was designed to be as efficient as
+          <para>&Boost.Threads; was designed to be as efficient as
 		  possible. When building a library on top of another library there is
 		  always a danger that the result will be so much slower than the
 		  "native" API that programmers are inclined to ignore the higher level
-		  API. &Boost.Thread; was designed to minimize the chances of this
+		  API. &Boost.Threads; was designed to minimize the chances of this
 		  occurring. The interfaces have been crafted to allow an implementation
 		  the greatest chance of being as efficient as possible. This goal is
 		  often at odds with the goal for <emphasis>safety</emphasis>. Every
@@ -98,18 +94,18 @@
   </section>
   <section>
     <title>Iterative Phases</title>
-    <para>Another goal of &Boost.Thread; was to take a dynamic, iterative
+    <para>Another goal of &Boost.Threads; was to take a dynamic, iterative
 	approach in its development. The computing industry is still exploring the
 	concepts of parallel programming. Most thread libraries supply only simple
 	primitive concepts for thread synchronization. These concepts are very
 	simple, but it is very difficult to use them safely or to provide formal
 	proofs for constructs built on top of them. There has been a lot of research
 	into other concepts, such as in "Communicating Sequential Processes."
-	&Boost.Thread; was designed in iterative steps, with each step providing 
+	&Boost.Threads; was designed in iterative steps, with each step providing 
 	the building blocks necessary for the next step and giving the researcher 
 	the tools necessary to explore new concepts in a portable manner.</para>
     <para>Given the goal of following a dynamic, iterative approach
-	&Boost.Thread; shall go through several growth cycles. Each phase in its
+	&Boost.Threads; shall go through several growth cycles. Each phase in its
 	development shall be roughly documented here.</para>
   </section>
   <section>
@@ -123,10 +119,10 @@
 	much help to a programmer who wants to use the library in his multithreaded
 	application. So there's a very great need for portable primitives that will
 	allow the library developer to create <link
-	linkend="thread.glossary.thread-safe">thread-safe</link>
+	linkend="threads.glossary.thread-safe">thread-safe</link>
 	implementations. This need far out weighs the need for portable methods to
 	create and manage threads.</para>
-    <para>Because of this need, the first phase of &Boost.Thread; focuses
+    <para>Because of this need, the first phase of &Boost.Threads; focuses
 	solely on providing portable primitive concepts for thread
 	synchronization. Types provided in this phase include the
 	<classname>boost::mutex</classname>, 
@@ -139,16 +135,16 @@
 	synchronization primitives, though there are others that will be added in
 	later phases.</para>
   </section>
-  <section id="thread.design.phase2">
+  <section id="threads.design.phase2">
     <title>Phase 2, Thread Management and Thread Specific Storage</title>
     <para>This phase addresses the creation and management of threads and
     provides a mechanism for thread specific storage (data associated with a
     thread instance). Thread management is a tricky issue in C++, so this
     phase addresses only the basic needs of multithreaded program. Later
     phases are likely to add additional functionality in this area. This
-    phase of &Boost.Thread; adds the <classname>boost::thread</classname> and
+    phase of &Boost.Threads; adds the <classname>boost::thread</classname> and
 	<classname>boost::thread_specific_ptr</classname> types. With these
-	additions the &Boost.Thread; library can be considered minimal but
+	additions the &Boost.Threads; library can be considered minimal but
 	complete.</para>
   </section>
   <section>

doc/entities.xml

@@ -1,31 +1,26 @@
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<!ENTITY Boost "<emphasis role='bold'>Boost</emphasis>">
-<!ENTITY Boost.Thread "<emphasis role='bold'>Boost.Thread</emphasis>">
+<!ENTITY Boost.Threads "<emphasis role='bold'>Boost.Threads</emphasis>">
 <!ENTITY Boost.Build "<emphasis role='bold'>Boost.Build</emphasis>">
 <!ENTITY cite.AndrewsSchneider83  "<citation><xref
-linkend='thread.bib.AndrewsSchneider83'
-endterm='thread.bib.AndrewsSchneider83.abbrev'/></citation>">
-<!ENTITY cite.Boost "<citation><xref linkend='thread.bib.Boost'
-endterm='thread.bib.Boost.abbrev'/></citation>">
-<!ENTITY cite.Hansen73 "<citation><xref linkend='thread.bib.Hansen73'
-endterm='thread.bib.Hansen73.abbrev'/></citation>">
-<!ENTITY cite.Butenhof97 "<citation><xref linkend='thread.bib.Butenhof97'
-endterm='thread.bib.Butenhof97.abbrev'/></citation>">
-<!ENTITY cite.Hoare74 "<citation><xref linkend='thread.bib.Hoare74'
-endterm='thread.bib.Hoare74.abbrev'/></citation>">
-<!ENTITY cite.ISO98 "<citation><xref linkend='thread.bib.ISO98'
-endterm='thread.bib.ISO98.abbrev'/></citation>">
+linkend='threads.bib.AndrewsSchneider83'
+endterm='threads.bib.AndrewsSchneider83.abbrev'/></citation>">
+<!ENTITY cite.Boost "<citation><xref linkend='threads.bib.Boost'
+endterm='threads.bib.Boost.abbrev'/></citation>">
+<!ENTITY cite.Hansen73 "<citation><xref linkend='threads.bib.Hansen73'
+endterm='threads.bib.Hansen73.abbrev'/></citation>">
+<!ENTITY cite.Butenhof97 "<citation><xref linkend='threads.bib.Butenhof97'
+endterm='threads.bib.Butenhof97.abbrev'/></citation>">
+<!ENTITY cite.Hoare74 "<citation><xref linkend='threads.bib.Hoare74'
+endterm='threads.bib.Hoare74.abbrev'/></citation>">
+<!ENTITY cite.ISO98 "<citation><xref linkend='threads.bib.ISO98'
+endterm='threads.bib.ISO98.abbrev'/></citation>">
 <!ENTITY cite.McDowellHelmbold89 "<citation><xref
-linkend='thread.bib.McDowellHelmbold89'
-endterm='thread.bib.McDowellHelmbold89.abbrev'/></citation>">
+linkend='threads.bib.McDowellHelmbold89'
+endterm='threads.bib.McDowellHelmbold89.abbrev'/></citation>">
 <!ENTITY cite.SchmidtPyarali "<citation><xref
-linkend='thread.bib.SchmidtPyarali'
-endterm='thread.bib.SchmidtPyarali.abbrev'/></citation>">
+linkend='threads.bib.SchmidtPyarali'
+endterm='threads.bib.SchmidtPyarali.abbrev'/></citation>">
 <!ENTITY cite.SchmidtStalRohnertBuschmann "<citation><xref
-linkend='thread.bib.SchmidtStalRohnertBuschmann'
-endterm='thread.bib.SchmidtStalRohnertBuschmann.abbrev'/></citation>">
-<!ENTITY cite.Stroustrup "<citation><xref linkend='thread.bib.Stroustrup'
-endterm='thread.bib.Stroustrup.abbrev'/></citation>">
+linkend='threads.bib.SchmidtStalRohnertBuschmann'
+endterm='threads.bib.SchmidtStalRohnertBuschmann.abbrev'/></citation>">
+<!ENTITY cite.Stroustrup "<citation><xref linkend='threads.bib.Stroustrup'
+endterm='threads.bib.Stroustrup.abbrev'/></citation>">

doc/exceptions-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/exceptions.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -38,7 +34,7 @@
 		<purpose>
 			<simpara>The <classname>thread_resource_error</classname> class
 			defines an exception type that is thrown by constructors in the
-			&Boost.Thread; library when thread-related resources can not be 
+			&Boost.Threads; library when thread-related resources can not be 
 			acquired.</simpara>
 		</purpose>
 

doc/faq.xml

@@ -1,49 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.faq" last-revision="$Date$">
+<section id="threads.faq" last-revision="$Date$">
   <title>Frequently Asked Questions</title>
   <qandaset>
     <qandaentry>
 	  <question>
 	    <para>Are lock objects <link
-		linkend="thread.glossary.thread-safe">thread safe</link>?</para>
+		linkend="threads.glossary.thread-safe">thread safe</link>?</para>
 	  </question>
 	  <answer>
 	    <para><emphasis role="bold">No!</emphasis> Lock objects are not meant to
 		be shared between threads. They are meant to be short-lived objects
 		created on automatic storage within a code block. Any other usage is
 		just likely to lead to errors and won't really be of actual benefit anyway.
-		Share <link linkend="thread.concepts.mutexes">Mutexes</link>, not
+		Share <link linkend="threads.concepts.mutexes">Mutexes</link>, not
 		Locks. For more information see the <link
-		linkend="thread.rationale.locks">rationale</link> behind the
+		linkend="threads.rationale.locks">rationale</link> behind the
 		design for lock objects.</para>
 	  </answer>
 	</qandaentry>
     <qandaentry>
       <question>
-	    <para>Why was &Boost.Thread; modeled after (specific library
+	    <para>Why was &Boost.Threads; modeled after (specific library
 		name)?</para>
 	  </question>
 	  <answer>
-	    <para>It wasn't. &Boost.Thread; was designed from scratch. Extensive
+	    <para>It wasn't. &Boost.Threads; was designed from scratch. Extensive
 		design discussions involved numerous people representing a wide range of
 		experience across many platforms. To ensure portability, the initial
 		implements were done in parallel using POSIX Threads and the Win32
-		threading API. But the &Boost.Thread; design is very much in the spirit
+		threading API. But the &Boost.Threads; design is very much in the spirit
 		of C++, and thus doesn't model such C based APIs.</para>
 	  </answer>
 	</qandaentry>
 	<qandaentry>
 	  <question>
-	    <para>Why wasn't &Boost.Thread; modeled after (specific library
+	    <para>Why wasn't &Boost.Threads; modeled after (specific library
 	    name)?</para>
 	  </question>
 	  <answer>
@@ -58,12 +54,12 @@
 	</qandaentry>
 	<qandaentry>
 	  <question>
-	    <para>Why do <link linkend="thread.concepts.mutexes">Mutexes</link>
+	    <para>Why do <link linkend="threads.concepts.mutexes">Mutexes</link>
 		have noncopyable semantics?</para>
 	  </question>
 	  <answer>
         <para>To ensure that <link
-		linkend="thread.glossary.deadlock">deadlocks</link> don't occur. The
+		linkend="threads.glossary.deadlock">deadlocks</link> don't occur. The
 		only logical form of copy would be to use some sort of shallow copy
 		semantics in which multiple mutex objects could refer to the same mutex
 		state. This means that if ObjA has a mutex object as part of its state
@@ -77,20 +73,20 @@
 	<qandaentry>
 	  <question>
 	    <para>How can you prevent <link
-		linkend="thread.glossary.deadlock">deadlock</link> from occurring when
+		linkend="threads.glossary.deadlock">deadlock</link> from occurring when
 		a thread must lock multiple mutexes?</para>
 	  </question>
 	  <answer>
 	    <para>Always lock them in the same order. One easy way of doing this is
 		to use each mutex's address to determine the order in which they are
-		locked. A future &Boost.Thread; concept may wrap this pattern up in a
+		locked. A future &Boost.Threads; concept may wrap this pattern up in a
 		reusable class.</para>
 	  </answer>
 	</qandaentry>
 	<qandaentry>
 	  <question>
 	    <para>Don't noncopyable <link
-		linkend="thread.concepts.mutexes">Mutex</link> semantics mean that a
+		linkend="threads.concepts.mutexes">Mutex</link> semantics mean that a
 		class with a mutex member will be noncopyable as well?</para>
 	  </question>
 	  <answer>
@@ -98,7 +94,7 @@
 		copy constructor and assignment operator, so they will have to be coded
 		explicitly. This is a <emphasis role="bold">good thing</emphasis>,
 		however, since the compiler generated operations would not be <link
-		linkend="thread.glossary.thread-safe">thread-safe</link>. The following
+		linkend="threads.glossary.thread-safe">thread-safe</link>. The following
 		is a simple example of a class with copyable semantics and internal
         synchronization through a mutex member.</para>
 <programlisting>
@@ -148,7 +144,7 @@ private:
 	<qandaentry>
 	  <question>
 	    <para>How can you lock a <link
-		linkend="thread.concepts.mutexes">Mutex</link> member in a const member
+		linkend="threads.concepts.mutexes">Mutex</link> member in a const member
 		function, in order to implement the Monitor Pattern?</para>
 	  </question>
 	  <answer>
@@ -169,8 +165,8 @@ private:
 	  </question>
 	  <answer>
 	    <para>Condition variables result in user code much less prone to <link
-		linkend="thread.glossary.race-condition">race conditions</link> than
-		event variables. See <xref linkend="thread.rationale.events" /> 
+		linkend="threads.glossary.race-condition">race conditions</link> than
+		event variables. See <xref linkend="threads.rationale.events" /> 
 		for analysis. Also see &cite.Hoare74; and &cite.SchmidtStalRohnertBuschmann;.
 		</para>
 	  </answer>
@@ -181,7 +177,7 @@ private:
 	  </question>
 	  <answer>
 	    <para>There's a valid need for thread termination, so at some point
-		&Boost.Thread; probably will include it, but only after we can find a
+		&Boost.Threads; probably will include it, but only after we can find a
 		truly safe (and portable) mechanism for this concept.</para>
 	  </answer>
 	</qandaentry>
@@ -210,26 +206,5 @@ private:
 		condition variable.</para>
 	  </answer>
 	</qandaentry>
-	<qandaentry>
-	  <question>
-	    <para>Why doesn't the thread's ctor take at least a void* to pass any
-	    information along with the function? All other threading libs support
-	    that and it makes Boost.Threads inferiour. </para>
-	  </question>
-	  <answer>
-	    <para>There is no need, because Boost.Threads are superiour! First
-	    thing is that its ctor doesn't take a function but a functor. That
-	    means that you can pass an object with an overloaded operator() and
-	    include additional data as members in that object. Beware though that
-	    this object is copied, use boost::ref to prevent that. Secondly, even
-	    a boost::function&lt;void (void)&gt; can carry parameters, you only have to
-	    use boost::bind() to create it from any function and bind its 
-	    parameters.</para>
-	    <para>That is also why Boost.Threads are superiour, because they
-	    don't require you to pass a type-unsafe void pointer. Rather, you can
-	    use the flexible Boost.Functions to create a thread entry out of
-	    anything that can be called.</para>
-	  </answer>
-	</qandaentry>
   </qandaset>
 </section>

doc/glossary.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<glossary id="thread.glossary" last-revision="$Date$">
+<glossary id="threads.glossary" last-revision="$Date$">
   <title>Glossary</title>
   <para>Definitions are given in terms of the C++ Standard
   &cite.ISO98;. References to the standard are in the form [1.2.3/4], which
@@ -16,9 +12,9 @@
   "/".</para>
   <para>Because the definitions are written in something akin to "standardese",
   they can be difficult to understand. The intent isn't to confuse, but rather
-  to clarify the additional requirements &Boost.Thread; places on a C++
+  to clarify the additional requirements &Boost.Threads; places on a C++
   implementation as defined by the C++ Standard.</para>
-  <glossentry id="thread.glossary.thread">
+  <glossentry id="threads.glossary.thread">
     <glossterm>Thread</glossterm>
     <glossdef>
 	  <para>Thread is short for "thread of execution". A thread of execution is
@@ -54,13 +50,13 @@
       </itemizedlist>
     </glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.thread-safe">
+  <glossentry id="threads.glossary.thread-safe">
     <glossterm>Thread-safe</glossterm>
 	<glossdef>
       <para>A program is thread-safe if it has no <link
-	  linkend="thread.glossary.race-condition">race conditions</link>, does
-	  not <link linkend="thread.glossary.deadlock">deadlock</link>, and has
-	  no <link linkend="thread.glossary.priority-failure">priority
+	  linkend="threads.glossary.race-condition">race conditions</link>, does
+	  not <link linkend="threads.glossary.deadlock">deadlock</link>, and has
+	  no <link linkend="threads.glossary.priority-failure">priority
 	  failures</link>.</para>
 	  <para>Note that thread-safety does not necessarily imply efficiency, and
 	  than while some thread-safety violations can be determined statically at
@@ -68,7 +64,7 @@
 	  runtime.</para>
 	</glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.thread-state">
+  <glossentry id="threads.glossary.thread-state">
     <glossterm>Thread State</glossterm>
 	<glossdef>
       <para>During the lifetime of a thread, it shall be in one of the following
@@ -170,7 +166,7 @@
 	  above table.]</para>
     </glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.race-condition">
+  <glossentry id="threads.glossary.race-condition">
     <glossterm>Race Condition</glossterm>
 	<glossdef>
       <para>A race condition is what occurs when multiple threads read from and write
@@ -179,10 +175,10 @@
 	  pattern which isn't even a valid value for the data type. A race condition
 	  results in undefined behavior [1.3.12].</para>
       <para>Race conditions can be prevented by serializing memory access using
-	  the tools provided by &Boost.Thread;.</para>
+	  the tools provided by &Boost.Threads;.</para>
     </glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.deadlock">
+  <glossentry id="threads.glossary.deadlock">
     <glossterm>Deadlock</glossterm>
 	<glossdef>
       <para>Deadlock is an execution state where for some set of threads, each
@@ -191,14 +187,14 @@
 	  become ready again.</para>
 	</glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.starvation">
+  <glossentry id="threads.glossary.starvation">
     <glossterm>Starvation</glossterm>
 	<glossdef>
 	  <para>The condition in which a thread is not making sufficient progress in
 	  its work during a given time interval.</para>
 	</glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.priority-failure">
+  <glossentry id="threads.glossary.priority-failure">
     <glossterm>Priority Failure</glossterm>
 	<glossdef>
 	  <para>A priority failure (such as priority inversion or infinite overtaking)
@@ -206,10 +202,10 @@
 	  performed in time to be useful.</para>
 	</glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.undefined-behavior">
+  <glossentry id="threads.glossary.undefined-behavior">
     <glossterm>Undefined Behavior</glossterm>
 	<glossdef>
-	  <para>The result of certain operations in &Boost.Thread; is undefined;
+	  <para>The result of certain operations in &Boost.Threads; is undefined;
 	  this means that those operations can invoke almost any behavior when
 	  they are executed.</para>
 	  
@@ -224,7 +220,7 @@
 	  programming error.</para>
 	</glossdef>
   </glossentry>
-  <glossentry id="thread.glossary.memory-visibility">
+  <glossentry id="threads.glossary.memory-visibility">
     <glossterm>Memory Visibility</glossterm>
 	<glossdef>
 	  <para>An address [1.7] shall always point to the same memory byte,

doc/implementation_notes.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.implementation_notes" last-revision="$Date$">
+<section id="threads.implementation_notes" last-revision="$Date$">
 	<title>Implementation Notes</title>
-	<section id="thread.implementation_notes.win32">
+	<section id="threads.implementation_notes.win32">
 		<title>Win32</title>
 		<para>
 			In the current Win32 implementation, creating a boost::thread object

doc/index.html

@@ -1,12 +1,8 @@
-<!-- Copyright (c) 2002-2003 Beman Dawes, William E. Kempf.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <html>
 <head>
-<meta http-equiv="refresh" content="0; URL=../../../doc/html/thread.html">
+<meta http-equiv="refresh" content="0; URL=../../../doc/html/threads.html">
 </head>
 <body>
-Automatic redirection failed, please go to <a href="../../../doc/html/thread.html">../../../doc/html/thread.html</a>
+Automatic redirection failed, please go to <a href="../../../doc/html/threads.html">../../../doc/html/threads.html</a>
 </body>
 </html>

doc/mutex-ref.xml

@@ -1,39 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/mutex.hpp"
   last-revision="$Date$">
   <namespace name="boost">
     <class name="mutex">
 		<purpose>
 			<para>The <classname>mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.Mutex">Mutex</link> concept.</para>
+			<link linkend="threads.concepts.Mutex">Mutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.Mutex">Mutex</link> concept. 
+			<link linkend="threads.concepts.Mutex">Mutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>try_mutex</classname> and <classname>timed_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<para>For <link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics, see <classname>recursive_mutex</classname>,
 			<classname>recursive_try_mutex</classname>, and <classname>recursive_timed_mutex</classname>.
 			</para>
 			
 			<para>The <classname>mutex</classname> class supplies the following typedef,
-			which <link linkend="thread.concepts.lock-models">models</link>
+			which <link linkend="threads.concepts.lock-models">models</link>
 			the specified locking strategy:
 
 			<informaltable>
@@ -47,7 +43,7 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -55,7 +51,7 @@
 			</para>
 
 			<para>The <classname>mutex</classname> class uses an 
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -65,10 +61,10 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in &Boost.Thread;, <classname>mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in &Boost.Threads;, <classname>mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>
@@ -104,26 +100,26 @@
 	<class name="try_mutex">
 		<purpose>
 			<para>The <classname>try_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryMutex">TryMutex</link> concept.</para>
+			<link linkend="threads.concepts.TryMutex">TryMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>try_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryMutex">TryMutex</link> concept. 
+			<link linkend="threads.concepts.TryMutex">TryMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>mutex</classname> and <classname>timed_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<para>For <link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics, see <classname>recursive_mutex</classname>,
 			<classname>recursive_try_mutex</classname>, and <classname>recursive_timed_mutex</classname>.
 			</para>
 			
 			<para>The <classname>try_mutex</classname> class supplies the following typedefs,
-			which <link linkend="thread.concepts.lock-models">model</link>
+			which <link linkend="threads.concepts.lock-models">model</link>
 			the specified locking strategies:
 
 			<informaltable>
@@ -137,11 +133,11 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -149,7 +145,7 @@
 			</para>
 
 			<para>The <classname>try_mutex</classname> class uses an 
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>try_mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -159,10 +155,10 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in &Boost.Thread;, <classname>try_mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in &Boost.Threads;, <classname>try_mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>
@@ -203,26 +199,26 @@
 	<class name="timed_mutex">
 		<purpose>
 			<para>The <classname>timed_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedMutex">TimedMutex</link> concept.</para>
+			<link linkend="threads.concepts.TimedMutex">TimedMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>timed_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedMutex">TimedMutex</link> concept. 
+			<link linkend="threads.concepts.TimedMutex">TimedMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>mutex</classname> and <classname>try_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<para>For <link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics, see <classname>recursive_mutex</classname>,
 			<classname>recursive_try_mutex</classname>, and <classname>recursive_timed_mutex</classname>.
 			</para>
 			
 			<para>The <classname>timed_mutex</classname> class supplies the following typedefs,
-			which <link linkend="thread.concepts.lock-models">model</link>
+			which <link linkend="threads.concepts.lock-models">model</link>
 			the specified locking strategies:
 
 			<informaltable>
@@ -236,15 +232,15 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_timed_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -252,7 +248,7 @@
 			</para>
 
 			<para>The <classname>timed_mutex</classname> class uses an 
-			<link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>timed_mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -262,10 +258,10 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all 
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in  &Boost.Thread;, <classname>timed_mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in  &Boost.Threads;, <classname>timed_mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>

doc/once-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/once.hpp"
 	last-revision="$Date$">
 	<macro name="BOOST_ONCE_INIT">
@@ -15,7 +11,7 @@
 		<code>once_flag</code> type (statically initialized to 
 		<macroname>BOOST_ONCE_INIT</macroname>) can be used to run a
 		routine exactly once. This can be used to initialize data in a
-		<link linkend="thread.glossary.thread-safe">thread-safe</link>
+		<link linkend="threads.glossary.thread-safe">thread-safe</link>
 		manner.</purpose>
 		
 		<description>The implementation-defined macro 
@@ -31,7 +27,7 @@
 			<code>once_flag</code> type (statically initialized to 
 			<macroname>BOOST_ONCE_INIT</macroname>) can be used to run a
 			routine exactly once. This can be used to initialize data in a
-			<link linkend="thread.glossary.thread-safe">thread-safe</link>
+			<link linkend="threads.glossary.thread-safe">thread-safe</link>
 			manner.</purpose>
 			
 			<description>The implementation-defined type <code>once_flag</code>
@@ -49,7 +45,7 @@
 			<code>once_flag</code> type (statically initialized to 
 			<macroname>BOOST_ONCE_INIT</macroname>) can be used to run a
 			routine exactly once. This can be used to initialize data in a
-			<link linkend="thread.glossary.thread-safe">thread-safe</link>
+			<link linkend="threads.glossary.thread-safe">thread-safe</link>
 			manner.</purpose>
 			
 			<description>
@@ -65,23 +61,25 @@ void init()
 
 void thread_proc()
 {
-    boost::call_once(once, &amp;init);
+    boost::call_once(&amp;init, once);
 }</programlisting>
 			</para></description>
 			
+			<parameter name="func">
+				<paramtype>void (*func)()</paramtype>
+			</parameter>
+			
 			<parameter name="flag">
 				<paramtype>once_flag&amp;</paramtype>
 			</parameter>
-
-			<parameter name="func">
-				<paramtype>Function func</paramtype>
-			</parameter>
+			
+			<requires>The function <code>func</code> shall not throw
+			exceptions.</requires>
 			
 			<effects>As if (in an atomic fashion): 
-			<code>if (flag == BOOST_ONCE_INIT) func();</code>. If <code>func()</code> throws an exception, it shall be as if this
-thread never invoked <code>call_once</code></effects>
+			<code>if (flag == BOOST_ONCE_INIT) func();</code></effects>
 			
-			<postconditions><code>flag != BOOST_ONCE_INIT</code> unless <code>func()</code> throws an exception.
+			<postconditions><code>flag != BOOST_ONCE_INIT</code>
 			</postconditions>
 		</function>
 	</namespace>

doc/overview.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.overview" last-revision="$Date$">
+<section id="threads.overview" last-revision="$Date$">
   <title>Overview</title>
-  <section id="thread.introduction">
+  <section id="threads.introduction">
     <title>Introduction</title>
-    <para>&Boost.Thread; allows C++ programs to execute as multiple,
+    <para>&Boost.Threads; allows C++ programs to execute as multiple,
     asynchronous, independent threads-of-execution. Each thread has its own
     machine state including program instruction counter and registers. Programs
     which execute as multiple threads are called multithreaded programs to
     distinguish them from traditional single-threaded programs. The <link
-	linkend="thread.glossary">glossary</link> gives a more complete description
+	linkend="threads.glossary">glossary</link> gives a more complete description
 	of the multithreading execution environment.</para>
     <para>Multithreading provides several advantages:
     <itemizedlist>
@@ -48,15 +44,15 @@
     multithreaded programs are subject to additional errors:
     <itemizedlist>
       <listitem>
-        <para><link linkend="thread.glossary.race-condition">Race
+        <para><link linkend="threads.glossary.race-condition">Race
 	    conditions</link></para>
       </listitem>
       <listitem>
-        <para><link linkend="thread.glossary.deadlock">Deadlock</link>
+        <para><link linkend="threads.glossary.deadlock">Deadlock</link>
         (sometimes called "deadly embrace")</para>
       </listitem>
       <listitem>
-        <para><link linkend="thread.glossary.priority-failure">Priority
+        <para><link linkend="threads.glossary.priority-failure">Priority
         failures</link> (priority inversion, infinite overtaking, starvation,
 		etc.)</para>
       </listitem>
@@ -65,10 +61,10 @@
 	errors. These aren't rare or exotic failures - they are virtually guaranteed
 	to occur unless multithreaded code is designed to avoid them. Priority
 	failures are somewhat less common, but are nonetheless serious.</para>
-    <para>The <link linkend="thread.design">&Boost.Thread; design</link>
+    <para>The <link linkend="threads.design">&Boost.Threads; design</link>
     attempts to minimize these errors, but they will still occur unless the
     programmer proactively designs to avoid them.</para>
-	<note>Please also see <xref linkend="thread.implementation_notes"/>
+	<note>Please also see <xref linkend="threads.implementation_notes"/>
 	for additional, implementation-specific considerations.</note>
 	</section>
     <section>
@@ -123,11 +119,11 @@
       <title>Runtime libraries</title>
       <para>
       <emphasis role="bold">Warning:</emphasis> Multithreaded programs such as
-	  those using &Boost.Thread; must link to <link
-	  linkend="thread.glossary.thread-safe">thread-safe</link> versions of
+	  those using &Boost.Threads; must link to <link
+	  linkend="threads.glossary.thread-safe">thread-safe</link> versions of
 	  all runtime libraries used by the program, including the runtime library
 	  for the C++ Standard Library. Failure to do so will cause <link
-	  linkend="thread.glossary.race-condition">race conditions</link> to occur
+	  linkend="threads.glossary.race-condition">race conditions</link> to occur
 	  when multiple threads simultaneously execute runtime library functions for
 	  <code>new</code>, <code>delete</code>, or other language features which
 	  imply shared state.</para>
@@ -173,15 +169,15 @@
     </section>
   </section>
   <section>
-    <title>Common guarantees for all &Boost.Thread; components</title>
+    <title>Common guarantees for all &Boost.Threads; components</title>
     <section>
       <title>Exceptions</title>
-      <para>&Boost.Thread; destructors never
+      <para>&Boost.Threads; destructors never
 	  throw exceptions. Unless otherwise specified, other
-	  &Boost.Thread; functions that do not have
+	  &Boost.Threads; functions that do not have
 	  an exception-specification may throw implementation-defined
 	  exceptions.</para>
-      <para>In particular, &Boost.Thread;
+      <para>In particular, &Boost.Threads;
 	  reports failure to allocate storage by throwing an exception of type
 	  <code>std::bad_alloc</code> or a class derived from
 	  <code>std::bad_alloc</code>, failure to obtain thread resources other than
@@ -195,7 +191,7 @@
     </section>
     <section>
       <title>NonCopyable requirement</title>
-      <para>&Boost.Thread; classes documented as
+      <para>&Boost.Threads; classes documented as
 	  meeting the NonCopyable requirement disallow copy construction and copy
 	  assignment. For the sake of exposition, the synopsis of such classes show
 	  private derivation from <classname>boost::noncopyable</classname>. Users

doc/rationale.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.rationale" last-revision="$Date$">
+<section id="threads.rationale" last-revision="$Date$">
   <title>Rationale</title>
   <para>This page explains the rationale behind various design decisions in the
-  &Boost.Thread; library. Having the rationale documented here should explain
+  &Boost.Threads; library. Having the rationale documented here should explain
   how we arrived at the current design as well as prevent future rehashing of
   discussions and thought processes that have already occurred. It can also give
   users a lot of insight into the design process required for this
   library.</para>
-  <section id="thread.rationale.Boost.Thread">
-    <title>Rationale for the Creation of &Boost.Thread;</title>
+  <section id="threads.rationale.Boost.Threads">
+    <title>Rationale for the Creation of &Boost.Threads;</title>
     <para>Processes often have a degree of "potential parallelism" and it can
 	often be more intuitive to design systems with this in mind. Further, these
 	parallel processes can result in more responsive programs. The benefits for
@@ -37,24 +33,24 @@
     <para>What's truly needed is C++ language support for threads. However, the
 	C++ standards committee needs existing practice or a good proposal as a
 	starting point for adding this to the standard.</para>
-    <para>The &Boost.Thread; library was developed to provide a C++ developer
+    <para>The &Boost.Threads; library was developed to provide a C++ developer
 	with a portable interface for writing multithreaded programs on numerous
 	platforms. There's a hope that the library can be the basis for a more
 	detailed proposal for the C++ standards committee to consider for inclusion
 	in the next C++ standard.</para>
   </section>
-  <section id="thread.rationale.primitives">
-    <title>Rationale for the Low Level Primitives Supported in &Boost.Thread;</title>
-    <para>The &Boost.Thread; library supplies a set of low level primitives for
+  <section id="threads.rationale.primitives">
+    <title>Rationale for the Low Level Primitives Supported in &Boost.Threads;</title>
+    <para>The &Boost.Threads; library supplies a set of low level primitives for
 	writing multithreaded programs, such as mutexes and condition variables. In
-	fact, the first release of &Boost.Thread; supports only these low level
+	fact, the first release of &Boost.Threads; supports only these low level
 	primitives. However, computer science research has shown that use of these
 	primitives is difficult since it's difficult to mathematically prove that a
 	usage pattern is correct, meaning it doesn't result in race conditions or
 	deadlocks. There are several algebras (such as CSP, CCS and Join calculus)
 	that have been developed to help write provably correct parallel
 	processes. In order to prove the correctness these processes must be coded
-	using higher level abstractions. So why does &Boost.Thread; support the
+	using higher level abstractions. So why does &Boost.Threads; support the
 	lower level concepts?</para>
     <para>The reason is simple: the higher level concepts need to be implemented
 	using at least some of the lower level concepts. So having portable lower
@@ -68,11 +64,11 @@
 	level concepts, supporting the lower level concepts provides
 	greater accessibility.</para>
   </section>
-  <section id="thread.rationale.locks">
+  <section id="threads.rationale.locks">
     <title>Rationale for the Lock Design</title>
     <para>Programmers who are used to multithreaded programming issues will
-	quickly note that the &Boost.Thread; design for mutex lock concepts is not
-	<link linkend="thread.glossary.thread-safe">thread-safe</link> (this is
+	quickly note that the &Boost.Threads; design for mutex lock concepts is not
+	<link linkend="threads.glossary.thread-safe">thread-safe</link> (this is
 	clearly documented as well). At first this may seem like a serious design
 	flaw. Why have a multithreading primitive that's not thread-safe
 	itself?</para>
@@ -95,17 +91,17 @@
 	since checking the state can occur only by a call after construction, we'd
 	have a race condition if the lock object were shared between threads.</para>
     <para>So, to avoid the overhead of synchronizing access to the state
-	information and to avoid the race condition, the &Boost.Thread; library
+	information and to avoid the race condition, the &Boost.Threads; library
 	simply does nothing to make lock objects thread-safe. Instead, sharing a
 	lock object between threads results in undefined behavior. Since the only
 	proper usage of lock objects is within block scope this isn't a problem, and
 	so long as the lock object is properly used there's no danger of any
 	multithreading issues.</para>
   </section>
-  <section id="thread.rationale.non-copyable">
+  <section id="threads.rationale.non-copyable">
     <title>Rationale for NonCopyable Thread Type</title>
     <para>Programmers who are used to C libraries for multithreaded programming
-	are likely to wonder why &Boost.Thread; uses a noncopyable design for
+	are likely to wonder why &Boost.Threads; uses a noncopyable design for
 	<classname>boost::thread</classname>. After all, the C thread types are
 	copyable, and you often have a need for copying them within user
 	code. However, careful comparison of C designs to C++ designs shows a flaw
@@ -141,7 +137,7 @@
 	appear to bear them out. To illustrate the analysis we'll first provide
 	pseudo-code illustrating the six typical usage patterns of a thread
 	object.</para>
-	<section id="thread.rationale.non-copyable.simple">
+	<section id="threads.rationale.non-copyable.simple">
 	  <title>1. Use case: Simple creation of a thread.</title>
       <programlisting>
       void foo()
@@ -150,7 +146,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale.non-copyable.joined">
+	<section id="threads.rationale.non-copyable.joined">
 	  <title>2. Use case: Creation of a thread that's later joined.</title>
       <programlisting>
       void foo()
@@ -160,7 +156,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale.non-copyable.loop">
+	<section id="threads.rationale.non-copyable.loop">
 	  <title>3. Use case: Simple creation of several threads in a loop.</title>
       <programlisting>
       void foo()
@@ -170,7 +166,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale.non-copyable.loop-join">
+	<section id="threads.rationale.non-copyable.loop-join">
 	  <title>4. Use case: Creation of several threads in a loop which are later joined.</title>
       <programlisting>
       void foo()
@@ -182,7 +178,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale.non-copyable.pass">
+	<section id="threads.rationale.non-copyable.pass">
 	  <title>5. Use case: Creation of a thread whose ownership is passed to another object/method.</title>
       <programlisting>
       void foo()
@@ -192,7 +188,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale.non-copyable.shared">
+	<section id="threads.rationale.non-copyable.shared">
 	  <title>6. Use case: Creation of a thread whose ownership is shared between multiple
 	  objects.</title>
 	  <programlisting>
@@ -225,7 +221,7 @@
 	use a concept for any of the usage patterns there would be a good argument
 	for choosing the other design. So we'll code all six usage patterns using
 	both designs.</para>
-	<section id="thread.rationale_comparison.non-copyable.simple">
+	<section id="threads.rationale_comparison.non-copyable.simple">
 	  <title>1. Comparison: simple creation of a thread.</title>
 	  <programlisting>
       void foo()
@@ -238,7 +234,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale_comparison.non-copyable.joined">
+	<section id="threads.rationale_comparison.non-copyable.joined">
 	  <title>2. Comparison: creation of a thread that's later joined.</title>
 	  <programlisting>
       void foo()
@@ -253,7 +249,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale_comparison.non-copyable.loop">
+	<section id="threads.rationale_comparison.non-copyable.loop">
 	  <title>3. Comparison: simple creation of several threads in a loop.</title>
       <programlisting>
       void foo()
@@ -268,7 +264,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale_comparison.non-copyable.loop-join">
+	<section id="threads.rationale_comparison.non-copyable.loop-join">
 	  <title>4. Comparison: creation of several threads in a loop which are later joined.</title>
       <programlisting>
       void foo()
@@ -289,7 +285,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale_comparison.non-copyable.pass">
+	<section id="threads.rationale_comparison.non-copyable.pass">
 	  <title>5. Comparison: creation of a thread whose ownership is passed to another object/method.</title>
       <programlisting>
       void foo()
@@ -304,7 +300,7 @@
       }
       </programlisting>
 	</section>
-	<section id="thread.rationale_comparison.non-copyable.shared">
+	<section id="threads.rationale_comparison.non-copyable.shared">
 	  <title>6. Comparison: creation of a thread whose ownership is shared 
 	  between multiple objects.</title>
       <programlisting>
@@ -325,18 +321,18 @@
     <para>This shows the usage patterns being nearly identical in complexity for
 	both designs. The only actual added complexity occurs because of the use of
 	operator new in 
-	<link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link>,
-	<link linkend="thread.rationale_comparison.non-copyable.pass">(5)</link>, and
-	<link linkend="thread.rationale_comparison.non-copyable.shared">(6)</link>;
+	<link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link>,
+	<link linkend="threads.rationale_comparison.non-copyable.pass">(5)</link>, and
+	<link linkend="threads.rationale_comparison.non-copyable.shared">(6)</link>;
 	and the use of std::auto_ptr and boost::shared_ptr in 
-	<link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link> and 
-	<link linkend="thread.rationale_comparison.non-copyable.shared">(6)</link>
+	<link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link> and 
+	<link linkend="threads.rationale_comparison.non-copyable.shared">(6)</link>
 	respectively. However, that's not really
 	much added complexity, and C++ programmers are used to using these idioms
 	anyway. Some may dislike the presence of operator new in user code, but
 	this can be eliminated by proper design of higher level concepts, such as
 	the boost::thread_group class that simplifies example 
-	<link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link>
+	<link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link>
 	down to:</para>
     <programlisting>
     void foo()
@@ -351,49 +347,49 @@
 	design.</para>
     <para>So what about performance? Looking at the above code examples, 
     we can analyze the theoretical impact to performance that both designs
-	have. For <link linkend="thread.rationale_comparison.non-copyable.simple">(1)</link>
+	have. For <link linkend="threads.rationale_comparison.non-copyable.simple">(1)</link>
 	we can see that platforms that don't have a ref-counted native
 	thread type (POSIX, for instance) will be impacted by a thread_ref
 	design. Even if the native thread type is ref-counted there may be an impact
 	if more state information has to be maintained for concepts foreign to the
 	native API, such as clean up stacks for Win32 implementations. 
-	For <link linkend="thread.rationale_comparison.non-copyable.joined">(2)</link>
-	and <link linkend="thread.rationale_comparison.non-copyable.loop">(3)</link>
+	For <link linkend="threads.rationale_comparison.non-copyable.joined">(2)</link>
+	and <link linkend="threads.rationale_comparison.non-copyable.loop">(3)</link>
 	the performance impact will be identical to
-	<link linkend="thread.rationale_comparison.non-copyable.simple">(1)</link>.
-	For <link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link>
+	<link linkend="threads.rationale_comparison.non-copyable.simple">(1)</link>.
+	For <link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link>
 	things get a little more interesting and we find that theoretically at least
 	the thread_ref may perform faster since the thread design requires dynamic
 	memory allocation/deallocation. However, in practice there may be dynamic
 	allocation for the thread_ref design as well, it will just be hidden from
 	the user. As long as the implementation has to do dynamic allocations the
 	thread_ref loses again because of the reference management. For 
-	<link linkend="thread.rationale_comparison.non-copyable.pass">(5)</link> we see
+	<link linkend="threads.rationale_comparison.non-copyable.pass">(5)</link> we see
 	the same impact as we do for 
-	<link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link>.
-	For <link linkend="thread.rationale_comparison.non-copyable.shared">(6)</link>
+	<link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link>.
+	For <link linkend="threads.rationale_comparison.non-copyable.shared">(6)</link>
 	we still have a possible impact to
 	the thread design because of dynamic allocation but thread_ref no longer
 	suffers because of its reference management, and in fact, theoretically at
 	least, the thread_ref may do a better job of managing the references. All of
 	this indicates that thread wins for 
-	<link linkend="thread.rationale_comparison.non-copyable.simple">(1)</link>, 
-	<link linkend="thread.rationale_comparison.non-copyable.joined">(2)</link> and 
-	<link linkend="thread.rationale_comparison.non-copyable.loop">(3)</link>; with 
-	<link linkend="thread.rationale_comparison.non-copyable.loop-join">(4)</link>
-	and <link linkend="thread.rationale_comparison.non-copyable.pass">(5)</link> the
+	<link linkend="threads.rationale_comparison.non-copyable.simple">(1)</link>, 
+	<link linkend="threads.rationale_comparison.non-copyable.joined">(2)</link> and 
+	<link linkend="threads.rationale_comparison.non-copyable.loop">(3)</link>; with 
+	<link linkend="threads.rationale_comparison.non-copyable.loop-join">(4)</link>
+	and <link linkend="threads.rationale_comparison.non-copyable.pass">(5)</link> the
 	winner depending on the implementation and the platform but with the thread design
 	probably having a better chance; and with 
-	<link linkend="thread.rationale_comparison.non-copyable.shared">(6)</link> 
+	<link linkend="threads.rationale_comparison.non-copyable.shared">(6)</link> 
 	it will again depend on the
 	implementation and platform but this time we favor thread_ref
 	slightly. Given all of this it's a narrow margin, but the thread design
 	prevails.</para>
 	<para>Given this analysis, and the fact that noncopyable objects for system
 	resources are the normal designs that C++ programmers are used to dealing
-	with, the &Boost.Thread; library has gone with a noncopyable design.</para>
+	with, the &Boost.Threads; library has gone with a noncopyable design.</para>
   </section>
-  <section id="thread.rationale.events">
+  <section id="threads.rationale.events">
     <title>Rationale for not providing <emphasis>Event Variables</emphasis></title>
     <para><emphasis>Event variables</emphasis> are simply far too
 	error-prone. <classname>boost::condition</classname> variables are a much safer
@@ -420,13 +416,13 @@
 	experiences caused them to be very careful in their use of event
 	variables. Overt problems can be avoided, for example, by teaming the event
 	variable with a mutex, but that may just convert a <link
-	linkend="thread.glossary.race-condition">race condition</link> into another
+	linkend="threads.glossary.race-condition">race condition</link> into another
 	problem, such as excessive resource use. One of the most distressing aspects
 	of the experience reports is the claim that many defects are latent. That
 	is, the programs appear to work correctly, but contain hidden timing
 	dependencies which will cause them to fail when environmental factors or
 	usage patterns change, altering relative thread timings.</para>
-    <para>The decision to exclude event variables from &Boost.Thread; has been
+    <para>The decision to exclude event variables from &Boost.Threads; has been
 	surprising to some Windows programmers. They have written programs which
 	work using event variables, and wonder what the problem is. It seems similar
 	to the "goto considered harmful" controversy of 30 years ago. It isn't that

doc/read_write_mutex-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/read_write_mutex.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -20,13 +16,13 @@
 
 			<purpose>
 				<para>Specifies the 
-				<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+				<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 				to use when a set of threads try to obtain different types of
 				locks simultaneously.</para>
 			</purpose>
 
 			<description>
-				<para>The only clock type supported by &Boost.Thread; is 
+				<para>The only clock type supported by &Boost.Threads; is 
 				<code>TIME_UTC</code>. The epoch for <code>TIME_UTC</code>
 				is 1970-01-01 00:00:00.</para>
 			</description>
@@ -36,31 +32,21 @@
     <class name="read_write_mutex">
 		<purpose>
 			<para>The <classname>read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.ReadWriteMutex">ReadWriteMutex</link> concept.</para>
-    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
-            some serious problems. So it was decided not to put this implementation into
-            release grade code. Also discussions on the mailing list led to the
-            conclusion that the current concepts need to be rethought. In particular
-            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
-                Inter-Class Scheduling Policies</link> are deemed unnecessary.
-            There seems to be common belief that a fair scheme suffices.
-            The following documentation has been retained however, to give
-            readers of this document the opportunity to study the original design.
-    </note>
+			<link linkend="threads.concepts.ReadWriteMutex">ReadWriteMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.ReadWriteMutex">ReadWriteMutex</link> concept. 
+			<link linkend="threads.concepts.ReadWriteMutex">ReadWriteMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>try_read_write_mutex</classname> and <classname>timed_read_write_mutex</classname>.</para>
 			
 			<para>The <classname>read_write_mutex</classname> class supplies the following typedefs,
-			which <link linkend="thread.concepts.read-write-lock-models">model</link>
+			which <link linkend="threads.concepts.read-write-lock-models">model</link>
 			the specified locking strategies:
 
 			<informaltable>
@@ -74,15 +60,15 @@
 					<tbody>
 						<row>
 							<entry>scoped_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -90,7 +76,7 @@
 			</para>
 
 			<para>The <classname>read_write_mutex</classname> class uses an 
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>read_write_mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -100,20 +86,20 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.read-write-mutex-models">read/write mutex models</link>
-			in &Boost.Thread;, <classname>read_write_mutex</classname> has two types of
-			<link linkend="thread.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-mutex-models">read/write mutex models</link>
+			in &Boost.Threads;, <classname>read_write_mutex</classname> has two types of
+			<link linkend="threads.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			between threads trying to obtain different types of locks and an
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
 			between threads trying to obtain the same type of lock.
 			The <classname>read_write_mutex</classname> class allows the
 			programmer to choose what
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			will be used; however, like all read/write mutex models, 
 			<classname>read_write_mutex</classname> leaves the 
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>.			
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>.			
 			</para>
 			
 			<note>Self-deadlock is virtually guaranteed if a thread tries to
@@ -169,31 +155,21 @@
     <class name="try_read_write_mutex">
 		<purpose>
 			<para>The <classname>try_read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryReadWriteMutex">TryReadWriteMutex</link> concept.</para>
-    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
-            some serious problems. So it was decided not to put this implementation into
-            release grade code. Also discussions on the mailing list led to the
-            conclusion that the current concepts need to be rethought. In particular
-            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
-                Inter-Class Scheduling Policies</link> are deemed unnecessary.
-            There seems to be common belief that a fair scheme suffices.
-            The following documentation has been retained however, to give
-            readers of this document the opportunity to study the original design.
-    </note>
+			<link linkend="threads.concepts.TryReadWriteMutex">TryReadWriteMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>try_read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryReadWriteMutex">TryReadWriteMutex</link> concept. 
+			<link linkend="threads.concepts.TryReadWriteMutex">TryReadWriteMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>read_write_mutex</classname> and <classname>timed_read_write_mutex</classname>.</para>
 			
 			<para>The <classname>try_read_write_mutex</classname> class supplies the following typedefs,
-			which <link linkend="thread.concepts.read-write-lock-models">model</link>
+			which <link linkend="threads.concepts.read-write-lock-models">model</link>
 			the specified locking strategies:
 
 			<informaltable>
@@ -207,27 +183,27 @@
 					<tbody>
 						<row>
 							<entry>scoped_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryReadWriteLock">ScopedTryReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryReadWriteLock">ScopedTryReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -235,7 +211,7 @@
 			</para>
 
 			<para>The <classname>try_read_write_mutex</classname> class uses an 
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>try_read_write_mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -245,20 +221,20 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.read-write-mutex-models">read/write mutex models</link>
-			in &Boost.Thread;, <classname>try_read_write_mutex</classname> has two types of
-			<link linkend="thread.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-mutex-models">read/write mutex models</link>
+			in &Boost.Threads;, <classname>try_read_write_mutex</classname> has two types of
+			<link linkend="threads.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			between threads trying to obtain different types of locks and an
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
 			between threads trying to obtain the same type of lock.
 			The <classname>try_read_write_mutex</classname> class allows the
 			programmer to choose what
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			will be used; however, like all read/write mutex models, 
 			<classname>try_read_write_mutex</classname> leaves the 
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
-			<link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>.			
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
+			<link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>.			
 			</para>
 			
 			<note>Self-deadlock is virtually guaranteed if a thread tries to
@@ -321,31 +297,21 @@
     <class name="timed_read_write_mutex">
 		<purpose>
 			<para>The <classname>timed_read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedReadWriteMutex">TimedReadWriteMutex</link> concept.</para>
-    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
-            some serious problems. So it was decided not to put this implementation into
-            release grade code. Also discussions on the mailing list led to the
-            conclusion that the current concepts need to be rethought. In particular
-            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
-                Inter-Class Scheduling Policies</link> are deemed unnecessary.
-            There seems to be common belief that a fair scheme suffices.
-            The following documentation has been retained however, to give
-            readers of this document the opportunity to study the original design.
-    </note>
+			<link linkend="threads.concepts.TimedReadWriteMutex">TimedReadWriteMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>timed_read_write_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedReadWriteMutex">TimedReadWriteMutex</link> concept. 
+			<link linkend="threads.concepts.TimedReadWriteMutex">TimedReadWriteMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>read_write_mutex</classname> and <classname>try_read_write_mutex</classname>.</para>
 			
 			<para>The <classname>timed_read_write_mutex</classname> class supplies the following typedefs,
-			which <link linkend="thread.concepts.read-write-lock-models">model</link>
+			which <link linkend="threads.concepts.read-write-lock-models">model</link>
 			the specified locking strategies:
 
 			<informaltable>
@@ -359,39 +325,39 @@
 					<tbody>
 						<row>
 							<entry>scoped_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedReadWriteLock">ScopedReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryReadWriteLock">ScopedTryReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryReadWriteLock">ScopedTryReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_timed_read_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTimedReadWriteLock">ScopedTimedReadWriteLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTimedReadWriteLock">ScopedTimedReadWriteLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_timed_read_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_timed_write_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -399,7 +365,7 @@
 			</para>
 
 			<para>The <classname>timed_read_write_mutex</classname> class uses an 
-			<link linkend="thread.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
+			<link linkend="threads.concepts.read-write-locking-strategies.unspecified">Unspecified</link>
 			locking strategy, so attempts to recursively lock a <classname>timed_read_write_mutex</classname>
 			object or attempts to unlock one by threads that don't own a lock on it result in
 			<emphasis role="bold">undefined behavior</emphasis>.
@@ -409,20 +375,20 @@
 			<code>NDEBUG</code> is not defined.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.read-write-mutex-models">read/write mutex models</link>
-			in &Boost.Thread;, <classname>timed_read_write_mutex</classname> has two types of
-			<link linkend="thread.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-mutex-models">read/write mutex models</link>
+			in &Boost.Threads;, <classname>timed_read_write_mutex</classname> has two types of
+			<link linkend="threads.concepts.read-write-scheduling-policies">scheduling policies</link>, an 
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			between threads trying to obtain different types of locks and an
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link>
 			between threads trying to obtain the same type of lock.
 			The <classname>timed_read_write_mutex</classname> class allows the
 			programmer to choose what
-			<link linkend="thread.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
+			<link linkend="threads.concepts.read-write-scheduling-policies.inter-class">inter-class sheduling policy</link>
 			will be used; however, like all read/write mutex models, 
 			<classname>timed_read_write_mutex</classname> leaves the 
-			<link linkend="thread.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
-			<link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>.			
+			<link linkend="threads.concepts.read-write-scheduling-policies.intra-class">intra-class sheduling policy</link> as 
+			<link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>.			
 			</para>
 			
 			<note>Self-deadlock is virtually guaranteed if a thread tries to

doc/recursive_mutex-ref.xml

@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/recursive_mutex.hpp"
   last-revision="$Date$">
   <namespace name="boost">
     <class name="recursive_mutex">
 		<purpose>
 			<para>The <classname>recursive_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.Mutex">Mutex</link> concept.</para>
+			<link linkend="threads.concepts.Mutex">Mutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>recursive_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.Mutex">Mutex</link> concept. 
+			<link linkend="threads.concepts.Mutex">Mutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>recursive_try_mutex</classname> and <classname>recursive_timed_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<para>For <link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics, see <classname>mutex</classname>,
 			<classname>try_mutex</classname>, and <classname>timed_mutex</classname>.
 			</para>
@@ -47,7 +43,7 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -55,7 +51,7 @@
 			</para>
 
 			<para>The <classname>recursive_mutex</classname> class uses a
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking strategy, so attempts to recursively lock a 
 			<classname>recursive_mutex</classname> object
 			succeed and an internal "lock count" is maintained. 
@@ -64,10 +60,10 @@
 			<emphasis role="bold">undefined behavior</emphasis>.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in &Boost.Thread;, <classname>recursive_mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in &Boost.Threads;, <classname>recursive_mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>
@@ -103,20 +99,20 @@
 	<class name="recursive_try_mutex">
 		<purpose>
 			<para>The <classname>recursive_try_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryMutex">TryMutex</link> concept.</para>
+			<link linkend="threads.concepts.TryMutex">TryMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>recursive_try_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TryMutex">TryMutex</link> concept. 
+			<link linkend="threads.concepts.TryMutex">TryMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>recursive_mutex</classname> and <classname>recursive_timed_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<para>For <link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics, see <classname>mutex</classname>,
 			<classname>try_mutex</classname>, and <classname>timed_mutex</classname>.
 			</para>
@@ -136,11 +132,11 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -148,7 +144,7 @@
 			</para>
 
 			<para>The <classname>recursive_try_mutex</classname> class uses a
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking strategy, so attempts to recursively lock a 
 			<classname>recursive_try_mutex</classname> object
 			succeed and an internal "lock count" is maintained. 
@@ -157,10 +153,10 @@
 			<emphasis role="bold">undefined behavior</emphasis>.</para>
 			
 			<para>Like all
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in &Boost.Thread;, <classname>recursive_try_mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in &Boost.Threads;, <classname>recursive_try_mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>
@@ -201,20 +197,20 @@
 	<class name="recursive_timed_mutex">
 		<purpose>
 			<para>The <classname>recursive_timed_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedMutex">TimedMutex</link> concept.</para>
+			<link linkend="threads.concepts.TimedMutex">TimedMutex</link> concept.</para>
 		</purpose>
 		
 		<description>
 			<para>The <classname>recursive_timed_mutex</classname> class is a model of the 
-			<link linkend="thread.concepts.TimedMutex">TimedMutex</link> concept. 
+			<link linkend="threads.concepts.TimedMutex">TimedMutex</link> concept. 
 			It should be used to synchronize access to shared resources using
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking mechanics.</para>
 
 			<para>For classes that model related mutex concepts, see 
 			<classname>recursive_mutex</classname> and <classname>recursive_try_mutex</classname>.</para>
 
-			<para>For <link linkend="thread.concepts.unspecified-locking-strategy">Unspecified</link>
+			<para>For <link linkend="threads.concepts.unspecified-locking-strategy">Unspecified</link>
 			locking mechanics, see <classname>mutex</classname>,
 			<classname>try_mutex</classname>, and <classname>timed_mutex</classname>.
 			</para>
@@ -234,15 +230,15 @@
 					<tbody>
 						<row>
 							<entry>scoped_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedLock">ScopedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedLock">ScopedLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_try_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTryLock">ScopedTryLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTryLock">ScopedTryLock</link></entry>
 						</row>
 						<row>
 							<entry>scoped_timed_lock</entry>
-							<entry><link linkend="thread.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
+							<entry><link linkend="threads.concepts.ScopedTimedLock">ScopedTimedLock</link></entry>
 						</row>
 					</tbody>
 				</tgroup>
@@ -250,7 +246,7 @@
 			</para>
 
 			<para>The <classname>recursive_timed_mutex</classname> class uses a
-			<link linkend="thread.concepts.recursive-locking-strategy">Recursive</link>
+			<link linkend="threads.concepts.recursive-locking-strategy">Recursive</link>
 			locking strategy, so attempts to recursively lock a 
 			<classname>recursive_timed_mutex</classname> object
 			succeed and an internal "lock count" is maintained. 
@@ -259,10 +255,10 @@
 			<emphasis role="bold">undefined behavior</emphasis>.</para>
 			
 			<para>Like all 
-			<link linkend="thread.concepts.mutex-models">mutex models</link>
-			in  &Boost.Thread;, <classname>recursive_timed_mutex</classname> leaves the 
-			<link linkend="thread.concepts.sheduling-policies">scheduling policy</link>
-			as <link linkend="thread.concepts.unspecified-scheduling-policy">Unspecified</link>. 
+			<link linkend="threads.concepts.mutex-models">mutex models</link>
+			in  &Boost.Threads;, <classname>recursive_timed_mutex</classname> leaves the 
+			<link linkend="threads.concepts.sheduling-policies">scheduling policy</link>
+			as <link linkend="threads.concepts.unspecified-scheduling-policy">Unspecified</link>. 
 			Programmers should make no assumptions about the order in which
 			waiting threads acquire a lock.</para>
 		</description>

doc/reference.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<library-reference id="thread.reference"
+<library-reference id="threads.reference"
   last-revision="$Date$"
   xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="barrier-ref.xml"/>
@@ -17,12 +13,6 @@
   <xi:include href="mutex-ref.xml"/>
   <xi:include href="once-ref.xml"/>
   <xi:include href="recursive_mutex-ref.xml"/>
-<!--
-  The read_write_mutex is held back from release, since the
-  implementation suffers from a serious, yet unresolved bug.
-  The implementation is likely to appear in a reworked
-  form in the next release.
--->
   <xi:include href="read_write_mutex-ref.xml"/>
   <xi:include href="thread-ref.xml"/>
   <xi:include href="tss-ref.xml"/>

doc/release_notes.xml

@@ -1,75 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<section id="thread.release_notes" last-revision="$Date$">
+<section id="threads.release_notes" last-revision="$Date$">
 	<title>Release Notes</title>
-    <section id="thread.release_notes.boost_1_34_0">
-        <title>Boost 1.34.0</title>
-
-        <section id="thread.release_notes.boost_1_34_0.change_log.maintainance">
-            <title>New team of maintainers</title>
-
-            <para>
-                Since the original author William E. Kempf no longer is available to
-                maintain the &Boost.Thread; library, a new team has been formed
-                in an attempt to continue the work on &Boost.Thread;.
-                Fortunately William E. Kempf has given
-                <ulink url="http://lists.boost.org/Archives/boost/2006/09/110143.php">
-                    permission </ulink> 
-                to use his work under the boost license.
-            </para>
-            <para>
-                The team currently consists of
-                <itemizedlist>
-                    <listitem>
-                        Anthony Williams, for the Win32 platform,
-                    </listitem>
-                    <listitem>
-                        Roland Schwarz, for the linux platform, and various "housekeeping" tasks.
-                    </listitem>
-                </itemizedlist>
-                Volunteers for other platforms are welcome!
-            </para>
-            <para>
-                As the &Boost.Thread; was kind of orphaned over the last release, this release
-                attempts to fix the known bugs. Upcoming releases will bring in new things.
-            </para>
-        </section>
-
-        <section id="thread.release_notes.boost_1_34_0.change_log.read_write_mutex">
-            <title>read_write_mutex still broken</title>
-
-            <para>
-                <note>
-                    It has been decided not to release the Read/Write Mutex, since the current
-                    implementation suffers from a serious bug. The documentation of the concepts
-                    has been included though, giving the interested reader an opportunity to study the
-                    original concepts. Please refer to the following links if you are interested
-                    which problems led to the decision to held back this mutex type.The issue
-                    has been discovered before 1.33 was released and the code has
-                    been omitted from that release. A reworked mutex is expected to appear in 1.35.
-                    Also see:  
-                    <ulink url="http://lists.boost.org/Archives/boost/2005/08/92307.php">
-                        read_write_mutex bug</ulink> 
-                    and 
-                    <ulink url="http://lists.boost.org/Archives/boost/2005/09/93180.php">
-                        read_write_mutex fundamentally broken in 1.33</ulink>
-                </note>
-            </para>
-        </section>
-
-    </section>
-    <section id="thread.release_notes.boost_1_32_0">
+	<section id="threads.release_notes.boost_1_32_0">
 		<title>Boost 1.32.0</title>
 
-		<section id="thread.release_notes.boost_1_32_0.change_log.documentation">
+		<section id="threads.release_notes.boost_1_32_0.change_log.documentation">
 			<title>Documentation converted to BoostBook</title>
 
 			<para>The documentation was converted to BoostBook format,
@@ -80,24 +20,24 @@
 			please report them!</para>
 		</section>
 
-		<section id="thread.release_notes.boost_1_32_0.change_log.static_link">
+		<section id="threads.release_notes.boost_1_32_0.change_log.static_link">
 			<title>Statically-link build option added</title>
 
-			<para>The option to link &Boost.Thread; as a static
+			<para>The option to link &Boost.Threads; as a static
 			library has been added (with some limitations on Win32 platforms).
 			This feature was originally removed from an earlier version
 			of Boost because <classname>boost::thread_specific_ptr</classname>
-			required that &Boost.Thread; be dynamically linked in order
+			required that &Boost.Threads; be dynamically linked in order
 			for its cleanup functionality to work on Win32 platforms.
 			Because this limitation never applied to non-Win32 platforms,
 			because significant progress has been made in removing
 			the limitation on Win32 platforms (many thanks to
 			Aaron LaFramboise and Roland Scwarz!), and because the lack
 			of static linking is one of the most common complaints of
-			&Boost.Thread; users, this decision was reversed.</para>
+			&Boost.Threads; users, this decision was reversed.</para>
 			
 			<para>On non-Win32 platforms: 
-			To choose the dynamically linked version of &Boost.Thread; 
+			To choose the dynamically linked version of &Boost.Threads; 
 			using Boost's auto-linking feature, #define BOOST_THREAD_USE_DLL;
 			to choose the statically linked version, 
 			#define BOOST_THREAD_USE_LIB. 
@@ -123,9 +63,9 @@
 			because it has not yet been possible to implement automatic
 			tss cleanup in the statically linked version for compilers
 			other than VC++, although it is hoped that this will be
-			possible in a future version of &Boost.Thread;.
+			possible in a future version of &Boost.Threads;.
 			
-			Note for advanced users: &Boost.Thread; provides several "hook"
+			Note for advanced users: &Boost.Threads; provides several "hook"
 			functions to allow users to experiment with the statically
 			linked version on Win32 with compilers other than VC++.
 			These functions are on_process_enter(), on_process_exit(),
@@ -134,13 +74,13 @@
 			information.</para>
 		</section>
 		
-		<section id="thread.release_notes.boost_1_32_0.change_log.barrier">
+		<section id="threads.release_notes.boost_1_32_0.change_log.barrier">
 			<title>Barrier functionality added</title>
 
 			<para>A new class, <classname>boost::barrier</classname>, was added.</para>
 		</section>
 		
-		<section id="thread.release_notes.boost_1_32_0.change_log.read_write_mutex">
+		<section id="threads.release_notes.boost_1_32_0.change_log.read_write_mutex">
 			<title>Read/write mutex functionality added</title>
 
 			<para>New classes, 
@@ -151,13 +91,13 @@
 			
 			<note>Since the read/write mutex and related classes are new,
 			both interface and implementation are liable to change
-			in future releases of &Boost.Thread;.
+			in future releases of &Boost.Threads;.
 			The lock concepts and lock promotion in particular are
 			still under discussion and very likely to change.</note>
 			</para>
 		</section>
 		
-		<section id="thread.release_notes.boost_1_32_0.change_log.thread_specific_ptr">
+		<section id="threads.release_notes.boost_1_32_0.change_log.thread_specific_ptr">
 			<title>Thread-specific pointer functionality changed</title>
 
 			<para>The <classname>boost::thread_specific_ptr</classname> 
@@ -184,7 +124,7 @@
 			is called.</para>
 		</section>
 
-		<section id="thread.release_notes.boost_1_32_0.change_log.mutex">
+		<section id="threads.release_notes.boost_1_32_0.change_log.mutex">
 			<title>Mutex implementation changed for Win32</title>
 
 			<para>On Win32, <classname>boost::mutex</classname>, 
@@ -195,10 +135,10 @@
 			<classname>boost::recursive_timed_mutex</classname> use a Win32 mutex.</para>
 		</section>
 
-		<section id="thread.release_notes.boost_1_32_0.change_log.wince">
+		<section id="threads.release_notes.boost_1_32_0.change_log.wince">
 			<title>Windows CE support improved</title>
 
-			<para>Minor changes were made to make Boost.Thread work on Windows CE.</para>
+			<para>Minor changes were made to make Boost.Threads work on Windows CE.</para>
 		</section>
 	</section>
 </section>

doc/thread-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/thread.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -15,15 +11,15 @@
 		<purpose>
 			<para>The <classname>thread</classname> class represents threads of
 			execution, and provides the functionality to create and manage 
-			threads within the &Boost.Thread; library. See 
-			<xref linkend="thread.glossary"/> for a precise description of 
-			<link linkend="thread.glossary.thread">thread of execution</link>,
+			threads within the &Boost.Threads; library. See 
+			<xref linkend="threads.glossary"/> for a precise description of 
+			<link linkend="threads.glossary.thread">thread of execution</link>,
 			and for definitions of threading-related terms and of thread states such as 
-			<link linkend="thread.glossary.thread-state">blocked</link>.</para>
+			<link linkend="threads.glossary.thread-state">blocked</link>.</para>
 		</purpose>
 
 		<description>
-			<para>A <link linkend="thread.glossary.thread">thread of execution</link>
+			<para>A <link linkend="threads.glossary.thread">thread of execution</link>
 			has an initial function. For the program's initial thread, the initial 
 			function is <code>main()</code>. For other threads, the initial 
 			function is <code>operator()</code> of the function object passed to
@@ -40,7 +36,7 @@
 			&quot;joinable&quot; or &quot;non-joinable&quot;.</para>
 
 			<para>Except as described below, the policy used by an implementation
-			of &Boost.Thread; to schedule transitions between thread states is 
+			of &Boost.Threads; to schedule transitions between thread states is 
 			unspecified.</para>
 
 			<para><note>Just as the lifetime of a file may be different from the
@@ -153,7 +149,7 @@
 				<notes>If <code>*this == thread()</code> the result is 
 				implementation-defined. If the implementation doesn't
 				detect this the result will be 
-				<link linkend="thread.glossary.deadlock">deadlock</link>.
+				<link linkend="threads.glossary.deadlock">deadlock</link>.
 				</notes>
 			</method>
 		</method-group>
@@ -174,7 +170,7 @@
 				<type>void</type>
 
 				<effects>The current thread of execution is placed in the
-				<link linkend="thread.glossary.thread-state">ready</link> 
+				<link linkend="threads.glossary.thread-state">ready</link> 
 				state.</effects>
 				
 				<notes>
@@ -233,7 +229,7 @@
 				<type>void</type>
 				
 				<parameter name="thrd">
-					<paramtype><classname>thread</classname>*</paramtype>
+					<paramtype><classname>thread</classname>* thrd</paramtype>
 				</parameter>
 				
 				<effects>Adds <code>thrd</code> to the 
@@ -247,7 +243,7 @@
 				<type>void</type>
 				
 				<parameter name="thrd">
-					<paramtype><classname>thread</classname>*</paramtype>
+					<paramtype><classname>thread</classname>* thrd</paramtype>
 				</parameter>
 				
 				<effects>Removes <code>thread</code> from <code>*this</code>'s

doc/thread.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-<library name="Thread" dirname="thread" id="thread"
+<library name="Threads" dirname="thread" id="threads"
 last-revision="$Date$"
 xmlns:xi="http://www.w3.org/2001/XInclude">
   <libraryinfo>
@@ -24,14 +20,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude">
       <holder>William E. Kempf</holder>
     </copyright>
     <legalnotice>
-      <para>Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)</para>
+      <para>Permission to use, copy, modify, distribute and sell this
+      software and its documentation for any purpose is hereby granted
+      without fee, provided that the above copyright notice appear in all
+      copies and that both that copyright notice and this permission notice
+      appear in supporting documentation. William E. Kempf makes no
+      representations about the suitability of this software for any purpose.
+      It is provided "as is" without express or implied warranty.</para>
     </legalnotice>
     <librarypurpose>Portable C++ multi-threading</librarypurpose>
     <librarycategory name="category:concurrent" />
-    <title>Boost.Thread</title>
+    <title>Boost.Threads</title>
   </libraryinfo>
-  <title>Boost.Thread</title>
+  <title>Boost.Threads</title>
   <xi:include href="overview.xml"/>
   <xi:include href="design.xml"/>
   <xi:include href="concepts.xml"/>

doc/tss-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/tss.hpp"
 	last-revision="$Date$">
 	<namespace name="boost">
@@ -21,7 +17,7 @@
 				<para>Thread specific storage is data associated with 
 				individual threads and is often used to make operations
 				that rely on global data 
-				<link linkend="thread.glossary.thread-safe">thread-safe</link>.
+				<link linkend="threads.glossary.thread-safe">thread-safe</link>.
 				</para>
 				
 				<para>Template <classname>thread_specific_ptr</classname> 

doc/xtime-ref.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
-  <!ENTITY % thread.entities SYSTEM "entities.xml">
-  %thread.entities;
+  <!ENTITY % threads.entities SYSTEM "entities.xml">
+  %threads.entities;
 ]>
-<!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
 <header name="boost/thread/xtime.hpp"
   last-revision="$Date$">
   <namespace name="boost">
@@ -20,7 +16,7 @@
 		</purpose>
 
 		<description>
-			<para>The only clock type supported by &Boost.Thread; is 
+			<para>The only clock type supported by &Boost.Threads; is 
 			<code>TIME_UTC</code>. The epoch for <code>TIME_UTC</code>
 			is 1970-01-01 00:00:00.</para>
 		</description>
@@ -37,9 +33,9 @@
 		<description>
 			<simpara>The <classname>xtime</classname> type is used to represent a point on 
 			some time scale or a duration in time. This type may be proposed for the C standard by 
-			Markus Kuhn. &Boost.Thread; provides only a very minimal implementation of this
+			Markus Kuhn. &Boost.Threads; provides only a very minimal implementation of this
 			proposal; it is expected that a full implementation (or some other time
-			library) will be provided in Boost as a separate library, at which time &Boost.Thread;
+			library) will be provided in Boost as a separate library, at which time &Boost.Threads;
 			will deprecate its own implementation.</simpara>
 			
 			<simpara><emphasis role="bold">Note</emphasis> that the resolution is 

example/Jamfile

@@ -0,0 +1,52 @@
+# Copyright (C) 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+#
+
+# The threading library is available in two versions.
+# Native to the environment or based ontop pthread.
+# To select which version to use you need to define
+# BOOST_THREAD_POSIX when compiling your sources.
+# If BOOST_THREAD_POSIX is defined this will choose
+# pthread implementation.
+# You also need to specify the correct library version by
+# specifying the the <lib> or <dll> tags.
+# <lib>@boost/libs/thread/build/boost_thread for static native and
+# <lib>@boost/libs/thread/build/boost_thread_pthread static pthread.
+# If your compiler does not have the pthread lib in a standard
+# include path, you need to specify that too, with <include> and
+# <library-file>.
+
+project-root ;
+
+template example
+        : ## sources ##
+	  <lib>@boost/libs/thread/build/boost_thread
+	  #<lib>@boost/libs/thread/build/boost_thread_pthread
+	  #<dll>@boost/libs/thread/build/boost_thread
+	  #<dll>@boost/libs/thread/build/boost_thread_pthread
+        : ## requirements ##
+	  <include>$(BOOST_ROOT)
+	  # uncomment below to get pthread on windows
+	  #<define>BOOST_THREAD_POSIX
+	  #<include>$(PTW32_INCLUDE)
+	  #<library-file>$(PTW32_LIB)
+        : ## default build ##
+          <threading>multi
+    	;
+
+exe monitor : <template>example monitor.cpp ;
+exe starvephil : <template>example starvephil.cpp ;
+exe tennis : <template>example tennis.cpp ;
+exe condition : <template>example condition.cpp ;
+exe mutex : <template>example mutex.cpp ;
+exe once : <template>example once.cpp ;
+exe recursive_mutex : <template>example recursive_mutex.cpp ;
+exe thread : <template>example thread.cpp ;
+exe thread_group : <template>example thread_group.cpp ;
+exe tss : <template>example tss.cpp ;
+exe xtime : <template>example xtime.cpp ;

example/Jamfile.v2

@@ -1,23 +1,5 @@
-# Copyright (C) 2001-2003
-# William E. Kempf
-#
-#  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)
 
-project boost/thread/example 
-    : requirements <library>../build//boost_thread <threading>multi
+exe starvephil 
+    : starvephil.cpp ../build/boost_thread  ../../test/build/unit_test_framework 
     ;
-       
-
-exe monitor : monitor.cpp ;
-exe starvephil : starvephil.cpp ;
-exe tennis : tennis.cpp ;
-exe condition : condition.cpp ;
-exe mutex : mutex.cpp ;
-exe once : once.cpp ;
-exe recursive_mutex : recursive_mutex.cpp ;
-exe thread : thread.cpp ;
-exe thread_group : thread_group.cpp ;
-exe tss : tss.cpp ;
-exe xtime : xtime.cpp ;
 

example/Jamrules

@@ -0,0 +1,53 @@
+# Copyright 2003 William E. Kempf
+# Copyright 2006 Roland Schwarz
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+
+project example ;
+
+# If you move this example from its place in the Boost tree, edit this
+# path to point at the root directory of your Boost installation (the
+# one containing a subdirectory called "boost/".
+path-global BOOST_ROOT : ../../.. ;
+
+# Makes a project id for boost so that other Boost.Build projects can
+# refer to it by name.
+#
+project boost : $(BOOST_ROOT) ;
+
+# Attn: path-global was broken in my version of bbv1, which prevented specifying
+# BOOST_ROOT as a relative path. So I needed to apply
+# the below fix in allyourbase.jam as shown below:
+#
+#rule project ( name : location ? )
+#{
+#    if ! $(location)
+#    {
+#	gPROJECT($(name)) = $(gPROJECT($(PROJECT))) ;
+#	PROJECT($(gPROJECT($(name)))) = $(name) ;
+#	PROJECT = $(name) ;
+#    }
+#    else
+#    {
+#        gPROJECT($(name)) = [ root-paths $(location) : [ root-paths $($(gTOP)) : [ PWD ] ] ] ;
+#        # speedsnail
+#        # Root the path globals to fix a bug which prevented to use them from an external
+#        # project. The fix is as as uninvasive as possible, as it will only trigger when
+#        # an external project is declared. So it will not interfere with the build of the
+#        # boost library. I took this route, as at the time of this fix, the bbv1 is expected
+#        # to be retired soon.
+#        # N.B.: The path-globals rule is expected to be invoked from Jamrules files only.
+#        local val ;
+#        for val in $(gPATH_GLOBALS) {
+#        gPATH_GLOBAL_VALUE($(val)) = [ root-paths $(gPATH_GLOBAL_VALUE($(val))) :
+#                                            [ root-paths $($(gTOP)) : [ PWD ]  ]
+#                                     ] ;
+#        }
+#        local [ protect-subproject ] ;
+#        enter-subproject @$(name) ;
+#     }
+#}

example/boost-build.jam

@@ -0,0 +1,22 @@
+# Copyright 2006 Roland Schwarz.
+# 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 work is a reimplementation along the design and ideas
+# of William E. Kempf.
+#
+
+# Edit this path to point at the tools/build/v1 subdirectory of your
+# Boost installation. 
+
+if --v2 in $(ARGV)
+{
+    JAMFILE = [Bb]uild.jam [Jj]amfile.v2 ;
+    boost-build ../../../tools/build/v2 ;
+}
+else
+{
+    boost-build ../../../tools/build/v1 ;
+}
+

example/condition.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <iostream>
 #include <vector>
@@ -38,7 +38,8 @@ public:
     }
 
 private:
-    int begin, end, buffered;
+    int begin, end;
+    std::vector<int>::size_type buffered;
     std::vector<int> circular_buf;
     boost::condition buffer_not_full, buffer_not_empty;
     boost::mutex monitor;

example/monitor.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <vector>
 #include <iostream>

example/mutex.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>

example/once.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/once.hpp>

example/recursive_mutex.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>

example/starvephil.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>

example/tennis.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>

example/thread.cpp

@@ -1,8 +1,13 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
 //
-//  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)
+// Permission to use, copy, modify, distribute and sell this software
+// and its documentation for any purpose is hereby granted without fee,
+// provided that the above copyright notice appear in all copies and
+// that both that copyright notice and this permission notice appear
+// in supporting documentation.  William E. Kempf makes no representations
+// about the suitability of this software for any purpose.
+// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>

example/thread_group.cpp

@@ -1,8 +1,9 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
+
 
 #include <boost/thread/thread.hpp>
 #include <iostream>

example/tss.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/tss.hpp>

example/xtime.cpp

@@ -1,8 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-//  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)
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>

include/boost/thread.hpp

@@ -1,8 +1,13 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
 //
-// 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)
+// Permission to use, copy, modify, distribute and sell this software
+// and its documentation for any purpose is hereby granted without fee,
+// provided that the above copyright notice appear in all copies and
+// that both that copyright notice and this permission notice appear
+// in supporting documentation.  William E. Kempf makes no representations
+// about the suitability of this software for any purpose.
+// It is provided "as is" without express or implied warranty.
 
 #if !defined(BOOST_THREAD_WEK01082003_HPP)
 #define BOOST_THREAD_WEK01082003_HPP

include/boost/thread/barrier.hpp

@@ -1,59 +1,64 @@
-// Copyright (C) 2002-2003
-// David Moore, William E. Kempf
-// Copyright (C) 2007 Anthony Williams
+#ifndef BOOST_THREAD_BARRIER_HPP
+#define BOOST_THREAD_BARRIER_HPP
+
+//  barrier.hpp
 //
-//  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)
-
-#ifndef BOOST_BARRIER_JDM030602_HPP
-#define BOOST_BARRIER_JDM030602_HPP
-
-#include <boost/thread/detail/config.hpp>
+//  (C) Copyright 2006 Anthony Williams 
+//
+//  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)
 
+#include <cstddef>
+#include <stdexcept>
+#include <boost/thread/detail/platform.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
-#include <string>
-#include <stdexcept>
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std
+{
+    using ::size_t;
+}
+#endif
 
 namespace boost
 {
-
     class barrier
     {
+        boost::mutex m;
+        boost::condition cond;
+        
+        const std::size_t max_count;
+        std::size_t current_count;
     public:
-        barrier(unsigned int count)
-            : m_threshold(count), m_count(count), m_generation(0)
+        barrier(std::size_t count):
+            max_count(count),current_count(0)
         {
-            if (count == 0)
-                throw std::invalid_argument("count cannot be zero.");
+            if(!max_count)
+            {
+                throw std::invalid_argument("You must specify a non-zero count");
+            }
         }
-    
+        
         bool wait()
         {
-            boost::mutex::scoped_lock lock(m_mutex);
-            unsigned int gen = m_generation;
-        
-            if (--m_count == 0)
+            boost::mutex::scoped_lock lock(m);
+            if(++current_count==max_count)
             {
-                m_generation++;
-                m_count = m_threshold;
-                m_cond.notify_all();
+                current_count=0;
+                cond.notify_all();
                 return true;
             }
-
-            while (gen == m_generation)
-                m_cond.wait(lock);
-            return false;
+            else
+            {
+                cond.wait(lock);
+                return false;
+            }
         }
-
-    private:
-        mutex m_mutex;
-        condition m_cond;
-        unsigned int m_threshold;
-        unsigned int m_count;
-        unsigned int m_generation;
+        
     };
+}
 
-}   // namespace boost
 
 #endif

include/boost/thread/condition.hpp

@@ -1,10 +1,16 @@
-#ifndef BOOST_THREAD_CONDITION_HPP
-#define BOOST_THREAD_CONDITION_HPP
-#include <boost/thread/condition_variable.hpp>
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-namespace boost
-{
-    typedef condition_variable_any condition;
-}
+#ifndef BOOST_THREAD_RS06040706_HPP
+#define BOOST_THREAD_RS06040706_HPP
+
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(condition.hpp)
+
+#endif // BOOST_THREAD_RS06040706_HPP
 
-#endif

include/boost/thread/condition_variable.hpp

@@ -1,15 +0,0 @@
-#ifndef BOOST_THREAD_CONDITION_VARIABLE_HPP
-#define BOOST_THREAD_CONDITION_VARIABLE_HPP
-
-//  condition_variable.hpp
-//
-//  (C) Copyright 2007 Anthony Williams 
-//
-//  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)
-
-#include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(condition_variable.hpp)
-
-#endif

include/boost/thread/detail/force_cast.hpp

@@ -1,39 +0,0 @@
-// Copyright (C) 2001-2003
-// Mac Murrett
-//
-// 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)
-//
-// See http://www.boost.org for most recent version including documentation.
-
-#ifndef BOOST_FORCE_CAST_MJM012402_HPP
-#define BOOST_FORCE_CAST_MJM012402_HPP
-
-#include <boost/thread/detail/config.hpp>
-
-namespace boost {
-namespace detail {
-namespace thread {
-
-// force_cast will convert anything to anything.
-
-// general case
-template<class Return_Type, class Argument_Type>
-inline Return_Type &force_cast(Argument_Type &rSrc)
-{
-    return(*reinterpret_cast<Return_Type *>(&rSrc));
-}
-
-// specialization for const
-template<class Return_Type, class Argument_Type>
-inline const Return_Type &force_cast(const Argument_Type &rSrc)
-{
-    return(*reinterpret_cast<const Return_Type *>(&rSrc));
-}
-
-} // namespace thread
-} // namespace detail
-} // namespace boost
-
-#endif // BOOST_FORCE_CAST_MJM012402_HPP

include/boost/thread/detail/move.hpp

@@ -1,33 +0,0 @@
-// 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)
-// (C) Copyright 2007 Anthony Williams
-
-#ifndef BOOST_THREAD_MOVE_HPP
-#define BOOST_THREAD_MOVE_HPP
-
-namespace boost
-{
-    template<typename T>
-    struct move_t
-    {
-        T& t;
-        move_t(T& t_):
-            t(t_)
-        {}
-
-        T* operator->() const
-        {
-            return &t;
-        }
-    };
-
-    template<typename T>
-    move_t<T> move(T& t)
-    {
-        return move_t<T>(t);
-    }
-}
-
-
-#endif

include/boost/thread/detail/singleton.hpp

@@ -1,59 +0,0 @@
-// Copyright (C) 2001-2003
-// Mac Murrett
-//
-// 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)
-//
-// See http://www.boost.org for most recent version including documentation.
-
-#ifndef BOOST_SINGLETON_MJM012402_HPP
-#define BOOST_SINGLETON_MJM012402_HPP
-
-#include <boost/thread/detail/config.hpp>
-
-namespace boost {
-namespace detail {
-namespace thread {
-
-// class singleton has the same goal as all singletons: create one instance of
-// a class on demand, then dish it out as requested.
-
-template <class T>
-class singleton : private T
-{
-private:
-    singleton();
-    ~singleton();
-
-public:
-    static T &instance();
-};
-
-
-template <class T>
-inline singleton<T>::singleton()
-{
-    /* no-op */
-}
-
-template <class T>
-inline singleton<T>::~singleton()
-{
-    /* no-op */
-}
-
-template <class T>
-/*static*/ T &singleton<T>::instance()
-{
-    // function-local static to force this to work correctly at static
-    // initialization time.
-    static singleton<T> s_oT;
-    return(s_oT);
-}
-
-} // namespace thread
-} // namespace detail
-} // namespace boost
-
-#endif // BOOST_SINGLETON_MJM012402_HPP

include/boost/thread/exceptions.hpp

@@ -1,106 +1,16 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-// Copyright (C) 2007 Anthony Williams
+// Copyright 2006 Roland Schwarz.
+// 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)
 //
-//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#ifndef BOOST_THREAD_EXCEPTIONS_PDM070801_H
-#define BOOST_THREAD_EXCEPTIONS_PDM070801_H
+#ifndef BOOST_THREAD_RS06040710_HPP
+#define BOOST_THREAD_RS06040710_HPP
 
-#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(exceptions.hpp)
 
-//  pdm: Sorry, but this class is used all over the place & I end up
-//       with recursive headers if I don't separate it
-//  wek: Not sure why recursive headers would cause compilation problems
-//       given the include guards, but regardless it makes sense to
-//       seperate this out any way.
-
-#include <string>
-#include <stdexcept>
-
-namespace boost {
-
-class BOOST_THREAD_DECL thread_exception : public std::exception
-{
-protected:
-    thread_exception();
-    thread_exception(int sys_err_code);
-
-public:
-    ~thread_exception() throw();
-
-    int native_error() const;
-
-private:
-    int m_sys_err;
-};
-
-    class condition_error:
-        public std::exception
-    {
-    public:
-        const char* what() const throw()
-        {
-            return "Condition error";
-        }
-    };
-    
-
-class BOOST_THREAD_DECL lock_error : public thread_exception
-{
-public:
-    lock_error();
-    lock_error(int sys_err_code);
-    ~lock_error() throw();
-
-    virtual const char* what() const throw();
-};
-
-class BOOST_THREAD_DECL thread_resource_error : public thread_exception
-{
-public:
-    thread_resource_error();
-    thread_resource_error(int sys_err_code);
-    ~thread_resource_error() throw();
-
-    virtual const char* what() const throw();
-};
-
-class BOOST_THREAD_DECL unsupported_thread_option : public thread_exception
-{
-public:
-    unsupported_thread_option();
-    unsupported_thread_option(int sys_err_code);
-    ~unsupported_thread_option() throw();
-
-    virtual const char* what() const throw();
-};
-
-class BOOST_THREAD_DECL invalid_thread_argument : public thread_exception
-{
-public:
-    invalid_thread_argument();
-    invalid_thread_argument(int sys_err_code);
-    ~invalid_thread_argument() throw();
-
-    virtual const char* what() const throw();
-};
-
-class BOOST_THREAD_DECL thread_permission_error : public thread_exception
-{
-public:
-    thread_permission_error();
-    thread_permission_error(int sys_err_code);
-    ~thread_permission_error() throw();
-
-    virtual const char* what() const throw();
-};
-
-} // namespace boost
-
-#endif // BOOST_THREAD_CONFIG_PDM070801_H
-
-// Change log:
-//    3 Jan 03  WEKEMPF Modified for DLL implementation.
+#endif // BOOST_THREAD_RS06040710_HPP
 

include/boost/thread/locks.hpp

@@ -1,520 +0,0 @@
-// 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)
-// (C) Copyright 2007 Anthony Williams
-#ifndef BOOST_THREAD_LOCKS_HPP
-#define BOOST_THREAD_LOCKS_HPP
-#include <boost/thread/detail/config.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <boost/thread/detail/move.hpp>
-#include <algorithm>
-#include <boost/thread/thread_time.hpp>
-
-namespace boost
-{
-    struct defer_lock_t
-    {};
-    struct try_to_lock_t
-    {};
-    struct adopt_lock_t
-    {};
-    
-    const defer_lock_t defer_lock={};
-    const try_to_lock_t try_to_lock={};
-    const adopt_lock_t adopt_lock={};
-
-    template<typename Mutex>
-    class shared_lock;
-
-    template<typename Mutex>
-    class exclusive_lock;
-
-    template<typename Mutex>
-    class upgrade_lock;
-
-    template<typename Mutex>
-    class lock_guard
-    {
-    private:
-        Mutex& m;
-
-        explicit lock_guard(lock_guard&);
-        lock_guard& operator=(lock_guard&);
-    public:
-        explicit lock_guard(Mutex& m_):
-            m(m_)
-        {
-            m.lock();
-        }
-        lock_guard(Mutex& m_,adopt_lock_t):
-            m(m_)
-        {}
-        ~lock_guard()
-        {
-            m.unlock();
-        }
-    };
-
-
-    template<typename Mutex>
-    class unique_lock
-    {
-    private:
-        Mutex* m;
-        bool is_locked;
-        explicit unique_lock(unique_lock&);
-        unique_lock& operator=(unique_lock&);
-    public:
-        explicit unique_lock(Mutex& m_):
-            m(&m_),is_locked(false)
-        {
-            lock();
-        }
-        unique_lock(Mutex& m_,adopt_lock_t):
-            m(&m_),is_locked(true)
-        {}
-        unique_lock(Mutex& m_,defer_lock_t):
-            m(&m_),is_locked(false)
-        {}
-        unique_lock(Mutex& m_,try_to_lock_t):
-            m(&m_),is_locked(false)
-        {
-            try_lock();
-        }
-        unique_lock(Mutex& m_,system_time const& target_time):
-            m(&m_),is_locked(false)
-        {
-            timed_lock(target_time);
-        }
-        unique_lock(boost::move_t<unique_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-        }
-        unique_lock(boost::move_t<upgrade_lock<Mutex> > other);
-
-        unique_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
-        {
-            unique_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        unique_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
-        {
-            unique_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        void swap(unique_lock& other)
-        {
-            std::swap(m,other.m);
-            std::swap(is_locked,other.is_locked);
-        }
-        void swap(boost::move_t<unique_lock<Mutex> > other)
-        {
-            std::swap(m,other->m);
-            std::swap(is_locked,other->is_locked);
-        }
-        
-        ~unique_lock()
-        {
-            if(owns_lock())
-            {
-                m->unlock();
-            }
-        }
-        void lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->lock();
-            is_locked=true;
-        }
-        bool try_lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            is_locked=m->try_lock();
-            return is_locked;
-        }
-        template<typename TimeDuration>
-        bool timed_lock(TimeDuration const& relative_time)
-        {
-            is_locked=m->timed_lock(relative_time);
-            return is_locked;
-        }
-        
-        bool timed_lock(::boost::system_time const& absolute_time)
-        {
-            is_locked=m->timed_lock(absolute_time);
-            return is_locked;
-        }
-        void unlock()
-        {
-            if(!owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->unlock();
-            is_locked=false;
-        }
-            
-        typedef void (unique_lock::*bool_type)();
-        operator bool_type() const
-        {
-            return is_locked?&unique_lock::lock:0;
-        }
-        bool operator!() const
-        {
-            return !owns_lock();
-        }
-        bool owns_lock() const
-        {
-            return is_locked;
-        }
-
-        Mutex* mutex() const
-        {
-            return m;
-        }
-
-        Mutex* release()
-        {
-            Mutex* const res=m;
-            m=0;
-            is_locked=false;
-            return res;
-        }
-
-        friend class shared_lock<Mutex>;
-        friend class upgrade_lock<Mutex>;
-    };
-
-    template<typename Mutex>
-    class shared_lock
-    {
-    protected:
-        Mutex* m;
-        bool is_locked;
-    private:
-        explicit shared_lock(shared_lock&);
-        shared_lock& operator=(shared_lock&);
-    public:
-        explicit shared_lock(Mutex& m_):
-            m(&m_),is_locked(false)
-        {
-            lock();
-        }
-        shared_lock(Mutex& m_,adopt_lock_t):
-            m(&m_),is_locked(true)
-        {}
-        shared_lock(Mutex& m_,defer_lock_t):
-            m(&m_),is_locked(false)
-        {}
-        shared_lock(Mutex& m_,try_to_lock_t):
-            m(&m_),is_locked(false)
-        {
-            try_lock();
-        }
-        shared_lock(Mutex& m_,system_time const& target_time):
-            m(&m_),is_locked(false)
-        {
-            timed_lock(target_time);
-        }
-
-        shared_lock(boost::move_t<shared_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-        }
-
-        shared_lock(boost::move_t<unique_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-            if(is_locked)
-            {
-                m->unlock_and_lock_shared();
-            }
-        }
-
-        shared_lock(boost::move_t<upgrade_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-            if(is_locked)
-            {
-                m->unlock_upgrade_and_lock_shared();
-            }
-        }
-
-        shared_lock& operator=(boost::move_t<shared_lock<Mutex> > other)
-        {
-            shared_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        shared_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
-        {
-            shared_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        shared_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
-        {
-            shared_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        void swap(shared_lock& other)
-        {
-            std::swap(m,other.m);
-            std::swap(is_locked,other.is_locked);
-        }
-        
-        ~shared_lock()
-        {
-            if(owns_lock())
-            {
-                m->unlock_shared();
-            }
-        }
-        void lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->lock_shared();
-            is_locked=true;
-        }
-        bool try_lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            is_locked=m->try_lock_shared();
-            return is_locked;
-        }
-        bool timed_lock(boost::system_time const& target_time)
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            is_locked=m->timed_lock_shared(target_time);
-            return is_locked;
-        }
-        void unlock()
-        {
-            if(!owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->unlock_shared();
-            is_locked=false;
-        }
-            
-        typedef void (shared_lock::*bool_type)();
-        operator bool_type() const
-        {
-            return is_locked?&shared_lock::lock:0;
-        }
-        bool operator!() const
-        {
-            return !owns_lock();
-        }
-        bool owns_lock() const
-        {
-            return is_locked;
-        }
-
-    };
-
-    template<typename Mutex>
-    class upgrade_lock
-    {
-    protected:
-        Mutex* m;
-        bool is_locked;
-    private:
-        explicit upgrade_lock(upgrade_lock&);
-        upgrade_lock& operator=(upgrade_lock&);
-    public:
-        explicit upgrade_lock(Mutex& m_):
-            m(&m_),is_locked(false)
-        {
-            lock();
-        }
-        upgrade_lock(Mutex& m_,bool do_lock):
-            m(&m_),is_locked(false)
-        {
-            if(do_lock)
-            {
-                lock();
-            }
-        }
-        upgrade_lock(boost::move_t<upgrade_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-        }
-
-        upgrade_lock(boost::move_t<unique_lock<Mutex> > other):
-            m(other->m),is_locked(other->is_locked)
-        {
-            other->is_locked=false;
-            if(is_locked)
-            {
-                m->unlock_and_lock_upgrade();
-            }
-        }
-
-        upgrade_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
-        {
-            upgrade_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        upgrade_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
-        {
-            upgrade_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-
-        void swap(upgrade_lock& other)
-        {
-            std::swap(m,other.m);
-            std::swap(is_locked,other.is_locked);
-        }
-        
-        ~upgrade_lock()
-        {
-            if(owns_lock())
-            {
-                m->unlock_upgrade();
-            }
-        }
-        void lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->lock_upgrade();
-            is_locked=true;
-        }
-        bool try_lock()
-        {
-            if(owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            is_locked=m->try_lock_upgrade();
-            return is_locked;
-        }
-        void unlock()
-        {
-            if(!owns_lock())
-            {
-                throw boost::lock_error();
-            }
-            m->unlock_upgrade();
-            is_locked=false;
-        }
-            
-        typedef void (upgrade_lock::*bool_type)();
-        operator bool_type() const
-        {
-            return is_locked?&upgrade_lock::lock:0;
-        }
-        bool operator!() const
-        {
-            return !owns_lock();
-        }
-        bool owns_lock() const
-        {
-            return is_locked;
-        }
-        friend class shared_lock<Mutex>;
-        friend class unique_lock<Mutex>;
-    };
-
-    template<typename Mutex>
-    unique_lock<Mutex>::unique_lock(boost::move_t<upgrade_lock<Mutex> > other):
-        m(other->m),is_locked(other->is_locked)
-    {
-        other->is_locked=false;
-        if(is_locked)
-        {
-            m->unlock_upgrade_and_lock();
-        }
-    }
-
-    template <class Mutex>
-    class upgrade_to_unique_lock
-    {
-    private:
-        upgrade_lock<Mutex>* source;
-        unique_lock<Mutex> exclusive;
-
-        explicit upgrade_to_unique_lock(upgrade_to_unique_lock&);
-        upgrade_to_unique_lock& operator=(upgrade_to_unique_lock&);
-    public:
-        explicit upgrade_to_unique_lock(upgrade_lock<Mutex>& m_):
-            source(&m_),exclusive(boost::move(*source))
-        {}
-        ~upgrade_to_unique_lock()
-        {
-            if(source)
-            {
-                *source=boost::move(exclusive);
-            }
-        }
-
-        upgrade_to_unique_lock(boost::move_t<upgrade_to_unique_lock<Mutex> > other):
-            source(other->source),exclusive(boost::move(other->exclusive))
-        {
-            other->source=0;
-        }
-        
-        upgrade_to_unique_lock& operator=(boost::move_t<upgrade_to_unique_lock<Mutex> > other)
-        {
-            upgrade_to_unique_lock temp(other);
-            swap(temp);
-            return *this;
-        }
-        void swap(upgrade_to_unique_lock& other)
-        {
-            std::swap(source,other.source);
-            exclusive.swap(other.exclusive);
-        }
-        typedef void (upgrade_to_unique_lock::*bool_type)(upgrade_to_unique_lock&);
-        operator bool_type() const
-        {
-            return exclusive.owns_lock()?&upgrade_to_unique_lock::swap:0;
-        }
-        bool operator!() const
-        {
-            return !owns_lock();
-        }
-        bool owns_lock() const
-        {
-            return exclusive.owns_lock();
-        }
-    };
-}
-
-#endif

include/boost/thread/mutex.hpp

@@ -1,15 +1,16 @@
-#ifndef BOOST_THREAD_MUTEX_HPP
-#define BOOST_THREAD_MUTEX_HPP
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-//  mutex.hpp
-//
-//  (C) Copyright 2007 Anthony Williams 
-//
-//  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)
+#ifndef BOOST_THREAD_RS06040704_HPP
+#define BOOST_THREAD_RS06040704_HPP
 
 #include <boost/thread/detail/platform.hpp>
 #include BOOST_THREAD_PLATFORM(mutex.hpp)
 
-#endif
+#endif // BOOST_THREAD_RS06040704_HPP
+

include/boost/thread/once.hpp

@@ -3,7 +3,7 @@
 
 //  once.hpp
 //
-//  (C) Copyright 2006-7 Anthony Williams 
+//  (C) Copyright 2006 Anthony Williams 
 //
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
@@ -12,12 +12,5 @@
 #include <boost/thread/detail/platform.hpp>
 #include BOOST_THREAD_PLATFORM(once.hpp)
 
-namespace boost
-{
-    inline void call_once(void (*func)(),once_flag& flag)
-    {
-        call_once(flag,func);
-    }
-}
 
 #endif

include/boost/thread/pthread/condition.hpp

@@ -0,0 +1,156 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040707_HPP
+#define BOOST_THREAD_RS06040707_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/thread/exceptions.hpp>
+#include <boost/utility.hpp>
+#include <boost/thread/pthread/lock.hpp>
+
+#include <pthread.h>
+
+namespace boost {
+
+struct xtime;
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+namespace detail {
+
+class BOOST_THREAD_DECL condition_impl : private noncopyable
+{
+    friend class condition;
+
+public:
+    condition_impl();
+    ~condition_impl();
+
+    void notify_one();
+    void notify_all();
+
+    void do_wait(pthread_mutex_t* pmutex);
+    bool do_timed_wait(const xtime& xt, pthread_mutex_t* pmutex);
+
+    pthread_cond_t m_condition;
+};
+
+} // namespace detail
+
+class condition : private noncopyable
+{
+public:
+    condition() { }
+    ~condition() { }
+
+    void notify_one() { m_impl.notify_one(); }
+    void notify_all() { m_impl.notify_all(); }
+
+    template <typename L>
+    void wait(L& lock)
+    {
+        if (!lock)
+            throw lock_error();
+
+        do_wait(lock.m_mutex);
+    }
+
+    template <typename L, typename Pr>
+    void wait(L& lock, Pr pred)
+    {
+        if (!lock)
+            throw lock_error();
+
+        while (!pred())
+            do_wait(lock.m_mutex);
+    }
+
+    template <typename L>
+    bool timed_wait(L& lock, const xtime& xt)
+    {
+        if (!lock)
+            throw lock_error();
+
+        return do_timed_wait(lock.m_mutex, xt);
+    }
+
+    template <typename L, typename Pr>
+    bool timed_wait(L& lock, const xtime& xt, Pr pred)
+    {
+        if (!lock)
+            throw lock_error();
+
+        while (!pred())
+        {
+            if (!do_timed_wait(lock.m_mutex, xt))
+                return false;
+        }
+
+        return true;
+    }
+
+private:
+    detail::condition_impl m_impl;
+
+    template <typename M>
+    void do_wait(M& mutex)
+    {
+
+        typedef detail::thread::lock_ops<M>
+#if defined(__HP_aCC) && __HP_aCC <= 33900 && !defined(BOOST_STRICT_CONFIG)
+# define lock_ops lock_ops_  // HP confuses lock_ops witht the template
+#endif
+            lock_ops;
+
+        typename lock_ops::lock_state state;
+        lock_ops::unlock(mutex, state);
+
+        m_impl.do_wait(state.pmutex);
+
+        lock_ops::lock(mutex, state);
+#undef lock_ops
+    }
+
+    template <typename M>
+    bool do_timed_wait(M& mutex, const xtime& xt)
+    {
+
+        typedef detail::thread::lock_ops<M>
+#if defined(__HP_aCC) && __HP_aCC <= 33900 && !defined(BOOST_STRICT_CONFIG)
+# define lock_ops lock_ops_  // HP confuses lock_ops witht the template
+#endif
+            lock_ops;
+
+        typename lock_ops::lock_state state;
+        lock_ops::unlock(mutex, state);
+
+        bool ret = false;
+
+        ret = m_impl.do_timed_wait(xt, state.pmutex);
+
+        lock_ops::lock(mutex, state);
+#undef lock_ops
+
+        return ret;
+    }
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif // BOOST_CONDITION_RS06040707_HPP

include/boost/thread/pthread/condition_variable.hpp

@@ -1,194 +0,0 @@
-#ifndef BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
-#define BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
-// 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)
-// (C) Copyright 2007 Anthony Williams
-
-#include <boost/thread/mutex.hpp>
-#include <limits.h>
-#include <boost/assert.hpp>
-#include <algorithm>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/thread_time.hpp>
-#include <pthread.h>
-#include "timespec.hpp"
-#include "pthread_mutex_scoped_lock.hpp"
-
-namespace boost
-{
-    class condition_variable
-    {
-    private:
-        pthread_cond_t cond;
-        
-        condition_variable(condition_variable&);
-        condition_variable& operator=(condition_variable&);
-    public:
-        condition_variable()
-        {
-            int const res=pthread_cond_init(&cond,NULL);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-        }
-        ~condition_variable()
-        {
-            int const res=pthread_cond_destroy(&cond);
-            BOOST_ASSERT(!res);
-        }
-
-        void wait(unique_lock<mutex>& m)
-        {
-            int const cond_res=pthread_cond_wait(&cond,m.mutex()->native_handle());
-            BOOST_ASSERT(!cond_res);
-        }
-
-        template<typename predicate_type>
-        void wait(unique_lock<mutex>& m,predicate_type pred)
-        {
-            while(!pred()) wait(m);
-        }
-
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until)
-        {
-            struct timespec const timeout=detail::get_timespec(wait_until);
-            int const cond_res=pthread_cond_timedwait(&cond,m.mutex()->native_handle(),&timeout);
-            if(cond_res==ETIMEDOUT)
-            {
-                return false;
-            }
-            BOOST_ASSERT(!cond_res);
-            return true;
-        }
-
-        template<typename predicate_type>
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until,predicate_type pred)
-        {
-            while (!pred())
-            {
-                if(!timed_wait(m, wait_until))
-                    return false;
-            }
-            return true;
-        }
-
-        void notify_one()
-        {
-            int const res=pthread_cond_signal(&cond);
-            BOOST_ASSERT(!res);
-        }
-        
-        void notify_all()
-        {
-            int const res=pthread_cond_broadcast(&cond);
-            BOOST_ASSERT(!res);
-        }
-    };
-    
-    class condition_variable_any
-    {
-        pthread_mutex_t internal_mutex;
-        pthread_cond_t cond;
-
-        condition_variable_any(condition_variable&);
-        condition_variable_any& operator=(condition_variable&);
-
-    public:
-        condition_variable_any()
-        {
-            int const res=pthread_mutex_init(&internal_mutex,NULL);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-            int const res2=pthread_cond_init(&cond,NULL);
-            if(res2)
-            {
-                int const destroy_res=pthread_mutex_destroy(&internal_mutex);
-                BOOST_ASSERT(!destroy_res);
-                throw thread_resource_error();
-            }
-        }
-        ~condition_variable_any()
-        {
-            int const res=pthread_mutex_destroy(&internal_mutex);
-            BOOST_ASSERT(!res);
-            int const res2=pthread_cond_destroy(&cond);
-            BOOST_ASSERT(!res2);
-        }
-        
-        template<typename lock_type>
-        void wait(lock_type& m)
-        {
-            int res=0;
-            {
-                boost::pthread::pthread_mutex_scoped_lock internal_lock(&internal_mutex);
-                m.unlock();
-                res=pthread_cond_wait(&cond,&internal_mutex);
-            }
-            m.lock();
-            if(res)
-            {
-                throw condition_error();
-            }
-        }
-
-        template<typename lock_type,typename predicate_type>
-        void wait(lock_type& m,predicate_type pred)
-        {
-            while(!pred()) wait(m);
-        }
-        
-        template<typename lock_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until)
-        {
-            struct timespec const timeout=detail::get_timespec(wait_until);
-            int res=0;
-            {
-                boost::pthread::pthread_mutex_scoped_lock internal_lock(&internal_mutex);
-                m.unlock();
-                res=pthread_cond_timedwait(&cond,&internal_mutex,&timeout);
-            }
-            m.lock();
-            if(res==ETIMEDOUT)
-            {
-                return false;
-            }
-            if(res)
-            {
-                throw condition_error();
-            }
-            return true;
-        }
-
-        template<typename lock_type,typename predicate_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until,predicate_type pred)
-        {
-            while (!pred())
-            {
-                if(!timed_wait(m, wait_until))
-                    return false;
-            }
-            return true;
-        }
-
-        void notify_one()
-        {
-            boost::pthread::pthread_mutex_scoped_lock internal_lock(&internal_mutex);
-            int const res=pthread_cond_signal(&cond);
-            BOOST_ASSERT(!res);
-        }
-        
-        void notify_all()
-        {
-            boost::pthread::pthread_mutex_scoped_lock internal_lock(&internal_mutex);
-            int const res=pthread_cond_broadcast(&cond);
-            BOOST_ASSERT(!res);
-        }
-    };
-
-}
-
-#endif

include/boost/thread/pthread/config.hpp

@@ -0,0 +1,77 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040702_HPP
+#define BOOST_THREAD_RS06040702_HPP
+
+#include <boost/config.hpp>
+
+// insist on threading support being available:
+#include <boost/config/requires_threads.hpp>
+
+#if defined(BOOST_THREAD_BUILD_DLL)   //Build dll
+#elif defined(BOOST_THREAD_BUILD_LIB) //Build lib
+#elif defined(BOOST_THREAD_USE_DLL)   //Use dll
+#elif defined(BOOST_THREAD_USE_LIB)   //Use lib
+#else //Use default
+#   if defined(BOOST_HAS_WINTHREADS)
+#       if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)
+            //For compilers supporting auto-tss cleanup
+            //with Boost.Threads lib, use Boost.Threads lib
+#           define BOOST_THREAD_USE_LIB
+#       else
+            //For compilers not yet supporting auto-tss cleanup
+            //with Boost.Threads lib, use Boost.Threads dll
+#           define BOOST_THREAD_USE_DLL
+#       endif
+#   else
+#       define BOOST_THREAD_USE_LIB
+#   endif
+#endif
+
+#if defined(BOOST_HAS_DECLSPEC)
+#   if defined(BOOST_THREAD_BUILD_DLL) //Build dll
+#       define BOOST_THREAD_DECL __declspec(dllexport)
+#   elif defined(BOOST_THREAD_USE_DLL) //Use dll
+#       define BOOST_THREAD_DECL __declspec(dllimport)
+#   else
+#       define BOOST_THREAD_DECL
+#   endif
+#else
+#   define BOOST_THREAD_DECL
+#endif // BOOST_HAS_DECLSPEC
+
+//
+// Automatically link to the correct build variant where possible.
+//
+#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_THREAD_NO_LIB) && !defined(BOOST_THREAD_BUILD_DLL) && !defined(BOOST_THREAD_BUILD_LIB)
+//
+// Tell the autolink to link dynamically, this will get undef'ed by auto_link.hpp
+// once it's done with it: 
+//
+#if defined(BOOST_THREAD_USE_DLL)
+#   define BOOST_DYN_LINK
+#endif
+//
+// Set the name of our library, this will get undef'ed by auto_link.hpp
+// once it's done with it:
+//
+#if defined(BOOST_THREAD_LIB_NAME)
+#    define BOOST_LIB_NAME BOOST_THREAD_LIB_NAME
+#else
+#    define BOOST_LIB_NAME boost_thread_pthread
+#endif
+//
+// If we're importing code from a dll, then tell auto_link.hpp about it:
+//
+// And include the header that does the work:
+//
+#include <boost/config/auto_link.hpp>
+#endif  // auto-linking disabled
+
+#endif // BOOST_THREAD_RS06040702_HPP

include/boost/thread/pthread/exceptions.hpp

@@ -0,0 +1,88 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040709_HPP
+#define BOOST_THREAD_RS06040709_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <string>
+#include <stdexcept>
+
+namespace boost {
+
+class BOOST_THREAD_DECL thread_exception : public std::exception
+{
+protected:
+    thread_exception();
+    thread_exception(int sys_err_code);
+
+public:
+    ~thread_exception() throw();
+
+    int native_error() const;
+
+    const char* message() const;
+
+private:
+    int m_sys_err;
+};
+
+class BOOST_THREAD_DECL lock_error : public thread_exception
+{
+public:
+    lock_error();
+    lock_error(int sys_err_code);
+    ~lock_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL thread_resource_error : public thread_exception
+{
+public:
+    thread_resource_error();
+    thread_resource_error(int sys_err_code);
+    ~thread_resource_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL unsupported_thread_option : public thread_exception
+{
+public:
+    unsupported_thread_option();
+    unsupported_thread_option(int sys_err_code);
+    ~unsupported_thread_option() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL invalid_thread_argument : public thread_exception
+{
+public:
+    invalid_thread_argument();
+    invalid_thread_argument(int sys_err_code);
+    ~invalid_thread_argument() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL thread_permission_error : public thread_exception
+{
+public:
+    thread_permission_error();
+    thread_permission_error(int sys_err_code);
+    ~thread_permission_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06040709_HPP

include/boost/thread/pthread/lock.hpp

@@ -0,0 +1,205 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040708_HPP
+#define BOOST_THREAD_RS06040708_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/thread/pthread/exceptions.hpp>
+
+namespace boost {
+
+class condition;
+struct xtime;
+
+namespace detail { namespace thread {
+
+template <typename Mutex>
+class lock_ops : private noncopyable
+{
+private:
+    lock_ops() { }
+
+public:
+    typedef typename Mutex::cv_state lock_state;
+
+    static void lock(Mutex& m)
+    {
+        m.do_lock();
+    }
+    static bool trylock(Mutex& m)
+    {
+        return m.do_trylock();
+    }
+    static bool timedlock(Mutex& m, const xtime& xt)
+    {
+        return m.do_timedlock(xt);
+    }
+    static void unlock(Mutex& m)
+    {
+        m.do_unlock();
+    }
+    static void lock(Mutex& m, lock_state& state)
+    {
+        m.do_lock(state);
+    }
+    static void unlock(Mutex& m, lock_state& state)
+    {
+        m.do_unlock(state);
+    }
+};
+
+template <typename Mutex>
+class scoped_lock : private noncopyable
+{
+public:
+    typedef Mutex mutex_type;
+
+    explicit scoped_lock(Mutex& mx, bool initially_locked=true)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<Mutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<Mutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+    friend class boost::condition;
+
+    Mutex& m_mutex;
+    bool m_locked;
+};
+
+template <typename TryMutex>
+class scoped_try_lock : private noncopyable
+{
+public:
+    typedef TryMutex mutex_type;
+
+    explicit scoped_try_lock(TryMutex& mx)
+        : m_mutex(mx), m_locked(false)
+    {
+        try_lock();
+    }
+    scoped_try_lock(TryMutex& mx, bool initially_locked)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_try_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<TryMutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    bool try_lock()
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TryMutex>::trylock(m_mutex));
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<TryMutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+    friend class boost::condition;
+
+    TryMutex& m_mutex;
+    bool m_locked;
+};
+
+template <typename TimedMutex>
+class scoped_timed_lock : private noncopyable
+{
+public:
+    typedef TimedMutex mutex_type;
+
+    scoped_timed_lock(TimedMutex& mx, const xtime& xt)
+        : m_mutex(mx), m_locked(false)
+    {
+        timed_lock(xt);
+    }
+    scoped_timed_lock(TimedMutex& mx, bool initially_locked)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_timed_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<TimedMutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    bool try_lock()
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TimedMutex>::trylock(m_mutex));
+    }
+    bool timed_lock(const xtime& xt)
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TimedMutex>::timedlock(m_mutex, xt));
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<TimedMutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+    friend class boost::condition;
+
+    TimedMutex& m_mutex;
+    bool m_locked;
+};
+
+} // namespace thread
+} // namespace detail
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06040708_HPP

include/boost/thread/pthread/mutex.hpp

@@ -1,205 +1,116 @@
-#ifndef BOOST_THREAD_PTHREAD_MUTEX_HPP
-#define BOOST_THREAD_PTHREAD_MUTEX_HPP
-// (C) Copyright 2007 Anthony Williams
+// Copyright 2006 Roland Schwarz.
 // 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040705_HPP
+#define BOOST_THREAD_RS06040705_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/thread/pthread/lock.hpp>
 
 #include <pthread.h>
-#include <boost/utility.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/thread_time.hpp>
-#include <boost/assert.hpp>
-#include <unistd.h>
-#include <errno.h>
-#include "timespec.hpp"
-#include "pthread_mutex_scoped_lock.hpp"
 
-#ifdef _POSIX_TIMEOUTS
-#if _POSIX_TIMEOUTS >= 0
-#define BOOST_PTHREAD_HAS_TIMEDLOCK
-#endif
+namespace boost {
+
+struct xtime;
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
 #endif
 
-namespace boost
+class BOOST_THREAD_DECL mutex
+    : private noncopyable
 {
-    class mutex:
-        boost::noncopyable
+public:
+    friend class detail::thread::lock_ops<mutex>;
+
+    typedef detail::thread::scoped_lock<mutex> scoped_lock;
+
+    mutex();
+    ~mutex();
+
+private:
+    struct cv_state
     {
-    private:
-        pthread_mutex_t m;
-    public:
-        mutex()
-        {
-            int const res=pthread_mutex_init(&m,NULL);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-        }
-        ~mutex()
-        {
-            int const res=pthread_mutex_destroy(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        void lock()
-        {
-            int const res=pthread_mutex_lock(&m);
-            BOOST_ASSERT(!res);
-        }
-
-        void unlock()
-        {
-            int const res=pthread_mutex_unlock(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            int const res=pthread_mutex_trylock(&m);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-
-        typedef pthread_mutex_t* native_handle_type;
-        native_handle_type native_handle() const
-        {
-            return &m;
-        }
-
-        typedef unique_lock<mutex> scoped_lock;
-        typedef scoped_lock scoped_try_lock;
+        pthread_mutex_t* pmutex;
     };
+    void do_lock();
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
 
-    typedef mutex try_mutex;
+    pthread_mutex_t m_mutex;
+};
 
-    class timed_mutex:
-        boost::noncopyable
+class BOOST_THREAD_DECL try_mutex
+    : private noncopyable
+{
+public:
+    friend class detail::thread::lock_ops<try_mutex>;
+
+    typedef detail::thread::scoped_lock<try_mutex> scoped_lock;
+    typedef detail::thread::scoped_try_lock<try_mutex> scoped_try_lock;
+
+    try_mutex();
+    ~try_mutex();
+
+private:
+    struct cv_state
     {
-    private:
-        pthread_mutex_t m;
-#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
-        pthread_cond_t cond;
-        bool is_locked;
-#endif
-    public:
-        timed_mutex()
-        {
-            int const res=pthread_mutex_init(&m,NULL);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
-            int const res2=pthread_cond_init(&cond,NULL);
-            if(res2)
-            {
-                int const destroy_res=pthread_mutex_destroy(&m);
-                BOOST_ASSERT(!destroy_res);
-                throw thread_resource_error();
-            }
-            is_locked=false;
-#endif
-        }
-        ~timed_mutex()
-        {
-            int const res=pthread_mutex_destroy(&m);
-            BOOST_ASSERT(!res);
-#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
-            int const res2=pthread_cond_destroy(&cond);
-            BOOST_ASSERT(!res2);
-#endif
-        }
-
-        template<typename TimeDuration>
-        bool timed_lock(TimeDuration const & relative_time)
-        {
-            return timed_lock(get_system_time()+relative_time);
-        }
-
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
-        void lock()
-        {
-            int const res=pthread_mutex_lock(&m);
-            BOOST_ASSERT(!res);
-        }
-
-        void unlock()
-        {
-            int const res=pthread_mutex_unlock(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            int const res=pthread_mutex_trylock(&m);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-        bool timed_lock(system_time const & abs_time)
-        {
-            struct timespec const timeout=detail::get_timespec(abs_time);
-            int const res=pthread_mutex_timedlock(&m,&timeout);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-#else
-        void lock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            while(is_locked)
-            {
-                int const cond_res=pthread_cond_wait(&cond,&m);
-                BOOST_ASSERT(!cond_res);
-            }
-            is_locked=true;
-        }
-
-        void unlock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            is_locked=false;
-            int const res=pthread_cond_signal(&cond);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            if(is_locked)
-            {
-                return false;
-            }
-            is_locked=true;
-            return true;
-        }
-
-        bool timed_lock(system_time const & abs_time)
-        {
-            struct timespec const timeout=detail::get_timespec(abs_time);
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            while(is_locked)
-            {
-                int const cond_res=pthread_cond_timedwait(&cond,&m,&timeout);
-                if(cond_res==ETIMEDOUT)
-                {
-                    return false;
-                }
-                BOOST_ASSERT(!cond_res);
-            }
-            is_locked=true;
-            return true;
-        }
-#endif
-
-        typedef unique_lock<timed_mutex> scoped_timed_lock;
-        typedef scoped_timed_lock scoped_try_lock;
-        typedef scoped_timed_lock scoped_lock;
+        pthread_mutex_t* pmutex;
     };
+    void do_lock();
+    bool do_trylock();
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
 
-}
+    pthread_mutex_t m_mutex;
+};
 
+class BOOST_THREAD_DECL timed_mutex
+    : private noncopyable
+{
+public:
+    friend class detail::thread::lock_ops<timed_mutex>;
 
+    typedef detail::thread::scoped_lock<timed_mutex> scoped_lock;
+    typedef detail::thread::scoped_try_lock<timed_mutex> scoped_try_lock;
+    typedef detail::thread::scoped_timed_lock<timed_mutex> scoped_timed_lock;
+
+    timed_mutex();
+    ~timed_mutex();
+
+private:
+    struct cv_state
+    {
+        pthread_mutex_t* pmutex;
+    };
+    void do_lock();
+    bool do_trylock();
+    bool do_timedlock(const xtime& xt);
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
+
+    pthread_mutex_t m_mutex;
+    pthread_cond_t m_condition;
+    bool m_locked;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
 #endif
+
+} // namespace boost
+
+#endif // BOOST_MUTEX_RS06040705_HPP

include/boost/thread/pthread/once.hpp

@@ -9,7 +9,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/thread/detail/config.hpp>
+#include <boost/thread/pthread/config.hpp>
 
 #include <pthread.h>
 #include <boost/assert.hpp>

include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp

@@ -1,30 +0,0 @@
-#ifndef BOOST_PTHREAD_MUTEX_SCOPED_LOCK_HPP
-#define BOOST_PTHREAD_MUTEX_SCOPED_LOCK_HPP
-#include <pthread.h>
-#include <boost/assert.hpp>
-
-namespace boost
-{
-    namespace pthread
-    {
-        class pthread_mutex_scoped_lock
-        {
-            pthread_mutex_t* m;
-        public:
-            explicit pthread_mutex_scoped_lock(pthread_mutex_t* m_):
-                m(m_)
-            {
-                int const res=pthread_mutex_lock(m);
-                BOOST_ASSERT(!res);
-            }
-            ~pthread_mutex_scoped_lock()
-            {
-                int const res=pthread_mutex_unlock(m);
-                BOOST_ASSERT(!res);
-            }
-            
-        };
-    }
-}
-
-#endif

include/boost/thread/pthread/read_write_mutex.hpp

@@ -1,5 +1,5 @@
-#ifndef BOOST_THREAD_PTHREAD_SHARED_MUTEX_HPP
-#define BOOST_THREAD_PTHREAD_SHARED_MUTEX_HPP
+#ifndef BOOST_THREAD_PTHREAD_READ_WRITE_MUTEX_HPP
+#define BOOST_THREAD_PTHREAD_READ_WRITE_MUTEX_HPP
 
 //  (C) Copyright 2006-7 Anthony Williams
 //
@@ -11,18 +11,19 @@
 #include <boost/static_assert.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
+#include <boost/thread/xtime.hpp>
 
 namespace boost
 {
-    class shared_mutex
+    class read_write_mutex
     {
     private:
         struct state_data
         {
-            unsigned shared_count;
-            bool exclusive;
-            bool upgrade;
-            bool exclusive_waiting_blocked;
+            unsigned shared_count:10;
+            unsigned exclusive:1;
+            unsigned upgradeable:1;
+            unsigned exclusive_waiting_blocked:1;
         };
         
 
@@ -31,7 +32,7 @@ namespace boost
         boost::mutex state_change;
         boost::condition shared_cond;
         boost::condition exclusive_cond;
-        boost::condition upgrade_cond;
+        boost::condition upgradeable_cond;
 
         void release_waiters()
         {
@@ -41,17 +42,17 @@ namespace boost
         
 
     public:
-        shared_mutex()
+        read_write_mutex()
         {
             state_data state_={0};
             state=state_;
         }
 
-        ~shared_mutex()
+        ~read_write_mutex()
         {
         }
 
-        void lock_shared()
+        void lock_shareable()
         {
             boost::mutex::scoped_lock lock(state_change);
                 
@@ -67,7 +68,7 @@ namespace boost
             }
         }
 
-        bool try_lock_shared()
+        bool try_lock_shareable()
         {
             boost::mutex::scoped_lock lock(state_change);
                 
@@ -82,7 +83,7 @@ namespace boost
             }
         }
 
-        bool timed_lock_shared(system_time const& timeout)
+        bool timed_lock_shareable(xtime const& timeout)
         {
             boost::mutex::scoped_lock lock(state_change);
                 
@@ -101,18 +102,18 @@ namespace boost
             }
         }
 
-        void unlock_shared()
+        void unlock_shareable()
         {
             boost::mutex::scoped_lock lock(state_change);
             bool const last_reader=!--state.shared_count;
                 
             if(last_reader)
             {
-                if(state.upgrade)
+                if(state.upgradeable)
                 {
-                    state.upgrade=false;
+                    state.upgradeable=false;
                     state.exclusive=true;
-                    upgrade_cond.notify_one();
+                    upgradeable_cond.notify_one();
                 }
                 else
                 {
@@ -141,7 +142,7 @@ namespace boost
             }
         }
 
-        bool timed_lock(system_time const& timeout)
+        bool timed_lock(xtime const& timeout)
         {
             boost::mutex::scoped_lock lock(state_change);
                 
@@ -187,15 +188,15 @@ namespace boost
             release_waiters();
         }
 
-        void lock_upgrade()
+        void lock_upgradeable()
         {
             boost::mutex::scoped_lock lock(state_change);
             while(true)
             {
-                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgrade)
+                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgradeable)
                 {
                     ++state.shared_count;
-                    state.upgrade=true;
+                    state.upgradeable=true;
                     return;
                 }
                 
@@ -203,15 +204,15 @@ namespace boost
             }
         }
 
-        bool timed_lock_upgrade(system_time const& timeout)
+        bool timed_lock_upgradeable(xtime const& timeout)
         {
             boost::mutex::scoped_lock lock(state_change);
             while(true)
             {
-                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgrade)
+                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgradeable)
                 {
                     ++state.shared_count;
-                    state.upgrade=true;
+                    state.upgradeable=true;
                     return true;
                 }
                 
@@ -222,25 +223,25 @@ namespace boost
             }
         }
 
-        bool try_lock_upgrade()
+        bool try_lock_upgradeable()
         {
             boost::mutex::scoped_lock lock(state_change);
-            if(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
+            if(state.exclusive || state.exclusive_waiting_blocked || state.upgradeable)
             {
                 return false;
             }
             else
             {
                 ++state.shared_count;
-                state.upgrade=true;
+                state.upgradeable=true;
                 return true;
             }
         }
 
-        void unlock_upgrade()
+        void unlock_upgradeable()
         {
             boost::mutex::scoped_lock lock(state_change);
-            state.upgrade=false;
+            state.upgradeable=false;
             bool const last_reader=!--state.shared_count;
                 
             if(last_reader)
@@ -250,7 +251,7 @@ namespace boost
             }
         }
 
-        void unlock_upgrade_and_lock()
+        void unlock_upgradeable_and_lock()
         {
             boost::mutex::scoped_lock lock(state_change);
             --state.shared_count;
@@ -258,25 +259,25 @@ namespace boost
             {
                 if(!state.shared_count)
                 {
-                    state.upgrade=false;
+                    state.upgradeable=false;
                     state.exclusive=true;
                     break;
                 }
-                upgrade_cond.wait(lock);
+                upgradeable_cond.wait(lock);
             }
         }
 
-        void unlock_and_lock_upgrade()
+        void unlock_and_lock_upgradeable()
         {
             boost::mutex::scoped_lock lock(state_change);
             state.exclusive=false;
-            state.upgrade=true;
+            state.upgradeable=true;
             ++state.shared_count;
             state.exclusive_waiting_blocked=false;
             release_waiters();
         }
         
-        void unlock_and_lock_shared()
+        void unlock_and_lock_shareable()
         {
             boost::mutex::scoped_lock lock(state_change);
             state.exclusive=false;
@@ -285,13 +286,102 @@ namespace boost
             release_waiters();
         }
         
-        void unlock_upgrade_and_lock_shared()
+        void unlock_upgradeable_and_lock_shareable()
         {
             boost::mutex::scoped_lock lock(state_change);
-            state.upgrade=false;
+            state.upgradeable=false;
             state.exclusive_waiting_blocked=false;
             release_waiters();
         }
+        
+        class scoped_read_lock
+        {
+            read_write_mutex& m;
+        public:
+            scoped_read_lock(read_write_mutex& m_):
+                m(m_)
+            {
+                m.lock_shareable();
+            }
+            ~scoped_read_lock()
+            {
+                m.unlock_shareable();
+            }
+        };
+
+        class scoped_write_lock
+        {
+            read_write_mutex& m;
+            bool locked;
+            
+        public:
+            scoped_write_lock(read_write_mutex& m_):
+                m(m_),locked(false)
+            {
+                lock();
+            }
+            void lock()
+            {
+                m.lock();
+                locked=true;
+            }
+            
+            void unlock()
+            {
+                m.unlock();
+                locked=false;
+            }
+            ~scoped_write_lock()
+            {
+                if(locked)
+                {
+                    unlock();
+                }
+            }
+        };
+
+        class scoped_upgradeable_lock
+        {
+            read_write_mutex& m;
+            bool locked;
+            bool upgraded;
+             
+        public:
+            scoped_upgradeable_lock(read_write_mutex& m_):
+                m(m_),
+                locked(false),upgraded(false)
+            {
+                lock();
+            }
+            void lock()
+            {
+                m.lock_upgradeable();
+                locked=true;
+            }
+            void upgrade()
+            {
+                m.unlock_upgradeable_and_lock();
+                upgraded=true;
+            }
+            void unlock()
+            {
+                if(upgraded)
+                {
+                    m.unlock();
+                }
+                else
+                {
+                    m.unlock_upgradeable();
+                }
+            }
+            ~scoped_upgradeable_lock()
+            {
+                if(locked)
+                {
+                    unlock();
+                }
+            }
+        };
     };
 }
 

include/boost/thread/pthread/recursive_mutex.hpp

@@ -1,260 +1,136 @@
-#ifndef BOOST_THREAD_PTHREAD_RECURSIVE_MUTEX_HPP
-#define BOOST_THREAD_PTHREAD_RECURSIVE_MUTEX_HPP
-// (C) Copyright 2007 Anthony Williams
-// 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)
+// Copyright (C) 2001-2003 William E. Kempf
+// Copyright (C) 2006 Roland Schwarz
+//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_RECURSIVE_MUTEX_RS06092302_HPP
+#define BOOST_RECURSIVE_MUTEX_RS06092302_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/thread/pthread/lock.hpp>
 
 #include <pthread.h>
-#include <boost/utility.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/thread_time.hpp>
-#include <boost/assert.hpp>
-#include <unistd.h>
-#include <boost/date_time/posix_time/conversion.hpp>
-#include <errno.h>
-#include "timespec.hpp"
-#include "pthread_mutex_scoped_lock.hpp"
 
-#ifdef _POSIX_TIMEOUTS
-#if _POSIX_TIMEOUTS >= 0
-#define BOOST_PTHREAD_HAS_TIMEDLOCK
-#endif
+namespace boost {
+
+struct xtime;
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
 #endif
 
-namespace boost
+class BOOST_THREAD_DECL recursive_mutex
+    : private noncopyable
 {
-    class recursive_mutex:
-        boost::noncopyable
+public:
+    friend class detail::thread::lock_ops<recursive_mutex>;
+
+    typedef detail::thread::scoped_lock<recursive_mutex> scoped_lock;
+
+    recursive_mutex();
+    ~recursive_mutex();
+
+private:
+    struct cv_state
     {
-    private:
-        pthread_mutex_t m;
-    public:
-        recursive_mutex()
-        {
-            pthread_mutexattr_t attr;
-            
-            int const init_attr_res=pthread_mutexattr_init(&attr);
-            if(init_attr_res)
-            {
-                throw thread_resource_error();
-            }
-            int const set_attr_res=pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_RECURSIVE);
-            if(set_attr_res)
-            {
-                throw thread_resource_error();
-            }
-            
-            int const res=pthread_mutex_init(&m,&attr);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-            int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
-            BOOST_ASSERT(!destroy_attr_res);
-        }
-        ~recursive_mutex()
-        {
-            int const res=pthread_mutex_destroy(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        void lock()
-        {
-            int const res=pthread_mutex_lock(&m);
-            BOOST_ASSERT(!res);
-        }
-
-        void unlock()
-        {
-            int const res=pthread_mutex_unlock(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            int const res=pthread_mutex_trylock(&m);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-        typedef unique_lock<recursive_mutex> scoped_lock;
-        typedef scoped_lock scoped_try_lock;
+        long count;
+        pthread_mutex_t* pmutex;
     };
+    void do_lock();
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
 
-    typedef recursive_mutex recursive_try_mutex;
+    pthread_mutex_t m_mutex;
+    unsigned m_count;
+#if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
+    pthread_cond_t m_unlocked;
+    pthread_t m_thread_id;
+    bool m_valid_id;
+#endif
+};
 
-    class recursive_timed_mutex:
-        boost::noncopyable
+class BOOST_THREAD_DECL recursive_try_mutex
+    : private noncopyable
+{
+public:
+    friend class detail::thread::lock_ops<recursive_try_mutex>;
+
+    typedef detail::thread::scoped_lock<recursive_try_mutex> scoped_lock;
+    typedef detail::thread::scoped_try_lock<
+        recursive_try_mutex> scoped_try_lock;
+
+    recursive_try_mutex();
+    ~recursive_try_mutex();
+
+private:
+    struct cv_state
     {
-    private:
-        pthread_mutex_t m;
-#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
-        pthread_cond_t cond;
-        bool is_locked;
-        pthread_t owner;
-        unsigned count;
-#endif
-    public:
-        recursive_timed_mutex()
-        {
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
-            pthread_mutexattr_t attr;
-            
-            int const init_attr_res=pthread_mutexattr_init(&attr);
-            if(init_attr_res)
-            {
-                throw thread_resource_error();
-            }
-            int const set_attr_res=pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_RECURSIVE);
-            if(set_attr_res)
-            {
-                throw thread_resource_error();
-            }
-            
-            int const res=pthread_mutex_init(&m,&attr);
-            if(res)
-            {
-                int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
-                BOOST_ASSERT(!destroy_attr_res);
-                throw thread_resource_error();
-            }
-            int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
-            BOOST_ASSERT(!destroy_attr_res);
-#else
-            int const res=pthread_mutex_init(&m,NULL);
-            if(res)
-            {
-                throw thread_resource_error();
-            }
-            int const res2=pthread_cond_init(&cond,NULL);
-            if(res2)
-            {
-                int const destroy_res=pthread_mutex_destroy(&m);
-                BOOST_ASSERT(!destroy_res);
-                throw thread_resource_error();
-            }
-            is_locked=false;
-            count=0;
-#endif
-        }
-        ~recursive_timed_mutex()
-        {
-            int const res=pthread_mutex_destroy(&m);
-            BOOST_ASSERT(!res);
-#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
-            int const res2=pthread_cond_destroy(&cond);
-            BOOST_ASSERT(!res2);
-#endif
-        }
-
-        template<typename TimeDuration>
-        bool timed_lock(TimeDuration const & relative_time)
-        {
-            return timed_lock(get_system_time()+relative_time);
-        }
-
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
-        void lock()
-        {
-            int const res=pthread_mutex_lock(&m);
-            BOOST_ASSERT(!res);
-        }
-
-        void unlock()
-        {
-            int const res=pthread_mutex_unlock(&m);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            int const res=pthread_mutex_trylock(&m);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-        bool timed_lock(system_time const & abs_time)
-        {
-            struct timespec const timeout=detail::get_timespec(abs_time);
-            int const res=pthread_mutex_timedlock(&m,&timeout);
-            BOOST_ASSERT(!res || res==EBUSY);
-            return !res;
-        }
-#else
-        void lock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            if(is_locked && owner==pthread_self())
-            {
-                ++count;
-                return;
-            }
-            
-            while(is_locked)
-            {
-                int const cond_res=pthread_cond_wait(&cond,&m);
-                BOOST_ASSERT(!cond_res);
-            }
-            is_locked=true;
-            ++count;
-            owner=pthread_self();
-        }
-
-        void unlock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            if(!--count)
-            {
-                is_locked=false;
-            }
-            int const res=pthread_cond_signal(&cond);
-            BOOST_ASSERT(!res);
-        }
-        
-        bool try_lock()
-        {
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            if(is_locked && owner!=pthread_self())
-            {
-                return false;
-            }
-            is_locked=true;
-            ++count;
-            owner=pthread_self();
-            return true;
-        }
-
-        bool timed_lock(system_time const & abs_time)
-        {
-            struct timespec const timeout=detail::get_timespec(abs_time);
-            boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
-            if(is_locked && owner==pthread_self())
-            {
-                ++count;
-                return true;
-            }
-            while(is_locked)
-            {
-                int const cond_res=pthread_cond_timedwait(&cond,&m,&timeout);
-                if(cond_res==ETIMEDOUT)
-                {
-                    return false;
-                }
-                BOOST_ASSERT(!cond_res);
-            }
-            is_locked=true;
-            ++count;
-            owner=pthread_self();
-            return true;
-        }
-#endif
-
-        typedef unique_lock<recursive_timed_mutex> scoped_timed_lock;
-        typedef scoped_timed_lock scoped_try_lock;
-        typedef scoped_timed_lock scoped_lock;
+        long count;
+        pthread_mutex_t* pmutex;
     };
+    void do_lock();
+    bool do_trylock();
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
 
-}
-
-
+    pthread_mutex_t m_mutex;
+    unsigned m_count;
+#if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
+    pthread_cond_t m_unlocked;
+    pthread_t m_thread_id;
+    bool m_valid_id;
 #endif
+};
+
+class BOOST_THREAD_DECL recursive_timed_mutex
+    : private noncopyable
+{
+public:
+    friend class detail::thread::lock_ops<recursive_timed_mutex>;
+
+    typedef detail::thread::scoped_lock<recursive_timed_mutex> scoped_lock;
+    typedef detail::thread::scoped_try_lock<
+        recursive_timed_mutex> scoped_try_lock;
+    typedef detail::thread::scoped_timed_lock<
+        recursive_timed_mutex> scoped_timed_lock;
+
+    recursive_timed_mutex();
+    ~recursive_timed_mutex();
+
+private:
+    struct cv_state
+    {
+        long count;
+        pthread_mutex_t* pmutex;
+    };
+    void do_lock();
+    bool do_trylock();
+    bool do_timedlock(const xtime& xt);
+    void do_unlock();
+    void do_lock(cv_state& state);
+    void do_unlock(cv_state& state);
+
+    pthread_mutex_t m_mutex;
+    pthread_cond_t m_unlocked;
+    pthread_t m_thread_id;
+    bool m_valid_id;
+    unsigned m_count;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif // BOOST_RECURSIVE_MUTEX_RS06092302_HPP

include/boost/thread/pthread/thread.hpp

@@ -0,0 +1,75 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040701_HPP
+#define BOOST_THREAD_RS06040701_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/thread/pthread/mutex.hpp>
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <list>
+#include <memory>
+#include <pthread.h>
+
+namespace boost {
+
+struct xtime;
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+class BOOST_THREAD_DECL thread : private noncopyable
+{
+public:
+    thread();
+    explicit thread(const function0<void>& threadfunc);
+    ~thread();
+
+    bool operator==(const thread& other) const;
+    bool operator!=(const thread& other) const;
+
+    void join();
+
+    static void sleep(const xtime& xt);
+    static void yield();
+
+private:
+    pthread_t m_thread;
+    bool m_joinable;
+};
+
+class BOOST_THREAD_DECL thread_group : private noncopyable
+{
+public:
+    thread_group();
+    ~thread_group();
+
+    thread* create_thread(const function0<void>& threadfunc);
+    void add_thread(thread* thrd);
+    void remove_thread(thread* thrd);
+    void join_all();
+        int size();
+
+private:
+    std::list<thread*> m_threads;
+    mutex m_mutex;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06040701_HPP

include/boost/thread/pthread/timespec.hpp

@@ -1,23 +0,0 @@
-#ifndef BOOST_THREAD_PTHREAD_TIMESPEC_HPP
-#define BOOST_THREAD_PTHREAD_TIMESPEC_HPP
-
-#include <boost/thread/thread_time.hpp>
-#include <boost/date_time/posix_time/conversion.hpp>
-
-namespace boost
-{
-    namespace detail
-    {
-        inline struct timespec get_timespec(boost::system_time const& abs_time)
-        {
-            struct timespec timeout={0};
-            boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
-            
-            timeout.tv_sec=time_since_epoch.total_seconds();
-            timeout.tv_nsec=time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second());
-            return timeout;
-        }
-    }
-}
-
-#endif

include/boost/thread/pthread/tss.hpp

@@ -0,0 +1,108 @@
+// Copyright (C) 2001-2003 William E. Kempf
+// Copyright (C) 2006 Roland Schwarz
+//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_TSS_RS06092304_HPP
+#define BOOST_TSS_RS06092304_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <boost/thread/pthread/exceptions.hpp>
+
+#include <pthread.h>
+
+namespace boost {
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+namespace detail {
+
+class BOOST_THREAD_DECL tss : private noncopyable
+{
+public:
+    tss(boost::function1<void, void*>* pcleanup) {
+        if (pcleanup == 0) throw boost::thread_resource_error();
+        try
+        {
+            init(pcleanup);
+        }
+        catch (...)
+        {
+            delete pcleanup;
+            throw boost::thread_resource_error();
+        }
+    }
+
+    void* get() const;
+    void set(void* value);
+    void cleanup(void* p);
+
+private:
+    unsigned int m_slot; //This is a "pseudo-slot", not a native slot
+
+    void init(boost::function1<void, void*>* pcleanup);
+};
+
+template <typename T>
+struct tss_adapter
+{
+    template <typename F>
+    tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
+    void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
+    boost::function1<void, T*> m_cleanup;
+};
+
+} // namespace detail
+
+template <typename T>
+class thread_specific_ptr : private noncopyable
+{
+public:
+    thread_specific_ptr()
+        : m_tss(new boost::function1<void, void*>(
+                    boost::detail::tss_adapter<T>(
+                        &thread_specific_ptr<T>::cleanup)))
+    {
+    }
+    thread_specific_ptr(void (*clean)(T*))
+        : m_tss(new boost::function1<void, void*>(
+                    boost::detail::tss_adapter<T>(clean)))
+    {
+    }
+    ~thread_specific_ptr() { reset(); }
+
+    T* get() const { return static_cast<T*>(m_tss.get()); }
+    T* operator->() const { return get(); }
+    T& operator*() const { return *get(); }
+    T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
+    void reset(T* p=0)
+    {
+        T* cur = get();
+        if (cur == p) return;
+        m_tss.set(p);
+        if (cur) m_tss.cleanup(cur);
+    }
+
+private:
+    static void cleanup(T* p) { delete p; }
+    detail::tss m_tss;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif //BOOST_TSS_RS06092304_HPP

include/boost/thread/pthread/xtime.hpp

@@ -0,0 +1,56 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040711_HPP
+#define BOOST_THREAD_RS06040711_HPP
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <boost/cstdint.hpp>
+
+namespace boost {
+
+enum xtime_clock_types
+{
+    TIME_UTC=1
+//    TIME_TAI,
+//    TIME_MONOTONIC,
+//    TIME_PROCESS,
+//    TIME_THREAD,
+//    TIME_LOCAL,
+//    TIME_SYNC,
+//    TIME_RESOLUTION
+};
+
+struct xtime
+{
+#if defined(BOOST_NO_INT64_T)
+    typedef int_fast32_t xtime_sec_t; //INT_FAST32_MIN <= sec <= INT_FAST32_MAX
+#else
+    typedef int_fast64_t xtime_sec_t; //INT_FAST64_MIN <= sec <= INT_FAST64_MAX
+#endif
+
+    typedef int_fast32_t xtime_nsec_t; //0 <= xtime.nsec < NANOSECONDS_PER_SECOND
+
+    xtime_sec_t sec;
+    xtime_nsec_t nsec;
+};
+
+int BOOST_THREAD_DECL xtime_get(struct xtime* xtp, int clock_type);
+
+inline int xtime_cmp(const xtime& xt1, const xtime& xt2)
+{
+    if (xt1.sec == xt2.sec)
+        return (int)(xt1.nsec - xt2.nsec);
+    else 
+        return (xt1.sec > xt2.sec) ? 1 : -1;
+}
+
+} // namespace boost
+
+#endif //BOOST_THREAD_RS06040711_HPP

include/boost/thread/read_write_mutex.hpp

@@ -0,0 +1,13 @@
+#ifndef BOOST_THREAD_READ_WRITE_MUTEX_HPP
+#define BOOST_THREAD_READ_WRITE_MUTEX_HPP
+
+// (C) Copyright 2006 Anthony Williams
+// 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)
+
+
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(read_write_mutex.hpp)
+
+#endif

include/boost/thread/recursive_mutex.hpp

@@ -3,7 +3,7 @@
 
 //  recursive_mutex.hpp
 //
-//  (C) Copyright 2007 Anthony Williams 
+//  (C) Copyright 2006 Anthony Williams 
 //
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
@@ -12,4 +12,5 @@
 #include <boost/thread/detail/platform.hpp>
 #include BOOST_THREAD_PLATFORM(recursive_mutex.hpp)
 
+
 #endif

include/boost/thread/shared_mutex.hpp

@@ -1,15 +0,0 @@
-#ifndef BOOST_THREAD_SHARED_MUTEX_HPP
-#define BOOST_THREAD_SHARED_MUTEX_HPP
-
-//  shared_mutex.hpp
-//
-//  (C) Copyright 2007 Anthony Williams 
-//
-//  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)
-
-#include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(shared_mutex.hpp)
-
-#endif

include/boost/thread/thread.hpp

@@ -1,88 +1,16 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright 2006 Roland Schwarz.
+// 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)
 //
-//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#ifndef BOOST_THREAD_WEK070601_HPP
-#define BOOST_THREAD_WEK070601_HPP
+#ifndef BOOST_THREAD_RS06032802_HPP
+#define BOOST_THREAD_RS06032802_HPP
 
-#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(thread.hpp)
 
-#include <boost/utility.hpp>
-#include <boost/function.hpp>
-#include <boost/thread/mutex.hpp>
-#include <list>
-#include <memory>
+#endif // BOOST_THREAD_RS06032802_HPP
 
-#if defined(BOOST_HAS_PTHREADS)
-#   include <pthread.h>
-#elif defined(BOOST_HAS_MPTASKS)
-#   include <Multiprocessing.h>
-#endif
-
-namespace boost {
-
-struct xtime;
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-#   pragma warning(push)
-#   pragma warning(disable: 4251 4231 4660 4275)
-#endif
-class BOOST_THREAD_DECL thread : private noncopyable
-{
-public:
-    thread();
-    explicit thread(const function0<void>& threadfunc);
-    ~thread();
-
-    bool operator==(const thread& other) const;
-    bool operator!=(const thread& other) const;
-
-    void join();
-
-    static void sleep(const xtime& xt);
-    static void yield();
-
-private:
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_thread;
-    unsigned int m_id;
-#elif defined(BOOST_HAS_PTHREADS)
-private:
-    pthread_t m_thread;
-#elif defined(BOOST_HAS_MPTASKS)
-    MPQueueID m_pJoinQueueID;
-    MPTaskID m_pTaskID;
-#endif
-    bool m_joinable;
-};
-
-class BOOST_THREAD_DECL thread_group : private noncopyable
-{
-public:
-    thread_group();
-    ~thread_group();
-
-    thread* create_thread(const function0<void>& threadfunc);
-    void add_thread(thread* thrd);
-    void remove_thread(thread* thrd);
-    void join_all();
-        int size() const;
-
-private:
-    std::list<thread*> m_threads;
-    mutex m_mutex;
-};
-#ifdef BOOST_MSVC
-#   pragma warning(pop)
-#endif
-} // namespace boost
-
-// Change Log:
-//    8 Feb 01  WEKEMPF Initial version.
-//    1 Jun 01  WEKEMPF Added boost::thread initial implementation.
-//    3 Jul 01  WEKEMPF Redesigned boost::thread to be noncopyable.
-
-#endif // BOOST_THREAD_WEK070601_HPP

include/boost/thread/thread_time.hpp

@@ -1,40 +0,0 @@
-#ifndef BOOST_THREAD_TIME_HPP
-#define BOOST_THREAD_TIME_HPP
-#include <boost/date_time/microsec_time_clock.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-
-namespace boost
-{
-    typedef boost::posix_time::ptime system_time;
-    
-    inline system_time get_system_time()
-    {
-        return boost::date_time::microsec_clock<system_time>::universal_time();
-    }
-
-    namespace detail
-    {
-        inline system_time get_system_time_sentinel()
-        {
-            return system_time(boost::posix_time::pos_infin);
-        }
-
-        inline unsigned long get_milliseconds_until(system_time const& target_time)
-        {
-            if(target_time.is_pos_infinity())
-            {
-                return ~(unsigned long)0;
-            }
-            system_time const now=get_system_time();
-            if(target_time<=now)
-            {
-                return 0;
-            }
-            return static_cast<unsigned long>((target_time-now).total_milliseconds()+1);
-        }
-
-    }
-    
-}
-
-#endif

include/boost/thread/tss.hpp

@@ -1,128 +1,16 @@
-// Copyright (C) 2001-2003 William E. Kempf
-// Copyright (C) 2006 Roland Schwarz
+// Copyright 2006 Roland Schwarz.
+// 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)
 //
-//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#ifndef BOOST_TSS_WEK070601_HPP
-#define BOOST_TSS_WEK070601_HPP
+#ifndef BOOST_TSS_RS06092303_HPP
+#define BOOST_TSS_RS06092303_HPP
 
-#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(tss.hpp)
 
-#include <boost/utility.hpp>
-#include <boost/function.hpp>
-#include <boost/thread/exceptions.hpp>
+#endif // BOOST_TSS_RS06092301_HPP
 
-#if defined(BOOST_HAS_PTHREADS)
-#   include <pthread.h>
-#elif defined(BOOST_HAS_MPTASKS)
-#   include <Multiprocessing.h>
-#endif
-
-namespace boost {
-
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-#   pragma warning(push)
-#   pragma warning(disable: 4251 4231 4660 4275)
-#endif
-
-namespace detail {
-
-class BOOST_THREAD_DECL tss : private noncopyable
-{
-public:
-    tss(boost::function1<void, void*>* pcleanup) {
-        if (pcleanup == 0) throw boost::thread_resource_error();
-        try
-        {
-            init(pcleanup);
-        }
-        catch (...)
-        {
-            delete pcleanup;
-            throw boost::thread_resource_error();
-        }
-    }
-
-    ~tss();
-    void* get() const;
-    void set(void* value);
-    void cleanup(void* p);
-
-private:
-    unsigned int m_slot; //This is a "pseudo-slot", not a native slot
-
-    void init(boost::function1<void, void*>* pcleanup);
-};
-
-#if defined(BOOST_HAS_MPTASKS)
-void thread_cleanup();
-#endif
-
-template <typename T>
-struct tss_adapter
-{
-    template <typename F>
-    tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
-    void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
-    boost::function1<void, T*> m_cleanup;
-};
-
-} // namespace detail
-
-template <typename T>
-class thread_specific_ptr : private noncopyable
-{
-public:
-    thread_specific_ptr()
-        : m_tss(new boost::function1<void, void*>(
-                    boost::detail::tss_adapter<T>(
-                        &thread_specific_ptr<T>::cleanup)))
-    {
-    }
-    thread_specific_ptr(void (*clean)(T*))
-        : m_tss(new boost::function1<void, void*>(
-                    boost::detail::tss_adapter<T>(clean)))
-    {
-    }
-    ~thread_specific_ptr() { reset(); }
-
-    T* get() const { return static_cast<T*>(m_tss.get()); }
-    T* operator->() const { return get(); }
-    T& operator*() const { return *get(); }
-    T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
-    void reset(T* p=0)
-    {
-        T* cur = get();
-        if (cur == p) return;
-        m_tss.set(p);
-        if (cur) m_tss.cleanup(cur);
-    }
-
-private:
-    static void cleanup(T* p) { delete p; }
-    detail::tss m_tss;
-};
-
-#ifdef BOOST_MSVC
-#   pragma warning(pop)
-#endif
-
-} // namespace boost
-
-#endif //BOOST_TSS_WEK070601_HPP
-
-// Change Log:
-//   6 Jun 01  
-//      WEKEMPF Initial version.
-//  30 May 02  WEKEMPF 
-//      Added interface to set specific cleanup handlers.
-//      Removed TLS slot limits from most implementations.
-//  22 Mar 04 GlassfordM for WEKEMPF
-//      Fixed: thread_specific_ptr::reset() doesn't check error returned
-//          by tss::set(); tss::set() now throws if it fails.
-//      Fixed: calling thread_specific_ptr::reset() or 
-//          thread_specific_ptr::release() causes double-delete: once on
-//          reset()/release() and once on ~thread_specific_ptr().

include/boost/thread/win32/basic_checked_mutex.hpp

@@ -0,0 +1,140 @@
+#ifndef BOOST_BASIC_CHECKED_MUTEX_WIN32_HPP
+#define BOOST_BASIC_CHECKED_MUTEX_WIN32_HPP
+
+//  basic_checked_mutex_win32.hpp
+//
+//  (C) Copyright 2006 Anthony Williams 
+//
+//  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)
+
+#include <boost/detail/interlocked.hpp>
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
+#include <boost/assert.hpp>
+
+namespace boost
+{
+    namespace detail
+    {
+        struct basic_checked_mutex
+        {
+            long locking_thread;
+            long active_count;
+            void* semaphore;
+
+            BOOST_STATIC_CONSTANT(long,destroyed_mutex_marker=~0);
+
+            void initialize()
+            {
+                locking_thread=0;
+                active_count=0;
+                semaphore=0;
+            }
+
+            void destroy()
+            {
+                long const old_locking_thread=BOOST_INTERLOCKED_EXCHANGE(&locking_thread,destroyed_mutex_marker);
+                BOOST_ASSERT(!old_locking_thread);
+                void* const old_semaphore=BOOST_INTERLOCKED_EXCHANGE_POINTER(&semaphore,0);
+                if(old_semaphore)
+                {
+                    bool const close_handle_succeeded=BOOST_CLOSE_HANDLE(old_semaphore)!=0;
+                    BOOST_ASSERT(close_handle_succeeded);
+                }
+            }
+          
+            bool try_lock()
+            {
+                check_mutex_lock();
+                bool const success=!BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,1,0);
+                if(success)
+                {
+                    set_locking_thread();
+                }
+                    
+                return success;
+            }
+            
+            void lock()
+            {
+                check_mutex_lock();
+                if(BOOST_INTERLOCKED_INCREMENT(&active_count)!=1)
+                {
+                    bool const wait_succeeded=BOOST_WAIT_FOR_SINGLE_OBJECT(get_semaphore(),BOOST_INFINITE)==0;
+                    BOOST_ASSERT(wait_succeeded);
+                }
+                set_locking_thread();
+            }
+
+            long get_active_count()
+            {
+                return ::boost::detail::interlocked_read(&active_count);
+            }
+
+            void unlock()
+            {
+                long const current_thread=BOOST_GET_CURRENT_THREAD_ID();
+                long const old_locking_thread=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&locking_thread,0,current_thread);
+                BOOST_ASSERT(old_locking_thread!=destroyed_mutex_marker);
+                BOOST_ASSERT(old_locking_thread==current_thread);
+
+                if(BOOST_INTERLOCKED_DECREMENT(&active_count)!=0)
+                {
+                    bool const release_succeeded=BOOST_RELEASE_SEMAPHORE(get_semaphore(),1,0)!=0;
+                    BOOST_ASSERT(release_succeeded);
+                }
+            }
+
+            bool locked()
+            {
+                return get_active_count()!=0;
+            }
+            
+        private:
+            void check_mutex_lock()
+            {
+                long const current_thread=BOOST_GET_CURRENT_THREAD_ID();
+                long const current_locking_thread=::boost::detail::interlocked_read(&locking_thread);
+                BOOST_ASSERT(current_locking_thread!=current_thread);
+                BOOST_ASSERT(current_locking_thread!=destroyed_mutex_marker);
+            }
+            
+            void set_locking_thread()
+            {
+                long const old_owner=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&locking_thread,BOOST_GET_CURRENT_THREAD_ID(),0);
+                BOOST_ASSERT(old_owner==0);
+            }
+            
+            void* get_semaphore()
+            {
+                void* current_semaphore=::boost::detail::interlocked_read(&semaphore);
+                
+                if(!current_semaphore)
+                {
+                    void* const new_semaphore=BOOST_CREATE_SEMAPHORE(0,0,1,0);
+                    BOOST_ASSERT(new_semaphore);
+                    void* const old_semaphore=BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&semaphore,new_semaphore,0);
+                    if(old_semaphore!=0)
+                    {
+                        bool const close_succeeded=BOOST_CLOSE_HANDLE(new_semaphore)!=0;
+                        BOOST_ASSERT(close_succeeded);
+                        return old_semaphore;
+                    }
+                    else
+                    {
+                        return new_semaphore;
+                    }
+                }
+                return current_semaphore;
+            }
+            
+        };
+        
+    }
+}
+
+#define BOOST_BASIC_CHECKED_MUTEX_INITIALIZER {0}
+
+#endif

include/boost/thread/win32/basic_recursive_mutex.hpp

@@ -3,14 +3,17 @@
 
 //  basic_recursive_mutex.hpp
 //
-//  (C) Copyright 2006-7 Anthony Williams 
+//  (C) Copyright 2006 Anthony Williams 
 //
 //  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)
 
-#include "thread_primitives.hpp"
-#include "basic_timed_mutex.hpp"
+#include <boost/detail/interlocked.hpp>
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
+#include <boost/thread/win32/basic_timed_mutex.hpp>
+#include <boost/thread/xtime.hpp>
 
 namespace boost
 {
@@ -51,7 +54,7 @@ namespace boost
                     recursion_count=1;
                 }
             }
-            bool timed_lock(::boost::system_time const& target)
+            bool timed_lock(::boost::xtime const& target)
             {
                 long const current_thread_id=win32::GetCurrentThreadId();
                 return try_recursive_lock(current_thread_id) || try_timed_lock(current_thread_id,target);
@@ -78,7 +81,7 @@ namespace boost
         private:
             bool try_recursive_lock(long current_thread_id)
             {
-                if(::boost::detail::interlocked_read_acquire(&locking_thread_id)==current_thread_id)
+                if(::boost::detail::interlocked_read(&locking_thread_id)==current_thread_id)
                 {
                     ++recursion_count;
                     return true;
@@ -97,7 +100,7 @@ namespace boost
                 return false;
             }
             
-            bool try_timed_lock(long current_thread_id,::boost::system_time const& target)
+            bool try_timed_lock(long current_thread_id,::boost::xtime const& target)
             {
                 if(mutex.timed_lock(target))
                 {

include/boost/thread/win32/basic_timed_mutex.hpp

@@ -10,10 +10,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/assert.hpp>
-#include "thread_primitives.hpp"
-#include "interlocked_read.hpp"
-#include <boost/thread/thread_time.hpp>
 #include <boost/detail/interlocked.hpp>
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
+#include <boost/thread/win32/xtime.hpp>
+#include <boost/thread/win32/xtime_utils.hpp>
 
 namespace boost
 {
@@ -21,7 +22,7 @@ namespace boost
     {
         struct basic_timed_mutex
         {
-            BOOST_STATIC_CONSTANT(long,lock_flag_value=0x80000000);
+            BOOST_STATIC_CONSTANT(long,lock_flag_value=0x10000);
             long active_count;
             void* event;
 
@@ -43,8 +44,8 @@ namespace boost
           
             bool try_lock()
             {
-                long old_count=active_count&~lock_flag_value;
-                do
+                long old_count=0;
+                while(!(old_count&lock_flag_value))
                 {
                     long const current_count=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,(old_count+1)|lock_flag_value,old_count);
                     if(current_count==old_count)
@@ -53,18 +54,17 @@ namespace boost
                     }
                     old_count=current_count;
                 }
-                while(!(old_count&lock_flag_value));
                 return false;
             }
             
             void lock()
             {
-                bool const success=timed_lock(::boost::detail::get_system_time_sentinel());
+                bool const success=timed_lock(::boost::detail::get_xtime_sentinel());
                 BOOST_ASSERT(success);
             }
-            bool timed_lock(::boost::system_time const& wait_until)
+            bool timed_lock(::boost::xtime const& target_time)
             {
-                long old_count=active_count;
+                long old_count=0;
                 while(true)
                 {
                     long const current_count=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,(old_count+1)|lock_flag_value,old_count);
@@ -83,7 +83,7 @@ namespace boost
                     do
                     {
                         old_count-=(lock_flag_value+1); // there will be one less active thread on this mutex when it gets unlocked
-                        if(win32::WaitForSingleObject(sem,::boost::detail::get_milliseconds_until(wait_until))!=0)
+                        if(win32::WaitForSingleObject(sem,::boost::detail::get_milliseconds_until_time(target_time))!=0)
                         {
                             BOOST_INTERLOCKED_DECREMENT(&active_count);
                             return false;
@@ -107,13 +107,13 @@ namespace boost
 
             long get_active_count()
             {
-                return ::boost::detail::interlocked_read_acquire(&active_count);
+                return ::boost::detail::interlocked_read(&active_count);
             }
 
             void unlock()
             {
                 long const offset=lock_flag_value+1;
-                long old_count=BOOST_INTERLOCKED_EXCHANGE_ADD(&active_count,(~offset)+1);
+                long old_count=BOOST_INTERLOCKED_EXCHANGE_ADD(&active_count,-offset);
                 
                 if(old_count>offset)
                 {
@@ -129,7 +129,7 @@ namespace boost
         private:
             void* get_event()
             {
-                void* current_event=::boost::detail::interlocked_read_acquire(&event);
+                void* current_event=::boost::detail::interlocked_read(&event);
                 
                 if(!current_event)
                 {

include/boost/thread/win32/condition.hpp

@@ -0,0 +1,229 @@
+// 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)
+// (C) Copyright 2007 Anthony Williams
+#ifndef CONDITION_HPP
+#define CONDITION_HPP
+#include "boost/config.hpp"
+#include "boost/thread/mutex.hpp"
+#include "boost/thread/win32/thread_primitives.hpp"
+#include "boost/thread/win32/xtime.hpp"
+#include "boost/thread/win32/xtime_utils.hpp"
+#include <limits.h>
+#include "boost/assert.hpp"
+#include <algorithm>
+
+namespace boost
+{
+    template<typename lock_type>
+    class basic_condition
+    {
+        boost::mutex internal_mutex;
+
+        struct list_entry
+        {
+            detail::win32::handle semaphore;
+            long count;
+            bool notified;
+        };
+
+        BOOST_STATIC_CONSTANT(unsigned,generation_count=10);
+
+        list_entry generations[generation_count];
+        detail::win32::handle wake_sem;
+
+        static bool no_waiters(list_entry const& entry)
+        {
+            return entry.count==0;
+        }
+
+        void shift_generations_down()
+        {
+            if(std::remove_if(generations,generations+generation_count,no_waiters)==generations+generation_count)
+            {
+                broadcast_entry(generations[generation_count-1],false);
+            }
+            std::copy_backward(generations,generations+generation_count,generations+generation_count);
+            generations[0].semaphore=0;
+            generations[0].count=0;
+            generations[0].notified=false;
+        }
+
+        void broadcast_entry(list_entry& entry,bool wake)
+        {
+            if(wake)
+            {
+                detail::win32::ReleaseSemaphore(wake_sem,entry.count,NULL);
+            }
+            detail::win32::ReleaseSemaphore(entry.semaphore,entry.count,NULL);
+            entry.count=0;
+            dispose_entry(entry);
+        }
+        
+
+        void dispose_entry(list_entry& entry)
+        {
+            BOOST_ASSERT(entry.count==0);
+            if(entry.semaphore)
+            {
+                unsigned long const close_result=detail::win32::CloseHandle(entry.semaphore);
+                BOOST_ASSERT(close_result);
+            }
+            entry.semaphore=0;
+            entry.notified=false;
+        }
+
+        detail::win32::handle duplicate_handle(detail::win32::handle source)
+        {
+            detail::win32::handle const current_process=detail::win32::GetCurrentProcess();
+            
+            long const same_access_flag=2;
+            detail::win32::handle new_handle=0;
+            bool const success=detail::win32::DuplicateHandle(current_process,source,current_process,&new_handle,0,false,same_access_flag)!=0;
+            BOOST_ASSERT(success);
+            return new_handle;
+        }
+
+        bool do_wait(lock_type& lock,::boost::xtime const& target_time)
+        {
+            detail::win32::handle local_wake_sem;
+            detail::win32::handle sem;
+            bool first_loop=true;
+            bool woken=false;
+            while(!woken)
+            {
+                {
+                    boost::mutex::scoped_lock internal_lock(internal_mutex);
+                    if(first_loop)
+                    {
+                        lock.unlock();
+                        if(!wake_sem)
+                        {
+                            wake_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+                            BOOST_ASSERT(wake_sem);
+                        }
+                        local_wake_sem=duplicate_handle(wake_sem);
+                        
+                        if(generations[0].notified)
+                        {
+                            shift_generations_down();
+                        }
+                        if(!generations[0].semaphore)
+                        {
+                            generations[0].semaphore=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+                            BOOST_ASSERT(generations[0].semaphore);
+                        }
+                        first_loop=false;
+                    }
+                    ++generations[0].count;
+                    sem=duplicate_handle(generations[0].semaphore);
+                }
+                unsigned long const notified=detail::win32::WaitForSingleObject(sem,::boost::detail::get_milliseconds_until_time(target_time));
+                BOOST_ASSERT(notified==detail::win32::timeout || notified==0);
+
+                unsigned long const sem_close_result=detail::win32::CloseHandle(sem);
+                BOOST_ASSERT(sem_close_result);
+
+                if(notified==detail::win32::timeout)
+                {
+                    break;
+                }
+                
+                unsigned long const woken_result=detail::win32::WaitForSingleObject(local_wake_sem,0);
+                BOOST_ASSERT(woken_result==detail::win32::timeout || woken_result==0);
+
+                woken=(woken_result==0);
+            }
+            unsigned long const wake_sem_close_result=detail::win32::CloseHandle(local_wake_sem);
+            BOOST_ASSERT(wake_sem_close_result);
+            lock.lock();
+            return woken;
+        }
+        
+    public:
+        basic_condition():
+            wake_sem(0)
+        {
+            for(unsigned i=0;i<generation_count;++i)
+            {
+                generations[i]=list_entry();
+            }
+        }
+        
+            
+        ~basic_condition()
+        {
+            for(unsigned i=0;i<generation_count;++i)
+            {
+                dispose_entry(generations[i]);
+            }
+            detail::win32::CloseHandle(wake_sem);
+        }
+
+        void wait(lock_type& m)
+        {
+            do_wait(m,::boost::detail::get_xtime_sentinel());
+        }
+
+        template<typename predicate_type>
+        void wait(lock_type& m,predicate_type pred)
+        {
+            while(!pred()) wait(m);
+        }
+        
+
+        bool timed_wait(lock_type& m,::boost::xtime const& target_time)
+        {
+            return do_wait(m,target_time);
+        }
+
+        template<typename predicate_type>
+        bool timed_wait(lock_type& m,::boost::xtime const& target_time,predicate_type pred)
+        {
+            while (!pred()) { if (!timed_wait(m, target_time)) return false; } return true;
+        }
+        
+        void notify_one()
+        {
+            boost::mutex::scoped_lock internal_lock(internal_mutex);
+            if(wake_sem)
+            {
+                detail::win32::ReleaseSemaphore(wake_sem,1,NULL);
+                for(unsigned generation=generation_count;generation!=0;--generation)
+                {
+                    list_entry& entry=generations[generation-1];
+                    if(entry.count)
+                    {
+                        entry.notified=true;
+                        detail::win32::ReleaseSemaphore(entry.semaphore,1,NULL);
+                        if(!--entry.count)
+                        {
+                            dispose_entry(entry);
+                        }
+                    }
+                }
+            }
+        }
+        
+        void notify_all()
+        {
+            boost::mutex::scoped_lock internal_lock(internal_mutex);
+            if(wake_sem)
+            {
+                for(unsigned generation=generation_count;generation!=0;--generation)
+                {
+                    list_entry& entry=generations[generation-1];
+                    if(entry.count)
+                    {
+                        broadcast_entry(entry,true);
+                    }
+                }
+            }
+        }
+        
+    };
+    
+    typedef basic_condition<boost::mutex::scoped_lock> condition;
+}
+
+#endif

include/boost/thread/win32/condition_variable.hpp

@@ -1,309 +0,0 @@
-#ifndef BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
-#define BOOST_THREAD_CONDITION_VARIABLE_WIN32_HPP
-// 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)
-// (C) Copyright 2007 Anthony Williams
-
-#include <boost/thread/mutex.hpp>
-#include "thread_primitives.hpp"
-#include <limits.h>
-#include <boost/assert.hpp>
-#include <algorithm>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/thread_time.hpp>
-#include "interlocked_read.hpp"
-
-namespace boost
-{
-    namespace detail
-    {
-        class basic_condition_variable
-        {
-            boost::mutex internal_mutex;
-            long total_count;
-            unsigned active_generation_count;
-
-            struct list_entry
-            {
-                detail::win32::handle semaphore;
-                long count;
-                bool notified;
-            };
-
-            BOOST_STATIC_CONSTANT(unsigned,generation_count=3);
-
-            list_entry generations[generation_count];
-            detail::win32::handle wake_sem;
-
-            static bool no_waiters(list_entry const& entry)
-            {
-                return entry.count==0;
-            }
-
-            void shift_generations_down()
-            {
-                list_entry* const last_active_entry=std::remove_if(generations,generations+generation_count,no_waiters);
-                if(last_active_entry==generations+generation_count)
-                {
-                    broadcast_entry(generations[generation_count-1],false);
-                }
-                else
-                {
-                    active_generation_count=(last_active_entry-generations)+1;
-                }
-            
-                std::copy_backward(generations,generations+active_generation_count-1,generations+active_generation_count);
-                generations[0]=list_entry();
-            }
-
-            void broadcast_entry(list_entry& entry,bool wake)
-            {
-                long const count_to_wake=entry.count;
-                detail::interlocked_write_release(&total_count,total_count-count_to_wake);
-                if(wake)
-                {
-                    detail::win32::ReleaseSemaphore(wake_sem,count_to_wake,0);
-                }
-                detail::win32::ReleaseSemaphore(entry.semaphore,count_to_wake,0);
-                entry.count=0;
-                dispose_entry(entry);
-            }
-        
-
-            void dispose_entry(list_entry& entry)
-            {
-                if(entry.semaphore)
-                {
-                    unsigned long const close_result=detail::win32::CloseHandle(entry.semaphore);
-                    BOOST_ASSERT(close_result);
-                    entry.semaphore=0;
-                }
-                entry.notified=false;
-            }
-
-            template<typename lock_type>
-            struct relocker
-            {
-                lock_type& lock;
-                bool unlocked;
-                
-                relocker(lock_type& lock_):
-                    lock(lock_),unlocked(false)
-                {}
-                void unlock()
-                {
-                    lock.unlock();
-                    unlocked=true;
-                }
-                ~relocker()
-                {
-                    if(unlocked)
-                    {
-                        lock.lock();
-                    }
-                    
-                }
-            };
-            
-
-        protected:
-            template<typename lock_type>
-            bool do_wait(lock_type& lock,::boost::system_time const& wait_until)
-            {
-                detail::win32::handle_manager local_wake_sem;
-                detail::win32::handle_manager sem;
-                bool first_loop=true;
-                bool woken=false;
-
-                relocker<lock_type> locker(lock);
-            
-                while(!woken)
-                {
-                    {
-                        boost::mutex::scoped_lock internal_lock(internal_mutex);
-                        detail::interlocked_write_release(&total_count,total_count+1);
-                        if(first_loop)
-                        {
-                            locker.unlock();
-                            if(!wake_sem)
-                            {
-                                wake_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
-                                BOOST_ASSERT(wake_sem);
-                            }
-                            local_wake_sem=detail::win32::duplicate_handle(wake_sem);
-                        
-                            if(generations[0].notified)
-                            {
-                                shift_generations_down();
-                            }
-                            else if(!active_generation_count)
-                            {
-                                active_generation_count=1;
-                            }
-                        
-                            first_loop=false;
-                        }
-                        if(!generations[0].semaphore)
-                        {
-                            generations[0].semaphore=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
-                            BOOST_ASSERT(generations[0].semaphore);
-                        }
-                        ++generations[0].count;
-                        sem=detail::win32::duplicate_handle(generations[0].semaphore);
-                    }
-                    unsigned long const wait_result=detail::win32::WaitForSingleObject(sem,::boost::detail::get_milliseconds_until(wait_until));
-
-                    if(wait_result==detail::win32::timeout)
-                    {
-                        break;
-                    }
-                    BOOST_ASSERT(!wait_result);
-                
-                    unsigned long const woken_result=detail::win32::WaitForSingleObject(local_wake_sem,0);
-                    BOOST_ASSERT(woken_result==detail::win32::timeout || woken_result==0);
-
-                    woken=(woken_result==0);
-                }
-                return woken;
-            }
-        
-            basic_condition_variable(const basic_condition_variable& other);
-            basic_condition_variable& operator=(const basic_condition_variable& other);
-        public:
-            basic_condition_variable():
-                total_count(0),active_generation_count(0),wake_sem(0)
-            {
-                for(unsigned i=0;i<generation_count;++i)
-                {
-                    generations[i]=list_entry();
-                }
-            }
-            
-            ~basic_condition_variable()
-            {
-                for(unsigned i=0;i<generation_count;++i)
-                {
-                    dispose_entry(generations[i]);
-                }
-                detail::win32::CloseHandle(wake_sem);
-            }
-
-        
-            void notify_one()
-            {
-                if(detail::interlocked_read_acquire(&total_count))
-                {
-                    boost::mutex::scoped_lock internal_lock(internal_mutex);
-                    detail::win32::ReleaseSemaphore(wake_sem,1,0);
-                    for(unsigned generation=active_generation_count;generation!=0;--generation)
-                    {
-                        list_entry& entry=generations[generation-1];
-                        if(entry.count)
-                        {
-                            detail::interlocked_write_release(&total_count,total_count-1);
-                            entry.notified=true;
-                            detail::win32::ReleaseSemaphore(entry.semaphore,1,0);
-                            if(!--entry.count)
-                            {
-                                dispose_entry(entry);
-                                if(generation==active_generation_count)
-                                {
-                                    --active_generation_count;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        
-            void notify_all()
-            {
-                if(detail::interlocked_read_acquire(&total_count))
-                {
-                    boost::mutex::scoped_lock internal_lock(internal_mutex);
-                    for(unsigned generation=active_generation_count;generation!=0;--generation)
-                    {
-                        list_entry& entry=generations[generation-1];
-                        if(entry.count)
-                        {
-                            broadcast_entry(entry,true);
-                        }
-                    }
-                    active_generation_count=0;
-                }
-            }
-        
-        };
-    }
-
-    class condition_variable:
-        public detail::basic_condition_variable
-    {
-    public:
-        void wait(unique_lock<mutex>& m)
-        {
-            do_wait(m,::boost::detail::get_system_time_sentinel());
-        }
-
-        template<typename predicate_type>
-        void wait(unique_lock<mutex>& m,predicate_type pred)
-        {
-            while(!pred()) wait(m);
-        }
-        
-
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until)
-        {
-            return do_wait(m,wait_until);
-        }
-
-        template<typename predicate_type>
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until,predicate_type pred)
-        {
-            while (!pred())
-            {
-                if(!timed_wait(m, wait_until))
-                    return false;
-            }
-            return true;
-        }
-    };
-    
-    class condition_variable_any:
-        public detail::basic_condition_variable
-    {
-    public:
-        template<typename lock_type>
-        void wait(lock_type& m)
-        {
-            do_wait(m,::boost::detail::get_system_time_sentinel());
-        }
-
-        template<typename lock_type,typename predicate_type>
-        void wait(lock_type& m,predicate_type pred)
-        {
-            while(!pred()) wait(m);
-        }
-        
-        template<typename lock_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until)
-        {
-            return do_wait(m,wait_until);
-        }
-
-        template<typename lock_type,typename predicate_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until,predicate_type pred)
-        {
-            while (!pred())
-            {
-                if(!timed_wait(m, wait_until))
-                    return false;
-            }
-            return true;
-        }
-    };
-
-}
-
-#endif

include/boost/thread/win32/config.hpp

@@ -1,31 +1,19 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright 2006 Roland Schwarz.
+// 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)
 //
-//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#ifndef BOOST_THREAD_CONFIG_WEK01032003_HPP
-#define BOOST_THREAD_CONFIG_WEK01032003_HPP
+#ifndef BOOST_THREAD_RS06041002_HPP
+#define BOOST_THREAD_RS06041002_HPP
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
-#  pragma warn -8008 // Condition always true/false
-#  pragma warn -8080 // Identifier declared but never used
-#  pragma warn -8057 // Parameter never used
-#  pragma warn -8066 // Unreachable code
-#endif
 
 // insist on threading support being available:
 #include <boost/config/requires_threads.hpp>
 
-// compatibility with the rest of Boost's auto-linking code:
-#if defined(BOOST_THREAD_DYN_DLL) || defined(BOOST_ALL_DYN_LINK)
-# undef  BOOST_THREAD_USE_LIB
-# define BOOST_THREAD_USE_DLL
-#endif
-
 #if defined(BOOST_THREAD_BUILD_DLL)   //Build dll
 #elif defined(BOOST_THREAD_BUILD_LIB) //Build lib
 #elif defined(BOOST_THREAD_USE_DLL)   //Use dll
@@ -86,10 +74,4 @@
 #include <boost/config/auto_link.hpp>
 #endif  // auto-linking disabled
 
-#endif // BOOST_THREAD_CONFIG_WEK1032003_HPP
-
-// Change Log:
-//   22 Jan 05 Roland Schwarz (speedsnail)
-//      Usage of BOOST_HAS_DECLSPEC macro.
-//      Default again is static lib usage.
-//      BOOST_DYN_LINK only defined when autolink included.
+#endif // BOOST_THREAD_RS06041002_HPP

include/boost/thread/win32/exceptions.hpp

@@ -0,0 +1,91 @@
+//  (C) Copyright 2005-6 Anthony Williams
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06041003_HPP
+#define BOOST_THREAD_RS06041003_HPP
+
+
+#include <boost/thread/win32/config.hpp>
+
+#include <string>
+#include <stdexcept>
+
+namespace boost {
+
+class BOOST_THREAD_DECL thread_exception : public std::exception
+{
+protected:
+    thread_exception();
+    thread_exception(int sys_err_code);
+
+public:
+    ~thread_exception() throw();
+
+    int native_error() const;
+
+    const char* message() const;
+
+private:
+    int m_sys_err;
+};
+
+class BOOST_THREAD_DECL lock_error : public thread_exception
+{
+public:
+    lock_error();
+    lock_error(int sys_err_code);
+    ~lock_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL thread_resource_error : public thread_exception
+{
+public:
+    thread_resource_error();
+    thread_resource_error(int sys_err_code);
+    ~thread_resource_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL unsupported_thread_option : public thread_exception
+{
+public:
+    unsupported_thread_option();
+    unsupported_thread_option(int sys_err_code);
+    ~unsupported_thread_option() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL invalid_thread_argument : public thread_exception
+{
+public:
+    invalid_thread_argument();
+    invalid_thread_argument(int sys_err_code);
+    ~invalid_thread_argument() throw();
+
+    virtual const char* what() const throw();
+};
+
+class BOOST_THREAD_DECL thread_permission_error : public thread_exception
+{
+public:
+    thread_permission_error();
+    thread_permission_error(int sys_err_code);
+    ~thread_permission_error() throw();
+
+    virtual const char* what() const throw();
+};
+
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06041003_HPP
+

include/boost/thread/win32/interlocked_read.hpp

@@ -9,7 +9,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#ifdef BOOST_MSVC
+#include <boost/detail/interlocked.hpp>
 
 extern "C" void _ReadWriteBarrier(void);
 #pragma intrinsic(_ReadWriteBarrier)
@@ -30,48 +30,7 @@ namespace boost
             _ReadWriteBarrier();
             return res;
         }
-
-        inline void interlocked_write_release(long volatile* x,long value)
-        {
-            _ReadWriteBarrier();
-            *x=value;
-        }
-        inline void interlocked_write_release(void* volatile* x,void* value)
-        {
-            _ReadWriteBarrier();
-            *x=value;
-        }
-    }
-}
-
-#else
-
-#include <boost/detail/interlocked.hpp>
-
-namespace boost
-{
-    namespace detail
-    {
-        inline long interlocked_read_acquire(long volatile* x)
-        {
-            return BOOST_INTERLOCKED_COMPARE_EXCHANGE(x,0,0);
-        }
-        inline void* interlocked_read_acquire(void* volatile* x)
-        {
-            return BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(x,0,0);
-        }
-        inline void interlocked_write_release(long volatile* x,long value)
-        {
-            BOOST_INTERLOCKED_EXCHANGE(x,value);
-        }
-        inline void interlocked_write_release(void* volatile* x,void* value)
-        {
-            BOOST_INTERLOCKED_EXCHANGE_POINTER(x,value);
-        }
     }
 }
 
 #endif
-
-
-#endif

include/boost/thread/win32/lock.hpp

@@ -0,0 +1,201 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06041005_HPP
+#define BOOST_THREAD_RS06041005_HPP
+
+#include <boost/thread/win32/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/thread/win32/exceptions.hpp>
+
+namespace boost {
+
+struct xtime;
+
+namespace detail { namespace thread {
+
+template <typename Mutex>
+class lock_ops : private noncopyable
+{
+private:
+    lock_ops() { }
+
+public:
+    typedef typename Mutex::cv_state lock_state;
+
+    static void lock(Mutex& m)
+    {
+        m.do_lock();
+    }
+    static bool trylock(Mutex& m)
+    {
+        return m.do_trylock();
+    }
+    static bool timedlock(Mutex& m, const xtime& xt)
+    {
+        return m.do_timedlock(xt);
+    }
+    static void unlock(Mutex& m)
+    {
+        m.do_unlock();
+    }
+    static void lock(Mutex& m, lock_state& state)
+    {
+        m.do_lock(state);
+    }
+    static void unlock(Mutex& m, lock_state& state)
+    {
+        m.do_unlock(state);
+    }
+};
+
+template <typename Mutex>
+class scoped_lock : private noncopyable
+{
+public:
+    typedef Mutex mutex_type;
+
+    explicit scoped_lock(Mutex& mx, bool initially_locked=true)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<Mutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<Mutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+
+    Mutex& m_mutex;
+    bool m_locked;
+};
+
+template <typename TryMutex>
+class scoped_try_lock : private noncopyable
+{
+public:
+    typedef TryMutex mutex_type;
+
+    explicit scoped_try_lock(TryMutex& mx)
+        : m_mutex(mx), m_locked(false)
+    {
+        try_lock();
+    }
+    scoped_try_lock(TryMutex& mx, bool initially_locked)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_try_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<TryMutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    bool try_lock()
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TryMutex>::trylock(m_mutex));
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<TryMutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+
+    TryMutex& m_mutex;
+    bool m_locked;
+};
+
+template <typename TimedMutex>
+class scoped_timed_lock : private noncopyable
+{
+public:
+    typedef TimedMutex mutex_type;
+
+    scoped_timed_lock(TimedMutex& mx, const xtime& xt)
+        : m_mutex(mx), m_locked(false)
+    {
+        timed_lock(xt);
+    }
+    scoped_timed_lock(TimedMutex& mx, bool initially_locked)
+        : m_mutex(mx), m_locked(false)
+    {
+        if (initially_locked) lock();
+    }
+    ~scoped_timed_lock()
+    {
+        if (m_locked) unlock();
+    }
+
+    void lock()
+    {
+        if (m_locked) throw lock_error();
+        lock_ops<TimedMutex>::lock(m_mutex);
+        m_locked = true;
+    }
+    bool try_lock()
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TimedMutex>::trylock(m_mutex));
+    }
+    bool timed_lock(const xtime& xt)
+    {
+        if (m_locked) throw lock_error();
+        return (m_locked = lock_ops<TimedMutex>::timedlock(m_mutex, xt));
+    }
+    void unlock()
+    {
+        if (!m_locked) throw lock_error();
+        lock_ops<TimedMutex>::unlock(m_mutex);
+        m_locked = false;
+    }
+
+    bool locked() const { return m_locked; }
+    operator const void*() const { return m_locked ? this : 0; }
+
+private:
+
+    TimedMutex& m_mutex;
+    bool m_locked;
+};
+
+} // namespace thread
+} // namespace detail
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06041005_HPP

include/boost/thread/win32/mutex.hpp

@@ -1,14 +1,22 @@
-#ifndef BOOST_THREAD_WIN32_MUTEX_HPP
-#define BOOST_THREAD_WIN32_MUTEX_HPP
-// (C) Copyright 2005-7 Anthony Williams
+//  (C) Copyright 2005-6 Anthony Williams
+// Copyright 2006 Roland Schwarz.
 // 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#include "basic_timed_mutex.hpp"
+#ifndef BOOST_THREAD_RS06041004_HPP
+#define BOOST_THREAD_RS06041004_HPP
+
+#include <boost/thread/win32/config.hpp>
+
+#include <boost/thread/win32/basic_timed_mutex.hpp>
 #include <boost/utility.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <boost/thread/locks.hpp>
+#include <boost/thread/win32/lock.hpp>
+#include <boost/thread/win32/xtime.hpp>
+#include <boost/thread/win32/exceptions.hpp>
 
 namespace boost
 {
@@ -18,7 +26,7 @@ namespace boost
     }
 
     class mutex:
-		boost::noncopyable,
+        noncopyable,
         public ::boost::detail::underlying_mutex
     {
     public:
@@ -31,15 +39,147 @@ namespace boost
             destroy();
         }
 
-        typedef unique_lock<mutex> scoped_lock;
-        typedef scoped_lock scoped_try_lock;
+        class scoped_lock
+        {
+        protected:
+            mutex& m;
+            bool is_locked;
+        public:
+            scoped_lock(mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_lock(mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
     };
 
-    typedef mutex try_mutex;
+    class try_mutex:
+        noncopyable,
+        protected ::boost::detail::underlying_mutex
+    {
+    public:
+        try_mutex()
+        {
+            initialize();
+        }
+        ~try_mutex()
+        {
+            destroy();
+        }
+
+        class scoped_try_lock
+        {
+        protected:
+            try_mutex& m;
+            bool is_locked;
+        public:
+            scoped_try_lock(try_mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_try_lock(try_mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_try_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            bool try_lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                is_locked=m.try_lock();
+                return is_locked;
+            }
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
+
+        typedef scoped_try_lock scoped_lock;
+    };
 
     class timed_mutex:
-        boost::noncopyable,
-        public ::boost::detail::basic_timed_mutex
+        noncopyable,
+        protected ::boost::detail::basic_timed_mutex
     {
     public:
         timed_mutex()
@@ -52,10 +192,81 @@ namespace boost
             destroy();
         }
 
-        typedef unique_lock<timed_mutex> scoped_timed_lock;
+        class scoped_timed_lock
+        {
+        protected:
+            timed_mutex& m;
+            bool is_locked;
+        public:
+            scoped_timed_lock(timed_mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_timed_lock(timed_mutex& m_,::boost::xtime const& target):
+                m(m_),is_locked(false)
+            {
+                timed_lock(target);
+            }
+            scoped_timed_lock(timed_mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_timed_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            bool try_lock()
+            {
+                is_locked=m.try_lock();
+                return is_locked;
+            }
+            bool timed_lock(::boost::xtime const& target)
+            {
+                is_locked=m.timed_lock(target);
+                return is_locked;
+            }
+            
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
+
         typedef scoped_timed_lock scoped_try_lock;
         typedef scoped_timed_lock scoped_lock;
     };
 }
 
-#endif
+#endif // BOOST_THREAD_RS06041004_HPP

include/boost/thread/win32/once.hpp

@@ -21,6 +21,7 @@
 #ifdef BOOST_NO_STDC_NAMESPACE
 namespace std
 {
+    using ::strlen;
     using ::memcpy;
     using ::ptrdiff_t;
 }
@@ -50,58 +51,38 @@ namespace boost
             }
         };
 
-#ifdef BOOST_NO_ANSI_APIS
-        template <class I>
-        void int_to_string(I p, wchar_t* buf)
-        {
-            for(unsigned i=0; i < sizeof(I)*2; ++i,++buf)
-            {
-                *buf = L'A' + static_cast<wchar_t>((p >> (i*4)) & 0x0f);
-            }
-            *buf = 0;
-        }
-#else
         template <class I>
         void int_to_string(I p, char* buf)
         {
-            for(unsigned i=0; i < sizeof(I)*2; ++i,++buf)
+            unsigned i=0;
+            for(; i < sizeof(I)*2; ++i)
             {
-                *buf = 'A' + static_cast<char>((p >> (i*4)) & 0x0f);
+                buf[i] = 'A' + static_cast<char>((p >> (i*4)) & 0x0f);
             }
-            *buf = 0;
+            buf[i] = 0;
         }
-#endif
 
+        unsigned const once_mutex_name_fixed_length=48;
+        unsigned const once_mutex_name_fixed_buffer_size=once_mutex_name_fixed_length+1;
+        unsigned const once_mutex_name_length=once_mutex_name_fixed_buffer_size+sizeof(void*)*2+sizeof(unsigned long)*2;
+        
         // create a named mutex. It doesn't really matter what this name is
         // as long as it is unique both to this process, and to the address of "flag":
-        inline void* create_once_mutex(void* flag_address)
+        inline void* create_once_mutex(char (&mutex_name)[once_mutex_name_length],void* flag_address)
         {
-        
-#ifdef BOOST_NO_ANSI_APIS
-            typedef wchar_t char_type;
-            static const char_type fixed_mutex_name[]=L"{C15730E2-145C-4c5e-B005-3BC753F42475}-once-flag";
-#else
-            typedef char char_type;
-            static const char_type fixed_mutex_name[]="{C15730E2-145C-4c5e-B005-3BC753F42475}-once-flag";
-#endif
-            unsigned const once_mutex_name_fixed_buffer_size=sizeof(fixed_mutex_name)/sizeof(char_type);
-            unsigned const once_mutex_name_fixed_length=once_mutex_name_fixed_buffer_size-1;
-            unsigned const once_mutex_name_length=once_mutex_name_fixed_buffer_size+sizeof(void*)*2+sizeof(unsigned long)*2;
-            char_type mutex_name[once_mutex_name_length];
-            
+            static const char fixed_mutex_name[]="{C15730E2-145C-4c5e-B005-3BC753F42475}-once-flag";
+            BOOST_STATIC_ASSERT(sizeof(fixed_mutex_name) == once_mutex_name_fixed_buffer_size);
+
             std::memcpy(mutex_name,fixed_mutex_name,sizeof(fixed_mutex_name));
+            BOOST_ASSERT(sizeof(mutex_name) == std::strlen(mutex_name) + sizeof(void*)*2 + sizeof(unsigned long)*2 + 1);
 
             BOOST_STATIC_ASSERT(sizeof(void*) == sizeof(std::ptrdiff_t));
             detail::int_to_string(reinterpret_cast<std::ptrdiff_t>(flag_address), mutex_name + once_mutex_name_fixed_length);
             detail::int_to_string(win32::GetCurrentProcessId(), mutex_name + once_mutex_name_fixed_length + sizeof(void*)*2);
+            BOOST_ASSERT(sizeof(mutex_name) == std::strlen(mutex_name) + 1);
 
-#ifdef BOOST_NO_ANSI_APIS
-            return win32::CreateMutexW(NULL, 0, mutex_name);
-#else
             return win32::CreateMutexA(NULL, 0, mutex_name);
-#endif
         }
-
         
     }
     
@@ -109,13 +90,14 @@ namespace boost
     template<typename Function>
     void call_once(once_flag& flag,Function f)
     {
-        // Try for a quick win: if the procedure has already been called
+        // Try for a quick win: if the proceedure has already been called
         // just skip through:
         long const function_complete_flag_value=0xc15730e2;
 
         if(::boost::detail::interlocked_read_acquire(&flag)!=function_complete_flag_value)
         {
-            void* const mutex_handle(::boost::detail::create_once_mutex(&flag));
+            char mutex_name[::boost::detail::once_mutex_name_length];
+            void* const mutex_handle(::boost::detail::create_once_mutex(mutex_name,&flag));
             BOOST_ASSERT(mutex_handle);
             detail::win32::handle_manager const closer(mutex_handle);
             detail::win32_mutex_scoped_lock const lock(mutex_handle);

include/boost/thread/win32/read_write_mutex.hpp

@@ -1,7 +1,7 @@
-#ifndef BOOST_THREAD_WIN32_SHARED_MUTEX_HPP
-#define BOOST_THREAD_WIN32_SHARED_MUTEX_HPP
+#ifndef BOOST_THREAD_WIN32_READ_WRITE_MUTEX_HPP
+#define BOOST_THREAD_WIN32_READ_WRITE_MUTEX_HPP
 
-//  (C) Copyright 2006-7 Anthony Williams
+//  (C) Copyright 2006 Anthony Williams
 //
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
@@ -10,24 +10,22 @@
 #include <boost/assert.hpp>
 #include <boost/detail/interlocked.hpp>
 #include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
 #include <boost/static_assert.hpp>
 #include <limits.h>
-#include <boost/utility.hpp>
-#include <boost/thread/thread_time.hpp>
 
 namespace boost
 {
-    class shared_mutex:
-        private boost::noncopyable
+    class read_write_mutex
     {
     private:
         struct state_data
         {
-            unsigned shared_count:11;
-            unsigned shared_waiting:11;
+            unsigned shared_count:10;
+            unsigned shared_waiting:10;
             unsigned exclusive:1;
-            unsigned upgrade:1;
-            unsigned exclusive_waiting:7;
+            unsigned upgradeable:1;
+            unsigned exclusive_waiting:9;
             unsigned exclusive_waiting_blocked:1;
 
             friend bool operator==(state_data const& lhs,state_data const& rhs)
@@ -51,7 +49,7 @@ namespace boost
         void* semaphores[2];
         void* &unlock_sem;
         void* &exclusive_sem;
-        void* upgrade_sem;
+        void* upgradeable_sem;
 
         void release_waiters(state_data old_state)
         {
@@ -70,25 +68,25 @@ namespace boost
         
 
     public:
-        shared_mutex():
+        read_write_mutex():
             unlock_sem(semaphores[0]),
             exclusive_sem(semaphores[1]) 
         {
             unlock_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
             exclusive_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
-            upgrade_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+            upgradeable_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
             state_data state_={0};
             state=state_;
         }
 
-        ~shared_mutex()
+        ~read_write_mutex()
         {
-            detail::win32::CloseHandle(upgrade_sem);
+            detail::win32::CloseHandle(upgradeable_sem);
             detail::win32::CloseHandle(unlock_sem);
             detail::win32::CloseHandle(exclusive_sem);
         }
 
-        bool try_lock_shared()
+        bool try_lock_shareable()
         {
             state_data old_state=state;
             do
@@ -110,13 +108,7 @@ namespace boost
             return !(old_state.exclusive| old_state.exclusive_waiting_blocked);
         }
 
-        void lock_shared()
-        {
-            bool const success=timed_lock_shared(::boost::detail::get_system_time_sentinel());
-            BOOST_ASSERT(success);
-        }
-
-        bool timed_lock_shared(boost::system_time const& wait_until)
+        void lock_shareable()
         {
             while(true)
             {
@@ -144,48 +136,15 @@ namespace boost
 
                 if(!(old_state.exclusive| old_state.exclusive_waiting_blocked))
                 {
-                    return true;
+                    return;
                 }
                     
-                unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
-                if(res==detail::win32::timeout)
-                {
-                    do
-                    {
-                        state_data new_state=old_state;
-                        if(new_state.exclusive || new_state.exclusive_waiting_blocked)
-                        {
-                            if(new_state.shared_waiting)
-                            {
-                                --new_state.shared_waiting;
-                            }
-                        }
-                        else
-                        {
-                            ++new_state.shared_count;
-                        }
-
-                        state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
-                        if(current_state==old_state)
-                        {
-                            break;
-                        }
-                        old_state=current_state;
-                    }
-                    while(true);
-
-                    if(!(old_state.exclusive| old_state.exclusive_waiting_blocked))
-                    {
-                        return true;
-                    }
-                    return false;
-                }
-                
+                unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite);
                 BOOST_ASSERT(res==0);
             }
         }
 
-        void unlock_shared()
+        void unlock_shareable()
         {
             state_data old_state=state;
             do
@@ -195,9 +154,9 @@ namespace boost
                 
                 if(last_reader)
                 {
-                    if(new_state.upgrade)
+                    if(new_state.upgradeable)
                     {
-                        new_state.upgrade=false;
+                        new_state.upgradeable=false;
                         new_state.exclusive=true;
                     }
                     else
@@ -216,9 +175,9 @@ namespace boost
                 {
                     if(last_reader)
                     {
-                        if(old_state.upgrade)
+                        if(old_state.upgradeable)
                         {
-                            bool const success=detail::win32::ReleaseSemaphore(upgrade_sem,1,NULL)!=0;
+                            bool const success=detail::win32::ReleaseSemaphore(upgradeable_sem,1,NULL)!=0;
                             BOOST_ASSERT(success);
                         }
                         else
@@ -234,12 +193,6 @@ namespace boost
         }
 
         void lock()
-        {
-            bool const success=timed_lock(::boost::detail::get_system_time_sentinel());
-            BOOST_ASSERT(success);
-        }
-
-        bool timed_lock(boost::system_time const& wait_until)
         {
             while(true)
             {
@@ -269,41 +222,10 @@ namespace boost
 
                 if(!old_state.shared_count && !old_state.exclusive)
                 {
-                    return true;
+                    break;
                 }
-                unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
-                if(wait_res==detail::win32::timeout)
-                {
-                    do
-                    {
-                        state_data new_state=old_state;
-                        if(new_state.shared_count || new_state.exclusive)
-                        {
-                            if(new_state.exclusive_waiting)
-                            {
-                                --new_state.exclusive_waiting;
-                            }
-                        }
-                        else
-                        {
-                            new_state.exclusive=true;
-                        }
-
-                        state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
-                        if(current_state==old_state)
-                        {
-                            break;
-                        }
-                        old_state=current_state;
-                    }
-                    while(true);
-                    if(!old_state.shared_count && !old_state.exclusive)
-                    {
-                        return true;
-                    }
-                    return false;
-                }
-                BOOST_ASSERT(wait_res<2);
+                bool const success2=detail::win32::WaitForMultipleObjects(2,semaphores,true,detail::win32::infinite)<2;
+                BOOST_ASSERT(success2);
             }
         }
 
@@ -332,7 +254,7 @@ namespace boost
             release_waiters(old_state);
         }
 
-        void lock_upgrade()
+        void lock_upgradeable()
         {
             while(true)
             {
@@ -340,14 +262,14 @@ namespace boost
                 do
                 {
                     state_data new_state=old_state;
-                    if(new_state.exclusive || new_state.exclusive_waiting_blocked || new_state.upgrade)
+                    if(new_state.exclusive || new_state.exclusive_waiting_blocked || new_state.upgradeable)
                     {
                         ++new_state.shared_waiting;
                     }
                     else
                     {
                         ++new_state.shared_count;
-                        new_state.upgrade=true;
+                        new_state.upgradeable=true;
                     }
 
                     state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
@@ -359,7 +281,7 @@ namespace boost
                 }
                 while(true);
 
-                if(!(old_state.exclusive|| old_state.exclusive_waiting_blocked|| old_state.upgrade))
+                if(!(old_state.exclusive|| old_state.exclusive_waiting_blocked|| old_state.upgradeable))
                 {
                     return;
                 }
@@ -369,13 +291,13 @@ namespace boost
             }
         }
 
-        void unlock_upgrade()
+        void unlock_upgradeable()
         {
             state_data old_state=state;
             do
             {
                 state_data new_state=old_state;
-                new_state.upgrade=false;
+                new_state.upgradeable=false;
                 bool const last_reader=!--new_state.shared_count;
                 
                 if(last_reader)
@@ -402,7 +324,7 @@ namespace boost
             while(true);
         }
 
-        void unlock_upgrade_and_lock()
+        void unlock_upgradeable_and_lock()
         {
             state_data old_state=state;
             do
@@ -412,7 +334,7 @@ namespace boost
                 
                 if(last_reader)
                 {
-                    new_state.upgrade=false;
+                    new_state.upgradeable=false;
                     new_state.exclusive=true;
                 }
                 
@@ -421,7 +343,7 @@ namespace boost
                 {
                     if(!last_reader)
                     {
-                        unsigned long const res=detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite);
+                        unsigned long const res=detail::win32::WaitForSingleObject(upgradeable_sem,detail::win32::infinite);
                         BOOST_ASSERT(res==0);
                     }
                     break;
@@ -431,14 +353,14 @@ namespace boost
             while(true);
         }
 
-        void unlock_and_lock_upgrade()
+        void unlock_and_lock_upgradeable()
         {
             state_data old_state=state;
             do
             {
                 state_data new_state=old_state;
                 new_state.exclusive=false;
-                new_state.upgrade=true;
+                new_state.upgradeable=true;
                 ++new_state.shared_count;
                 if(new_state.exclusive_waiting)
                 {
@@ -458,7 +380,7 @@ namespace boost
             release_waiters(old_state);
         }
         
-        void unlock_and_lock_shared()
+        void unlock_and_lock_shareable()
         {
             state_data old_state=state;
             do
@@ -484,13 +406,13 @@ namespace boost
             release_waiters(old_state);
         }
         
-        void unlock_upgrade_and_lock_shared()
+        void unlock_upgradeable_and_lock_shareable()
         {
             state_data old_state=state;
             do
             {
                 state_data new_state=old_state;
-                new_state.upgrade=false;
+                new_state.upgradeable=false;
                 if(new_state.exclusive_waiting)
                 {
                     --new_state.exclusive_waiting;
@@ -509,6 +431,96 @@ namespace boost
             release_waiters(old_state);
         }
         
+        class scoped_read_lock
+        {
+            read_write_mutex& m;
+        public:
+            scoped_read_lock(read_write_mutex& m_):
+                m(m_)
+            {
+                m.lock_shareable();
+            }
+            ~scoped_read_lock()
+            {
+                m.unlock_shareable();
+            }
+        };
+
+        class scoped_write_lock
+        {
+            read_write_mutex& m;
+            bool locked;
+            
+        public:
+            scoped_write_lock(read_write_mutex& m_):
+                m(m_),locked(false)
+            {
+                lock();
+            }
+            void lock()
+            {
+                m.lock();
+                locked=true;
+            }
+            
+            void unlock()
+            {
+                m.unlock();
+                locked=false;
+            }
+            ~scoped_write_lock()
+            {
+                if(locked)
+                {
+                    unlock();
+                }
+            }
+        };
+
+        class scoped_upgradeable_lock
+        {
+            read_write_mutex& m;
+            bool locked;
+            bool upgraded;
+            
+        public:
+            scoped_upgradeable_lock(read_write_mutex& m_):
+                m(m_),
+                locked(false),upgraded(false)
+            {
+                lock();
+            }
+            void lock()
+            {
+                m.lock_upgradeable();
+                locked=true;
+            }
+            void upgrade()
+            {
+                m.unlock_upgradeable_and_lock();
+                upgraded=true;
+            }
+            void unlock()
+            {
+                if(upgraded)
+                {
+                    m.unlock();
+                }
+                else
+                {
+                    m.unlock_upgradeable();
+                }
+            }
+            ~scoped_upgradeable_lock()
+            {
+                if(locked)
+                {
+                    unlock();
+                }
+            }
+        };
+        
+        
     };
 }
 

include/boost/thread/win32/recursive_mutex.hpp

@@ -3,23 +3,23 @@
 
 //  recursive_mutex.hpp
 //
-//  (C) Copyright 2006-7 Anthony Williams 
+//  (C) Copyright 2006 Anthony Williams 
 //
 //  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)
 
 
+#include <boost/thread/win32/basic_recursive_mutex.hpp>
 #include <boost/utility.hpp>
-#include "basic_recursive_mutex.hpp"
+#include <boost/thread/xtime.hpp>
 #include <boost/thread/exceptions.hpp>
-#include <boost/thread/locks.hpp>
 
 namespace boost
 {
     class recursive_mutex:
-        boost::noncopyable,
-        public ::boost::detail::basic_recursive_mutex
+        noncopyable,
+        protected ::boost::detail::basic_recursive_mutex
     {
     public:
         recursive_mutex()
@@ -31,15 +31,146 @@ namespace boost
             ::boost::detail::basic_recursive_mutex::destroy();
         }
 
-        typedef unique_lock<recursive_mutex> scoped_lock;
-        typedef scoped_lock scoped_try_lock;
+        class scoped_lock
+        {
+        protected:
+            recursive_mutex& m;
+            bool is_locked;
+        public:
+            scoped_lock(recursive_mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_lock(recursive_mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
     };
 
-    typedef recursive_mutex recursive_try_mutex;
+    class recursive_try_mutex:
+        noncopyable,
+        protected ::boost::detail::basic_recursive_mutex
+    {
+    public:
+        recursive_try_mutex()
+        {
+            ::boost::detail::basic_recursive_mutex::initialize();
+        }
+        ~recursive_try_mutex()
+        {
+            ::boost::detail::basic_recursive_mutex::destroy();
+        }
+        class scoped_try_lock
+        {
+        protected:
+            recursive_try_mutex& m;
+            bool is_locked;
+        public:
+            scoped_try_lock(recursive_try_mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_try_lock(recursive_try_mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_try_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            bool try_lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                is_locked=m.try_lock();
+                return is_locked;
+            }
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
+
+        typedef scoped_try_lock scoped_lock;
+    };
 
     class recursive_timed_mutex:
-        boost::noncopyable,
-        public ::boost::detail::basic_recursive_timed_mutex
+        noncopyable,
+        protected ::boost::detail::basic_recursive_timed_mutex
     {
     public:
         recursive_timed_mutex()
@@ -51,7 +182,78 @@ namespace boost
             ::boost::detail::basic_recursive_timed_mutex::destroy();
         }
 
-        typedef unique_lock<recursive_timed_mutex> scoped_timed_lock;
+        class scoped_timed_lock
+        {
+        protected:
+            recursive_timed_mutex& m;
+            bool is_locked;
+        public:
+            scoped_timed_lock(recursive_timed_mutex& m_):
+                m(m_),is_locked(false)
+            {
+                lock();
+            }
+            scoped_timed_lock(recursive_timed_mutex& m_,::boost::xtime const& target):
+                m(m_),is_locked(false)
+            {
+                timed_lock(target);
+            }
+            scoped_timed_lock(recursive_timed_mutex& m_,bool do_lock):
+                m(m_),is_locked(false)
+            {
+                if(do_lock)
+                {
+                    lock();
+                }
+            }
+            ~scoped_timed_lock()
+            {
+                if(locked())
+                {
+                    m.unlock();
+                }
+            }
+            
+            void lock()
+            {
+                if(locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.lock();
+                is_locked=true;
+            }
+            bool try_lock()
+            {
+                is_locked=m.try_lock();
+                return is_locked;
+            }
+            bool timed_lock(::boost::xtime const& target)
+            {
+                is_locked=m.timed_lock(target);
+                return is_locked;
+            }
+            
+            void unlock()
+            {
+                if(!locked())
+                {
+                    throw boost::lock_error();
+                }
+                m.unlock();
+                is_locked=false;
+            }
+            
+            operator void* () const
+            {
+                return is_locked?const_cast<void*>(static_cast<void const*>(this)):0;
+            }
+            bool locked() const
+            {
+                return is_locked;
+            }
+        };
+
         typedef scoped_timed_lock scoped_try_lock;
         typedef scoped_timed_lock scoped_lock;
     };

include/boost/thread/win32/thread.hpp

@@ -0,0 +1,77 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06041007_HPP
+#define BOOST_THREAD_RS06041007_HPP
+
+#include <boost/thread/win32/config.hpp>
+
+
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+
+#include <boost/thread/win32/mutex.hpp>
+#include <list>
+#include <memory>
+
+namespace boost {
+
+struct xtime;
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+class BOOST_THREAD_DECL thread : private noncopyable
+{
+public:
+    thread();
+    explicit thread(const function0<void>& threadfunc);
+    ~thread();
+
+    bool operator==(const thread& other) const;
+    bool operator!=(const thread& other) const;
+
+    void join();
+
+    static void sleep(const xtime& xt);
+    static void yield();
+
+private:
+    void* m_thread;
+    unsigned int m_id;
+    bool m_joinable;
+};
+
+class BOOST_THREAD_DECL thread_group : private noncopyable
+{
+public:
+    thread_group();
+    ~thread_group();
+
+    thread* create_thread(const function0<void>& threadfunc);
+    void add_thread(thread* thrd);
+    void remove_thread(thread* thrd);
+    void join_all();
+        int size();
+
+private:
+    std::list<thread*> m_threads;
+    mutex m_mutex;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif // BOOST_THREAD_RS06041007_HPP

include/boost/thread/win32/thread_primitives.hpp

@@ -112,22 +112,14 @@ namespace boost
             
             inline handle create_anonymous_event(event_type type,initial_event_state state)
             {
-                handle const res=win32::CreateEventA(0,type,state,0);
-                if(!res)
-                {
-                    throw thread_resource_error();
-                }
-                return res;
+                handle const res=CreateEventA(0,type,state,0);
+                return res?res:throw thread_resource_error();
             }
 
             inline handle create_anonymous_semaphore(long initial_count,long max_count)
             {
                 handle const res=CreateSemaphoreA(NULL,initial_count,max_count,NULL);
-                if(!res)
-                {
-                    throw thread_resource_error();
-                }
-                return res;
+                return res?res:throw thread_resource_error();
             }
 
             inline handle duplicate_handle(handle source)
@@ -136,11 +128,7 @@ namespace boost
                 long const same_access_flag=2;
                 handle new_handle=0;
                 bool const success=DuplicateHandle(current_process,source,current_process,&new_handle,0,false,same_access_flag)!=0;
-                if(!success)
-                {
-                    throw thread_resource_error();
-                }
-                return new_handle;
+                return success?new_handle:throw thread_resource_error();
             }
 
             inline void release_semaphore(handle semaphore,long count)
@@ -177,7 +165,6 @@ namespace boost
                 {
                     cleanup();
                     handle_to_manage=new_handle;
-                    return *this;
                 }
 
                 operator handle() const

include/boost/thread/win32/tss.hpp

@@ -0,0 +1,106 @@
+// Copyright (C) 2001-2003 William E. Kempf
+// Copyright (C) 2006 Roland Schwarz
+//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_TSS_RS06092305_HPP
+#define BOOST_TSS_RS06092305_HPP
+
+#include <boost/thread/win32/config.hpp>
+
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <boost/thread/win32/exceptions.hpp>
+
+namespace boost {
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+#	pragma warning(push)
+#	pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+namespace detail {
+
+class BOOST_THREAD_DECL tss : private noncopyable
+{
+public:
+    tss(boost::function1<void, void*>* pcleanup) {
+        if (pcleanup == 0) throw boost::thread_resource_error();
+        try
+        {
+            init(pcleanup);
+        }
+        catch (...)
+        {
+            delete pcleanup;
+            throw boost::thread_resource_error();
+        }
+    }
+
+    void* get() const;
+    void set(void* value);
+    void cleanup(void* p);
+
+private:
+    unsigned int m_slot; //This is a "pseudo-slot", not a native slot
+
+    void init(boost::function1<void, void*>* pcleanup);
+};
+
+template <typename T>
+struct tss_adapter
+{
+    template <typename F>
+    tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
+    void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
+    boost::function1<void, T*> m_cleanup;
+};
+
+} // namespace detail
+
+template <typename T>
+class thread_specific_ptr : private noncopyable
+{
+public:
+    thread_specific_ptr()
+        : m_tss(new boost::function1<void, void*>(
+                    boost::detail::tss_adapter<T>(
+                        &thread_specific_ptr<T>::cleanup)))
+    {
+    }
+    thread_specific_ptr(void (*clean)(T*))
+        : m_tss(new boost::function1<void, void*>(
+                    boost::detail::tss_adapter<T>(clean)))
+    {
+    }
+    ~thread_specific_ptr() { reset(); }
+
+    T* get() const { return static_cast<T*>(m_tss.get()); }
+    T* operator->() const { return get(); }
+    T& operator*() const { return *get(); }
+    T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
+    void reset(T* p=0)
+    {
+        T* cur = get();
+        if (cur == p) return;
+        m_tss.set(p);
+        if (cur) m_tss.cleanup(cur);
+    }
+
+private:
+    static void cleanup(T* p) { delete p; }
+    detail::tss m_tss;
+};
+
+#ifdef BOOST_MSVC
+#	pragma warning(pop)
+#endif
+
+} // namespace boost
+
+#endif //BOOST_TSS_RS06092305_HPP

include/boost/thread/win32/tss_hooks.hpp

@@ -1,14 +1,16 @@
-// (C) Copyright Michael Glassford 2004.
-// Use, modification and distribution are subject to 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)
+// Copyright (C) 2001-2003 William E. Kempf
+// Copyright (C) Michael Glassford 2004.
+// Copyright (C) 2006 Roland Schwarz
+//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#if !defined(BOOST_TLS_HOOKS_HPP)
-#define BOOST_TLS_HOOKS_HPP
+#ifndef BOOST_TLS_HOOKS_RS06092306_HPP
+#define BOOST_TLS_HOOKS_RS06092306_HPP
 
-#include <boost/thread/detail/config.hpp>
-
-#if defined(BOOST_HAS_WINTHREADS)
+#include <boost/thread/win32/config.hpp>
 
     typedef void (__cdecl *thread_exit_handler)(void);
 
@@ -26,10 +28,6 @@
             //zero if successful and a nonzero
             //value if an error occurs.
 
-#endif //defined(BOOST_HAS_WINTHREADS)
-
-#if defined(BOOST_HAS_WINTHREADS)
-
     extern "C" BOOST_THREAD_DECL void on_process_enter(void);
         //Function to be called when the exe or dll
             //that uses Boost.Threads first starts
@@ -73,6 +71,4 @@
             //cleanup has been implemented and to force
             //it to be linked into the Boost.Threads library.
 
-#endif //defined(BOOST_HAS_WINTHREADS)
-
-#endif //!defined(BOOST_TLS_HOOKS_HPP)
+#endif //BOOST_TLS_HOOKS_RS06092306_HPP

include/boost/thread/win32/xtime.hpp

@@ -0,0 +1,56 @@
+// Copyright 2006 Roland Schwarz.
+// 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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06041006_HPP
+#define BOOST_THREAD_RS06041006_HPP
+
+#include <boost/thread/win32/config.hpp>
+
+#include <boost/cstdint.hpp>
+
+namespace boost {
+
+enum xtime_clock_types
+{
+    TIME_UTC=1
+//    TIME_TAI,
+//    TIME_MONOTONIC,
+//    TIME_PROCESS,
+//    TIME_THREAD,
+//    TIME_LOCAL,
+//    TIME_SYNC,
+//    TIME_RESOLUTION
+};
+
+struct xtime
+{
+#if defined(BOOST_NO_INT64_T)
+    typedef int_fast32_t xtime_sec_t; //INT_FAST32_MIN <= sec <= INT_FAST32_MAX
+#else
+    typedef int_fast64_t xtime_sec_t; //INT_FAST64_MIN <= sec <= INT_FAST64_MAX
+#endif
+
+    typedef int_fast32_t xtime_nsec_t; //0 <= xtime.nsec < NANOSECONDS_PER_SECOND
+
+    xtime_sec_t sec;
+    xtime_nsec_t nsec;
+};
+
+int BOOST_THREAD_DECL xtime_get(struct xtime* xtp, int clock_type);
+
+inline int xtime_cmp(const xtime& xt1, const xtime& xt2)
+{
+    if (xt1.sec == xt2.sec)
+        return (int)(xt1.nsec - xt2.nsec);
+    else 
+        return (xt1.sec > xt2.sec) ? 1 : -1;
+}
+
+} // namespace boost
+
+#endif //BOOST_THREAD_RS06041006_HPP

include/boost/thread/win32/xtime_utils.hpp

@@ -0,0 +1,85 @@
+#ifndef BOOST_THREAD_DETAIL_XTIME_UTILS_HPP
+#define BOOST_THREAD_DETAIL_XTIME_UTILS_HPP
+
+//  xtime_utils.hpp
+//
+//  (C) Copyright 2005 Anthony Williams 
+//
+//  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)
+
+#include <boost/thread/win32/xtime.hpp>
+#include <limits>
+
+namespace boost
+{
+    namespace detail
+    {
+        inline ::boost::xtime get_xtime_sentinel()
+        {
+            boost::xtime const sentinel={
+                (std::numeric_limits<boost::xtime::xtime_sec_t>::max)(),
+                (std::numeric_limits<boost::xtime::xtime_nsec_t>::max)()
+            };
+            return sentinel;
+            
+        }
+        
+        // get the number of milliseconds from now to target
+        // if target is in the past, return 0
+        // if target cannot be represented as unsigned long, return
+        // the maximum instead
+        // 2006-08-04 <roland>
+        inline unsigned long get_milliseconds_until_time(::boost::xtime target)
+        {
+            if(!boost::xtime_cmp(target,get_xtime_sentinel()))
+            {
+                return (std::numeric_limits<unsigned long>::max)();
+            }
+            
+            boost::xtime now;
+            boost::xtime_get(&now, boost::TIME_UTC);
+
+            if (target.sec < now.sec)
+            {
+                return 0;
+            }
+            else
+            {
+                boost::xtime::xtime_nsec_t const nanoseconds_per_second=1000000000;
+                boost::xtime::xtime_nsec_t const milliseconds_per_second=1000;
+                boost::xtime::xtime_nsec_t const nanoseconds_per_millisecond=nanoseconds_per_second/milliseconds_per_second;
+                if (target.nsec < now.nsec) 
+                {
+                    if (target.sec == now.sec)
+                    {
+                        return 0;
+                    }
+                    target.nsec += nanoseconds_per_second - now.nsec;
+                    target.sec -= now.sec + 1;
+                }
+                else
+                {
+                    target.nsec -= now.nsec;
+                    target.sec -= now.sec;
+                }
+                // we are throwing away some bits, but one second after having 
+                // waited for 49 years does not really matter ...
+                if (target.sec < (std::numeric_limits<unsigned long>::max)()/milliseconds_per_second)
+                {
+                    return static_cast<unsigned long>(
+                        target.sec*milliseconds_per_second + 
+                        (target.nsec+nanoseconds_per_millisecond/2)/nanoseconds_per_millisecond);
+                }
+                else
+                {
+                    return (std::numeric_limits<unsigned long>::max)();
+                }
+            }
+        }
+    }
+}
+
+
+#endif

include/boost/thread/xtime.hpp

@@ -1,79 +1,16 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-// Copyright (C) 2007 Anthony Williams
+// Copyright 2006 Roland Schwarz.
+// 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)
 //
-//  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 work is a reimplementation along the design and ideas
+// of William E. Kempf.
 
-#ifndef BOOST_XTIME_WEK070601_HPP
-#define BOOST_XTIME_WEK070601_HPP
+#ifndef BOOST_THREAD_RS06040712_HPP
+#define BOOST_THREAD_RS06040712_HPP
 
-#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(xtime.hpp)
 
-#include <boost/cstdint.hpp>
-#include <boost/thread/thread_time.hpp>
-#include <boost/date_time/posix_time/conversion.hpp>
+#endif // BOOST_THREAD_RS06040712_HPP
 
-namespace boost {
-
-enum xtime_clock_types
-{
-    TIME_UTC=1
-//    TIME_TAI,
-//    TIME_MONOTONIC,
-//    TIME_PROCESS,
-//    TIME_THREAD,
-//    TIME_LOCAL,
-//    TIME_SYNC,
-//    TIME_RESOLUTION
-};
-
-struct xtime
-{
-#if defined(BOOST_NO_INT64_T)
-    typedef int_fast32_t xtime_sec_t; //INT_FAST32_MIN <= sec <= INT_FAST32_MAX
-#else
-    typedef int_fast64_t xtime_sec_t; //INT_FAST64_MIN <= sec <= INT_FAST64_MAX
-#endif
-
-    typedef int_fast32_t xtime_nsec_t; //0 <= xtime.nsec < NANOSECONDS_PER_SECOND
-
-    xtime_sec_t sec;
-    xtime_nsec_t nsec;
-
-    operator system_time() const
-    {
-        return boost::posix_time::from_time_t(0)+
-            boost::posix_time::seconds(static_cast<long>(sec))+
-#ifdef BOOST_DATE_TIME_HAS_NANOSECONDS
-            boost::posix_time::nanoseconds(nsec);
-#else
-        boost::posix_time::microseconds((nsec+500)/1000);
-#endif
-    }
-    
-};
-
-int BOOST_THREAD_DECL xtime_get(struct xtime* xtp, int clock_type);
-
-inline int xtime_cmp(const xtime& xt1, const xtime& xt2)
-{
-    if (xt1.sec == xt2.sec)
-        return (int)(xt1.nsec - xt2.nsec);
-    else 
-        return (xt1.sec > xt2.sec) ? 1 : -1;
-}
-
-inline xtime get_xtime(boost::system_time const& abs_time)
-{
-    xtime res={0};
-    boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
-            
-    res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds());
-    res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second()));
-    return res;
-}
-
-} // namespace boost
-
-#endif //BOOST_XTIME_WEK070601_HPP

index.html

@@ -1,8 +1,3 @@
-<!-- Copyright (c) 2002-2003 William E. Kempf.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <html>
 <head>
 <meta http-equiv="refresh" content="0; URL=doc/index.html">

src/mac/debug_prefix.hpp

@@ -1,8 +0,0 @@
-// (C) Copyright Mac Murrett 2001.
-// Use, modification and distribution are subject to 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)
-
-// See http://www.boost.org for most recent version.
-
-#define TARGET_CARBON    1

src/mac/delivery_man.cpp

@@ -1,66 +0,0 @@
-// (C) Copyright Mac Murrett 2001.
-// Use, modification and distribution are subject to 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)
-
-// See http://www.boost.org for most recent version.
-
-#include "delivery_man.hpp"
-
-#include "os.hpp"
-#include "execution_context.hpp"
-
-
-namespace boost {
-
-namespace threads {
-
-namespace mac {
-
-namespace detail {
-
-
-delivery_man::delivery_man():
-    m_pPackage(NULL),
-    m_pSemaphore(kInvalidID),
-    m_bPackageWaiting(false)
-{
-    assert(at_st());
-
-    OSStatus lStatus = MPCreateSemaphore(1UL, 0UL, &m_pSemaphore);
-// TODO - throw on error here
-    assert(lStatus == noErr);
-}
-
-delivery_man::~delivery_man()
-{
-    assert(m_bPackageWaiting == false);
-
-    OSStatus lStatus = MPDeleteSemaphore(m_pSemaphore);
-    assert(lStatus == noErr);
-}
-
-
-void delivery_man::accept_deliveries()
-{
-    if(m_bPackageWaiting)
-    {
-        assert(m_pPackage != NULL);
-        m_pPackage->accept();
-        m_pPackage = NULL;
-        m_bPackageWaiting = false;
-
-    // signal to the thread making the call that we're done
-        OSStatus lStatus = MPSignalSemaphore(m_pSemaphore);
-        assert(lStatus == noErr);
-    }
-}
-
-
-} // namespace detail
-
-} // namespace mac
-
-} // namespace threads
-
-} // namespace boost