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

Merge "init: watchdog restarted during shutdown fsck"

Browse source 
am: 3443caa

* commit '3443caa2fe8bfd7ef0d1f2cac8fea4dc6530a9cf':
  init: watchdog restarted during shutdown fsck

Change-Id: I7b16347948ffb1b39cd787dc10056e56bfc3ed0c
This commit is contained in:
Mark Salyzyn 2016-04-05 18:41:50 +00:00 • committed by android-build-merger
commit 34dcdd8075
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/builtins.cpp
View file

@ -21,6 +21,7 @@
#include <mntent.h> #include <mntent.h>
#include <net/if.h> #include <net/if.h>
#include <signal.h> #include <signal.h>
#include <sched.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -129,6 +130,16 @@ static void unmount_and_fsck(const struct mntent *entry) {
ServiceManager::GetInstance().ForEachService([] (Service* s) { s->Stop(); }); ServiceManager::GetInstance().ForEachService([] (Service* s) { s->Stop(); });
TEMP_FAILURE_RETRY(kill(-1, SIGKILL)); TEMP_FAILURE_RETRY(kill(-1, SIGKILL));
// Restart Watchdogd to allow us to complete umounting and fsck
Service *svc = ServiceManager::GetInstance().FindServiceByName("watchdogd");
if (svc) {
do {
sched_yield(); // do not be so eager, let cleanup have priority
ServiceManager::GetInstance().ReapAnyOutstandingChildren();
} while (svc->flags() & SVC_RUNNING); // Paranoid Cargo
svc->Start();
}
int count = 0; int count = 0;
while (count++ < UNMOUNT_CHECK_TIMES) { while (count++ < UNMOUNT_CHECK_TIMES) {
int fd = TEMP_FAILURE_RETRY(open(entry->mnt_fsname, O_RDONLY | O_EXCL)); int fd = TEMP_FAILURE_RETRY(open(entry->mnt_fsname, O_RDONLY | O_EXCL));
@ -149,6 +160,11 @@ static void unmount_and_fsck(const struct mntent *entry) {
} }
} }
// NB: With watchdog still running, there is no cap on the time it takes
// to complete the fsck, from the users perspective the device graphics
// and responses are locked-up and they may choose to hold the power
// button in frustration if it drags out.
int st; int st;
if (!strcmp(entry->mnt_type, "f2fs")) { if (!strcmp(entry->mnt_type, "f2fs")) {
const char *f2fs_argv[] = { const char *f2fs_argv[] = {