commit 3e99e546b148c77bb7a44f27293d666624c2f842
author Thierry Strudel <tstrudel@google.com> Sat May 23 00:03:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 23 00:03:23 2015 +0000
tree da304cb7a872b053857f716fa9e707103f6bff9f
parent ede1d798d179258009aeb2f1d70a8643138f0f85
parent 7dd5152811abcfb20adc1df6f7c4638e9de2007f

am 604e7544: am 91cf41cf: init: wait_for_file use smaller time resolution

* commit '604e75449d8a2138c920b2497c21dc400983f544':
  init: wait_for_file use smaller time resolution

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index d22045f..c2058a6 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -367,10 +367,10 @@
 int wait_for_file(const char *filename, int timeout)
 {
     struct stat info;
-    time_t timeout_time = gettime() + timeout;
+    uint64_t timeout_time_ns = gettime_ns() + timeout * UINT64_C(1000000000);
     int ret = -1;
 
-    while (gettime() < timeout_time && ((ret = stat(filename, &info)) < 0))
+    while (gettime_ns() < timeout_time_ns && ((ret = stat(filename, &info)) < 0))
         usleep(10000);
 
     return ret;