chakrashim: implement LowMemoryNotification and ifdef DEBUG -> CHAKRA…

…_UNIMPLEMENTED Fixes #433 PR-URL: #425 Reviewed-By: Hitesh Kanwathirtha <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Nov 30, 2017 · 74d08c6 · 74d08c6
1 parent 77ab790
commit 74d08c6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/deps/chakrashim/src/jsrtisolateshim.cc b/deps/chakrashim/src/jsrtisolateshim.cc
@@ -426,6 +426,10 @@ bool IsolateShim::GetMemoryUsage(size_t * memoryUsage) {
   return (JsGetRuntimeMemoryUsage(runtime, memoryUsage) == JsNoError);
 }
 
+void IsolateShim::CollectGarbage() {
+  JsCollectGarbage(runtime);
+}
+
 void IsolateShim::DisposeAll() {
   // CHAKRA-TODO: multithread locking for s_isolateList?
   IsolateShim * curr = s_isolateList;

diff --git a/deps/chakrashim/src/jsrtisolateshim.h b/deps/chakrashim/src/jsrtisolateshim.h
@@ -62,6 +62,7 @@ class IsolateShim {
   bool NewContext(JsContextRef * context, bool exposeGC, bool useGlobalTTState,
                                JsValueRef globalObjectTemplateInstance);
   bool GetMemoryUsage(size_t * memoryUsage);
+  void CollectGarbage();
   bool Dispose();
   bool IsDisposing();
 

diff --git a/deps/chakrashim/src/jsrtutils.h b/deps/chakrashim/src/jsrtutils.h
@@ -78,21 +78,22 @@ inline size_t _countof(T (&)[N]) {
     } \
   }
 
+#ifdef DEBUG
+#define CHAKRA_ASSERT(expr) assert(expr)
 #define CHAKRA_UNIMPLEMENTED() jsrt::Unimplemented(__FUNCTION__)
 #define CHAKRA_UNIMPLEMENTED_(message) jsrt::Unimplemented(message)
+#else // DEBUG
+#define CHAKRA_UNIMPLEMENTED()         /* no-op */
+#define CHAKRA_UNIMPLEMENTED_(message) /* no-op */
+#define CHAKRA_ASSERT(expr)            /* no-op */
+#endif // DEBUG
 
 #define CHAKRA_VERIFY(expr) if (!(expr)) { \
   jsrt::Fatal("internal error %s(%d): %s", __FILE__, __LINE__, #expr); }
 
 #define CHAKRA_VERIFY_NOERROR(errorCode) if (errorCode != JsNoError) { \
   jsrt::Fatal("internal error %s(%d): %x", __FILE__, __LINE__, errorCode); }
 
-#ifdef DEBUG
-#define CHAKRA_ASSERT(expr) assert(expr)
-#else
-#define CHAKRA_ASSERT(expr)
-#endif
-
 namespace jsrt {
 
 // Similar to v8::String::Utf8Value but only operates on JS String.

diff --git a/deps/chakrashim/src/v8isolate.cc b/deps/chakrashim/src/v8isolate.cc
@@ -215,7 +215,7 @@ void Isolate::TerminateExecution() {
 }
 
 void Isolate::RequestGarbageCollectionForTesting(GarbageCollectionType type) {
-  JsCollectGarbage(jsrt::IsolateShim::FromIsolate(this)->GetRuntimeHandle());
+  jsrt::IsolateShim::FromIsolate(this)->CollectGarbage();
 }
 
 void Isolate::SetCounterFunction(CounterLookupCallback) {
@@ -241,7 +241,7 @@ bool Isolate::IdleNotification(int idle_time_in_ms) {
 }
 
 void Isolate::LowMemoryNotification() {
-  CHAKRA_UNIMPLEMENTED();
+  jsrt::IsolateShim::GetCurrent()->CollectGarbage();
 }
 
 int Isolate::ContextDisposedNotification() {