This commit was manufactured by cvs2svn to create branch 'RC_1_27_0'.

[SVN r12739]

doc/acknowledgements.html

@@ -30,6 +30,9 @@
         <p><a href="../../../people/william_kempf.htm">William E. Kempf</a> was
         the architect, designer, and implementor of <b>Boost.Threads</b>.</p>
 
+		<p>Mac OS Carbon implementation written by
+		<a href="../../../people/mac_murrett.htm">Mac Murrett</a>.</p>
+
         <p>Important contributions were also made by Jeremy Siek (lots of input
         on the design and on the implementation), Alexander Terekhov (lots of
         input on the Win32 implementation, especially in regards to

doc/thread.html

@@ -239,7 +239,8 @@ int main(int argc, char* argv[])
 {
    int secs = 5;
    std::cout << "setting alarm for 5 seconds..." << std::endl;
-   boost::thread thrd(thread_alarm(secs));
+   thread_alarm alarm(secs);
+   boost::thread thrd(alarm);
    thrd.join();
 }
 </pre>

example/monitor/Carbon.r

@@ -0,0 +1 @@
+/*

example/monitor/monitor.cpp

@@ -8,19 +8,19 @@
 namespace {
     const int ITERS = 100;
     boost::mutex io_mutex;
-};
+}
 
 template <typename M>
 class buffer_t
 {
 public:
     typedef typename M::scoped_lock scoped_lock;
-    
+
     buffer_t(int n)
         : p(0), c(0), full(0), buf(n)
     {
     }
-    
+
     void send(int m)
     {
         scoped_lock lk(mutex);
@@ -29,7 +29,7 @@ public:
         buf[p] = m;
         p = (p+1) % buf.size();
         ++full;
-        cond.notify_all();
+        cond.notify_one();
     }
     int receive()
     {
@@ -39,41 +39,40 @@ public:
         int i = buf[c];
         c = (c+1) % buf.size();
         --full;
-        cond.notify_all();
+        cond.notify_one();
         return i;
     }
-    
+
     static buffer_t& get_buffer()
     {
         static buffer_t buf(2);
         return buf;
     }
-    
+
     static void do_sender_thread()
     {
         for (int n = 0; n < ITERS; ++n)
         {
-            get_buffer().send(n);
             {
                 boost::mutex::scoped_lock lock(io_mutex);
-                std::cout << "sent: " << n << std::endl;
+                std::cout << "sending: " << n << std::endl;
             }
+            get_buffer().send(n);
         }
     }
-    
+
     static void do_receiver_thread()
     {
-        int n;
-        do
+        for (int x=0; x < (ITERS/2); ++x)
         {
-            n = get_buffer().receive();
+            int n = get_buffer().receive();
             {
                 boost::mutex::scoped_lock lock(io_mutex);
                 std::cout << "received: " << n << std::endl;
             }
-        } while (n < ITERS - 1);
+        }
     }
-    
+
 private:
     M mutex;
     boost::condition cond;
@@ -86,10 +85,12 @@ void do_test(M* dummy=0)
 {
     typedef buffer_t<M> buffer_type;
     buffer_type::get_buffer();
-    boost::thread thrd1(&buffer_type::do_sender_thread);
+    boost::thread thrd1(&buffer_type::do_receiver_thread);
     boost::thread thrd2(&buffer_type::do_receiver_thread);
+    boost::thread thrd3(&buffer_type::do_sender_thread);
     thrd1.join();
     thrd2.join();
+    thrd3.join();
 }
 
 void test_buffer()

example/starvephil/Carbon.r

@@ -0,0 +1 @@
+/*

example/starvephil/starvephil.cpp

@@ -7,124 +7,124 @@
 
 namespace
 {
-	boost::mutex iomx;
-};
+    boost::mutex iomx;
+}
 
 class canteen
 {
 public:
-	canteen() : m_chickens(0) { }
+    canteen() : m_chickens(0) { }
 
-	void get(int id)
-	{
-		boost::mutex::scoped_lock lock(m_mutex);
-		while (m_chickens == 0)
-		{
-			{
-				boost::mutex::scoped_lock lock(iomx);
-				std::cout << "(" << clock() << ") Phil" << id <<
-					": wot, no chickens?  I'll WAIT ..." << std::endl;
-			}
-			m_condition.wait(lock);
-		}
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() << ") Phil" << id <<
-				": those chickens look good ... one please ..." << std::endl;
-		}
-		m_chickens--;
-	}
-	void put(int value)
-	{
-		boost::mutex::scoped_lock lock(m_mutex);
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() <<
-				") Chef: ouch ... make room ... this dish is very hot ..." << std::endl;
-		}
+    void get(int id)
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+        while (m_chickens == 0)
+        {
+            {
+                boost::mutex::scoped_lock lock(iomx);
+                std::cout << "(" << clock() << ") Phil" << id <<
+                    ": wot, no chickens?  I'll WAIT ..." << std::endl;
+            }
+            m_condition.wait(lock);
+        }
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() << ") Phil" << id <<
+                ": those chickens look good ... one please ..." << std::endl;
+        }
+        m_chickens--;
+    }
+    void put(int value)
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() <<
+                ") Chef: ouch ... make room ... this dish is very hot ..." << std::endl;
+        }
         boost::xtime xt;
         boost::xtime_get(&xt, boost::TIME_UTC);
         xt.sec += 3;
         boost::thread::sleep(xt);
-		m_chickens += value;
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() <<
-				") Chef: more chickens ... " << m_chickens <<
-				" now available ... NOTIFYING ..." << std::endl;
-		}
-		m_condition.notify_all();
-	}
+        m_chickens += value;
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() <<
+                ") Chef: more chickens ... " << m_chickens <<
+                " now available ... NOTIFYING ..." << std::endl;
+        }
+        m_condition.notify_all();
+    }
 
 private:
-	boost::mutex m_mutex;
-	boost::condition m_condition;
-	int m_chickens;
+    boost::mutex m_mutex;
+    boost::condition m_condition;
+    int m_chickens;
 };
 
 canteen g_canteen;
 
 void chef()
 {
-	const int chickens = 4;
-	{
-		boost::mutex::scoped_lock lock(iomx);
-		std::cout << "(" << clock() << ") Chef: starting ..." << std::endl;
-	}
-	for (;;)
-	{
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
-		}
+    const int chickens = 4;
+    {
+        boost::mutex::scoped_lock lock(iomx);
+        std::cout << "(" << clock() << ") Chef: starting ..." << std::endl;
+    }
+    for (;;)
+    {
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
+        }
         boost::xtime xt;
         boost::xtime_get(&xt, boost::TIME_UTC);
         xt.sec += 2;
         boost::thread::sleep(xt);
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() << ") Chef: " << chickens
-				<< " chickens, ready-to-go ..." << std::endl;
-		}
-		g_canteen.put(chickens);
-	}
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() << ") Chef: " << chickens
+                << " chickens, ready-to-go ..." << std::endl;
+        }
+        g_canteen.put(chickens);
+    }
 }
 
 struct phil
 {
-	phil(int id) : m_id(id) { }
+    phil(int id) : m_id(id) { }
     void run() {
-		{
-			boost::mutex::scoped_lock lock(iomx);
-			std::cout << "(" << clock() << ") Phil" << m_id << ": starting ..." << std::endl;
-		}
-		for (;;)
-		{
-			if (m_id > 0)
+        {
+            boost::mutex::scoped_lock lock(iomx);
+            std::cout << "(" << clock() << ") Phil" << m_id << ": starting ..." << std::endl;
+        }
+        for (;;)
+        {
+            if (m_id > 0)
             {
                 boost::xtime xt;
                 boost::xtime_get(&xt, boost::TIME_UTC);
                 xt.sec += 3;
                 boost::thread::sleep(xt);
             }
-			{
-				boost::mutex::scoped_lock lock(iomx);
-				std::cout << "(" << clock() << ") Phil" << m_id
-					<< ": gotta eat ..." << std::endl;
-			}
-			g_canteen.get(m_id);
-			{
-				boost::mutex::scoped_lock lock(iomx);
-				std::cout << "(" << clock() << ") Phil" << m_id
-					<< ": mmm ... that's good ..." << std::endl;
-			}
-		}
+            {
+                boost::mutex::scoped_lock lock(iomx);
+                std::cout << "(" << clock() << ") Phil" << m_id
+                    << ": gotta eat ..." << std::endl;
+            }
+            g_canteen.get(m_id);
+            {
+                boost::mutex::scoped_lock lock(iomx);
+                std::cout << "(" << clock() << ") Phil" << m_id
+                    << ": mmm ... that's good ..." << std::endl;
+            }
+        }
     }
-	static void do_thread(void* param) {
+    static void do_thread(void* param) {
         static_cast<phil*>(param)->run();
-	}
+    }
 
-	int m_id;
+    int m_id;
 };
 
 struct thread_adapt

example/tennis/Carbon.r

@@ -0,0 +1 @@
+/*

example/tennis/tennis.cpp

@@ -5,8 +5,8 @@
 #include <iostream>
 
 #if defined(BOOST_HAS_WINTHREADS)
-#	include <windows.h>
-#	include <process.h>
+#   include <windows.h>
+#   include <process.h>
 #endif
 
 enum game_state

include/boost/thread/condition.hpp

@@ -23,6 +23,8 @@
 
 #if defined(BOOST_HAS_PTHREADS)
 #   include <pthread.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#   include "scoped_critical_region.hpp"
 #endif
 
 namespace boost {
@@ -85,7 +87,7 @@ private:
     template <typename M>
     void do_wait(M& mutex)
     {
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         enter_wait();
 #endif
 
@@ -95,7 +97,7 @@ private:
 
 #if defined(BOOST_HAS_PTHREADS)
         do_wait(state.pmutex);
-#elif defined(BOOST_HAS_WINTHREADS)
+#elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         do_wait();
 #endif
 
@@ -105,7 +107,7 @@ private:
     template <typename M>
     bool do_timed_wait(M& mutex, const xtime& xt)
     {
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         enter_wait();
 #endif
 
@@ -117,7 +119,7 @@ private:
 
 #if defined(BOOST_HAS_PTHREADS)
         ret = do_timed_wait(xt, state.pmutex);
-#elif defined(BOOST_HAS_WINTHREADS)
+#elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         ret = do_timed_wait(xt);
 #endif
 
@@ -126,7 +128,7 @@ private:
         return ret;
     }
 
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
     void enter_wait();
     void do_wait();
     bool do_timed_wait(const xtime& xt);
@@ -145,6 +147,15 @@ private:
                       //   m_waiting to be removed from the m_queue
 #elif defined(BOOST_HAS_PTHREADS)
     pthread_cond_t m_condition;
+#elif defined(BOOST_HAS_MPTASKS)
+    MPSemaphoreID m_gate;
+    MPSemaphoreID m_queue;
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
+    unsigned m_gone; // # threads that timed out and never made it to the m_queue
+    unsigned long m_blocked; // # threads m_blocked m_waiting for the condition
+    unsigned m_waiting; // # threads m_waiting no longer m_waiting for the condition but still
+                      //   m_waiting to be removed from the m_queue
 #endif
 };
 

include/boost/thread/detail/force_cast.hpp

@@ -0,0 +1,44 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_FORCE_CAST_MJM012402_HPP
+#define BOOST_FORCE_CAST_MJM012402_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/singleton.hpp

@@ -0,0 +1,64 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_SINGLETON_MJM012402_HPP
+#define BOOST_SINGLETON_MJM012402_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/mutex.hpp

@@ -24,6 +24,10 @@
 #   include <pthread.h>
 #endif
 
+#if defined(BOOST_HAS_MPTASKS)
+#   include "scoped_critical_region.hpp"
+#endif
+
 namespace boost {
 
 struct xtime;
@@ -46,6 +50,10 @@ private:
     {
         pthread_mutex_t* pmutex;
     };
+#elif defined(BOOST_HAS_MPTASKS)
+    struct cv_state
+    {
+    };
 #endif
     void do_lock();
     void do_unlock();
@@ -56,6 +64,9 @@ private:
     void* m_mutex;
 #elif defined(BOOST_HAS_PTHREADS)
     pthread_mutex_t m_mutex;
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
 #endif
 };
 
@@ -78,6 +89,10 @@ private:
     {
         pthread_mutex_t* pmutex;
     };
+#elif defined(BOOST_HAS_MPTASKS)
+    struct cv_state
+    {
+    };
 #endif
     void do_lock();
     bool do_trylock();
@@ -89,6 +104,9 @@ private:
     void* m_mutex;
 #elif defined(BOOST_HAS_PTHREADS)
     pthread_mutex_t m_mutex;
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
 #endif
 };
 
@@ -112,6 +130,10 @@ private:
     {
         pthread_mutex_t* pmutex;
     };
+#elif defined(BOOST_HAS_MPTASKS)
+    struct cv_state
+    {
+    };
 #endif
     void do_lock();
     bool do_trylock();
@@ -126,6 +148,9 @@ private:
     pthread_mutex_t m_mutex;
     pthread_cond_t m_condition;
     bool m_locked;
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
 #endif
 };
 

include/boost/thread/once.hpp

@@ -28,7 +28,7 @@ namespace boost {
 typedef pthread_once_t once_flag;
 #define BOOST_ONCE_INIT PTHREAD_ONCE_INIT
 
-#elif defined(BOOST_HAS_WINTHREADS)
+#elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
 
 typedef bool once_flag;
 #define BOOST_ONCE_INIT false

include/boost/thread/recursive_mutex.hpp

@@ -22,6 +22,8 @@
 
 #if defined(BOOST_HAS_PTHREADS)
 #   include <pthread.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#   include "scoped_critical_region.hpp"
 #endif
 
 namespace boost {
@@ -39,7 +41,7 @@ public:
     ~recursive_mutex();
 
 private:
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
     typedef std::size_t cv_state;
 #elif defined(BOOST_HAS_PTHREADS)
     struct cv_state
@@ -64,6 +66,10 @@ private:
     pthread_t m_thread_id;
     bool m_valid_id;
 #   endif
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
+    std::size_t m_count;
 #endif
 };
 
@@ -79,7 +85,7 @@ public:
     ~recursive_try_mutex();
 
 private:
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
     typedef std::size_t cv_state;
 #elif defined(BOOST_HAS_PTHREADS)
     struct cv_state
@@ -105,6 +111,10 @@ private:
     pthread_t m_thread_id;
     bool m_valid_id;
 #   endif
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
+    std::size_t m_count;
 #endif
 };
 
@@ -121,7 +131,7 @@ public:
     ~recursive_timed_mutex();
 
 private:
-#if defined(BOOST_HAS_WINTHREADS)
+#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
     typedef std::size_t cv_state;
 #elif defined(BOOST_HAS_PTHREADS)
     struct cv_state
@@ -146,6 +156,10 @@ private:
     pthread_t m_thread_id;
     bool m_valid_id;
     unsigned m_count;
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::scoped_critical_region m_mutex;
+    threads::mac::detail::scoped_critical_region m_mutex_mutex;
+    std::size_t m_count;
 #endif
 };
 

include/boost/thread/thread.hpp

@@ -26,6 +26,8 @@
 #if defined(BOOST_HAS_PTHREADS)
 #   include <pthread.h>
 #   include <boost/thread/condition.hpp>
+#elif defined(BOOST_HAS_MPTASKS)
+#   include <Multiprocessing.h>
 #endif
 
 namespace boost {
@@ -54,6 +56,9 @@ private:
 #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;
 };

include/boost/thread/tss.hpp

@@ -21,6 +21,8 @@
 
 #if defined(BOOST_HAS_PTHREADS)
 #   include <pthread.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#   include <Multiprocessing.h>
 #endif
 
 namespace boost {
@@ -41,8 +43,15 @@ namespace boost {
             void (*m_cleanup)(void*);
         #elif defined(BOOST_HAS_PTHREADS)
             pthread_key_t m_key;
+        #elif defined(BOOST_HAS_MPTASKS)
+            TaskStorageIndex m_key;
+            void (*m_cleanup)(void*);
         #endif
         };
+
+    #if defined(BOOST_HAS_MPTASKS)
+        void thread_cleanup();
+    #endif
     }
 
 template <typename T>

src/condition.cpp

@@ -18,10 +18,16 @@
 #include "timeconv.inl"
 
 #if defined(BOOST_HAS_WINTHREADS)
-#   define NOMINMAX
+#   ifndef NOMINMAX
+#      define NOMINMAX
+#   endif
 #   include <windows.h>
 #elif defined(BOOST_HAS_PTHREADS)
 #   include <errno.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#    include <MacErrors.h>
+#    include "mac/init.hpp"
+#    include "mac/safe.hpp"
 #endif
 
 namespace boost {
@@ -87,6 +93,7 @@ void condition::notify_one()
 
         ++m_waiting;
         --m_blocked;
+        signals = 1;
     }
     else
     {
@@ -107,15 +114,15 @@ void condition::notify_one()
             res = ReleaseSemaphore(reinterpret_cast<HANDLE>(m_gate), 1, 0);
             assert(res);
         }
+    }
 
-        res = ReleaseMutex(reinterpret_cast<HANDLE>(m_mutex));
+    res = ReleaseMutex(reinterpret_cast<HANDLE>(m_mutex));
+    assert(res);
+
+    if (signals)
+    {
+        res = ReleaseSemaphore(reinterpret_cast<HANDLE>(m_queue), signals, 0);
         assert(res);
-
-        if (signals)
-        {
-            res = ReleaseSemaphore(reinterpret_cast<HANDLE>(m_queue), signals, 0);
-            assert(res);
-        }
     }
 }
 
@@ -351,6 +358,285 @@ bool condition::do_timed_wait(const xtime& xt, pthread_mutex_t* pmutex)
 
     return res != ETIMEDOUT;
 }
+#elif defined(BOOST_HAS_MPTASKS)
+
+using threads::mac::detail::safe_enter_critical_region;
+using threads::mac::detail::safe_wait_on_semaphore;
+
+condition::condition()
+    : m_gone(0), m_blocked(0), m_waiting(0)
+{
+    threads::mac::detail::thread_init();
+
+    OSStatus lStatus = noErr;
+
+    lStatus = MPCreateSemaphore(1, 1, &m_gate);
+    if(lStatus == noErr)
+        lStatus = MPCreateSemaphore(ULONG_MAX, 0, &m_queue);
+
+    if(lStatus != noErr || !m_gate || !m_queue)
+    {
+        if (m_gate)
+        {
+            lStatus = MPDeleteSemaphore(m_gate);
+            assert(lStatus == noErr);
+        }
+        if (m_queue)
+        {
+            lStatus = MPDeleteSemaphore(m_queue);
+            assert(lStatus == noErr);
+        }
+
+        throw thread_resource_error();
+    }
+}
+
+condition::~condition()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPDeleteSemaphore(m_gate);
+    assert(lStatus == noErr);
+    lStatus = MPDeleteSemaphore(m_queue);
+    assert(lStatus == noErr);
+}
+
+void condition::notify_one()
+{
+    unsigned signals = 0;
+
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    if (m_waiting != 0) // the m_gate is already closed
+    {
+        if (m_blocked == 0)
+        {
+            lStatus = MPExitCriticalRegion(m_mutex);
+            assert(lStatus == noErr);
+            return;
+        }
+
+        ++m_waiting;
+        --m_blocked;
+    }
+    else
+    {
+        lStatus = safe_wait_on_semaphore(m_gate, kDurationForever);
+        assert(lStatus == noErr);
+        if (m_blocked > m_gone)
+        {
+            if (m_gone != 0)
+            {
+                m_blocked -= m_gone;
+                m_gone = 0;
+            }
+            signals = m_waiting = 1;
+            --m_blocked;
+        }
+        else
+        {
+            lStatus = MPSignalSemaphore(m_gate);
+            assert(lStatus == noErr);
+        }
+
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+
+        while (signals)
+        {
+            lStatus = MPSignalSemaphore(m_queue);
+            assert(lStatus == noErr);
+            --signals;
+        }
+    }
+}
+
+void condition::notify_all()
+{
+    unsigned signals = 0;
+
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    if (m_waiting != 0) // the m_gate is already closed
+    {
+        if (m_blocked == 0)
+        {
+            lStatus = MPExitCriticalRegion(m_mutex);
+            assert(lStatus == noErr);
+            return;
+        }
+
+        m_waiting += (signals = m_blocked);
+        m_blocked = 0;
+    }
+    else
+    {
+        lStatus = safe_wait_on_semaphore(m_gate, kDurationForever);
+        assert(lStatus == noErr);
+        if (m_blocked > m_gone)
+        {
+            if (m_gone != 0)
+            {
+                m_blocked -= m_gone;
+                m_gone = 0;
+            }
+            signals = m_waiting = m_blocked;
+            m_blocked = 0;
+        }
+        else
+        {
+            lStatus = MPSignalSemaphore(m_gate);
+            assert(lStatus == noErr);
+        }
+
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+
+        while (signals)
+        {
+            lStatus = MPSignalSemaphore(m_queue);
+            assert(lStatus == noErr);
+            --signals;
+        }
+    }
+}
+
+void condition::enter_wait()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_wait_on_semaphore(m_gate, kDurationForever);
+    assert(lStatus == noErr);
+    ++m_blocked;
+    lStatus = MPSignalSemaphore(m_gate);
+    assert(lStatus == noErr);
+}
+
+void condition::do_wait()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_wait_on_semaphore(m_queue, kDurationForever);
+    assert(lStatus == noErr);
+
+    unsigned was_waiting=0;
+    unsigned was_gone=0;
+
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+    was_waiting = m_waiting;
+    was_gone = m_gone;
+    if (was_waiting != 0)
+    {
+        if (--m_waiting == 0)
+        {
+            if (m_blocked != 0)
+            {
+                lStatus = MPSignalSemaphore(m_gate); // open m_gate
+                assert(lStatus == noErr);
+                was_waiting = 0;
+            }
+            else if (m_gone != 0)
+                m_gone = 0;
+        }
+    }
+    else if (++m_gone == (std::numeric_limits<unsigned>::max() / 2))
+    {
+        // timeout occured, normalize the m_gone count
+        // this may occur if many calls to wait with a timeout are made and
+        // no call to notify_* is made
+        lStatus = safe_wait_on_semaphore(m_gate, kDurationForever);
+        assert(lStatus == noErr);
+        m_blocked -= m_gone;
+        lStatus = MPSignalSemaphore(m_gate);
+        assert(lStatus == noErr);
+        m_gone = 0;
+    }
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+
+    if (was_waiting == 1)
+    {
+        for (/**/ ; was_gone; --was_gone)
+        {
+            // better now than spurious later
+            lStatus = safe_wait_on_semaphore(m_queue, kDurationForever);
+            assert(lStatus == noErr);
+        }
+        lStatus = MPSignalSemaphore(m_gate);
+        assert(lStatus == noErr);
+    }
+}
+
+bool condition::do_timed_wait(const xtime& xt)
+{
+    unsigned milliseconds;
+    to_duration(xt, milliseconds);
+
+    OSStatus lStatus = noErr;
+    lStatus = safe_wait_on_semaphore(m_queue, milliseconds);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+
+    bool ret = (lStatus == noErr);
+
+    unsigned was_waiting=0;
+    unsigned was_gone=0;
+
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+    was_waiting = m_waiting;
+    was_gone = m_gone;
+    if (was_waiting != 0)
+    {
+        if (!ret) // timeout
+        {
+            if (m_blocked != 0)
+                --m_blocked;
+            else
+                ++m_gone; // count spurious wakeups
+        }
+        if (--m_waiting == 0)
+        {
+            if (m_blocked != 0)
+            {
+                lStatus = MPSignalSemaphore(m_gate); // open m_gate
+                assert(lStatus == noErr);
+                was_waiting = 0;
+            }
+            else if (m_gone != 0)
+                m_gone = 0;
+        }
+    }
+    else if (++m_gone == (std::numeric_limits<unsigned>::max() / 2))
+    {
+        // timeout occured, normalize the m_gone count
+        // this may occur if many calls to wait with a timeout are made and
+        // no call to notify_* is made
+        lStatus = safe_wait_on_semaphore(m_gate, kDurationForever);
+        assert(lStatus == noErr);
+        m_blocked -= m_gone;
+        lStatus = MPSignalSemaphore(m_gate);
+        assert(lStatus == noErr);
+        m_gone = 0;
+    }
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+
+    if (was_waiting == 1)
+    {
+        for (/**/ ; was_gone; --was_gone)
+        {
+            // better now than spurious later
+            lStatus = safe_wait_on_semaphore(m_queue, kDurationForever);
+            assert(lStatus == noErr);
+        }
+        lStatus = MPSignalSemaphore(m_gate);
+        assert(lStatus == noErr);
+    }
+
+    return ret;
+}
 #endif
 
 } // namespace boost

