X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libs%2Finterprocess%2Ftest%2Fmutex_test_template.hpp;h=f298fb8b46c143d3a9c43da5829b5893454de33b;hb=08c1e93fa36a49f49325a07fe91ff92c964c2b6c;hp=6bba87238b98dded505e2a9f493d0008bcbce4e8;hpb=bb4dd8289b351fae6b55e303f189127a394a1edd;p=platform%2Fupstream%2Fboost.git

diff --git a/libs/interprocess/test/mutex_test_template.hpp b/libs/interprocess/test/mutex_test_template.hpp
index 6bba872..f298fb8 100644
--- a/libs/interprocess/test/mutex_test_template.hpp
+++ b/libs/interprocess/test/mutex_test_template.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Ion Gaztanaga 2004-2011. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2004-2012. Distributed under the Boost
 // Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
@@ -25,7 +25,7 @@
 #include <boost/interprocess/exceptions.hpp>
 #include "boost_interprocess_check.hpp"
 #include "util.hpp"
-#include <boost/thread/thread.hpp>
+#include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <iostream>
@@ -46,16 +46,16 @@ struct test_lock
       // Test the lock's constructors.
       {
          lock_type lock(interprocess_mutex, boost::interprocess::defer_lock);
-         BOOST_INTERPROCES_CHECK(!lock);
+         BOOST_INTERPROCESS_CHECK(!lock);
       }
       lock_type lock(interprocess_mutex);
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
 
       // Test the lock and unlock methods.
       lock.unlock();
-      BOOST_INTERPROCES_CHECK(!lock);
+      BOOST_INTERPROCESS_CHECK(!lock);
       lock.lock();
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
    }
 };
 
@@ -72,24 +72,24 @@ struct test_trylock
       // Test the lock's constructors.
       {
          try_to_lock_type lock(interprocess_mutex, boost::interprocess::try_to_lock);
-         BOOST_INTERPROCES_CHECK(lock ? true : false);
+         BOOST_INTERPROCESS_CHECK(lock ? true : false);
       }
       {
          try_to_lock_type lock(interprocess_mutex, boost::interprocess::defer_lock);
-         BOOST_INTERPROCES_CHECK(!lock);
+         BOOST_INTERPROCESS_CHECK(!lock);
       }
       try_to_lock_type lock(interprocess_mutex);
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
 
       // Test the lock, unlock and trylock methods.
       lock.unlock();
-      BOOST_INTERPROCES_CHECK(!lock);
+      BOOST_INTERPROCESS_CHECK(!lock);
       lock.lock();
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
       lock.unlock();
-      BOOST_INTERPROCES_CHECK(!lock);
-      BOOST_INTERPROCES_CHECK(lock.try_lock());
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(!lock);
+      BOOST_INTERPROCESS_CHECK(lock.try_lock());
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
    }
 };
 
@@ -109,25 +109,25 @@ struct test_timedlock
          boost::posix_time::ptime pt = delay(1*BaseSeconds, 0);
 
          timed_lock_type lock(interprocess_mutex, pt);
-         BOOST_INTERPROCES_CHECK(lock ? true : false);
+         BOOST_INTERPROCESS_CHECK(lock ? true : false);
       }
       {
          timed_lock_type lock(interprocess_mutex, boost::interprocess::defer_lock);
-         BOOST_INTERPROCES_CHECK(!lock);
+         BOOST_INTERPROCESS_CHECK(!lock);
       }
       timed_lock_type lock(interprocess_mutex);
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
 
       // Test the lock, unlock and timedlock methods.
       lock.unlock();
-      BOOST_INTERPROCES_CHECK(!lock);
+      BOOST_INTERPROCESS_CHECK(!lock);
       lock.lock();
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
       lock.unlock();
-      BOOST_INTERPROCES_CHECK(!lock);
+      BOOST_INTERPROCESS_CHECK(!lock);
       boost::posix_time::ptime pt = delay(3*BaseSeconds, 0);
-      BOOST_INTERPROCES_CHECK(lock.timed_lock(pt));
-      BOOST_INTERPROCES_CHECK(lock ? true : false);
+      BOOST_INTERPROCESS_CHECK(lock.timed_lock(pt));
+      BOOST_INTERPROCESS_CHECK(lock ? true : false);
    }
 };
 
@@ -170,10 +170,10 @@ void lock_and_sleep(void *arg, M &sm)
    data<M> *pdata = static_cast<data<M>*>(arg);
    boost::interprocess::scoped_lock<M> l(sm);
    if(pdata->m_secs){
-      boost::thread::sleep(xsecs(pdata->m_secs));
+      boost::interprocess::ipcdetail::thread_sleep((1000*pdata->m_secs));
    }
    else{
-      boost::thread::sleep(xsecs(2*BaseSeconds));
+      boost::interprocess::ipcdetail::thread_sleep((1000*2*BaseSeconds));
    }
 
    ++shared_val;
