Merge pull request #1516 from NativeScript/vmutafov/merge-release-into-master

Merge release into master

Author: Vasil Hristov

CHANGELOG.md

@@ -4,6 +4,21 @@
 ## What's New
  - [Upgrade v8 to 7.7.299.11 (#1478)](https://github.com/NativeScript/android-runtime/issues/1478)
 
+6.1.2
+==
+
+## Bug Fixes
+
+- [UI freezes with tns-android 6.1.0 (Android only) (#1479)](https://github.com/NativeScript/android-runtime/issues/1479)
+
+6.1.1
+==
+
+## Bug Fixes
+
+- [When using kotlin sometimes the metadata is not existing in the result apk (#1476)](https://github.com/NativeScript/android-runtime/issues/1476)
+
+
 6.1.0
 ==
 

test-app/runtime/src/main/cpp/ObjectManager.cpp

@@ -85,8 +85,8 @@ void ObjectManager::Init(Isolate *isolate) {
     m_poJsWrapperFunc = new Persistent<Function>(isolate, jsWrapperFunc);
 
     if (m_markingMode != JavaScriptMarkingMode::None) {
-        isolate->AddGCPrologueCallback(ObjectManager::OnGcStartedStatic, kGCTypeAll);
-        isolate->AddGCEpilogueCallback(ObjectManager::OnGcFinishedStatic, kGCTypeAll);
+        isolate->AddGCPrologueCallback(ObjectManager::OnGcStartedStatic, kGCTypeMarkSweepCompact);
+        isolate->AddGCEpilogueCallback(ObjectManager::OnGcFinishedStatic, kGCTypeMarkSweepCompact);
     }
 }
 
@@ -380,9 +380,18 @@ void ObjectManager::JSObjectWeakCallback(Isolate *isolate, ObjectWeakCallbackSta
                     jsInstanceInfo->IsJavaObjectWeak = true;
                 }
             } else {
-                assert(!m_markedForGC.empty());
-                auto &topGCInfo = m_markedForGC.top();
-                topGCInfo.markedForGC.push_back(po);
+                if(m_markedForGC.empty()){
+                    // Emulates the behavior in the OnGcStarted callback. Тhis is necessary as the hooking
+                    // to the V8 GC is done only on the markSweepCompact phase. The JSObjectWeakCallback
+                    // however is still triggered in other V8 GC phases (scavenger for example). This
+                    // creates a problem that there is no 'top' on the m_markedForGC stack.
+                    GarbageCollectionInfo gcInfo(++m_numberOfGC);
+                    gcInfo.markedForGC.push_back(po);
+                    m_markedForGC.push(gcInfo);
+                } else {
+                    auto &topGCInfo = m_markedForGC.top();
+                    topGCInfo.markedForGC.push_back(po);
+                }
             }
         }
     }
@@ -637,9 +646,15 @@ void ObjectManager::MarkReachableArrayElements(Local<Object> &o, stack<Local<Val
 
 void ObjectManager::OnGcStartedStatic(Isolate *isolate, GCType type, GCCallbackFlags flags) {
     try {
+        tns::instrumentation::Frame frame;
+
         auto runtime = Runtime::GetRuntime(isolate);
         auto objectManager = runtime->GetObjectManager();
         objectManager->OnGcStarted(type, flags);
+
+        if(frame.check()){
+            frame.log("OnGcStartedStatic");
+        }
     } catch (NativeScriptException &e) {
         e.ReThrowToV8();
     } catch (std::exception e) {
@@ -655,9 +670,15 @@ void ObjectManager::OnGcStartedStatic(Isolate *isolate, GCType type, GCCallbackF
 
 void ObjectManager::OnGcFinishedStatic(Isolate *isolate, GCType type, GCCallbackFlags flags) {
     try {
+        tns::instrumentation::Frame frame;
+
         auto runtime = Runtime::GetRuntime(isolate);
         auto objectManager = runtime->GetObjectManager();
         objectManager->OnGcFinished(type, flags);
+
+        if(frame.check()){
+            frame.log("OnGcFinishedStatic");
+        }
     } catch (NativeScriptException &e) {
         e.ReThrowToV8();
     } catch (std::exception e) {

test-app/runtime/src/main/cpp/ObjectManager.h

@@ -78,6 +78,7 @@ class ObjectManager {
         };
 
         JavaScriptMarkingMode GetMarkingMode();
+
     private:
 
         struct JSInstanceInfo {
@@ -166,6 +167,8 @@ class ObjectManager {
 
         static void JSObjectFinalizerStatic(const v8::WeakCallbackInfo<ObjectWeakCallbackState>& data);
 
+
+
         void JSObjectWeakCallback(v8::Isolate* isolate, ObjectWeakCallbackState* callbackState);
 
         void JSObjectFinalizer(v8::Isolate* isolate, ObjectWeakCallbackState* callbackState);