X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Ffiber%2Ftest%2Ftest_condition_variable_any_post.cpp;h=da6d882a06c2135be8d434651e85bb82641458cd;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=1ed44f883ac9760f20afa3de5677a4ffc3b2dc98;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/fiber/test/test_condition_variable_any_post.cpp b/ceph/src/boost/libs/fiber/test/test_condition_variable_any_post.cpp
index 1ed44f883..da6d882a0 100644
--- a/ceph/src/boost/libs/fiber/test/test_condition_variable_any_post.cpp
+++ b/ceph/src/boost/libs/fiber/test/test_condition_variable_any_post.cpp
@@ -21,10 +21,10 @@
 typedef std::chrono::nanoseconds  ns;
 typedef std::chrono::milliseconds ms;
 
-int value = 0;
+int value1 = 0;
 
 inline
-std::chrono::system_clock::time_point delay(int secs, int msecs=0, int nsecs=0) {
+std::chrono::system_clock::time_point delay(int secs, int msecs=0, int /*nsecs*/=0) {
     std::chrono::system_clock::time_point t = std::chrono::system_clock::now();
     t += std::chrono::seconds( secs);
     t += std::chrono::milliseconds( msecs);
@@ -78,12 +78,12 @@ void wait_fn(
 	boost::fibers::condition_variable_any & cond) {
 	mtx.lock();
 	cond.wait( mtx);
-	++value;
+	++value1;
     mtx.unlock();
 }
 
 void test_one_waiter_notify_one() {
-	value = 0;
+	value1 = 0;
 	boost::fibers::mutex mtx;
 	boost::fibers::condition_variable_any cond;
 
@@ -92,23 +92,23 @@ void test_one_waiter_notify_one() {
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
 	boost::fibers::fiber f2(
                 boost::fibers::launch::post,
                 notify_one_fn,
                 std::ref( cond) );
 
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     f1.join();
     f2.join();
 
-	BOOST_CHECK_EQUAL( 1, value);
+	BOOST_CHECK_EQUAL( 1, value1);
 }
 
 void test_two_waiter_notify_one() {
-	value = 0;
+	value1 = 0;
 	boost::fibers::mutex mtx;
 	boost::fibers::condition_variable_any cond;
 
@@ -117,37 +117,37 @@ void test_two_waiter_notify_one() {
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f2(
                 boost::fibers::launch::post,
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f3(
                 boost::fibers::launch::post,
                 notify_one_fn,
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f4(
                 boost::fibers::launch::post,
                 notify_one_fn,
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     f1.join();
     f2.join();
     f3.join();
     f4.join();
 
-	BOOST_CHECK_EQUAL( 2, value);
+	BOOST_CHECK_EQUAL( 2, value1);
 }
 
 void test_two_waiter_notify_all() {
-	value = 0;
+	value1 = 0;
 	boost::fibers::mutex mtx;
 	boost::fibers::condition_variable_any cond;
 
@@ -156,33 +156,33 @@ void test_two_waiter_notify_all() {
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f2(
                 boost::fibers::launch::post,
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f3(
                 boost::fibers::launch::post,
                 notify_all_fn,
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f4(
                 boost::fibers::launch::post,
                 wait_fn,
                 std::ref( mtx),
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     boost::fibers::fiber f5(
                 boost::fibers::launch::post,
                 notify_all_fn,
                 std::ref( cond) );
-	BOOST_CHECK_EQUAL( 0, value);
+	BOOST_CHECK_EQUAL( 0, value1);
 
     f1.join();
     f2.join();
@@ -190,7 +190,7 @@ void test_two_waiter_notify_all() {
     f4.join();
     f5.join();
 
-	BOOST_CHECK_EQUAL( 3, value);
+	BOOST_CHECK_EQUAL( 3, value1);
 }
 
 int test1 = 0;
@@ -225,7 +225,7 @@ void fn2( boost::fibers::mutex & m, boost::fibers::condition_variable_any & cv)
         BOOST_CHECK(t1 - t0 < ms(250));
         BOOST_CHECK(test2 != 0);
     } else {
-        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+5+1000));
+        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+100+1000));
         BOOST_CHECK(test2 == 0);
     }
     ++runs;
@@ -258,7 +258,7 @@ void fn3( boost::fibers::mutex & m, boost::fibers::condition_variable_any & cv)
         BOOST_CHECK(test2 != 0);
         BOOST_CHECK(r);
     } else {
-        BOOST_CHECK(t1 - t0 - ms(250) < ms(250+2));
+        BOOST_CHECK(t1 - t0 - ms(250) < ms(250+100));
         BOOST_CHECK(test2 == 0);
         BOOST_CHECK(!r);
     }
@@ -280,7 +280,7 @@ void fn4( boost::fibers::mutex & m, boost::fibers::condition_variable_any & cv)
         BOOST_CHECK(t1 - t0 < ms(250));
         BOOST_CHECK(test2 != 0);
     } else {
-        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+5+1000));
+        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+100+1000));
         BOOST_CHECK(test2 == 0);
     }
     ++runs;
@@ -301,7 +301,7 @@ void fn5( boost::fibers::mutex & m, boost::fibers::condition_variable_any & cv)
         BOOST_CHECK(t1 - t0 < ms(250+1000));
         BOOST_CHECK(test2 != 0);
     } else {
-        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+2));
+        BOOST_CHECK(t1 - t0 - ms(250) < ms(count*250+100));
         BOOST_CHECK(test2 == 0);
     }
     ++runs;