tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Be more aggressive about obtaining vold service.

Browse source 
vdc is typically invoked very early during boot, where it races with
vold starting up.  The default getService() implementation waits a
whole second between retrying, so write a local getServiceAggressive()
that only waits 10ms between attempts.

Test: builds, boots
Bug: 65737446
Change-Id: I581db3afcf7f81dd7cd9cc84dc03194759861669
This commit is contained in:
Jeff Sharkey 2017-09-21 18:20:45 -06:00
parent 49672b9351
commit 4a53a9edb3
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vdc.cpp
View file

@ -39,6 +39,21 @@
static void usage(char *progname); static void usage(char *progname);
static android::sp<android::IBinder> getServiceAggressive() {
android::sp<android::IBinder> res;
auto sm = android::defaultServiceManager();
auto name = android::String16("vold");
for (int i = 0; i < 500; i++) {
res = sm->checkService(name);
if (res) {
LOG(VERBOSE) << "Waited " << (i * 10) << "ms for vold";
break;
}
usleep(10000); // 10ms
}
return res;
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
int sock; int sock;
int wait; int wait;
@ -46,6 +61,7 @@ int main(int argc, char **argv) {
progname = argv[0]; progname = argv[0];
setenv("ANDROID_LOG_TAGS", "*:v", 1);
if (getppid() == 1) { if (getppid() == 1) {
// If init is calling us then it's during boot and we should log to kmsg // If init is calling us then it's during boot and we should log to kmsg
android::base::InitLogging(argv, &android::base::KernelLogger); android::base::InitLogging(argv, &android::base::KernelLogger);
@ -67,8 +83,7 @@ int main(int argc, char **argv) {
std::string arg1 = argv[1]; std::string arg1 = argv[1];
std::string arg2 = argv[2]; std::string arg2 = argv[2];
android::sp<android::IBinder> binder = android::defaultServiceManager()->getService( android::sp<android::IBinder> binder = getServiceAggressive();
android::String16("vold"));
if (!binder) { if (!binder) {
LOG(ERROR) << "Failed to obtain vold Binder"; LOG(ERROR) << "Failed to obtain vold Binder";
exit(EINVAL); exit(EINVAL);