commit c8dbd22fb188abbc8d5cd74ba3d41930332b8337
author Howard Hinnant <hhinnant@apple.com> Sat Nov 20 19:16:30 2010 +0000
committer Howard Hinnant <hhinnant@apple.com> Sat Nov 20 19:16:30 2010 +0000
tree a2c1014b9c89cfa2bc59e9bbfb2f392f9cce8196
parent 35255adba3072c503e78215e81a830ef89882913

N3191: C++ Timeout Specification

llvm-svn: 119909
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 3dc6455ff0216030b1864b1d9676549f74f1a128

src/chrono.cpp

diff --git a/src/chrono.cpp b/src/chrono.cpp
index fe3c3f6..c371420 100644
--- a/src/chrono.cpp
+++ b/src/chrono.cpp
@@ -44,7 +44,7 @@
     return system_clock::time_point(seconds(t));
 }
 
-// monotonic_clock
+// steady_clock
 
 #if __APPLE__
 //   mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of
@@ -58,15 +58,15 @@
 #pragma GCC visibility push(hidden)
 
 static
-monotonic_clock::rep
-monotonic_simplified()
+steady_clock::rep
+steady_simplified()
 {
     return mach_absolute_time();
 }
 
 static
 double
-compute_monotonic_factor()
+compute_steady_factor()
 {
     mach_timebase_info_data_t MachInfo;
     mach_timebase_info(&MachInfo);
@@ -74,32 +74,32 @@
 }
 
 static
-monotonic_clock::rep
-monotonic_full()
+steady_clock::rep
+steady_full()
 {
-    static const double factor = compute_monotonic_factor();
-    return static_cast<monotonic_clock::rep>(mach_absolute_time() * factor);
+    static const double factor = compute_steady_factor();
+    return static_cast<steady_clock::rep>(mach_absolute_time() * factor);
 }
 
-typedef monotonic_clock::rep (*FP)();
+typedef steady_clock::rep (*FP)();
 
 static
 FP
-init_monotonic_clock()
+init_steady_clock()
 {
     mach_timebase_info_data_t MachInfo;
     mach_timebase_info(&MachInfo);
     if (MachInfo.numer == MachInfo.denom)
-        return &monotonic_simplified;
-    return &monotonic_full;
+        return &steady_simplified;
+    return &steady_full;
 }
 
 #pragma GCC visibility pop
 
-monotonic_clock::time_point
-monotonic_clock::now()
+steady_clock::time_point
+steady_clock::now()
 {
-    static FP fp = init_monotonic_clock();
+    static FP fp = init_steady_clock();
     return time_point(duration(fp()));
 }
 
@@ -109,12 +109,12 @@
 // _POSIX_MONOTONIC_CLOCK and fall back to something else if those
 // don't exist.
 
-// Warning:  If this is not truly monotonic, then it is non-conforming.  It is
+// Warning:  If this is not truly steady, then it is non-conforming.  It is
 //  better for it to not exist and have the rest of libc++ use system_clock
 //  instead.
 
-monotonic_clock::time_point
-monotonic_clock::now()
+steady_clock::time_point
+steady_clock::now()
 {
     struct timespec tp;
     if (0 != clock_gettime(CLOCK_MONOTONIC, &tp))