Drop JSC code on background

Reviewed By: lexs

Differential Revision: D3311037

fbshipit-source-id: e46559108c51f1cd163ed5c557d23c21f696ef88

ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java

@@ -20,6 +20,7 @@ import static android.content.ComponentCallbacks2.TRIM_MEMORY_BACKGROUND;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_MODERATE;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL;
+import static android.content.ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN;
 
 /**
  * Translates and routes memory pressure events to the current catalyst instance.
@@ -27,6 +28,8 @@ import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL;
 public class MemoryPressureRouter {
   // Trigger this by sending an intent to your activity with adb shell:
   // am broadcast -a com.facebook.catalyst.ACTION_TRIM_MEMORY_MODERATE
+  private static final String ACTION_TRIM_MEMORY_UI_HIDDEN =
+    "com.facebook.rnfeed.ACTION_TRIM_MEMORY_UI_HIDDEN";
   private static final String ACTION_TRIM_MEMORY_MODERATE =
     "com.facebook.rnfeed.ACTION_TRIM_MEMORY_MODERATE";
   private static final String ACTION_TRIM_MEMORY_CRITICAL =
@@ -52,6 +55,9 @@ public class MemoryPressureRouter {
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
   public static boolean handleDebugIntent(Application application, String action) {
     switch (action) {
+      case ACTION_TRIM_MEMORY_UI_HIDDEN:
+        simulateTrimMemory(application, ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN);
+        break;
       case ACTION_TRIM_MEMORY_MODERATE:
         simulateTrimMemory(application, TRIM_MEMORY_MODERATE);
         break;
@@ -87,10 +93,12 @@ public class MemoryPressureRouter {
   }
 
   private void trimMemory(int level) {
-    if (level >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) {
+    if (level >= TRIM_MEMORY_COMPLETE) {
       dispatchMemoryPressure(MemoryPressure.CRITICAL);
     } else if (level >= TRIM_MEMORY_BACKGROUND || level == TRIM_MEMORY_RUNNING_CRITICAL) {
       dispatchMemoryPressure(MemoryPressure.MODERATE);
+    } else if (level == TRIM_MEMORY_UI_HIDDEN) {
+      dispatchMemoryPressure(MemoryPressure.UI_HIDDEN);
     }
   }
 

ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressure.java

@@ -3,6 +3,7 @@
 package com.facebook.react.bridge;
 
 public enum MemoryPressure {
+  UI_HIDDEN,
   MODERATE,
   CRITICAL
 }

ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java

@@ -58,6 +58,9 @@ public class ReactBridge extends Countable {
 
   public void handleMemoryPressure(MemoryPressure level) {
     switch (level) {
+      case UI_HIDDEN:
+        handleMemoryPressureUiHidden();
+        break;
       case MODERATE:
         handleMemoryPressureModerate();
         break;
@@ -86,6 +89,7 @@ public class ReactBridge extends Countable {
   public native void startProfiler(String title);
   public native void stopProfiler(String title, String filename);
   public native ExecutorToken getMainExecutorToken();
+  private native void handleMemoryPressureUiHidden();
   private native void handleMemoryPressureModerate();
   private native void handleMemoryPressureCritical();
   public native void destroy();

ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java

@@ -289,8 +289,26 @@ public class CatalystInstanceImpl implements CatalystInstance {
     return mJavaRegistry.getAllModules();
   }
 
+  private native void handleMemoryPressureUiHidden();
+  private native void handleMemoryPressureModerate();
+  private native void handleMemoryPressureCritical();
+
   @Override
   public void handleMemoryPressure(MemoryPressure level) {
+    if (mDestroyed) {
+      return;
+    }
+    switch(level) {
+      case UI_HIDDEN:
+        handleMemoryPressureUiHidden();
+        break;
+      case MODERATE:
+        handleMemoryPressureModerate();
+        break;
+      case CRITICAL:
+        handleMemoryPressureCritical();
+        break;
+    }
   }
 
   /**

ReactAndroid/src/main/jni/react/Bridge.cpp

@@ -127,6 +127,12 @@ void Bridge::stopProfiler(const std::string& title, const std::string& filename)
   });
 }
 
+void Bridge::handleMemoryPressureUiHidden() {
+  runOnExecutorQueue(*m_mainExecutorToken, [=] (JSExecutor* executor) {
+    executor->handleMemoryPressureUiHidden();
+  });
+}
+
 void Bridge::handleMemoryPressureModerate() {
   runOnExecutorQueue(*m_mainExecutorToken, [=] (JSExecutor* executor) {
     executor->handleMemoryPressureModerate();

ReactAndroid/src/main/jni/react/Bridge.h

@@ -96,6 +96,7 @@ public:
   bool supportsProfiling();
   void startProfiler(const std::string& title);
   void stopProfiler(const std::string& title, const std::string& filename);
+  void handleMemoryPressureUiHidden();
   void handleMemoryPressureModerate();
   void handleMemoryPressureCritical();
 

ReactAndroid/src/main/jni/react/Executor.h

@@ -68,6 +68,7 @@ public:
   };
   virtual void startProfiler(const std::string &titleString) {};
   virtual void stopProfiler(const std::string &titleString, const std::string &filename) {};
+  virtual void handleMemoryPressureUiHidden() {};
   virtual void handleMemoryPressureModerate() {};
   virtual void handleMemoryPressureCritical() {
     handleMemoryPressureModerate();

ReactAndroid/src/main/jni/react/JSCExecutor.cpp

@@ -363,6 +363,12 @@ void JSCExecutor::stopProfiler(const std::string &titleString, const std::string
   #endif
 }
 
+void JSCExecutor::handleMemoryPressureUiHidden() {
+  #ifdef WITH_JSC_MEMORY_PRESSURE
+  JSHandleMemoryPressure(this, m_context, JSMemoryPressure::UI_HIDDEN);
+  #endif
+}
+
 void JSCExecutor::handleMemoryPressureModerate() {
   #ifdef WITH_JSC_MEMORY_PRESSURE
   JSHandleMemoryPressure(this, m_context, JSMemoryPressure::MODERATE);

ReactAndroid/src/main/jni/react/JSCExecutor.h

@@ -71,6 +71,7 @@ public:
   virtual bool supportsProfiling() override;
   virtual void startProfiler(const std::string &titleString) override;
   virtual void stopProfiler(const std::string &titleString, const std::string &filename) override;
+  virtual void handleMemoryPressureUiHidden() override;
   virtual void handleMemoryPressureModerate() override;
   virtual void handleMemoryPressureCritical() override;
   virtual void destroy() override;

ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

@@ -839,6 +839,12 @@ static void stopProfiler(JNIEnv* env, jobject obj, jstring title, jstring filena
   bridge->stopProfiler(fromJString(env, title), fromJString(env, filename));
 }
 
+static void handleMemoryPressureUiHidden(JNIEnv* env, jobject obj) {
+  LOG(WARNING) << "handleMemoryPressureUiHidden";
+  auto bridge = extractRefPtr<CountableBridge>(env, obj);
+  bridge->handleMemoryPressureUiHidden();
+}
+
 static void handleMemoryPressureModerate(JNIEnv* env, jobject obj) {
   auto bridge = extractRefPtr<CountableBridge>(env, obj);
   bridge->handleMemoryPressureModerate();
@@ -1029,6 +1035,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         makeNativeMethod("supportsProfiling", bridge::supportsProfiling),
         makeNativeMethod("startProfiler", bridge::startProfiler),
         makeNativeMethod("stopProfiler", bridge::stopProfiler),
+        makeNativeMethod("handleMemoryPressureUiHidden", bridge::handleMemoryPressureUiHidden),
         makeNativeMethod("handleMemoryPressureModerate", bridge::handleMemoryPressureModerate),
         makeNativeMethod("handleMemoryPressureCritical", bridge::handleMemoryPressureCritical),
         makeNativeMethod("getJavaScriptContextNativePtrExperimental", bridge::getJavaScriptContext),

ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp

@@ -106,6 +106,9 @@ void CatalystInstanceImpl::registerNatives() {
       makeNativeMethod("callJSCallback", CatalystInstanceImpl::callJSCallback),
       makeNativeMethod("getMainExecutorToken", CatalystInstanceImpl::getMainExecutorToken),
       makeNativeMethod("setGlobalVariable", CatalystInstanceImpl::setGlobalVariable),
+      makeNativeMethod("handleMemoryPressureUiHidden", CatalystInstanceImpl::handleMemoryPressureUiHidden),
+      makeNativeMethod("handleMemoryPressureModerate", CatalystInstanceImpl::handleMemoryPressureModerate),
+      makeNativeMethod("handleMemoryPressureCritical", CatalystInstanceImpl::handleMemoryPressureCritical),
       makeNativeMethod("supportsProfiling", CatalystInstanceImpl::supportsProfiling),
       makeNativeMethod("startProfiler", CatalystInstanceImpl::startProfiler),
       makeNativeMethod("stopProfiler", CatalystInstanceImpl::stopProfiler),
@@ -204,6 +207,18 @@ void CatalystInstanceImpl::setGlobalVariable(std::string propName,
                                folly::make_unique<JSBigStdString>(std::move(jsonValue)));
 }
 
+void CatalystInstanceImpl::handleMemoryPressureUiHidden() {
+  instance_->handleMemoryPressureUiHidden();
+}
+
+void CatalystInstanceImpl::handleMemoryPressureModerate() {
+  instance_->handleMemoryPressureModerate();
+}
+
+void CatalystInstanceImpl::handleMemoryPressureCritical() {
+  instance_->handleMemoryPressureCritical();
+}
+
 jboolean CatalystInstanceImpl::supportsProfiling() {
   if (!instance_) {
     return false;

ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h

@@ -55,6 +55,9 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   local_ref<JExecutorToken::JavaPart> getMainExecutorToken();
   void setGlobalVariable(std::string propName,
                          std::string&& jsonValue);
+  void handleMemoryPressureUiHidden();
+  void handleMemoryPressureModerate();
+  void handleMemoryPressureCritical();
   jboolean supportsProfiling();
   void startProfiler(const std::string& title);
   void stopProfiler(const std::string& title, const std::string& filename);

ReactCommon/bridge/Executor.h

@@ -168,6 +168,7 @@ public:
   }
   virtual void startProfiler(const std::string &titleString) {}
   virtual void stopProfiler(const std::string &titleString, const std::string &filename) {}
+  virtual void handleMemoryPressureUiHidden() {}
   virtual void handleMemoryPressureModerate() {}
   virtual void handleMemoryPressureCritical() {
     handleMemoryPressureModerate();

ReactCommon/bridge/Instance.cpp

@@ -118,5 +118,17 @@ ExecutorToken Instance::getMainExecutorToken() {
   return nativeToJsBridge_->getMainExecutorToken();
 }
 
+void Instance::handleMemoryPressureUiHidden() {
+  nativeToJsBridge_->handleMemoryPressureUiHidden();
+}
+
+void Instance::handleMemoryPressureModerate() {
+  nativeToJsBridge_->handleMemoryPressureModerate();
+}
+
+void Instance::handleMemoryPressureCritical() {
+  nativeToJsBridge_->handleMemoryPressureCritical();
+}
+
 } // namespace react
 } // namespace facebook

ReactCommon/bridge/Instance.h

@@ -50,6 +50,9 @@ class Instance {
   MethodCallResult callSerializableNativeHook(ExecutorToken token, unsigned int moduleId,
                                               unsigned int methodId, folly::dynamic&& args);
   ExecutorToken getMainExecutorToken();
+  void handleMemoryPressureUiHidden();
+  void handleMemoryPressureModerate();
+  void handleMemoryPressureCritical();
 
  private:
   void callNativeModules(ExecutorToken token, const std::string& calls, bool isEndOfBatch);

ReactCommon/bridge/JSCExecutor.cpp

@@ -371,6 +371,12 @@ void JSCExecutor::stopProfiler(const std::string &titleString, const std::string
   #endif
 }
 
+void JSCExecutor::handleMemoryPressureUiHidden() {
+  #ifdef WITH_JSC_MEMORY_PRESSURE
+  JSHandleMemoryPressure(this, m_context, JSMemoryPressure::UI_HIDDEN);
+  #endif
+}
+
 void JSCExecutor::handleMemoryPressureModerate() {
   #ifdef WITH_JSC_MEMORY_PRESSURE
   JSHandleMemoryPressure(this, m_context, JSMemoryPressure::MODERATE);

ReactCommon/bridge/JSCExecutor.h

@@ -74,6 +74,7 @@ public:
   virtual bool supportsProfiling() override;
   virtual void startProfiler(const std::string &titleString) override;
   virtual void stopProfiler(const std::string &titleString, const std::string &filename) override;
+  virtual void handleMemoryPressureUiHidden() override;
   virtual void handleMemoryPressureModerate() override;
   virtual void handleMemoryPressureCritical() override;
   virtual void destroy() override;

ReactCommon/bridge/NativeToJsBridge.cpp

@@ -226,6 +226,12 @@ void NativeToJsBridge::stopProfiler(const std::string& title, const std::string&
   });
 }
 
+void NativeToJsBridge::handleMemoryPressureUiHidden() {
+  runOnExecutorQueue(m_mainExecutorToken, [=] (JSExecutor* executor) {
+    executor->handleMemoryPressureUiHidden();
+  });
+}
+
 void NativeToJsBridge::handleMemoryPressureModerate() {
   runOnExecutorQueue(m_mainExecutorToken, [=] (JSExecutor* executor) {
     executor->handleMemoryPressureModerate();

ReactCommon/bridge/NativeToJsBridge.h

@@ -101,6 +101,7 @@ public:
   bool supportsProfiling();
   void startProfiler(const std::string& title);
   void stopProfiler(const std::string& title, const std::string& filename);
+  void handleMemoryPressureUiHidden();
   void handleMemoryPressureModerate();
   void handleMemoryPressureCritical();