X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fthread%2Fsrc%2Fpthread%2Fthread.cpp;h=5e51f8ea1f5564fb7b82c8c86a0dba5100a00715;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=12c3cf960fce4cb6affe94f3571e0449d9380c88;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/thread/src/pthread/thread.cpp b/ceph/src/boost/libs/thread/src/pthread/thread.cpp
index 12c3cf960..5e51f8ea1 100644
--- a/ceph/src/boost/libs/thread/src/pthread/thread.cpp
+++ b/ceph/src/boost/libs/thread/src/pthread/thread.cpp
@@ -52,7 +52,7 @@ namespace boost
             for (async_states_t::iterator i = async_states_.begin(), e = async_states_.end();
                     i != e; ++i)
             {
-                (*i)->make_ready();
+                (*i)->notify_deferred();
             }
         }
 
@@ -457,9 +457,9 @@ namespace boost
                 }
           }
 
-          void BOOST_THREAD_DECL sleep_until(const timespec& ts)
+          void BOOST_THREAD_DECL sleep_until_realtime(const timespec& ts)
           {
-                timespec now = boost::detail::timespec_now();
+                timespec now = boost::detail::timespec_now_realtime();
                 if (boost::detail::timespec_gt(ts, now))
                 {
                   for (int foo=0; foo < 5; ++foo)
@@ -479,7 +479,7 @@ namespace boost
                     condition_variable cond;
                     cond.do_wait_until(lock, ts);
     #   endif
-                    timespec now2 = boost::detail::timespec_now();
+                    timespec now2 = boost::detail::timespec_now_realtime();
                     if (boost::detail::timespec_ge(now2, ts))
                     {
                       return;
@@ -487,7 +487,6 @@ namespace boost
                   }
                 }
           }
-
         }
       }
       namespace hidden
@@ -507,7 +506,7 @@ namespace boost
             }
         }
 
-        void BOOST_THREAD_DECL sleep_until(const timespec& ts)
+        void BOOST_THREAD_DECL sleep_until_realtime(const timespec& ts)
         {
             boost::detail::thread_data_base* const thread_info=boost::detail::get_current_thread_data();
 
@@ -518,7 +517,7 @@ namespace boost
             }
             else
             {
-              boost::this_thread::no_interruption_point::hidden::sleep_until(ts);
+              boost::this_thread::no_interruption_point::hidden::sleep_until_realtime(ts);
             }
         }
       } // hidden