@@ -188,10 +188,10 @@ void lock_and_catch_errors(void *arg, M &sm)
    {
       boost::interprocess::scoped_lock<M> l(sm);
       if(pdata->m_secs){
-         boost::thread::sleep(xsecs(pdata->m_secs));
+         boost::interprocess::ipcdetail::thread_sleep((1000*pdata->m_secs));
       }
       else{
-         boost::thread::sleep(xsecs(2*BaseSeconds));
+         boost::interprocess::ipcdetail::thread_sleep((1000*2*BaseSeconds));
       }
       ++shared_val;
       pdata->m_value = shared_val;
@@ -208,7 +208,7 @@ void try_lock_and_sleep(void *arg, M &sm)
    data<M> *pdata = static_cast<data<M>*>(arg);
    boost::interprocess::scoped_lock<M> l(sm, boost::interprocess::defer_lock);
    if (l.try_lock()){
-      boost::thread::sleep(xsecs(2*BaseSeconds));
+      boost::interprocess::ipcdetail::thread_sleep((1000*2*BaseSeconds));
       ++shared_val;
       pdata->m_value = shared_val;
    }
@@ -222,7 +222,7 @@ void timed_lock_and_sleep(void *arg, M &sm)
    boost::interprocess::scoped_lock<M>
       l (sm, boost::interprocess::defer_lock);
    if (l.timed_lock(pt)){
-      boost::thread::sleep(xsecs(2*BaseSeconds));
+      boost::interprocess::ipcdetail::thread_sleep((1000*2*BaseSeconds));
       ++shared_val;
       pdata->m_value = shared_val;
    }
@@ -232,35 +232,38 @@ template<typename M>
 void test_mutex_lock()
 {
    shared_val = 0;
-  
+
    M mtx;
 
    data<M> d1(1);
    data<M> d2(2);
 
    // Locker one launches, holds the lock for 2*BaseSeconds seconds.
-   boost::thread tm1(thread_adapter<M>(&lock_and_sleep, &d1, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm1;
+   boost::interprocess::ipcdetail::thread_launch(tm1, thread_adapter<M>(&lock_and_sleep, &d1, mtx));
 
    //Wait 1*BaseSeconds
-   boost::thread::sleep(xsecs(1*BaseSeconds));
+   boost::interprocess::ipcdetail::thread_sleep((1000*1*BaseSeconds));
 
    // Locker two launches, but it won't hold the lock for 2*BaseSeconds seconds.
-   boost::thread tm2(thread_adapter<M>(&lock_and_sleep, &d2, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm2;
+   boost::interprocess::ipcdetail::thread_launch(tm2, thread_adapter<M>(&lock_and_sleep, &d2, mtx));
 
    //Wait completion
-   tm1.join();
-   boost::thread::sleep(xsecs(1*BaseSeconds));
-   tm2.join();
 
-   BOOST_INTERPROCES_CHECK(d1.m_value == 1);
-   BOOST_INTERPROCES_CHECK(d2.m_value == 2);
+   boost::interprocess::ipcdetail::thread_join(tm1);
+   boost::interprocess::ipcdetail::thread_sleep((1000*1*BaseSeconds));
+   boost::interprocess::ipcdetail::thread_join(tm2);
+
+   BOOST_INTERPROCESS_CHECK(d1.m_value == 1);
+   BOOST_INTERPROCESS_CHECK(d2.m_value == 2);
 }
 
 template<typename M>
 void test_mutex_lock_timeout()
 {
    shared_val = 0;
-  
+
    M mtx;
 
    int wait_time_s = BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS / 1000;
@@ -271,23 +274,25 @@ void test_mutex_lock_timeout()
    data<M> d2(2, wait_time_s * 2);
 
    // Locker one launches, and holds the lock for wait_time_s * 2 seconds.
-   boost::thread tm1(thread_adapter<M>(&lock_and_sleep, &d1, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm1;
+   boost::interprocess::ipcdetail::thread_launch(tm1, thread_adapter<M>(&lock_and_sleep, &d1, mtx));
 
    //Wait 1*BaseSeconds
-   boost::thread::sleep(xsecs(wait_time_s));
+   boost::interprocess::ipcdetail::thread_sleep((1000*wait_time_s));
 
    // Locker two launches, and attempts to hold the lock for wait_time_s * 2 seconds.
-   boost::thread tm2(thread_adapter<M>(&lock_and_catch_errors, &d2, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm2;
+   boost::interprocess::ipcdetail::thread_launch(tm2, thread_adapter<M>(&lock_and_catch_errors, &d2, mtx));
 
    //Wait completion
-   tm1.join();
-   boost::thread::sleep(xsecs(1*BaseSeconds));
-   tm2.join();
-
-   BOOST_INTERPROCES_CHECK(d1.m_value == 1);
-   BOOST_INTERPROCES_CHECK(d2.m_value == -1);
-   BOOST_INTERPROCES_CHECK(d1.m_error == no_error);
-   BOOST_INTERPROCES_CHECK(d2.m_error == boost::interprocess::timeout_when_locking_error);
+   boost::interprocess::ipcdetail::thread_join(tm1);
+   boost::interprocess::ipcdetail::thread_sleep((1000*1*BaseSeconds));
+   boost::interprocess::ipcdetail::thread_join(tm2);
+
+   BOOST_INTERPROCESS_CHECK(d1.m_value == 1);
+   BOOST_INTERPROCESS_CHECK(d2.m_value == -1);
+   BOOST_INTERPROCESS_CHECK(d1.m_error == no_error);
+   BOOST_INTERPROCESS_CHECK(d2.m_error == boost::interprocess::timeout_when_locking_error);
 }
 
 template<typename M>
@@ -301,20 +306,23 @@ void test_mutex_try_lock()
    data<M> d2(2);
 
    // Locker one launches, holds the lock for 2*BaseSeconds seconds.
-   boost::thread tm1(thread_adapter<M>(&try_lock_and_sleep, &d1, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm1;
+   boost::interprocess::ipcdetail::thread_launch(tm1, thread_adapter<M>(&try_lock_and_sleep, &d1, mtx));
 
    //Wait 1*BaseSeconds
-   boost::thread::sleep(xsecs(1*BaseSeconds));
+   boost::interprocess::ipcdetail::thread_sleep((1000*1*BaseSeconds));
 
    // Locker two launches, but it should fail acquiring the lock
-   boost::thread tm2(thread_adapter<M>(&try_lock_and_sleep, &d2, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm2;
+   boost::interprocess::ipcdetail::thread_launch(tm2, thread_adapter<M>(&try_lock_and_sleep, &d2, mtx));
 
    //Wait completion
-   tm1.join();
-   tm2.join();
+   boost::interprocess::ipcdetail::thread_join(tm1);
+   boost::interprocess::ipcdetail::thread_join(tm2);
+
    //Only the first should succeed locking
-   BOOST_INTERPROCES_CHECK(d1.m_value == 1);
-   BOOST_INTERPROCES_CHECK(d2.m_value == -1);
+   BOOST_INTERPROCESS_CHECK(d1.m_value == 1);
+   BOOST_INTERPROCESS_CHECK(d2.m_value == -1);
 }
 
 template<typename M>
@@ -329,21 +337,23 @@ void test_mutex_timed_lock()
    data<M> d2(2, 2*BaseSeconds);
 
    // Locker one launches, holds the lock for 2*BaseSeconds seconds.
-   boost::thread tm1(thread_adapter<M>(&timed_lock_and_sleep, &d1, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm1;
+   boost::interprocess::ipcdetail::thread_launch(tm1, thread_adapter<M>(&timed_lock_and_sleep, &d1, mtx));
 
    //Wait 1*BaseSeconds
-   boost::thread::sleep(xsecs(1*BaseSeconds));
+   boost::interprocess::ipcdetail::thread_sleep((1000*1*BaseSeconds));
 
    // Locker two launches, holds the lock for 2*BaseSeconds seconds.
-   boost::thread tm2(thread_adapter<M>(&timed_lock_and_sleep, &d2, mtx));
+   boost::interprocess::ipcdetail::OS_thread_t tm2;
+   boost::interprocess::ipcdetail::thread_launch(tm2, thread_adapter<M>(&timed_lock_and_sleep, &d2, mtx));
 
    //Wait completion
-   tm1.join();
-   tm2.join();
+   boost::interprocess::ipcdetail::thread_join(tm1);
+   boost::interprocess::ipcdetail::thread_join(tm2);
 
    //Both should succeed locking
-   BOOST_INTERPROCES_CHECK(d1.m_value == 1);
-   BOOST_INTERPROCES_CHECK(d2.m_value == 2);
+   BOOST_INTERPROCESS_CHECK(d1.m_value == 1);
+   BOOST_INTERPROCESS_CHECK(d2.m_value == 2);
 }
 
 template <typename M>