openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc 

am: 0660919ccf

Change-Id: I95f30c8f6f4b24daae103156dbd9996f68e38c33
This commit is contained in:
Wei Wang 2017-08-17 02:03:05 +00:00 committed by android-build-merger
parent 78a298ce24 0660919ccf
commit 7bba2bf2d9
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
init/reboot.cpp
View File

@ -267,8 +267,6 @@ static void DumpUmountDebuggingInfo(bool dump_all) {
static UmountStat UmountPartitions(std::chrono::milliseconds timeout) {
Timer t;
UmountStat stat = UMOUNT_STAT_TIMEOUT;
int retry = 0;
/* data partition needs all pending writes to be completed and all emulated partitions
* umounted.If the current waiting is not good enough, give
* up and leave it to e2fsck after reboot to fix it.
@ -280,25 +278,27 @@ static UmountStat UmountPartitions(std::chrono::milliseconds timeout) {
return UMOUNT_STAT_ERROR;
}
if (block_devices.size() == 0) {
stat = UMOUNT_STAT_SUCCESS;
break;
return UMOUNT_STAT_SUCCESS;
}
if ((timeout < t.duration()) && retry > 0) { // try umount at least once
stat = UMOUNT_STAT_TIMEOUT;
break;
bool unmount_done = true;
if (emulated_devices.size() > 0) {
unmount_done = std::all_of(emulated_devices.begin(), emulated_devices.end(),
[](auto& entry) { return entry.Umount(); });
if (unmount_done) {
sync();
}
}
if (emulated_devices.size() > 0 &&
std::all_of(emulated_devices.begin(), emulated_devices.end(),
[](auto& entry) { return entry.Umount(); })) {
sync();
unmount_done = std::all_of(block_devices.begin(), block_devices.end(),
[](auto& entry) { return entry.Umount(); }) &&
unmount_done;
if (unmount_done) {
return UMOUNT_STAT_SUCCESS;
}
for (auto& entry : block_devices) {
entry.Umount();
if ((timeout < t.duration())) { // try umount at least once
return UMOUNT_STAT_TIMEOUT;
}
retry++;
std::this_thread::sleep_for(100ms);
}
return stat;
}
static void KillAllProcesses() { android::base::WriteStringToFile("i", "/proc/sysrq-trigger"); }