commit e095c9135a6b28c3e8059a9a55d4c479f3e2c7f3
author Andreas Gampe <agampe@google.com> Thu Mar 14 13:38:49 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 15 02:01:41 2019 +0000
tree 1cc69dbb19fc52285ea19fa6b72e46fa17d2f7ff
parent b214694e13890559ae587263f93eb3cfdd63eaa1

ART: Cache Runtime* in nativePostForkChild

Preparation for future change.

Bug: 125474642
Test: m test-art-host
Test: Device boots
Change-Id: I69018b9afe2063ca6ba8dd9f70f3b996888611a4

runtime/native/dalvik_system_ZygoteHooks.cc

diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc
index da0e048..7194f9e 100644
--- a/runtime/native/dalvik_system_ZygoteHooks.cc
+++ b/runtime/native/dalvik_system_ZygoteHooks.cc
@@ -282,13 +282,15 @@
   runtime_flags = EnableDebugFeatures(runtime_flags);
   hiddenapi::EnforcementPolicy api_enforcement_policy = hiddenapi::EnforcementPolicy::kDisabled;
 
+  Runtime* runtime = Runtime::Current();
+
   if ((runtime_flags & DISABLE_VERIFIER) != 0) {
-    Runtime::Current()->DisableVerifier();
+    runtime->DisableVerifier();
     runtime_flags &= ~DISABLE_VERIFIER;
   }
 
   if ((runtime_flags & ONLY_USE_SYSTEM_OAT_FILES) != 0 || is_system_server) {
-    Runtime::Current()->GetOatFileManager().SetOnlyUseSystemOatFiles();
+    runtime->GetOatFileManager().SetOnlyUseSystemOatFiles();
     runtime_flags &= ~ONLY_USE_SYSTEM_OAT_FILES;
   }
 
@@ -299,7 +301,7 @@
   bool profile_system_server = (runtime_flags & PROFILE_SYSTEM_SERVER) == PROFILE_SYSTEM_SERVER;
   runtime_flags &= ~PROFILE_SYSTEM_SERVER;
 
-  Runtime::Current()->SetLoadAppImageStartupCacheEnabled(
+  runtime->SetLoadAppImageStartupCacheEnabled(
       (runtime_flags & USE_APP_IMAGE_STARTUP_CACHE) != 0u);
   runtime_flags &= ~USE_APP_IMAGE_STARTUP_CACHE;
 
@@ -307,15 +309,15 @@
     LOG(ERROR) << StringPrintf("Unknown bits set in runtime_flags: %#x", runtime_flags);
   }
 
-  Runtime::Current()->GetHeap()->PostForkChildAction(thread);
-  if (Runtime::Current()->GetJit() != nullptr) {
+  runtime->GetHeap()->PostForkChildAction(thread);
+  if (runtime->GetJit() != nullptr) {
     if (!is_system_server) {
       // System server already called the JIT cache post fork action in `nativePostForkSystemServer`.
-      Runtime::Current()->GetJit()->GetCodeCache()->PostForkChildAction(
+      runtime->GetJit()->GetCodeCache()->PostForkChildAction(
           /* is_system_server= */ false, is_zygote);
     }
     // This must be called after EnableDebugFeatures.
-    Runtime::Current()->GetJit()->PostForkChildAction(is_zygote);
+    runtime->GetJit()->PostForkChildAction(is_zygote);
   }
 
   // Update tracing.
@@ -365,10 +367,10 @@
       << "SystemServer should be forked with EnforcementPolicy::kDisable";
   DCHECK(!(is_zygote && do_hidden_api_checks))
       << "Child zygote processes should be forked with EnforcementPolicy::kDisable";
-  Runtime::Current()->SetHiddenApiEnforcementPolicy(api_enforcement_policy);
-  Runtime::Current()->SetDedupeHiddenApiWarnings(true);
+  runtime->SetHiddenApiEnforcementPolicy(api_enforcement_policy);
+  runtime->SetDedupeHiddenApiWarnings(true);
   if (api_enforcement_policy != hiddenapi::EnforcementPolicy::kDisabled &&
-      Runtime::Current()->GetHiddenApiEventLogSampleRate() != 0) {
+      runtime->GetHiddenApiEventLogSampleRate() != 0) {
     // Hidden API checks are enabled, and we are sampling access for the event log. Initialize the
     // random seed, to ensure the sampling is actually random. We do this post-fork, as doing it
     // pre-fork would result in the same sequence for every forked process.
@@ -389,10 +391,9 @@
     if (isa != InstructionSet::kNone && isa != kRuntimeISA) {
       action = Runtime::NativeBridgeAction::kInitialize;
     }
-    Runtime::Current()->InitNonZygoteOrPostFork(
-        env, is_system_server, action, isa_string.c_str());
+    runtime->InitNonZygoteOrPostFork(env, is_system_server, action, isa_string.c_str());
   } else {
-    Runtime::Current()->InitNonZygoteOrPostFork(
+    runtime->InitNonZygoteOrPostFork(
         env,
         is_system_server,
         Runtime::NativeBridgeAction::kUnload,