import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / thread / test / sync / mutual_exclusion / locks / strict_lock / default_pass.cpp

diff --git a/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp b/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
index afaf20cc48a6632edd07b937332b63d8a808547e..aa2fb007195dba96f1a925a2c7b41d9f2958db72 100644 (file)
--- a/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
+++ b/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
@@ -13,6 +13,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
 typedef boost::chrono::high_resolution_clock Clock;
@@ -20,27 +21,22 @@ typedef Clock::time_point time_point;
 typedef Clock::duration duration;
 typedef boost::chrono::milliseconds ms;
 typedef boost::chrono::nanoseconds ns;
+time_point t0;
+time_point t1;
 #endif
 
 boost::mutex m;
 
-#ifdef BOOST_THREAD_PLATFORM_WIN32
-const ms max_diff(250);
-#else
-const ms max_diff(75);
-#endif
+const ms max_diff(BOOST_THREAD_TEST_TIME_MS);
 
 void f()
 {
 #ifdef BOOST_THREAD_USES_CHRONO
-  time_point t0 = Clock::now();
-  time_point t1;
+  t0 = Clock::now();
   {
     boost::strict_lock<boost::mutex> lg(m);
     t1 = Clock::now();
   }
-  ns d = t1 - t0 - ms(250);
-  BOOST_TEST(d < max_diff);
 #else
   //time_point t0 = Clock::now();
   //time_point t1;
@@ -58,10 +54,21 @@ int main()
   m.lock();
   boost::thread t(f);
 #ifdef BOOST_THREAD_USES_CHRONO
+  time_point t2 = Clock::now();
   boost::this_thread::sleep_for(ms(250));
+  time_point t3 = Clock::now();
 #endif
   m.unlock();
   t.join();
 
+#if defined BOOST_THREAD_USES_CHRONO
+  ns sleep_time = t3 - t2;
+  ns d_ns = t1 - t0 - sleep_time;
+  ms d_ms = boost::chrono::duration_cast<boost::chrono::milliseconds>(d_ns);
+  // BOOST_TEST_GE(d_ms.count(), 0);
+  BOOST_THREAD_TEST_IT(d_ms, max_diff);
+  BOOST_THREAD_TEST_IT(d_ns, ns(max_diff));
+#endif
+
   return boost::report_errors();
 }