commit caabb1b77b4a55eb1bb45ebcd3071c9ea01dd3cf
author Brian Carlstrom <bdc@google.com> Tue Oct 11 18:09:13 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 11 22:29:58 2011 -0700
tree b4c83f013acb40f842e45128c3fe7f6fe6580d47
parent 1b5f4975e6e822ae06e2ccd361d62e4c1664d404

Implement Zygote_nativeForkSystemServer

Change-Id: I2f0c7b93e8ac3b3fa4bb350e787065f92c17972f

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index a707c4d..4f74c67 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -359,9 +359,7 @@
   // come after ClassLinker::RunRootClinits.
   started_ = true;
 
-  if (!is_zygote_) {
-    signal_catcher_ = new SignalCatcher;
-  }
+  StartSignalCatcher();
 
   StartDaemonThreads();
 
@@ -374,6 +372,18 @@
   }
 }
 
+void Runtime::DidForkFromZygote() {
+  CHECK(is_zygote_);
+  is_zygote_ = false;
+  StartSignalCatcher();
+}
+
+void Runtime::StartSignalCatcher() {
+  if (!is_zygote_) {
+    signal_catcher_ = new SignalCatcher;
+  }
+}
+
 void Runtime::StartDaemonThreads() {
   if (IsVerboseStartup()) {
     LOG(INFO) << "Runtime::StartDaemonThreads entering";