[Boost-commit] svn:boost r81647 - trunk/libs/thread/test

Subject: [Boost-commit] svn:boost r81647 - trunk/libs/thread/test
From: vicente.botet_at_[hidden]
Date: 2012-12-01 06:08:04

Author: viboes
Date: 2012-12-01 06:08:03 EST (Sat, 01 Dec 2012)
New Revision: 81647
URL: http://svn.boost.org/trac/boost/changeset/81647

Log:
Thread: force BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
Text files modified: 
   trunk/libs/thread/test/test_4882.cpp |    31 ++++++++++++++++---------------         
   1 files changed, 16 insertions(+), 15 deletions(-)

Modified: trunk/libs/thread/test/test_4882.cpp
==============================================================================
--- trunk/libs/thread/test/test_4882.cpp	(original)
+++ trunk/libs/thread/test/test_4882.cpp	2012-12-01 06:08:03 EST (Sat, 01 Dec 2012)
@@ -4,18 +4,19 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_THREAD_VERSION 2
-#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
+//#define BOOST_THREAD_USES_LOG
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/detail/no_exceptions_support.hpp>
-#include <boost/thread/detail/log.hpp>
+//#include <boost/thread/detail/log.hpp>
 
 boost::shared_mutex mutex;
 
 void thread()
 {
-  BOOST_THREAD_LOG << "<thrd" << BOOST_THREAD_END_LOG;
+  //BOOST_THREAD_LOG << "<thrd" << BOOST_THREAD_END_LOG;
   BOOST_TRY
   {
     for (int i =0; i<10; ++i)
@@ -25,40 +26,40 @@
 
       if (mutex.timed_lock(timeout))
       {
-        BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
+        //BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
         boost::this_thread::sleep(boost::posix_time::milliseconds(10));
         mutex.unlock();
-        BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
+        //BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
       }
 #else
       boost::chrono::system_clock::time_point timeout = boost::chrono::system_clock::now() + boost::chrono::milliseconds(50);
 
-      BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
+      //BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
       if (mutex.try_lock_until(timeout))
       {
-        BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
+        //BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
         boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
         mutex.unlock();
-        BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
+        //BOOST_THREAD_LOG << "<thrd" << " i="<<i << BOOST_THREAD_END_LOG;
       }
 #endif
     }
   }
   BOOST_CATCH (boost::lock_error& le)
   {
-    BOOST_THREAD_LOG << "lock_error exception thrd>" << BOOST_THREAD_END_LOG;
+    //BOOST_THREAD_LOG << "lock_error exception thrd>" << BOOST_THREAD_END_LOG;
   }
   BOOST_CATCH (...)
   {
-    BOOST_THREAD_LOG << "exception thrd>" << BOOST_THREAD_END_LOG;
+    //BOOST_THREAD_LOG << "exception thrd>" << BOOST_THREAD_END_LOG;
   }
   BOOST_CATCH_END
-  BOOST_THREAD_LOG << "thrd>" << BOOST_THREAD_END_LOG;
+  //BOOST_THREAD_LOG << "thrd>" << BOOST_THREAD_END_LOG;
 }
 
 int main()
 {
-  BOOST_THREAD_LOG << "<main" << BOOST_THREAD_END_LOG;
+  //BOOST_THREAD_LOG << "<main" << BOOST_THREAD_END_LOG;
   const int nrThreads = 20;
   boost::thread* threads[nrThreads];
 
@@ -68,10 +69,10 @@
   for (int i = 0; i < nrThreads; ++i)
   {
     threads[i]->join();
-    BOOST_THREAD_LOG << "main" << BOOST_THREAD_END_LOG;
+    //BOOST_THREAD_LOG << "main" << BOOST_THREAD_END_LOG;
     delete threads[i];
-    BOOST_THREAD_LOG << "main" << BOOST_THREAD_END_LOG;
+    //BOOST_THREAD_LOG << "main" << BOOST_THREAD_END_LOG;
   }
-  BOOST_THREAD_LOG << "main>" << BOOST_THREAD_END_LOG;
+  //BOOST_THREAD_LOG << "main>" << BOOST_THREAD_END_LOG;
   return 0;
 }