commit 3d0b1ea86623150351715833da3f825d7de4d625
author Daniel Rosenberg <drosen@google.com> Mon Nov 21 16:46:13 2022 -0800
committer Alexander Martinz <amartinz@shiftphones.com> Thu Sep 28 20:25:26 2023 +0200
tree eb35f450a934b4d05bd627b2c822c86d6f524a23
parent 722688825a5e3801ae5db99fbb70a55e756cc41c

Use sleep_for for fsck timeout

sleep may exit early due to interupts.
This ensures the full expected time elapses before timing out.

Bug: 258348748
Test: Mount removable storage with ~30K folders,
      observe timeout in logs
Change-Id: I8092d4be43b85c9a53e8bb2658316159ab93bfc2

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index e8049ed..8214536 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -766,7 +766,7 @@
         }
         pid_t timer_pid = fork();
         if (timer_pid == 0) {
-            sleep(timeout.count());
+            std::this_thread::sleep_for(timeout);
             _exit(ETIMEDOUT);
         }
         if (timer_pid == -1) {