src/mac/debug_prefix.hpp

@@ -0,0 +1,14 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#define TARGET_CARBON    1

src/mac/delivery_man.cpp

@@ -0,0 +1,72 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#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

src/mac/delivery_man.hpp

@@ -0,0 +1,90 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_DELIVERY_MAN_MJM012402_HPP
+#define BOOST_DELIVERY_MAN_MJM012402_HPP
+
+
+#include <boost/function.hpp>
+#include <boost/utility.hpp>
+
+#include <boost/thread/mutex.hpp>
+
+#include "package.hpp"
+
+#include <Multiprocessing.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class delivery_man is intended to move boost::function objects from MP tasks to
+//    other execution contexts (such as deferred task time or system task time).
+
+class delivery_man: private noncopyable
+{
+  public:
+    delivery_man();
+    ~delivery_man();
+
+  public:
+    template<class R>
+    R deliver(function<R> &rFunctor);
+
+    void accept_deliveries();
+
+  private:
+    base_package *m_pPackage;
+    mutex m_oMutex;
+    MPSemaphoreID m_pSemaphore;
+    bool m_bPackageWaiting;
+};
+
+
+template<class R>
+R delivery_man::deliver(function<R> &rFunctor)
+{
+    assert(at_mp());
+
+// lock our mutex
+    mutex::scoped_lock oLock(m_oMutex);
+
+// create a package and save it
+    package<R> oPackage(rFunctor);
+    m_pPackage = &oPackage;
+    m_bPackageWaiting = true;
+
+// wait on the semaphore
+    OSStatus lStatus = MPWaitOnSemaphore(m_pSemaphore, kDurationForever);
+    assert(lStatus == noErr);
+
+    return(oPackage.return_value());
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_DELIVERY_MAN_MJM012402_HPP

src/mac/dt_scheduler.cpp

@@ -0,0 +1,99 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "dt_scheduler.hpp"
+
+#include "ot_context.hpp"
+
+
+#include <boost/thread/detail/singleton.hpp>
+
+#include <OpenTransportProtocol.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+const OTTimeout k_ulTimerTaskDelay = 1UL;
+
+
+dt_scheduler::dt_scheduler():
+    m_bReschedule(false),
+    m_uppTask(NULL),
+    m_lTask(0UL)
+{
+    using ::boost::detail::thread::singleton;
+
+    ot_context &rContext(singleton<ot_context>::instance());
+
+    m_uppTask = NewOTProcessUPP(task_entry);
+    m_lTask = OTCreateTimerTaskInContext(m_uppTask, this, rContext.get_context());
+}
+
+dt_scheduler::~dt_scheduler()
+{
+    OTDestroyTimerTask(m_lTask);
+    m_lTask = 0UL;
+    DisposeOTProcessUPP(m_uppTask);
+    m_uppTask = NULL;
+}
+
+
+void dt_scheduler::start_polling()
+{
+    m_bReschedule = true;
+    schedule_task();
+}
+
+void dt_scheduler::stop_polling()
+{
+    m_bReschedule = false;
+}
+
+
+void dt_scheduler::schedule_task()
+{
+    if(m_bReschedule)
+    {
+        OTScheduleTimerTask(m_lTask, k_ulTimerTaskDelay);
+    }
+}
+
+
+/*static*/ pascal void dt_scheduler::task_entry(void *pRefCon)
+{
+    dt_scheduler *pThis = reinterpret_cast<dt_scheduler *>(pRefCon);
+    assert(pThis != NULL);
+    pThis->task();
+}
+
+void dt_scheduler::task()
+{
+    periodic_function();
+    schedule_task();
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/dt_scheduler.hpp

@@ -0,0 +1,69 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_DT_SCHEDULER_MJM012402_HPP
+#define BOOST_DT_SCHEDULER_MJM012402_HPP
+
+
+#include "periodical.hpp"
+
+#include <OpenTransport.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class dt_scheduler calls its pure-virtual periodic_function method periodically at
+//    deferred task time.  This is generally 1kHz under Mac OS 9.
+
+class dt_scheduler
+{
+  public:
+    dt_scheduler();
+    virtual ~dt_scheduler();
+
+  protected:
+    void start_polling();
+    void stop_polling();
+
+  private:
+    virtual void periodic_function() = 0;
+
+  private:
+    void schedule_task();
+    static pascal void task_entry(void *pRefCon);
+    void task();
+
+  private:
+    bool m_bReschedule;
+    OTProcessUPP m_uppTask;
+    long m_lTask;
+};
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_DT_SCHEDULER_MJM012402_HPP

src/mac/execution_context.cpp

@@ -0,0 +1,66 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include <Debugging.h>
+#include <Multiprocessing.h>
+
+#include "execution_context.hpp"
+#include "init.hpp"
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+
+execution_context_t execution_context()
+{
+// make sure that MP services are available the first time through
+    static bool bIgnored = detail::thread_init();
+
+// first check if we're an MP task
+    if(MPTaskIsPreemptive(kInvalidID))
+    {
+        return(k_eExecutionContextMPTask);
+    }
+
+#if TARGET_CARBON
+// Carbon has TaskLevel
+    UInt32 ulLevel = TaskLevel();
+
+    if(ulLevel == 0UL)
+    {
+        return(k_eExecutionContextSystemTask);
+    }
+
+    if(ulLevel & kInDeferredTaskMask)
+    {
+        return(k_eExecutionContextDeferredTask);
+    }
+
+    return(k_eExecutionContextOther);
+#else
+// this can be implemented using TaskLevel if you don't mind linking against
+//    DebugLib (and therefore breaking Mac OS 8.6 support), or CurrentExecutionLevel.
+#    error execution_context unimplimented
+#endif
+}
+
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/execution_context.hpp

@@ -0,0 +1,53 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_EXECUTION_CONTEXT_MJM012402_HPP
+#define BOOST_EXECUTION_CONTEXT_MJM012402_HPP
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+
+// utility functions for figuring out what context your code is executing in.
+//    Bear in mind that at_mp and in_blue are the only functions guarenteed by
+//    Apple to work.  There is simply no way of being sure that you will not get
+//    false readings about task level at interrupt time in blue.
+
+typedef enum {
+    k_eExecutionContextSystemTask,
+    k_eExecutionContextDeferredTask,
+    k_eExecutionContextMPTask,
+    k_eExecutionContextOther
+} execution_context_t;
+
+execution_context_t execution_context();
+
+inline bool at_st()
+    {    return(execution_context() == k_eExecutionContextSystemTask);    }
+
+inline bool at_mp()
+    {    return(execution_context() == k_eExecutionContextMPTask);        }
+inline bool in_blue()
+    {    return(!at_mp());                                                }
+
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+#endif // BOOST_EXECUTION_CONTEXT_MJM012402_HPP

src/mac/init.cpp

@@ -0,0 +1,64 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "init.hpp"
+
+#include "remote_call_manager.hpp"
+
+
+#include <boost/thread/detail/singleton.hpp>
+
+#include <Multiprocessing.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+namespace {
+
+// force these to get called by the end of static initialization time.
+static bool g_bInitialized = (thread_init() && create_singletons());
+
+}
+
+
+bool thread_init()
+{
+    static bool bResult = MPLibraryIsLoaded();
+
+    return(bResult);
+}
+
+bool create_singletons()
+{
+    using ::boost::detail::thread::singleton;
+
+    singleton<remote_call_manager>::instance();
+
+    return(true);
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/init.hpp

@@ -0,0 +1,40 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_INIT_MJM012402_HPP
+#define BOOST_INIT_MJM012402_HPP
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+bool thread_init();
+bool create_singletons();
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_INIT_MJM012402_HPP

src/mac/msl_replacements/assert.cpp

@@ -0,0 +1,30 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include <cassert>
+#include <cstdio>
+
+#include <MacTypes.h>
+
+#include "remote_calls.hpp"
+
+// this function will be called when an assertion fails.  We redirect the assertion
+//    to DebugStr (MacsBug under Mac OS 1.x-9.x, Console under Mac OS X).
+void __assertion_failed(char const *pszAssertion, char const *pszFile, int nLine)
+{
+    using std::snprintf;
+    unsigned char strlDebug[sizeof(Str255) + 1];
+    char *pszDebug = reinterpret_cast<char *>(&strlDebug[1]);
+    strlDebug[0] = snprintf(pszDebug, sizeof(Str255), "assertion failed: \"%s\", %s, line %d", pszAssertion, pszFile, nLine);
+    boost::threads::mac::dt_remote_call(DebugStr, static_cast<ConstStringPtr>(strlDebug));
+}

src/mac/msl_replacements/console_io.cpp

@@ -0,0 +1,134 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+//
+// includes
+//
+
+#include <abort_exit.h>
+#include <console.h>
+#include <console_io.h>
+#include <misc_io.h>
+#include <SIOUX.h>
+
+#include "remote_calls.hpp"
+
+
+//
+// using declarations
+//
+
+using std::__file_handle;
+using std::__idle_proc;
+using std::__io_error;
+using std::__no_io_error;
+using std::size_t;
+
+using boost::threads::mac::st_remote_call;
+
+
+//
+// prototypes
+//
+
+static bool check_console();
+static int do_read_console(__file_handle ulHandle, unsigned char *pBuffer, size_t *pCount, __idle_proc pfnIdleProc);
+static int do_write_console(__file_handle ulHandle, unsigned char *pBuffer, size_t *pCount, __idle_proc pfnIdleProc);
+
+
+//
+// MSL function replacements
+//
+
+// these two functions are called by cin and cout, respectively, as well as by (all?)
+//    other functions in MSL that do console I/O.  All that they do is as the remote
+//    call manager to ensure that their guts are called at system task time.
+int __read_console(__file_handle handle, unsigned char * buffer, size_t * count, __idle_proc idle_proc)
+{
+    return(st_remote_call(do_read_console, handle, buffer, count, idle_proc));
+}
+
+int __write_console(__file_handle handle, unsigned char * buffer, size_t * count, __idle_proc idle_proc)
+{
+    return(st_remote_call(do_write_console, handle, buffer, count, idle_proc));
+}
+
+
+//
+// implementations
+//
+
+static bool check_console()
+{
+    static bool s_bHaveConsole(false);
+    static bool s_bWontHaveConsole(false);
+
+    if(s_bHaveConsole)
+    {
+        return(true);
+    }
+
+    if(s_bWontHaveConsole == false)
+    {
+        __stdio_atexit();
+
+        if(InstallConsole(0) != 0)
+        {
+            s_bWontHaveConsole = true;
+            return(false);
+        }
+        __console_exit = RemoveConsole;
+        s_bHaveConsole = true;
+        return(true);
+    }
+
+    return(false);
+}
+
+
+int do_read_console(__file_handle /*ulHandle*/, unsigned char *pBuffer, size_t *pCount, __idle_proc /*pfnIdleProc*/)
+{
+    assert(pCount != NULL);
+    assert(pBuffer != NULL || *pCount == 0UL);
+
+    if(check_console() == false)
+    {
+        return(__io_error);
+    }
+    std::fflush(stdout);
+    long lCount = ReadCharsFromConsole(reinterpret_cast<char *>(pBuffer), static_cast<long>(*pCount));
+    *pCount = static_cast<size_t>(lCount);
+    if(lCount == -1L)
+    {
+        return(__io_error);
+    }
+
+    return(__no_io_error);
+}
+
+int do_write_console(__file_handle /*ulHandle*/, unsigned char *pBuffer, size_t *pCount, __idle_proc /*pfnIdleProc*/)
+{
+    if(check_console() == false)
+    {
+        return(__io_error);
+    }
+
+    long lCount = WriteCharsToConsole(reinterpret_cast<char *>(pBuffer), static_cast<long>(*pCount));
+    *pCount = static_cast<size_t>(lCount);
+    if(lCount == -1L)
+    {
+        return(__io_error);
+    }
+
+    return(__no_io_error);
+}

src/mac/msl_replacements/malloc.cpp

@@ -0,0 +1,58 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+//
+// includes
+//
+
+#include <cstdlib>
+
+#include <Multiprocessing.h>
+
+
+//
+// using declarations
+//
+
+using std::size_t;
+
+
+extern "C" {
+
+//
+// prototypes
+//
+
+void *malloc(size_t ulSize);
+void free(void *pBlock);
+
+}
+
+
+//
+// MSL function replacements
+//
+
+// all allocation/deallocation currently goes through MPAllocateAligned/MPFree.  This
+//    solution is sub-optimal at best, but will have to do for now.
+void *malloc(size_t ulSize)
+{
+    static bool bIgnored = MPLibraryIsLoaded();
+    return(MPAllocateAligned(ulSize, kMPAllocateDefaultAligned, 0UL));
+}
+
+void free(void *pBlock)
+{
+    if(pBlock == NULL) return;
+    MPFree(pBlock);
+}

src/mac/msl_replacements/news_and_deletes.cpp

@@ -0,0 +1,105 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+//
+// includes
+//
+
+#include <new>
+
+#include <Multiprocessing.h>
+
+
+//
+// using declarations
+//
+
+using std::size_t;
+using std::bad_alloc;
+using std::nothrow_t;
+using std::nothrow;
+
+
+//
+// local utility functions
+//
+
+// all allocation/deallocation currently goes through MPAllocateAligned/MPFree.  This
+//    solution is sub-optimal at best, but will have to do for now.
+inline static void *allocate(size_t ulSize, const nothrow_t &)
+{
+    static bool bIgnored = MPLibraryIsLoaded();
+    return(MPAllocateAligned(ulSize, kMPAllocateDefaultAligned, 0UL));
+}
+
+inline static void *allocate(size_t ulSize)
+{
+    void *pBlock = allocate(ulSize, nothrow);
+    if(pBlock == NULL)
+        throw(bad_alloc());
+    return(pBlock);
+}
+
+inline static void deallocate(void *pBlock)
+{
+    if(pBlock == NULL) return;
+    MPFree(pBlock);
+}
+
+
+//
+// global operators
+//
+
+void *operator new(size_t ulSize)
+{
+    return(allocate(ulSize));
+}
+
+void *operator new[](size_t ulSize)
+{
+    return(allocate(ulSize));
+}
+
+
+void *operator new(size_t ulSize, const nothrow_t &rNoThrow)
+{
+    return(allocate(ulSize, rNoThrow));
+}
+
+void *operator new[](size_t ulSize, const nothrow_t &rNoThrow)
+{
+    return(allocate(ulSize, rNoThrow));
+}
+
+
+void operator delete(void *pBlock)
+{
+    deallocate(pBlock);
+}
+
+void operator delete[](void *pBlock)
+{
+    deallocate(pBlock);
+}
+
+
+void operator delete(void *pBlock, const nothrow_t &)
+{
+    deallocate(pBlock);
+}
+
+void operator delete[](void *pBlock, const nothrow_t &)
+{
+    deallocate(pBlock);
+}

src/mac/msl_replacements/time.cpp

@@ -0,0 +1,156 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include <cassert>
+// we include timesize.mac.h to get whether or not __TIMESIZE_DOUBLE__ is
+//  defined.  This is not safe, given that __TIMESIZE_DOUBLE__ affects MSL
+//  at MSL's compile time, not ours, so be forgiving if you have changed it
+//  since you have built MSL.
+#include <timesize.mac.h>
+#include <time.h>
+
+#include <boost/thread/detail/force_cast.hpp>
+#include <boost/thread/xtime.hpp>
+
+#include "execution_context.hpp"
+
+#include <DriverServices.h>
+
+
+extern "C"
+{
+    clock_t __get_clock();
+    time_t __get_time();
+    int __to_gm_time(time_t *pTime);
+    int __is_dst();
+}
+
+
+static inline uint64_t get_nanoseconds()
+{
+    using boost::detail::thread::force_cast;
+    return(force_cast<uint64_t>(AbsoluteToNanoseconds(UpTime())));
+}
+
+
+#ifdef __TIMESIZE_DOUBLE__
+
+// return number of microseconds since startup as a double
+clock_t __get_clock()
+{
+    static const double k_dNanosecondsPerMicrosecond(1000.0);
+
+    return(get_nanoseconds() / k_dNanosecondsPerMicrosecond);
+}
+
+#else
+
+// return number of ticks (60th of a second) since startup as a long
+clock_t __get_clock()
+{
+    static const uint64_t k_ullTicksPerSecond(60ULL);
+    static const uint64_t k_ullNanosecondsPerSecond(1000ULL * 1000ULL * 1000ULL);
+    static const uint64_t k_ullNanosecondsPerTick(k_ullNanosecondsPerSecond / k_ullTicksPerSecond);
+
+    return(get_nanoseconds() / k_ullNanosecondsPerTick);
+}
+
+#endif
+
+// return number of seconds elapsed since Jan 1, 1970
+time_t __get_time()
+{
+    boost::xtime sTime;
+    int nType = boost::xtime_get(&sTime, boost::TIME_UTC);
+    assert(nType == boost::TIME_UTC);
+    return(static_cast<time_t>(sTime.sec));
+}
+
+
+static inline MachineLocation &read_location()
+{
+    static MachineLocation s_sLocation;
+    assert(boost::threads::mac::at_st());
+    ReadLocation(&s_sLocation);
+    return(s_sLocation);
+}
+
+static inline MachineLocation &get_location()
+{
+    static MachineLocation &s_rLocation(read_location());
+    return(s_rLocation);
+}
+
+
+// force the machine location to be cached at static initlialization
+static MachineLocation &g_rIgnored(get_location());
+
+static inline long calculate_delta()
+{
+    MachineLocation &rLocation(get_location());
+
+// gmtDelta is a 24-bit, signed integer.  We need to strip out the lower 24 bits,
+//  then sign-extend what we have.
+    long lDelta = rLocation.u.gmtDelta & 0x00ffffffL;
+    if((lDelta & 0x00800000L) != 0L)
+    {
+        lDelta |= 0xFF000000;
+    }
+    return(lDelta);
+}
+
+static inline bool check_if_location_is_broken()
+{
+    MachineLocation &rLocation(get_location());
+    if(rLocation.latitude == 0 && rLocation.longitude == 0 && rLocation.u.gmtDelta == 0)
+        return(true);
+    return(false);
+}
+
+static inline bool location_is_broken()
+{
+    static bool s_bLocationIsBroken(check_if_location_is_broken());
+    return(s_bLocationIsBroken);
+}
+
+
+// translate time to GMT
+int __to_gm_time(time_t *pTime)
+{
+    if(location_is_broken())
+    {
+        return(0);
+    }
+
+    static long s_lDelta(calculate_delta());
+    *pTime -= s_lDelta;
+    return(1);
+}
+
+
+static inline bool is_daylight_savings_time()
+{
+    MachineLocation &rLocation(get_location());
+    return(rLocation.u.dlsDelta != 0);
+}
+
+// check if we're in daylight savings time
+int __is_dst()
+{
+    if(location_is_broken())
+    {
+        return(-1);
+    }
+    static bool bIsDaylightSavingsTime(is_daylight_savings_time());
+    return(static_cast<int>(bIsDaylightSavingsTime));
+}

src/mac/os.cpp

@@ -0,0 +1,63 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "os.hpp"
+
+
+#include <cassert>
+
+#include <Gestalt.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace os {
+
+
+// read the OS version from Gestalt
+static inline long get_version()
+{
+    long lVersion;
+    OSErr nErr = Gestalt(gestaltSystemVersion, &lVersion);
+    assert(nErr == noErr);
+    return(lVersion);
+}
+
+
+// check if we're running under Mac OS X and cache that information
+bool x()
+{
+    static bool bX = (version() >= 0x1000);
+    return(bX);
+}
+
+
+// read the OS version and cache it
+long version()
+{
+    static long lVersion = get_version();
+    return(lVersion);
+}
+
+
+} // namespace os
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/os.hpp

@@ -0,0 +1,43 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_OS_MJM012402_HPP
+#define BOOST_OS_MJM012402_HPP
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace os {
+
+
+// functions to determine the OS environment.  With namespaces, you get a cute call:
+//    mac::os::x
+
+bool x();
+long version();
+
+
+} // namespace os
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_OS_MJM012402_HPP

src/mac/ot_context.cpp

@@ -0,0 +1,52 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "ot_context.hpp"
+
+#include "execution_context.hpp"
+
+
+#include <cassert>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+ot_context::ot_context()
+{
+    assert(at_st());
+
+    OSStatus lStatus = InitOpenTransportInContext(0UL, &m_pContext);
+// TODO - throw on error
+    assert(lStatus == noErr);
+}
+
+ot_context::~ot_context()
+{
+    CloseOpenTransportInContext(m_pContext);
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/ot_context.hpp

@@ -0,0 +1,64 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_OT_CONTEXT_MJM012402_HPP
+#define BOOST_OT_CONTEXT_MJM012402_HPP
+
+
+#include <OpenTransport.h>
+
+#include <boost/utility.hpp>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class ot_context is intended to be used only as a singleton.  All that this class
+//    does is ask OpenTransport to create him an OTClientContextPtr, and then doles
+//    this out to anyone who wants it.  ot_context should only be instantiated at
+//    system task time.
+
+class ot_context: private noncopyable
+{
+  protected:
+    ot_context();
+    ~ot_context();
+
+  public:
+    OTClientContextPtr get_context();
+
+  private:
+    OTClientContextPtr m_pContext;
+};
+
+
+inline OTClientContextPtr ot_context::get_context()
+    {    return(m_pContext);    }
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_OT_CONTEXT_MJM012402_HPP

src/mac/package.hpp

@@ -0,0 +1,82 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_PACKAGE_MJM012402_HPP
+#define BOOST_PACKAGE_MJM012402_HPP
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+class base_package: private noncopyable
+{
+  public:
+    virtual void accept() = 0;
+};
+
+template<class R>
+class package: public base_package
+{
+  public:
+    inline package(function<R> &rFunctor):
+        m_rFunctor(rFunctor)
+        {    /* no-op */                }
+    inline ~package()
+        {    /* no-op */                }
+
+    virtual void accept()
+        {    m_oR = m_rFunctor();    }
+    inline R return_value()
+        {    return(m_oR);            }
+
+  private:
+    function<R> &m_rFunctor;
+    R m_oR;
+};
+
+template<>
+class package<void>: public base_package
+{
+  public:
+    inline package(function<void> &rFunctor):
+        m_rFunctor(rFunctor)
+        {    /* no-op */                }
+    inline ~package()
+        {    /* no-op */                }
+
+    virtual void accept()
+        {    m_rFunctor();            }
+    inline void return_value()
+        {    return;                    }
+
+  private:
+    function<void> &m_rFunctor;
+};
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_PACKAGE_MJM012402_HPP

src/mac/periodical.hpp

@@ -0,0 +1,103 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_PERIODICAL_MJM012402_HPP
+#define BOOST_PERIODICAL_MJM012402_HPP
+
+
+#include <boost/function.hpp>
+#include <boost/utility.hpp>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class periodical inherits from its template parameter, which should follow the
+//    pattern set by classes dt_scheduler and st_scheduler.  periodical knows how to
+//    call a boost::function, where the xx_scheduler classes only know to to call a
+//    member periodically.
+
+template<class Scheduler>
+class periodical: private noncopyable, private Scheduler
+{
+  public:
+    periodical(function<void> &rFunction);
+    ~periodical();
+
+  public:
+    void start();
+    void stop();
+
+  protected:
+    virtual void periodic_function();
+
+  private:
+    function<void> m_oFunction;
+};
+
+
+template<class Scheduler>
+periodical<Scheduler>::periodical(function<void> &rFunction):
+    m_oFunction(rFunction)
+{
+// no-op
+}
+
+template<class Scheduler>
+periodical<Scheduler>::~periodical()
+{
+    stop();
+}
+
+template<class Scheduler>
+void periodical<Scheduler>::start()
+{
+    start_polling();
+}
+
+template<class Scheduler>
+void periodical<Scheduler>::stop()
+{
+    stop_polling();
+}
+
+
+template<class Scheduler>
+inline void periodical<Scheduler>::periodic_function()
+{
+    try
+    {
+        m_oFunction();
+    }
+    catch(...)
+    {
+    }
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_PERIODICAL_MJM012402_HPP

src/mac/prefix.hpp

@@ -0,0 +1,15 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#define NDEBUG
+#define TARGET_CARBON    1

src/mac/remote_call_manager.cpp

@@ -0,0 +1,54 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "remote_call_manager.hpp"
+
+#include <boost/bind.hpp>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+using detail::delivery_man;
+
+
+remote_call_manager::remote_call_manager():
+    m_oDTDeliveryMan(),
+    m_oSTDeliveryMan(),
+    m_oDTFunction(bind(&delivery_man::accept_deliveries, &m_oDTDeliveryMan)),
+    m_oSTFunction(bind(&delivery_man::accept_deliveries, &m_oSTDeliveryMan)),
+    m_oDTPeriodical(m_oDTFunction),
+    m_oSTPeriodical(m_oSTFunction)
+{
+    m_oDTPeriodical.start();
+    m_oSTPeriodical.start();
+}
+
+remote_call_manager::~remote_call_manager()
+{
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/remote_call_manager.hpp

@@ -0,0 +1,108 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_REMOTE_CALL_MANAGER_MJM012402_HPP
+#define BOOST_REMOTE_CALL_MANAGER_MJM012402_HPP
+
+
+#include <boost/utility.hpp>
+
+#include "delivery_man.hpp"
+#include "dt_scheduler.hpp"
+#include "periodical.hpp"
+#include "execution_context.hpp"
+#include "st_scheduler.hpp"
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class remote_call_manager is used by the remote call functions (dt_remote_call and
+//  st_remote_call) to execute functions in non-MP contexts.
+
+class remote_call_manager: private noncopyable
+{
+  protected:
+    remote_call_manager();
+    ~remote_call_manager();
+
+  public:
+    template<class R>
+    R execute_at_dt(function<R> &rFunctor);
+    template<class R>
+    R execute_at_st(function<R> &rFunctor);
+
+  private:
+    template<class R>
+    static R execute_now(function<R> &rFunctor);
+
+  private:
+    delivery_man m_oDTDeliveryMan;
+    delivery_man m_oSTDeliveryMan;
+    function<void> m_oDTFunction;
+    function<void> m_oSTFunction;
+    periodical<dt_scheduler> m_oDTPeriodical;
+    periodical<st_scheduler> m_oSTPeriodical;
+};
+
+
+template<class R>
+/*static*/ inline R remote_call_manager::execute_now(function<R> &rFunctor)
+{
+    return(rFunctor());
+}
+template<>
+/*static*/ inline void remote_call_manager::execute_now<void>(function<void> &rFunctor)
+{
+    rFunctor();
+}
+
+
+template<class R>
+inline R remote_call_manager::execute_at_dt(function<R> &rFunctor)
+{
+    if(at_mp())
+    {
+        return(m_oDTDeliveryMan.deliver(rFunctor));
+    }
+    return(execute_now(rFunctor));
+}
+
+template<class R>
+inline R remote_call_manager::execute_at_st(function<R> &rFunctor)
+{
+    if(at_mp())
+    {
+        return(m_oSTDeliveryMan.deliver(rFunctor));
+    }
+    assert(at_st());
+    return(execute_now(rFunctor));
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_REMOTE_CALL_MANAGER_MJM012402_HPP

src/mac/remote_calls.hpp

@@ -0,0 +1,163 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_REMOTE_CALLS_MJM012402_HPP
+#define BOOST_REMOTE_CALLS_MJM012402_HPP
+
+
+#include <boost/bind.hpp>
+
+#include "remote_call_manager.hpp"
+#include <boost/thread/detail/singleton.hpp>
+
+
+// this file contains macros to generate functions with the signatures:
+//  ReturnType st_remote_call([pascal] ReturnType (*pfnFunction)(
+//                              [Argument1Type[, Argument2Type[...]]])
+//                            [, Argument1Type oArgument1[, Argument2Type oArgument2[...]]])
+// and
+//  ReturnType dt_remote_call([pascal] ReturnType (*pfnFunction)(
+//                              [Argument1Type[, Argument2Type[...]]])
+//                            [, Argument1Type oArgument1[, Argument2Type oArgument2[...]]])
+// in other words, identical to the function pointer versions of boost::bind, but
+//  with the return type returned.  The purpose of these functions is to be able to
+//  request that a function be called at system task time or deferred task time, then
+//  sleep until it is called, and finally get back its return value.
+
+#define BOOST_REMOTE_CALL_CLASS_LIST_0
+#define BOOST_REMOTE_CALL_CLASS_LIST_1 BOOST_REMOTE_CALL_CLASS_LIST_0, class A1
+#define BOOST_REMOTE_CALL_CLASS_LIST_2 BOOST_REMOTE_CALL_CLASS_LIST_1, class A2
+#define BOOST_REMOTE_CALL_CLASS_LIST_3 BOOST_REMOTE_CALL_CLASS_LIST_2, class A3
+#define BOOST_REMOTE_CALL_CLASS_LIST_4 BOOST_REMOTE_CALL_CLASS_LIST_3, class A4
+#define BOOST_REMOTE_CALL_CLASS_LIST_5 BOOST_REMOTE_CALL_CLASS_LIST_4, class A5
+#define BOOST_REMOTE_CALL_CLASS_LIST_6 BOOST_REMOTE_CALL_CLASS_LIST_5, class A6
+#define BOOST_REMOTE_CALL_CLASS_LIST_7 BOOST_REMOTE_CALL_CLASS_LIST_6, class A7
+#define BOOST_REMOTE_CALL_CLASS_LIST_8 BOOST_REMOTE_CALL_CLASS_LIST_7, class A8
+#define BOOST_REMOTE_CALL_CLASS_LIST_9 BOOST_REMOTE_CALL_CLASS_LIST_8, class A9
+
+
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_0
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_1 BOOST_REMOTE_CALL_ARGUMENT_LIST_0  A1 oA1
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_2 BOOST_REMOTE_CALL_ARGUMENT_LIST_1, A2 oA2
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_3 BOOST_REMOTE_CALL_ARGUMENT_LIST_2, A3 oA3
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_4 BOOST_REMOTE_CALL_ARGUMENT_LIST_3, A4 oA4
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_5 BOOST_REMOTE_CALL_ARGUMENT_LIST_4, A5 oA5
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_6 BOOST_REMOTE_CALL_ARGUMENT_LIST_5, A6 oA6
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_7 BOOST_REMOTE_CALL_ARGUMENT_LIST_6, A7 oA7
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_8 BOOST_REMOTE_CALL_ARGUMENT_LIST_7, A8 oA8
+#define BOOST_REMOTE_CALL_ARGUMENT_LIST_9 BOOST_REMOTE_CALL_ARGUMENT_LIST_8, A9 oA9
+
+
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_0
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_1 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_0, oA1
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_2 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_1, oA2
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_3 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_2, oA3
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_4 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_3, oA4
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_5 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_4, oA5
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_6 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_5, oA6
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_7 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_6, oA7
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_8 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_7, oA8
+#define BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_9 BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_8, oA9
+
+
+#define BOOST_REMOTE_CALL_COMMA_0
+#define BOOST_REMOTE_CALL_COMMA_1 ,
+#define BOOST_REMOTE_CALL_COMMA_2 ,
+#define BOOST_REMOTE_CALL_COMMA_3 ,
+#define BOOST_REMOTE_CALL_COMMA_4 ,
+#define BOOST_REMOTE_CALL_COMMA_5 ,
+#define BOOST_REMOTE_CALL_COMMA_6 ,
+#define BOOST_REMOTE_CALL_COMMA_7 ,
+#define BOOST_REMOTE_CALL_COMMA_8 ,
+#define BOOST_REMOTE_CALL_COMMA_9 ,
+
+
+// this is the macro that ties it all together.  From here, we generate all forms of
+//  dt_remote_call and st_remote_call.
+
+#define BOOST_REMOTE_CALL(context, stack, n)                                        \
+template<class R BOOST_REMOTE_CALL_CLASS_LIST_ ## n>                                \
+inline R context ## _remote_call(stack R (*pfnF)(                                   \
+                                      BOOST_REMOTE_CALL_ARGUMENT_LIST_ ## n)        \
+                                      BOOST_REMOTE_CALL_COMMA_ ## n                 \
+                                  BOOST_REMOTE_CALL_ARGUMENT_LIST_ ## n)            \
+{                                                                                   \
+    using ::boost::detail::thread::singleton;                                       \
+    using detail::remote_call_manager;                                              \
+    function<R> oFunc(bind(pfnF BOOST_REMOTE_CALL_FUNCTION_ARGUMENT_LIST_ ## n));   \
+    remote_call_manager &rManager(singleton<remote_call_manager>::instance());      \
+    return(rManager.execute_at_ ## context(oFunc));                                 \
+}
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+
+BOOST_REMOTE_CALL(st, , 0)
+BOOST_REMOTE_CALL(st, , 1)
+BOOST_REMOTE_CALL(st, , 2)
+BOOST_REMOTE_CALL(st, , 3)
+BOOST_REMOTE_CALL(st, , 4)
+BOOST_REMOTE_CALL(st, , 5)
+BOOST_REMOTE_CALL(st, , 6)
+BOOST_REMOTE_CALL(st, , 7)
+BOOST_REMOTE_CALL(st, , 8)
+BOOST_REMOTE_CALL(st, , 9)
+
+BOOST_REMOTE_CALL(dt, , 0)
+BOOST_REMOTE_CALL(dt, , 1)
+BOOST_REMOTE_CALL(dt, , 2)
+BOOST_REMOTE_CALL(dt, , 3)
+BOOST_REMOTE_CALL(dt, , 4)
+BOOST_REMOTE_CALL(dt, , 5)
+BOOST_REMOTE_CALL(dt, , 6)
+BOOST_REMOTE_CALL(dt, , 7)
+BOOST_REMOTE_CALL(dt, , 8)
+BOOST_REMOTE_CALL(dt, , 9)
+
+
+BOOST_REMOTE_CALL(st, pascal, 0)
+BOOST_REMOTE_CALL(st, pascal, 1)
+BOOST_REMOTE_CALL(st, pascal, 2)
+BOOST_REMOTE_CALL(st, pascal, 3)
+BOOST_REMOTE_CALL(st, pascal, 4)
+BOOST_REMOTE_CALL(st, pascal, 5)
+BOOST_REMOTE_CALL(st, pascal, 6)
+BOOST_REMOTE_CALL(st, pascal, 7)
+BOOST_REMOTE_CALL(st, pascal, 8)
+BOOST_REMOTE_CALL(st, pascal, 9)
+
+BOOST_REMOTE_CALL(dt, pascal, 0)
+BOOST_REMOTE_CALL(dt, pascal, 1)
+BOOST_REMOTE_CALL(dt, pascal, 2)
+BOOST_REMOTE_CALL(dt, pascal, 3)
+BOOST_REMOTE_CALL(dt, pascal, 4)
+BOOST_REMOTE_CALL(dt, pascal, 5)
+BOOST_REMOTE_CALL(dt, pascal, 6)
+BOOST_REMOTE_CALL(dt, pascal, 7)
+BOOST_REMOTE_CALL(dt, pascal, 8)
+BOOST_REMOTE_CALL(dt, pascal, 9)
+
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_REMOTE_CALLS_MJM012402_HPP

src/mac/safe.cpp

@@ -0,0 +1,216 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include <DriverServices.h>
+#include <Events.h>
+#include <Multiprocessing.h>
+#include <Threads.h>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
+#include <boost/thread/detail/force_cast.hpp>
+#include <limits>
+#include "execution_context.hpp"
+
+
+using boost::detail::thread::force_cast;
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+static OSStatus safe_wait(function<OSStatus, Duration> &rFunction, Duration lDuration);
+
+
+// we call WNE to allow tasks that own the resource the blue is waiting on system
+//    task time, in case they are blocked on an ST remote call (or a memory allocation
+//    for that matter).
+static void idle()
+{
+    if(at_st())
+    {
+        EventRecord sEvent;
+        bool bEvent = WaitNextEvent(0U, &sEvent, 0UL, NULL);
+    }
+}
+
+
+OSStatus safe_wait_on_semaphore(MPSemaphoreID pSemaphoreID, Duration lDuration)
+{
+    function<OSStatus, Duration> oWaitOnSemaphore;
+    oWaitOnSemaphore = bind(MPWaitOnSemaphore, pSemaphoreID, _1);
+    return(safe_wait(oWaitOnSemaphore, lDuration));
+}
+
+
+OSStatus safe_enter_critical_region(MPCriticalRegionID pCriticalRegionID, Duration lDuration, MPCriticalRegionID pCriticalRegionCriticalRegionID/* = kInvalidID*/)
+{
+    if(pCriticalRegionCriticalRegionID != kInvalidID)
+    {
+        if(at_mp())
+        {
+        // enter the critical region's critical region
+            OSStatus lStatus = noErr;
+            AbsoluteTime sExpiration;
+            if(lDuration != kDurationImmediate && lDuration != kDurationForever)
+            {
+                sExpiration = AddDurationToAbsolute(lDuration, UpTime());
+            }            
+            lStatus = MPEnterCriticalRegion(pCriticalRegionCriticalRegionID, lDuration);
+            assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+            if(lStatus == noErr)
+            {
+            // calculate a new duration
+                if(lDuration != kDurationImmediate && lDuration != kDurationForever)
+                {
+                // check if we have any time left
+                    AbsoluteTime sUpTime(UpTime());
+                    if(force_cast<uint64_t>(sExpiration) > force_cast<uint64_t>(sUpTime))
+                    {
+                    // reset our duration to our remaining time
+                        lDuration = AbsoluteDeltaToDuration(sExpiration, sUpTime);
+                    }
+                    else
+                    {
+                    // no time left
+                        lDuration = kDurationImmediate;
+                    }
+                }            
+            // if we entered the critical region, exit it again
+                lStatus = MPExitCriticalRegion(pCriticalRegionCriticalRegionID);
+                assert(lStatus == noErr);
+            }
+            else
+            {
+            // otherwise, give up
+                return(lStatus);
+            }
+        }
+        else
+        {
+        // if we're at system task time, try to enter the critical region's critical
+        //    region until we succeed.  MP tasks will block on this until we let it go.
+            OSStatus lStatus;
+            do
+            {
+                lStatus = MPEnterCriticalRegion(pCriticalRegionCriticalRegionID, kDurationImmediate);
+            } while(lStatus == kMPTimeoutErr);
+            assert(lStatus == noErr);
+        }
+    }
+
+// try to enter the critical region
+    function<OSStatus, Duration> oEnterCriticalRegion;
+    oEnterCriticalRegion = bind(MPEnterCriticalRegion, pCriticalRegionID, _1);
+    OSStatus lStatus = safe_wait(oEnterCriticalRegion, lDuration);
+
+// if we entered the critical region's critical region to get the critical region,
+//    exit the critical region's critical region.
+    if(pCriticalRegionCriticalRegionID != kInvalidID && at_mp() == false)
+    {
+        lStatus = MPExitCriticalRegion(pCriticalRegionCriticalRegionID);
+        assert(lStatus == noErr);
+    }
+    return(lStatus);
+}
+
+OSStatus safe_wait_on_queue(MPQueueID pQueueID, void **pParam1, void **pParam2, void **pParam3, Duration lDuration)
+{
+    function<OSStatus, Duration> oWaitOnQueue;
+    oWaitOnQueue = bind(MPWaitOnQueue, pQueueID, pParam1, pParam2, pParam3, _1);
+    return(safe_wait(oWaitOnQueue, lDuration));
+}
+
+OSStatus safe_delay_until(AbsoluteTime *pWakeUpTime)
+{
+    if(execution_context() == k_eExecutionContextMPTask)
+    {
+        return(MPDelayUntil(pWakeUpTime));
+    }
+    else
+    {
+        uint64_t ullWakeUpTime = force_cast<uint64_t>(*pWakeUpTime);
+
+        while(force_cast<uint64_t>(UpTime()) < ullWakeUpTime)
+        {
+            idle();
+        }
+
+        return(noErr);
+    }
+}
+
+
+OSStatus safe_wait(function<OSStatus, Duration> &rFunction, Duration lDuration)
+{
+    if(execution_context() == k_eExecutionContextMPTask)
+    {
+        return(rFunction(lDuration));
+    }
+    else
+    {
+        uint64_t ullExpiration = 0ULL;
+
+    // get the expiration time in UpTime units
+        if(lDuration == kDurationForever)
+        {
+            ullExpiration = ::std::numeric_limits<uint64_t>::max();
+        }
+        else if(lDuration == kDurationImmediate)
+        {
+            ullExpiration = force_cast<uint64_t>(UpTime());
+        }
+        else
+        {
+            AbsoluteTime sExpiration = AddDurationToAbsolute(lDuration, UpTime());
+            ullExpiration = force_cast<uint64_t>(sExpiration);
+        }
+
+        OSStatus lStatus;
+        bool bExpired = false;
+
+        do
+        {
+            lStatus = rFunction(kDurationImmediate);
+// mm - "if" #if 0'd out to allow task time to threads blocked on I/O
+#if 0
+            if(lStatus == kMPTimeoutErr)
+#endif
+            {
+                idle();
+            }
+            if(lDuration != kDurationForever)
+            {
+                bExpired = (force_cast<uint64_t>(UpTime()) < ullExpiration);
+            }
+        } while(lStatus == kMPTimeoutErr && bExpired == false);
+
+        return(lStatus);
+    }
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/safe.hpp

@@ -0,0 +1,47 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_SAFE_MJM012402_HPP
+#define BOOST_SAFE_MJM012402_HPP
+
+
+#include <Multiprocessing.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// these functions are used to wain in an execution context-independent manor.  All of these
+//  functions are both MP- and ST-safe.
+
+OSStatus safe_wait_on_semaphore(MPSemaphoreID pSemaphoreID, Duration lDuration);
+OSStatus safe_enter_critical_region(MPCriticalRegionID pCriticalRegionID, Duration lDuration, MPCriticalRegionID pCriticalRegionCriticalRegionID = kInvalidID);
+OSStatus safe_wait_on_queue(MPQueueID pQueueID, void **pParam1, void **pParam2, void **pParam3, Duration lDuration);
+OSStatus safe_delay_until(AbsoluteTime *pWakeUpTime);
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+#endif // BOOST_SAFE_MJM012402_HPP

src/mac/scoped_critical_region.cpp

@@ -0,0 +1,53 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "scoped_critical_region.hpp"
+
+#include "init.hpp"
+
+
+#include <cassert>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+scoped_critical_region::scoped_critical_region():
+    m_pCriticalRegionID(kInvalidID)
+{
+    static bool bIgnored = thread_init();
+    OSStatus lStatus = MPCreateCriticalRegion(&m_pCriticalRegionID);
+    if(lStatus != noErr || m_pCriticalRegionID == kInvalidID)
+        throw(thread_resource_error());
+}
+
+scoped_critical_region::~scoped_critical_region()
+{
+    OSStatus lStatus = MPDeleteCriticalRegion(m_pCriticalRegionID);
+    assert(lStatus == noErr);
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/scoped_critical_region.hpp

@@ -0,0 +1,69 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_SCOPED_CRITICAL_REGION_MJM012402_HPP
+#define BOOST_SCOPED_CRITICAL_REGION_MJM012402_HPP
+
+
+#include <boost/thread/exceptions.hpp>
+
+#include <Multiprocessing.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class scoped_critical_region probably needs a new name.  Although the current name
+//    is accurate, it can be read to mean that a critical region is entered for the
+//    current scope.  In reality, a critical region is _created_ for the current scope.
+//    This class is intended as a replacement for MPCriticalRegionID that will
+//    automatically create and dispose of itself.
+
+class scoped_critical_region
+{
+  public:
+    scoped_critical_region();
+    ~scoped_critical_region();
+
+  public:
+    operator const MPCriticalRegionID &() const;
+    const MPCriticalRegionID &get() const;
+
+  private:
+    MPCriticalRegionID m_pCriticalRegionID;
+};
+
+
+// these are inlined for speed.
+inline scoped_critical_region::operator const MPCriticalRegionID &() const
+    {    return(m_pCriticalRegionID);    }
+inline const MPCriticalRegionID &scoped_critical_region::get() const
+    {    return(m_pCriticalRegionID);    }
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_SCOPED_CRITICAL_REGION_MJM012402_HPP

src/mac/st_scheduler.cpp

@@ -0,0 +1,91 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "st_scheduler.hpp"
+
+#include <cassert>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+#if TARGET_CARBON
+
+st_scheduler::st_scheduler():
+    m_uppTask(NULL),
+    m_pTimer(NULL)
+{
+    m_uppTask = NewEventLoopTimerUPP(task_entry);
+// TODO - throw on error
+    assert(m_uppTask != NULL);
+}
+
+st_scheduler::~st_scheduler()
+{
+    DisposeEventLoopTimerUPP(m_uppTask);
+    m_uppTask = NULL;
+}
+
+
+void st_scheduler::start_polling()
+{
+    assert(m_pTimer == NULL);
+    OSStatus lStatus = InstallEventLoopTimer(GetMainEventLoop(),
+                                                0 * kEventDurationSecond,
+                                                kEventDurationMillisecond,
+                                                m_uppTask,
+                                                this,
+                                                &m_pTimer);
+// TODO - throw on error
+    assert(lStatus == noErr);
+}
+
+void st_scheduler::stop_polling()
+{
+    assert(m_pTimer != NULL);
+    OSStatus lStatus = RemoveEventLoopTimer(m_pTimer);
+    assert(lStatus == noErr);
+    m_pTimer = NULL;
+}
+
+
+/*static*/ pascal void st_scheduler::task_entry(EventLoopTimerRef /*pTimer*/, void *pRefCon)
+{
+    st_scheduler *pThis = reinterpret_cast<st_scheduler *>(pRefCon);
+    assert(pThis != NULL);
+    pThis->task();
+}
+
+void st_scheduler::task()
+{
+    periodic_function();
+}
+
+#else
+#    error st_scheduler unimplemented!
+#endif
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/st_scheduler.hpp

@@ -0,0 +1,73 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_ST_SCHEDULER_MJM012402_HPP
+#define BOOST_ST_SCHEDULER_MJM012402_HPP
+
+
+#include <CarbonEvents.h>
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+// class st_scheduler calls its pure-virtual periodic_function method periodically at
+//  system task time.  This is generally 40Hz under Mac OS 9.
+
+class st_scheduler
+{
+  public:
+    st_scheduler();
+    virtual ~st_scheduler();
+
+  protected:
+    void start_polling();
+    void stop_polling();
+
+  private:
+    virtual void periodic_function() = 0;
+
+#if TARGET_CARBON
+// use event loop timers under Carbon
+  private:
+    static pascal void task_entry(EventLoopTimerRef pTimer, void *pRefCon);
+    void task();
+
+  private:
+    EventLoopTimerUPP m_uppTask;
+    EventLoopTimerRef m_pTimer;
+#else
+// this can be implemented using OT system tasks.  This would be mostly a copy-and-
+//  paste of the dt_scheduler code, replacing DeferredTask with SystemTask and DT
+//  with ST.
+#   error st_scheduler unimplemented!
+#endif
+};
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_ST_SCHEDULER_MJM012402_HPP

src/mac/thread_cleanup.cpp

@@ -0,0 +1,62 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#include "thread_cleanup.hpp"
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+namespace {
+
+TaskStorageIndex g_ulIndex(0UL);
+
+} // anonymous namespace
+
+
+void do_thread_startup()
+{
+    if(g_ulIndex == 0UL)
+    {
+        OSStatus lStatus = MPAllocateTaskStorageIndex(&g_ulIndex);
+        assert(lStatus == noErr);
+    }
+    set_thread_cleanup_task(NULL);
+}
+
+void do_thread_cleanup()
+{
+    void (*pfnTask)() = MPGetTaskValue(g_ulIndex)
+}
+
+
+void set_thread_cleanup_task(void (*pfnTask)())
+{
+    lStatus = MPSetTaskValue(g_ulIndex, reinterpret_cast<TaskStorageValue>(pfnTask));
+    assert(lStatus == noErr);
+}
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost

src/mac/thread_cleanup.hpp

@@ -0,0 +1,42 @@
+// Copyright (C) 2001
+// Mac Murrett
+//
+// 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.  Mac Murrett makes no representations
+// about the suitability of this software for any purpose.  It is
+// provided "as is" without express or implied warranty.
+//
+// See http://www.boost.org for most recent version including documentation.
+
+#ifndef BOOST_THREAD_CLEANUP_MJM012402_HPP
+#define BOOST_THREAD_CLEANUP_MJM012402_HPP
+
+
+namespace boost {
+
+namespace threads {
+
+namespace mac {
+
+namespace detail {
+
+
+void do_thread_startup();
+void do_thread_cleanup();
+
+void set_thread_cleanup_task();
+
+
+} // namespace detail
+
+} // namespace mac
+
+} // namespace threads
+
+} // namespace boost
+
+
+#endif // BOOST_THREAD_CLEANUP_MJM012402_HPP

src/mutex.cpp

@@ -24,6 +24,11 @@
 #   include <time.h>
 #elif defined(BOOST_HAS_PTHREADS)
 #   include <errno.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#    include <MacErrors.h>
+
+#    include "mac/init.hpp"
+#    include "mac/safe.hpp"
 #endif
 
 namespace boost {
@@ -394,6 +399,134 @@ void timed_mutex::do_unlock(cv_state& state)
 
     state.pmutex = &m_mutex;
 }
+#elif defined(BOOST_HAS_MPTASKS)
+
+using threads::mac::detail::safe_enter_critical_region;
+
+mutex::mutex()
+{
+}
+
+mutex::~mutex()
+{
+}
+
+void mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+}
+
+void mutex::do_unlock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
+
+void mutex::do_lock(cv_state& /*state*/)
+{
+    do_lock();
+}
+
+void mutex::do_unlock(cv_state& /*state*/)
+{
+    do_unlock();
+}
+
+try_mutex::try_mutex()
+{
+}
+
+try_mutex::~try_mutex()
+{
+}
+
+void try_mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+}
+
+bool try_mutex::do_trylock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+    return lStatus == noErr;
+}
+
+void try_mutex::do_unlock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
+
+void try_mutex::do_lock(cv_state& /*state*/)
+{
+    do_lock();
+}
+
+void try_mutex::do_unlock(cv_state& /*state*/)
+{
+    do_unlock();
+}
+
+timed_mutex::timed_mutex()
+{
+}
+
+timed_mutex::~timed_mutex()
+{
+}
+
+void timed_mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+}
+
+bool timed_mutex::do_trylock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+    return(lStatus == noErr);
+}
+
+bool timed_mutex::do_timedlock(const xtime& xt)
+{
+    unsigned microseconds;
+    to_microduration(xt, microseconds);
+    Duration lDuration = kDurationMicrosecond * microseconds;
+
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, lDuration, m_mutex_mutex);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+
+    return(lStatus == noErr);
+}
+
+void timed_mutex::do_unlock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
+
+void timed_mutex::do_lock(cv_state& /*state*/)
+{
+    do_lock();
+}
+
+void timed_mutex::do_unlock(cv_state& /*state*/)
+{
+    do_unlock();
+}
 #endif
 
 } // namespace boost

src/once.cpp

@@ -28,6 +28,8 @@
 #   else
 #       include <sstream>
 #   endif
+#elif defined(BOOST_HAS_MPTASKS)
+#   include <Multiprocessing.h>
 #endif
 
 #ifdef BOOST_NO_STDC_NAMESPACE
@@ -54,7 +56,18 @@ static void do_once()
     once_callback* cb = reinterpret_cast<once_callback*>(pthread_getspecific(key));
     (**cb)();
 }
+#elif defined(BOOST_HAS_MPTASKS)
+void *remote_call_proxy(void *pData)
+{
+    std::pair<void (*)(), boost::once_flag *> &rData(*reinterpret_cast<std::pair<void (*)(), boost::once_flag *> *>(pData));
 
+    if(*rData.second == false)
+    {
+        rData.first();
+        *rData.second = true;
+    }
+
+    return(NULL);
 }
 #endif
 
@@ -107,6 +120,14 @@ void call_once(void (*func)(), once_flag& flag)
     pthread_once(&once, &key_init);
     pthread_setspecific(key, &func);
     pthread_once(&flag, do_once);
+#elif defined(BOOST_HAS_MPTASKS)
+    if(flag == false)
+    {
+    // all we do here is make a remote call to blue, as blue is not reentrant.
+        std::pair<void (*)(), once_flag *> sData(func, &flag);
+        MPRemoteCall(remote_call_proxy, &sData, kMPOwningProcessRemoteContext);
+        assert(flag == true);
+    }
 #endif
 }
 

src/recursive_mutex.cpp

@@ -22,6 +22,9 @@
 #   include <time.h>
 #elif defined(BOOST_HAS_PTHREADS)
 #   include <errno.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#    include <MacErrors.h>
+#    include "safe.hpp"
 #endif
 
 namespace boost {
@@ -766,6 +769,221 @@ void recursive_timed_mutex::do_unlock(cv_state& state)
     state.pmutex = &m_mutex;
     state.count = m_count;
 }
+#elif defined(BOOST_HAS_MPTASKS)
+
+using threads::mac::detail::safe_enter_critical_region;
+
+
+recursive_mutex::recursive_mutex()
+    : m_count(0)
+{
+}
+
+recursive_mutex::~recursive_mutex()
+{
+}
+
+void recursive_mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    if (++m_count > 1)
+    {
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+void recursive_mutex::do_unlock()
+{
+    if (--m_count == 0)
+    {
+        OSStatus lStatus = noErr;
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+void recursive_mutex::do_lock(cv_state& state)
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    m_count = state;
+}
+
+void recursive_mutex::do_unlock(cv_state& state)
+{
+    state = m_count;
+    m_count = 0;
+
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
+
+recursive_try_mutex::recursive_try_mutex()
+    : m_count(0)
+{
+}
+
+recursive_try_mutex::~recursive_try_mutex()
+{
+}
+
+void recursive_try_mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    if (++m_count > 1)
+    {
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+bool recursive_try_mutex::do_trylock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+
+    if (lStatus == noErr)
+    {
+        if (++m_count > 1)
+        {
+            lStatus = MPExitCriticalRegion(m_mutex);
+            assert(lStatus == noErr);
+        }
+        return true;
+    }
+    return false;
+}
+
+void recursive_try_mutex::do_unlock()
+{
+    if (--m_count == 0)
+    {
+        OSStatus lStatus = noErr;
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+void recursive_try_mutex::do_lock(cv_state& state)
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    m_count = state;
+}
+
+void recursive_try_mutex::do_unlock(cv_state& state)
+{
+    state = m_count;
+    m_count = 0;
+
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
+
+recursive_timed_mutex::recursive_timed_mutex()
+    : m_count(0)
+{
+}
+
+recursive_timed_mutex::~recursive_timed_mutex()
+{
+}
+
+void recursive_timed_mutex::do_lock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    if (++m_count > 1)
+    {
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+bool recursive_timed_mutex::do_trylock()
+{
+    OSStatus lStatus = noErr;
+    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+
+    if (lStatus == noErr)
+    {
+        if (++m_count > 1)
+        {
+            lStatus = MPExitCriticalRegion(m_mutex);
+            assert(lStatus == noErr);
+        }
+        return true;
+    }
+    return false;
+}
+
+bool recursive_timed_mutex::do_timedlock(const xtime& xt)
+{
+    unsigned microseconds;
+    to_microduration(xt, microseconds);
+    Duration lDuration = kDurationMicrosecond * microseconds;
+
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, lDuration, m_mutex_mutex);
+    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
+
+    if (lStatus == noErr)
+    {
+        if (++m_count > 1)
+        {
+            lStatus = MPExitCriticalRegion(m_mutex);
+            assert(lStatus == noErr);
+        }
+        return true;
+    }
+    return false;
+}
+
+void recursive_timed_mutex::do_unlock()
+{
+    if (--m_count == 0)
+    {
+        OSStatus lStatus = noErr;
+        lStatus = MPExitCriticalRegion(m_mutex);
+        assert(lStatus == noErr);
+    }
+}
+
+void recursive_timed_mutex::do_lock(cv_state& state)
+{
+    OSStatus lStatus = noErr;
+    lStatus = safe_enter_critical_region(m_mutex, kDurationForever, m_mutex_mutex);
+    assert(lStatus == noErr);
+
+    m_count = state;
+}
+
+void recursive_timed_mutex::do_unlock(cv_state& state)
+{
+    state = m_count;
+    m_count = 0;
+
+    OSStatus lStatus = noErr;
+    lStatus = MPExitCriticalRegion(m_mutex);
+    assert(lStatus == noErr);
+}
 #endif
 
 } // namespace boost

src/thread.cpp

@@ -17,6 +17,12 @@
 #if defined(BOOST_HAS_WINTHREADS)
 #   include <windows.h>
 #   include <process.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#    include <DriverServices.h>
+
+#    include "init.hpp"
+#    include "safe.hpp"
+#    include <boost/thread/tss.hpp>
 #endif
 
 #include "timeconv.inl"
@@ -53,6 +59,8 @@ extern "C" {
 unsigned __stdcall thread_proxy(void* param)
 #elif defined(BOOST_HAS_PTHREADS)
 static void* thread_proxy(void* param)
+#elif defined(BOOST_HAS_MPTASKS)
+static OSStatus thread_proxy(void* param)
 #endif
 {
     try
@@ -65,6 +73,9 @@ static void* thread_proxy(void* param)
     catch (...)
     {
     }
+#if defined(BOOST_HAS_MPTASKS)
+    ::boost::detail::thread_cleanup();
+#endif
     return 0;
 }
 
@@ -80,6 +91,11 @@ thread::thread()
     m_id = GetCurrentThreadId();
 #elif defined(BOOST_HAS_PTHREADS)
     m_thread = pthread_self();
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::thread_init();
+    threads::mac::detail::create_singletons();
+    m_pTaskID = MPCurrentTaskID();
+    m_pJoinQueueID = kInvalidID;
 #endif
 }
 
@@ -96,6 +112,25 @@ thread::thread(const function0<void>& threadfunc)
     res = pthread_create(&m_thread, 0, &thread_proxy, &param);
     if (res != 0)
         throw thread_resource_error();
+#elif defined(BOOST_HAS_MPTASKS)
+    threads::mac::detail::thread_init();
+    threads::mac::detail::create_singletons();
+    OSStatus lStatus = noErr;
+
+    m_pJoinQueueID = kInvalidID;
+    m_pTaskID = kInvalidID;
+
+    lStatus = MPCreateQueue(&m_pJoinQueueID);
+    if(lStatus != noErr) throw thread_resource_error();
+
+    lStatus = MPCreateTask(&thread_proxy, &param, 0UL, m_pJoinQueueID, NULL, NULL,
+                            0UL, &m_pTaskID);
+    if(lStatus != noErr)
+    {
+        lStatus = MPDeleteQueue(m_pJoinQueueID);
+        assert(lStatus == noErr);
+        throw thread_resource_error();
+    }
 #endif
     param.wait();
 }
@@ -110,6 +145,10 @@ thread::~thread()
         assert(res);
 #elif defined(BOOST_HAS_PTHREADS)
         pthread_detach(m_thread);
+#elif defined(BOOST_HAS_MPTASKS)
+        assert(m_pJoinQueueID != kInvalidID);
+        OSStatus lStatus = MPDeleteQueue(m_pJoinQueueID);
+        assert(lStatus == noErr);
 #endif
     }
 }
@@ -120,6 +159,8 @@ bool thread::operator==(const thread& other) const
     return other.m_id == m_id;
 #elif defined(BOOST_HAS_PTHREADS)
     return pthread_equal(m_thread, other.m_thread) != 0;
+#elif defined(BOOST_HAS_MPTASKS)
+    return other.m_pTaskID == m_pTaskID;
 #endif
 }
 
@@ -139,6 +180,9 @@ void thread::join()
 #elif defined(BOOST_HAS_PTHREADS)
     res = pthread_join(m_thread, 0);
     assert(res == 0);
+#elif defined(BOOST_HAS_MPTASKS)
+    OSStatus lStatus = threads::mac::detail::safe_wait_on_queue(m_pJoinQueueID, NULL, NULL, NULL, kDurationForever);
+    assert(lStatus == noErr);
 #endif
     // This isn't a race condition since any race that could occur would
     // have us in undefined behavior territory any way.
@@ -171,6 +215,12 @@ void thread::sleep(const xtime& xt)
     condition cond;
     cond.timed_wait(lock, xt);
 #   endif
+#elif defined(BOOST_HAS_MPTASKS)
+    unsigned microseconds;
+    to_microduration(xt, microseconds);
+    Duration lMicroseconds(kDurationMicrosecond * microseconds);
+    AbsoluteTime sWakeTime(DurationToAbsolute(lMicroseconds));
+    threads::mac::detail::safe_delay_until(&sWakeTime);
 #endif
 }
 
@@ -192,6 +242,8 @@ void thread::yield()
     xtime_get(&xt, TIME_UTC);
     sleep(xt);
 #   endif
+#elif defined(BOOST_HAS_MPTASKS)
+    MPYield();
 #endif
 }
 

