Reverted trunk to before adding new threads code

[SVN r30957]

src/once.cpp

@@ -11,8 +11,6 @@
 
 #include <boost/thread/detail/config.hpp>
 
-#ifndef BOOST_HAS_WINTHREADS
-
 #include <boost/detail/workaround.hpp>
 
 #include <boost/thread/once.hpp>
@@ -20,7 +18,27 @@
 #include <cassert>
 
 
-#if defined(BOOST_HAS_MPTASKS)
+#if defined(BOOST_HAS_WINTHREADS)
+#   if BOOST_WORKAROUND(__BORLANDC__,<= 0x551)
+      using std::size_t;
+#   endif
+#   include <windows.h>
+#   if defined(BOOST_NO_STRINGSTREAM)
+#       include <strstream>
+
+class unfreezer
+{
+public:
+    unfreezer(std::ostrstream& s) : m_stream(s) {}
+    ~unfreezer() { m_stream.freeze(false); }
+private:
+    std::ostrstream& m_stream;
+};
+
+#   else
+#       include <sstream>
+#   endif
+#elif defined(BOOST_HAS_MPTASKS)
 #   include <Multiprocessing.h>
 #endif
 
@@ -68,13 +86,110 @@ void *remote_call_proxy(void *pData)
 }
 }
 
+#elif defined(BOOST_HAS_WINTHREADS)
+namespace {
+// The signature for InterlockedCompareExchange has changed with the
+// addition of Win64 support. I can't determine any (consistent and
+// portable) way of using conditional compilation to detect this, so
+// we use these type wrappers.  Unfortunately, the various vendors
+// use different calling conventions and other signature anamolies,
+// and thus have unique types as well.  This is known to work on VC6,
+// VC7, Borland 5.5.2 and gcc 3.2.  Are there other signatures for
+// other platforms?
+inline LONG ice_wrapper(LONG (__stdcall *ice)(LONG*, LONG, LONG),
+    volatile LONG* dest, LONG exch, LONG cmp)
+{
+    return (*ice)(const_cast<LONG*>(dest), exch, cmp);
+}
+
+inline LONG ice_wrapper(LONG (__stdcall *ice)(volatile LONG*, LONG, LONG),
+    volatile LONG* dest, LONG exch, LONG cmp)
+{
+    return (*ice)(dest, exch, cmp);
+}
+
+inline LONG ice_wrapper(LPVOID (__stdcall *ice)(LPVOID*, LPVOID, LPVOID),
+    volatile LONG* dest, LONG exch, LONG cmp)
+{
+    return (LONG)(*ice)((LPVOID*)dest, (LPVOID)exch, (LPVOID)cmp);
+}
+
+// The friendly form of InterlockedCompareExchange that defers
+// according to the above function type wrappers.
+inline LONG compare_exchange(volatile LPLONG dest, LONG exch, LONG cmp)
+{
+    return ice_wrapper(&InterlockedCompareExchange, dest, exch, cmp);
+}
+}
 #endif
 
 namespace boost {
 
 void call_once(void (*func)(), once_flag& flag)
 {
-#if defined(BOOST_HAS_PTHREADS)
+#if defined(BOOST_HAS_WINTHREADS)
+    if (compare_exchange(&flag, 1, 1) == 0)
+    {
+#if defined(BOOST_NO_STRINGSTREAM)
+        std::ostrstream strm;
+        strm << "2AC1A572DB6944B0A65C38C4140AF2F4" 
+             << std::hex
+             << GetCurrentProcessId() 
+             << &flag 
+             << std::ends;
+        unfreezer unfreeze(strm);
+#   if defined (BOOST_NO_ANSI_APIS)
+        USES_CONVERSION;
+        HANDLE mutex = CreateMutexW(NULL, FALSE, A2CW(strm.str()));
+#   else
+        HANDLE mutex = CreateMutexA(NULL, FALSE, strm.str());
+#   endif
+#else
+#   if defined (BOOST_NO_ANSI_APIS)
+        std::wostringstream strm;
+        strm << L"2AC1A572DB6944B0A65C38C4140AF2F4" 
+             << std::hex
+             << GetCurrentProcessId() 
+             << &flag;
+        HANDLE mutex = CreateMutexW(NULL, FALSE, strm.str().c_str());
+#   else
+        std::ostringstream strm;
+        strm << "2AC1A572DB6944B0A65C38C4140AF2F4" 
+             << std::hex
+             << GetCurrentProcessId() 
+             << &flag;
+        HANDLE mutex = CreateMutexA(NULL, FALSE, strm.str().c_str());
+#   endif
+#endif
+        assert(mutex != NULL);
+
+        int res = 0;
+        res = WaitForSingleObject(mutex, INFINITE);
+        assert(res == WAIT_OBJECT_0);
+
+        if (compare_exchange(&flag, 1, 1) == 0)
+        {
+            try
+            {
+                func();
+            }
+            catch (...)
+            {
+                res = ReleaseMutex(mutex);
+                assert(res);
+                res = CloseHandle(mutex);
+                assert(res);
+                throw;
+            }
+            InterlockedExchange(&flag, 1);
+        }
+
+        res = ReleaseMutex(mutex);
+        assert(res);
+        res = CloseHandle(mutex);
+        assert(res);
+    }
+#elif defined(BOOST_HAS_PTHREADS)
     pthread_once(&once, &key_init);
     pthread_setspecific(key, &func);
     pthread_once(&flag, do_once);
@@ -92,8 +207,5 @@ void call_once(void (*func)(), once_flag& flag)
 
 }
 
-#endif
-
 // Change Log:
 //   1 Aug 01  WEKEMPF Initial version.
-//   6 Sep 05  Anthony Williams. Removed win32 implementation