ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: add timers around sync() during shutdown"

Browse source
This commit is contained in:
Tom Cherry 2018-03-15 20:04:17 +00:00 • committed by Gerrit Code Review
commit 39273df651
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/reboot.cpp
View file

@ -429,10 +429,20 @@ void RebootThread(unsigned int cmd, std::chrono::milliseconds shutdown_timeout,
if (kill_after_apps.count(s->name())) s->Stop(); if (kill_after_apps.count(s->name())) s->Stop();
} }
// 4. sync, try umount, and optionally run fsck for user shutdown // 4. sync, try umount, and optionally run fsck for user shutdown
sync(); {
Timer sync_timer;
LOG(INFO) << "sync() before umount...";
sync();
LOG(INFO) << "sync() before umount took" << sync_timer;
}
UmountStat stat = TryUmountAndFsck(runFsck, shutdown_timeout - t.duration()); UmountStat stat = TryUmountAndFsck(runFsck, shutdown_timeout - t.duration());
// Follow what linux shutdown is doing: one more sync with little bit delay // Follow what linux shutdown is doing: one more sync with little bit delay
sync(); {
Timer sync_timer;
LOG(INFO) << "sync() after umount...";
sync();
LOG(INFO) << "sync() after umount took" << sync_timer;
}
if (cmd != ANDROID_RB_THERMOFF) std::this_thread::sleep_for(100ms); if (cmd != ANDROID_RB_THERMOFF) std::this_thread::sleep_for(100ms);
LogShutdownTime(stat, &t); LogShutdownTime(stat, &t);