src/timeconv.inl

@@ -14,6 +14,9 @@ namespace {
     const unsigned NANOSECONDS_PER_SECOND = 1000000000;
     const unsigned NANOSECONDS_PER_MILLISECOND = 1000000;
 
+    const unsigned MICROSECONDS_PER_SECOND = 1000000;
+    const unsigned NANOSECONDS_PER_MICROSECOND = 1000;
+
     inline void to_time(unsigned milliseconds, boost::xtime& xt)
     {
         int res = 0;
@@ -35,7 +38,7 @@ namespace {
     {
         ts.tv_sec = static_cast<int>(xt.sec);
         ts.tv_nsec = static_cast<int>(xt.nsec);
-        if(ts.tv_nsec > NANOSECONDS_PER_SECOND)
+        if(ts.tv_nsec > static_cast<const int>(NANOSECONDS_PER_SECOND))
         {
             ts.tv_sec += ts.tv_nsec / NANOSECONDS_PER_SECOND;
             ts.tv_nsec %= NANOSECONDS_PER_SECOND;
@@ -71,7 +74,7 @@ namespace {
                 ts.tv_sec -= 1;
                 ts.tv_nsec += NANOSECONDS_PER_SECOND;
             }
-           if(ts.tv_nsec > NANOSECONDS_PER_SECOND)
+           if(ts.tv_nsec > static_cast<const int>(NANOSECONDS_PER_SECOND))
            {
                ts.tv_sec += ts.tv_nsec / NANOSECONDS_PER_SECOND;
                ts.tv_nsec %= NANOSECONDS_PER_SECOND;
@@ -96,6 +99,23 @@ namespace {
                 NANOSECONDS_PER_MILLISECOND));
         }
     }
+
+    inline void to_microduration(const boost::xtime& xt, unsigned& microseconds)
+    {
+        boost::xtime cur;
+        int res = 0;
+        res = boost::xtime_get(&cur, boost::TIME_UTC);
+        assert(res == boost::TIME_UTC);
+
+        if (xt.sec < cur.sec || (xt.sec == cur.sec && xt.nsec < cur.nsec))
+            microseconds = 0;
+        else
+        {
+            microseconds = static_cast<unsigned long>(((xt.sec - cur.sec) * MICROSECONDS_PER_SECOND) +
+                (((xt.nsec - cur.nsec) + (NANOSECONDS_PER_MICROSECOND/2)) /
+                NANOSECONDS_PER_MICROSECOND));
+        }
+    }
 }
 
 // Change Log:

src/tss.cpp

@@ -72,6 +72,72 @@ namespace {
         return handlers;
     }
 }
+#elif defined(BOOST_HAS_MPTASKS)
+#include <map>
+namespace {
+    typedef std::pair<void(*)(void*), void*> cleanup_info;
+    typedef std::map<int, cleanup_info> cleanup_handlers;
+
+    TaskStorageIndex key;
+    boost::once_flag once = BOOST_ONCE_INIT;
+
+    void init_cleanup_key()
+    {
+        OSStatus lStatus = MPAllocateTaskStorageIndex(&key);
+        assert(lStatus == noErr);
+    }
+
+    cleanup_handlers* get_handlers()
+    {
+        boost::call_once(&init_cleanup_key, once);
+
+        cleanup_handlers* handlers = reinterpret_cast<cleanup_handlers*>(MPGetTaskStorageValue(key));
+        if (!handlers)
+        {
+            try
+            {
+                handlers = new cleanup_handlers;
+            }
+            catch (...)
+            {
+                return 0;
+            }
+            OSStatus lStatus = noErr;
+            lStatus = MPSetTaskStorageValue(key, reinterpret_cast<TaskStorageValue>(handlers));
+            assert(lStatus == noErr);
+        // TODO - create a generalized mechanism for registering thread exit functions
+        //            and use it here.
+        }
+
+        return handlers;
+    }
+}
+
+namespace boost {
+
+namespace detail {
+
+
+void thread_cleanup()
+{
+    cleanup_handlers* handlers = reinterpret_cast<cleanup_handlers*>(MPGetTaskStorageValue(key));
+    if(handlers != NULL)
+    {
+        for (cleanup_handlers::iterator it = handlers->begin(); it != handlers->end(); ++it)
+        {
+            cleanup_info info = it->second;
+            if (info.second)
+                info.first(info.second);
+        }
+        delete handlers;
+    }
+}
+
+
+} // namespace detail
+
+} // namespace boost
+
 #endif
 
 namespace boost { namespace detail {
@@ -136,6 +202,42 @@ bool tss::set(void* value)
 {
     return pthread_setspecific(m_key, value) == 0;
 }
+#elif defined(BOOST_HAS_MPTASKS)
+tss::tss(void (*cleanup)(void*))
+{
+    OSStatus lStatus = MPAllocateTaskStorageIndex(&m_key);
+    if(lStatus != noErr)
+        throw thread_resource_error();
+
+    m_cleanup = cleanup;
+}
+
+tss::~tss()
+{
+    OSStatus lStatus = MPDeallocateTaskStorageIndex(m_key);
+    assert(lStatus == noErr);
+}
+
+void* tss::get() const
+{
+    TaskStorageValue ulValue = MPGetTaskStorageValue(m_key);
+    return(reinterpret_cast<void *>(ulValue));
+}
+
+bool tss::set(void* value)
+{
+    if (value && m_cleanup)
+    {
+        cleanup_handlers* handlers = get_handlers();
+        assert(handlers);
+        if (!handlers)
+            return false;
+        cleanup_info info(m_cleanup, value);
+        (*handlers)[m_key] = info;
+    }
+    OSStatus lStatus = MPSetTaskStorageValue(m_key, reinterpret_cast<TaskStorageValue>(value));
+    return(lStatus == noErr);
+}
 #endif
 
 } // namespace detail

src/xtime.cpp

@@ -15,10 +15,61 @@
 #   include <windows.h>
 #elif defined(BOOST_HAS_GETTIMEOFDAY)
 #   include <sys/time.h>
+#elif defined(BOOST_HAS_MPTASKS)
+#   include <DriverServices.h>
+#   include <boost/thread/detail/force_cast.hpp>
 #endif
 
 namespace boost {
 
+#ifdef BOOST_HAS_MPTASKS
+
+namespace detail
+{
+
+using thread::force_cast;
+
+struct startup_time_info
+{
+    startup_time_info()
+    {
+    // 1970 Jan 1 at 00:00:00
+        static const DateTimeRec k_sUNIXBase = {1970, 1, 1, 0, 0, 0, 0};
+        static unsigned long s_ulUNIXBaseSeconds = 0UL;
+
+        if(s_ulUNIXBaseSeconds == 0UL)
+        {
+        // calculate the number of seconds between the Mac OS base and the UNIX base
+        //    the first time we enter this constructor.
+            DateToSeconds(&k_sUNIXBase, &s_ulUNIXBaseSeconds);
+        }
+
+        unsigned long ulSeconds;
+
+    // get the time in UpTime units twice, with the time in seconds in the middle.
+        uint64_t ullFirstUpTime = force_cast<uint64_t>(UpTime());
+        GetDateTime(&ulSeconds);
+        uint64_t ullSecondUpTime = force_cast<uint64_t>(UpTime());
+
+    // calculate the midpoint of the two UpTimes, and save that.
+        uint64_t ullAverageUpTime = (ullFirstUpTime + ullSecondUpTime) / 2ULL;
+        m_sStartupAbsoluteTime = force_cast<AbsoluteTime>(ullAverageUpTime);
+
+    // save the number of seconds, recentered at the UNIX base.
+        m_ulStartupSeconds = ulSeconds - s_ulUNIXBaseSeconds;
+    }
+
+    AbsoluteTime m_sStartupAbsoluteTime;
+    UInt32 m_ulStartupSeconds;
+};
+
+static startup_time_info g_sStartupTimeInfo;
+
+} // namespace detail
+
+#endif
+
+
 int xtime_get(struct xtime* xtp, int clock_type)
 {
     if (clock_type == TIME_UTC)
@@ -43,6 +94,19 @@ int xtime_get(struct xtime* xtp, int clock_type)
         xtp->sec = ts.tv_sec;
         xtp->nsec = ts.tv_nsec;
         return clock_type;
+#elif defined(BOOST_HAS_MPTASKS)
+        using detail::thread::force_cast;
+    // the Mac OS does not have an MP-safe way of getting the date/time, so we use a
+    //  delta from the startup time.  We _could_ defer this and use something that is
+    //  interrupt-safe, but this would be _SLOW_, and we need speed here.
+        const uint64_t k_ullNanosecondsPerSecond(1000ULL * 1000ULL * 1000ULL);
+        AbsoluteTime sUpTime(UpTime());
+        uint64_t ullNanoseconds(force_cast<uint64_t>(AbsoluteDeltaToNanoseconds(sUpTime, detail::g_sStartupTimeInfo.m_sStartupAbsoluteTime)));
+        uint64_t ullSeconds = (ullNanoseconds / k_ullNanosecondsPerSecond);
+        ullNanoseconds -= (ullSeconds * k_ullNanosecondsPerSecond);
+        xtp->sec = detail::g_sStartupTimeInfo.m_ulStartupSeconds + ullSeconds;
+        xtp->nsec = ullNanoseconds;
+        return clock_type;
 #else
 #   error "xtime_get implementation undefined"
 #endif

test/Carbon.r

@@ -0,0 +1 @@
+/*

test/test_thread.cpp

@@ -11,25 +11,25 @@
 #include <boost/test/test_tools.hpp>
 
 #if defined(BOOST_HAS_WINTHREADS)
-#	include <windows.h>
+#   include <windows.h>
 #endif
 
 template <typename M>
 void test_lock(M* dummy=0)
 {
-	typedef M mutex_type;
-	typedef typename M::scoped_lock lock_type;
+    typedef M mutex_type;
+    typedef typename M::scoped_lock lock_type;
 
-	mutex_type mutex;
-	boost::condition condition;
+    mutex_type mutex;
+    boost::condition condition;
 
     // Test the lock's constructors.
     {
         lock_type lock(mutex, false);
         BOOST_TEST(!lock);
     }
-	lock_type lock(mutex);
-	BOOST_TEST(lock);
+    lock_type lock(mutex);
+    BOOST_TEST(lock);
 
     // Construct and initialize an xtime for a fast time out.
     boost::xtime xt;
@@ -39,24 +39,24 @@ void test_lock(M* dummy=0)
     // Test the lock and the mutex with condition variables.
     // No one is going to notify this condition variable.  We expect to
     // time out.
-	BOOST_TEST(condition.timed_wait(lock, xt) == false);
-	BOOST_TEST(lock);
+    BOOST_TEST(condition.timed_wait(lock, xt) == false);
+    BOOST_TEST(lock);
 
     // Test the lock and unlock methods.
-	lock.unlock();
-	BOOST_TEST(!lock);
-	lock.lock();
-	BOOST_TEST(lock);
+    lock.unlock();
+    BOOST_TEST(!lock);
+    lock.lock();
+    BOOST_TEST(lock);
 }
 
 template <typename M>
 void test_trylock(M* dummy=0)
 {
-	typedef M mutex_type;
-	typedef typename M::scoped_try_lock try_lock_type;
+    typedef M mutex_type;
+    typedef typename M::scoped_try_lock try_lock_type;
 
-	mutex_type mutex;
-	boost::condition condition;
+    mutex_type mutex;
+    boost::condition condition;
 
     // Test the lock's constructors.
     {
@@ -67,8 +67,8 @@ void test_trylock(M* dummy=0)
         try_lock_type lock(mutex, false);
         BOOST_TEST(!lock);
     }
-	try_lock_type lock(mutex, true);
-	BOOST_TEST(lock);
+    try_lock_type lock(mutex, true);
+    BOOST_TEST(lock);
 
     // Construct and initialize an xtime for a fast time out.
     boost::xtime xt;
@@ -78,28 +78,28 @@ void test_trylock(M* dummy=0)
     // Test the lock and the mutex with condition variables.
     // No one is going to notify this condition variable.  We expect to
     // time out.
-	BOOST_TEST(condition.timed_wait(lock, xt) == false);
+    BOOST_TEST(condition.timed_wait(lock, xt) == false);
     BOOST_TEST(lock);
 
     // Test the lock, unlock and trylock methods.
-	lock.unlock();
-	BOOST_TEST(!lock);
-	lock.lock();
-	BOOST_TEST(lock);
-	lock.unlock();
-	BOOST_TEST(!lock);
-	BOOST_TEST(lock.try_lock());
-	BOOST_TEST(lock);
+    lock.unlock();
+    BOOST_TEST(!lock);
+    lock.lock();
+    BOOST_TEST(lock);
+    lock.unlock();
+    BOOST_TEST(!lock);
+    BOOST_TEST(lock.try_lock());
+    BOOST_TEST(lock);
 }
 
 template <typename M>
 void test_timedlock(M* dummy=0)
 {
-	typedef M mutex_type;
-	typedef typename M::scoped_timed_lock timed_lock_type;
+    typedef M mutex_type;
+    typedef typename M::scoped_timed_lock timed_lock_type;
 
-	mutex_type mutex;
-	boost::condition condition;
+    mutex_type mutex;
+    boost::condition condition;
 
     // Test the lock's constructors.
     {
@@ -115,8 +115,8 @@ void test_timedlock(M* dummy=0)
         timed_lock_type lock(mutex, false);
         BOOST_TEST(!lock);
     }
-	timed_lock_type lock(mutex, true);
-	BOOST_TEST(lock);
+    timed_lock_type lock(mutex, true);
+    BOOST_TEST(lock);
 
     // Construct and initialize an xtime for a fast time out.
     boost::xtime xt;
@@ -127,15 +127,15 @@ void test_timedlock(M* dummy=0)
     // No one is going to notify this condition variable.  We expect to
     // time out.
     BOOST_TEST(condition.timed_wait(lock, xt) == false);
-	BOOST_TEST(lock);
+    BOOST_TEST(lock);
 
     // Test the lock, unlock and timedlock methods.
     lock.unlock();
-	BOOST_TEST(!lock);
-	lock.lock();
-	BOOST_TEST(lock);
-	lock.unlock();
-	BOOST_TEST(!lock);
+    BOOST_TEST(!lock);
+    lock.lock();
+    BOOST_TEST(lock);
+    lock.unlock();
+    BOOST_TEST(!lock);
     BOOST_TEST(boost::xtime_get(&xt, boost::TIME_UTC) == boost::TIME_UTC);
     xt.nsec += 100000000;
     BOOST_TEST(lock.timed_lock(xt));
@@ -194,23 +194,23 @@ void test_recursive_timed_mutex()
 
 struct condition_test_data
 {
-	condition_test_data() : notified(0), awoken(0) { }
+    condition_test_data() : notified(0), awoken(0) { }
 
-	boost::mutex mutex;
-	boost::condition condition;
-	int notified;
-	int awoken;
+    boost::mutex mutex;
+    boost::condition condition;
+    int notified;
+    int awoken;
 };
 
 void condition_test_thread(void* param)
 {
     condition_test_data* data = static_cast<condition_test_data*>(param);
-	boost::mutex::scoped_lock lock(data->mutex);
-	BOOST_TEST(lock);
-	while (!(data->notified > 0))
-		data->condition.wait(lock);
-	BOOST_TEST(lock);
-	data->awoken++;
+    boost::mutex::scoped_lock lock(data->mutex);
+    BOOST_TEST(lock);
+    while (!(data->notified > 0))
+        data->condition.wait(lock);
+    BOOST_TEST(lock);
+    data->awoken++;
 }
 
 class thread_adapter
@@ -225,39 +225,39 @@ private:
 
 void test_condition_notify_one()
 {
-	condition_test_data data;
+    condition_test_data data;
 
     boost::thread thread(thread_adapter(&condition_test_thread, &data));
 
-	{
-		boost::mutex::scoped_lock lock(data.mutex);
-		BOOST_TEST(lock);
-		data.notified++;
-		data.condition.notify_one();
-	}
+    {
+        boost::mutex::scoped_lock lock(data.mutex);
+        BOOST_TEST(lock);
+        data.notified++;
+        data.condition.notify_one();
+    }
 
     thread.join();
-	BOOST_TEST(data.awoken == 1);
+    BOOST_TEST(data.awoken == 1);
 }
 
 void test_condition_notify_all()
 {
-	const int NUMTHREADS = 5;
+    const int NUMTHREADS = 5;
     boost::thread_group threads;
-	condition_test_data data;
+    condition_test_data data;
 
-	for (int i = 0; i < NUMTHREADS; ++i)
+    for (int i = 0; i < NUMTHREADS; ++i)
         threads.create_thread(thread_adapter(&condition_test_thread, &data));
 
-	{
-		boost::mutex::scoped_lock lock(data.mutex);
-		BOOST_TEST(lock);
-		data.notified++;
-		data.condition.notify_all();
-	}
+    {
+        boost::mutex::scoped_lock lock(data.mutex);
+        BOOST_TEST(lock);
+        data.notified++;
+        data.condition.notify_all();
+    }
 
     threads.join_all();
-	BOOST_TEST(data.awoken == NUMTHREADS);
+    BOOST_TEST(data.awoken == NUMTHREADS);
 }
 
 struct cond_predicate