import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / thread / test / sync / mutual_exclusion / locks / upgrade_lock / cons / duration_pass.cpp

diff --git a/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp b/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
index f06da0235584a7bfc572593c13599ba3c070d249..b6506b9b32049644fb7b8b55ebc90a6393f553b0 100644 (file)
--- a/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
+++ b/ceph/src/boost/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
@@ -26,39 +26,36 @@
 #include <boost/thread/thread.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/chrono/chrono_io.hpp>
+#include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
 
-typedef boost::chrono::steady_clock Clock;
+typedef boost::chrono::high_resolution_clock Clock;
 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;
 
-#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 f1()
 {
-  time_point t0 = Clock::now();
+  t0 = Clock::now();
   boost::upgrade_lock<boost::shared_mutex> lk(m, ms(750));
   BOOST_TEST(lk.owns_lock() == true);
-  time_point t1 = Clock::now();
-  ns d = t1 - t0 - ms(250);
-  BOOST_TEST(d < max_diff);
+  t1 = Clock::now();
 }
 
 void f2()
 {
-  time_point t0 = Clock::now();
+  t0 = Clock::now();
   boost::upgrade_lock<boost::shared_mutex> lk(m, ms(250));
   BOOST_TEST(lk.owns_lock() == false);
-  time_point t1 = Clock::now();
+  t1 = Clock::now();
   ns d = t1 - t0 - ms(250);
-  BOOST_TEST(d < max_diff);
+  BOOST_THREAD_TEST_IT(d, ns(max_diff));
 }
 
 int main()
@@ -66,9 +63,18 @@ int main()
   {
     m.lock();
     boost::thread t(f1);
+    time_point t2 = Clock::now();
     boost::this_thread::sleep_for(ms(250));
+    time_point t3 = Clock::now();
     m.unlock();
     t.join();
+
+    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));
   }
   {
     m.lock();