feat: migrate to faster maps and use runtime context (#1793)

* feat: migrate to faster maps and use runtime context

* fix: missing include

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

@@ -200,7 +200,7 @@ ArgConverter::TypeLongOperationsCache* ArgConverter::GetTypeLongCache(v8::Isolat
     auto itFound = s_type_long_operations_cache.find(isolate);
     if (itFound == s_type_long_operations_cache.end()) {
         cache = new TypeLongOperationsCache;
-        s_type_long_operations_cache.insert(make_pair(isolate, cache));
+        s_type_long_operations_cache.emplace(isolate, cache);
     } else {
         cache = itFound->second;
     }
@@ -230,4 +230,4 @@ void ArgConverter::onDisposeIsolate(Isolate* isolate) {
     }
 }
 
-std::map<Isolate*, ArgConverter::TypeLongOperationsCache*> ArgConverter::s_type_long_operations_cache;
+robin_hood::unordered_map<Isolate*, ArgConverter::TypeLongOperationsCache*> ArgConverter::s_type_long_operations_cache;

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

@@ -124,7 +124,7 @@ class ArgConverter {
          * "s_type_long_operations_cache" used to keep function
          * dealing with operations concerning java long -> javascript number.
          */
-        static std::map<v8::Isolate*, TypeLongOperationsCache*> s_type_long_operations_cache;
+        static robin_hood::unordered_map<v8::Isolate*, TypeLongOperationsCache*> s_type_long_operations_cache;
 };
 }
 

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

@@ -685,7 +685,8 @@ int CallbackHandlers::RunOnMainThreadFdCallback(int fd, int events, void *data)
     Isolate::Scope isolate_scope(isolate);
     HandleScope handle_scope(isolate);
     Local<v8::Function> cb = it->second.callback_.Get(isolate);
-    v8::Local<v8::Context> context = cb->GetCreationContextChecked();
+    Runtime* runtime = Runtime::GetRuntime(isolate);
+    v8::Local<v8::Context> context = runtime->GetContext();
     Context::Scope context_scope(context);
     // erase the it here as we're already done with its values and the callback might invalidate the iterator
     cache_.erase(it);
@@ -1025,7 +1026,7 @@ void CallbackHandlers::NewThreadCallback(const v8::FunctionCallbackInfo<v8::Valu
 
         auto persistentWorker = new Persistent<Object>(isolate, thiz);
 
-        id2WorkerMap.insert(make_pair(workerId, persistentWorker));
+        id2WorkerMap.emplace(workerId, persistentWorker);
 
         DEBUG_WRITE("Called Worker constructor id=%d", workerId);
 
@@ -1740,7 +1741,7 @@ std::atomic_uint64_t CallbackHandlers::frameCallbackCount_ = {0};
 
 
 int CallbackHandlers::nextWorkerId = 0;
-std::map<int, Persistent<Object> *> CallbackHandlers::id2WorkerMap;
+robin_hood::unordered_map<int, Persistent<Object> *> CallbackHandlers::id2WorkerMap;
 
 short CallbackHandlers::MAX_JAVA_STRING_ARRAY_LENGTH = 100;
 jclass CallbackHandlers::RUNTIME_CLASS = nullptr;

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

@@ -18,6 +18,7 @@
 #include <errno.h>
 #include "NativeScriptAssert.h"
 #include "NativeScriptException.h"
+#include "Runtime.h"
 
 namespace tns {
     class CallbackHandlers {
@@ -27,7 +28,7 @@ namespace tns {
          * Stores persistent handles of all 'Worker' objects initialized on the main thread
          * Note: No isolates different than that of the main thread should access this map
          */
-        static std::map<int, v8::Persistent<v8::Object> *> id2WorkerMap;
+        static robin_hood::unordered_map<int, v8::Persistent<v8::Object> *> id2WorkerMap;
 
         static int nextWorkerId;
 
@@ -364,7 +365,8 @@ namespace tns {
                     v8::Isolate::Scope isolate_scope(isolate);
                     v8::HandleScope handle_scope(isolate);
                     v8::Local<v8::Function> cb = entry->callback_.Get(isolate);
-                    v8::Local<v8::Context> context = cb->GetCreationContextChecked();
+                    Runtime* runtime = Runtime::GetRuntime(isolate);
+                    v8::Local<v8::Context> context = runtime->GetContext();
                     v8::Context::Scope context_scope(context);
                     // we're running the callback now, so it's not scheduled anymore
                     entry->markUnscheduled();

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

@@ -769,7 +769,7 @@ jclass JEnv::CheckForClassInCache(const string &className) {
 
 jclass JEnv::InsertClassIntoCache(const string &className, jclass &tmp) {
     auto global_class = reinterpret_cast<jclass>(m_env->NewGlobalRef(tmp));
-    s_classCache.insert(make_pair(className, global_class));
+    s_classCache.emplace(className, global_class);
     m_env->DeleteLocalRef(tmp);
 
     return global_class;
@@ -788,7 +788,7 @@ jthrowable JEnv::CheckForClassMissingCache(const string &className) {
 
 jthrowable JEnv::InsertClassIntoMissingCache(const string &className,const jthrowable &tmp) {
     auto throwable = reinterpret_cast<jthrowable>(m_env->NewGlobalRef(tmp));
-    s_missingClasses.insert(make_pair(className, throwable));
+    s_missingClasses.emplace(className, throwable);
     m_env->DeleteLocalRef(tmp);
 
     return throwable;
@@ -855,8 +855,8 @@ void JEnv::CheckForJavaException() {
 }
 
 JavaVM *JEnv::s_jvm = nullptr;
-map<string, jclass> JEnv::s_classCache;
-map<string, jthrowable> JEnv::s_missingClasses;
+robin_hood::unordered_map<string, jclass> JEnv::s_classCache;
+robin_hood::unordered_map<string, jthrowable> JEnv::s_missingClasses;
 jclass JEnv::RUNTIME_CLASS = nullptr;
 jmethodID JEnv::GET_CACHED_CLASS_METHOD_ID = nullptr;
 

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

@@ -2,7 +2,7 @@
 #define JENV_H_
 
 #include "jni.h"
-#include <map>
+#include "robin_hood.h"
 #include <string>
 
 namespace tns {
@@ -342,8 +342,8 @@ class JEnv {
 
         static jmethodID GET_CACHED_CLASS_METHOD_ID;
 
-        static std::map<std::string, jclass> s_classCache;
-        static std::map<std::string, jthrowable> s_missingClasses;
+        static robin_hood::unordered_map<std::string, jclass> s_classCache;
+        static robin_hood::unordered_map<std::string, jthrowable> s_missingClasses;
 };
 }
 

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

@@ -97,7 +97,7 @@ MetadataNode* MetadataNode::GetOrCreate(const string& className) {
 
         node = GetOrCreateInternal(treeNode);
 
-        s_name2NodeCache.insert(make_pair(className, node));
+        s_name2NodeCache.emplace(className, node);
     } else {
         node = it->second;
     }
@@ -115,7 +115,7 @@ MetadataNode* MetadataNode::GetOrCreateInternal(MetadataTreeNode* treeNode) {
     } else {
         result = new MetadataNode(treeNode);
 
-        s_treeNode2NodeCache.insert(make_pair(treeNode, result));
+        s_treeNode2NodeCache.emplace(treeNode, result);
     }
 
     return result;
@@ -131,7 +131,7 @@ MetadataTreeNode* MetadataNode::GetOrCreateTreeNodeByName(const string& classNam
     } else {
         result = s_metadataReader.GetOrCreateTreeNodeByName(className);
 
-        s_name2TreeNodeCache.insert(make_pair(className, result));
+        s_name2TreeNodeCache.emplace(className, result);
     }
 
     return result;
@@ -993,7 +993,7 @@ Local<FunctionTemplate> MetadataNode::GetConstructorFunctionTemplate(Isolate* is
         ctorFuncTemplate.Clear();
         auto pft = new Persistent<FunctionTemplate>(isolate, ctorFuncTemplate);
         CtorCacheData ctorCacheItem(pft, instanceMethodsCallbackData);
-        cache->CtorFuncCache.insert(make_pair(treeNode, ctorCacheItem));
+        cache->CtorFuncCache.emplace(treeNode, ctorCacheItem);
         return ctorFuncTemplate;
     }
 
@@ -1060,7 +1060,7 @@ Local<FunctionTemplate> MetadataNode::GetConstructorFunctionTemplate(Isolate* is
    //cache "ctorFuncTemplate"
    auto pft = new Persistent<FunctionTemplate>(isolate, ctorFuncTemplate);
    CtorCacheData ctorCacheItem(pft, instanceMethodsCallbackData);
-   cache->CtorFuncCache.insert(make_pair(treeNode, ctorCacheItem));
+   cache->CtorFuncCache.emplace(treeNode, ctorCacheItem);
 
     SetInnerTypes(isolate, wrappedCtorFunc, treeNode);
 
@@ -1735,11 +1735,11 @@ void MetadataNode::ExtendMethodCallback(const v8::FunctionCallbackInfo<v8::Value
         SetTypeMetadata(isolate, extendFunc, new TypeMetadata(fullExtendedName));
         info.GetReturnValue().Set(extendFunc);
 
-        s_name2NodeCache.insert(make_pair(fullExtendedName, node));
+        s_name2NodeCache.emplace(fullExtendedName, node);
 
         ExtendedClassCacheData cacheData(extendFunc, fullExtendedName, node);
         auto cache = GetMetadataNodeCache(isolate);
-        cache->ExtendedCtorFuncCache.insert(make_pair(fullExtendedName, cacheData));
+        cache->ExtendedCtorFuncCache.emplace(fullExtendedName, cacheData);
 
         if (frame.check()) {
             frame.log("Extending: " + node->m_name);
@@ -2027,7 +2027,7 @@ MetadataNode::MetadataNodeCache* MetadataNode::GetMetadataNodeCache(Isolate* iso
     auto itFound = s_metadata_node_cache.find(isolate);
     if (itFound == s_metadata_node_cache.end()) {
         cache = new MetadataNodeCache;
-        s_metadata_node_cache.insert(make_pair(isolate, cache));
+        s_metadata_node_cache.emplace(isolate, cache);
     } else {
         cache = itFound->second;
     }
@@ -2293,10 +2293,10 @@ void MetadataNode::onDisposeIsolate(Isolate* isolate) {
 
 string MetadataNode::TNS_PREFIX = "com/tns/gen/";
 MetadataReader MetadataNode::s_metadataReader;
-std::map<std::string, MetadataNode*> MetadataNode::s_name2NodeCache;
-std::map<std::string, MetadataTreeNode*> MetadataNode::s_name2TreeNodeCache;
-std::map<MetadataTreeNode*, MetadataNode*> MetadataNode::s_treeNode2NodeCache;
-map<Isolate*, MetadataNode::MetadataNodeCache*> MetadataNode::s_metadata_node_cache;
+robin_hood::unordered_map<std::string, MetadataNode*> MetadataNode::s_name2NodeCache;
+robin_hood::unordered_map<std::string, MetadataTreeNode*> MetadataNode::s_name2TreeNodeCache;
+robin_hood::unordered_map<MetadataTreeNode*, MetadataNode*> MetadataNode::s_treeNode2NodeCache;
+robin_hood::unordered_map<Isolate*, MetadataNode::MetadataNodeCache*> MetadataNode::s_metadata_node_cache;
 bool MetadataNode::s_profilerEnabled = false;
-std::map<Isolate*, Persistent<ObjectTemplate>*> MetadataNode::s_arrayObjectTemplates;
+robin_hood::unordered_map<Isolate*, Persistent<ObjectTemplate>*> MetadataNode::s_arrayObjectTemplates;
 

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

@@ -170,18 +170,18 @@ class MetadataNode {
                                    PrototypeTemplateFiller& protoFiller);
 
         MetadataTreeNode* m_treeNode;
-        std::map<v8::Isolate*, v8::Persistent<v8::Function>*> m_poCtorCachePerIsolate;
+        robin_hood::unordered_map<v8::Isolate*, v8::Persistent<v8::Function>*> m_poCtorCachePerIsolate;
         std::string m_name;
         std::string m_implType;
         bool m_isArray;
 
         static std::string TNS_PREFIX;
         static MetadataReader s_metadataReader;
-        static std::map<std::string, MetadataNode*> s_name2NodeCache;
-        static std::map<std::string, MetadataTreeNode*> s_name2TreeNodeCache;
-        static std::map<MetadataTreeNode*, MetadataNode*> s_treeNode2NodeCache;
-        static std::map<v8::Isolate*, MetadataNodeCache*> s_metadata_node_cache;
-        static std::map<v8::Isolate*, v8::Persistent<v8::ObjectTemplate>*> s_arrayObjectTemplates;
+        static robin_hood::unordered_map<std::string, MetadataNode*> s_name2NodeCache;
+        static robin_hood::unordered_map<std::string, MetadataTreeNode*> s_name2TreeNodeCache;
+        static robin_hood::unordered_map<MetadataTreeNode*, MetadataNode*> s_treeNode2NodeCache;
+        static robin_hood::unordered_map<v8::Isolate*, MetadataNodeCache*> s_metadata_node_cache;
+        static robin_hood::unordered_map<v8::Isolate*, v8::Persistent<v8::ObjectTemplate>*> s_arrayObjectTemplates;
         static bool s_profilerEnabled;
 
         struct MethodCallbackData {
@@ -263,9 +263,9 @@ class MetadataNode {
         struct MetadataNodeCache {
             v8::Persistent<v8::String>* MetadataKey;
 
-            std::map<MetadataTreeNode*, CtorCacheData> CtorFuncCache;
+            robin_hood::unordered_map<MetadataTreeNode*, CtorCacheData> CtorFuncCache;
 
-            std::map<std::string, MetadataNode::ExtendedClassCacheData> ExtendedCtorFuncCache;
+            robin_hood::unordered_map<std::string, MetadataNode::ExtendedClassCacheData> ExtendedCtorFuncCache;
         };
 };
 }

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

@@ -178,7 +178,7 @@ string MetadataReader::ReadTypeName(MetadataTreeNode* treeNode) {
     } else {
         name = ReadTypeNameInternal(treeNode);
 
-        m_typeNameCache.insert(make_pair(treeNode, name));
+        m_typeNameCache.emplace(treeNode, name);
     }
 
     return name;

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

@@ -6,6 +6,7 @@
 #include <map>
 #include <string>
 #include <assert.h>
+#include "robin_hood.h"
 namespace tns {
 typedef std::vector<std::string> (*GetTypeMetadataCallback)(const std::string& classname, int index);
 
@@ -186,7 +187,7 @@ class MetadataReader {
         std::vector<MetadataTreeNode*> m_v;
         GetTypeMetadataCallback m_getTypeMetadataCallback;
 
-        std::map<MetadataTreeNode*, std::string> m_typeNameCache;
+        robin_hood::unordered_map<MetadataTreeNode*, std::string> m_typeNameCache;
 };
 }
 

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

@@ -54,7 +54,7 @@ MethodCache::CacheMethodInfo MethodCache::ResolveMethodSignature(const string& c
                               :
                               env.GetMethodID(clazz, methodName, signature);
 
-            s_mthod_ctor_signature_cache.insert(make_pair(encoded_method_signature, method_info));
+            s_mthod_ctor_signature_cache.emplace(encoded_method_signature, method_info);
         }
     } else {
         method_info = (*it).second;
@@ -81,7 +81,7 @@ MethodCache::CacheMethodInfo MethodCache::ResolveConstructorSignature(const Args
             constructor_info.signature = signature;
             constructor_info.mid = env.GetMethodID(javaClass, "<init>", signature);
 
-            s_mthod_ctor_signature_cache.insert(make_pair(encoded_ctor_signature, constructor_info));
+            s_mthod_ctor_signature_cache.emplace(encoded_ctor_signature, constructor_info);
         }
     } else {
         constructor_info = (*it).second;
@@ -261,7 +261,7 @@ string MethodCache::ResolveConstructor(const FunctionCallbackInfo<Value>& args,
     return resolvedSignature;
 }
 
-map<string, MethodCache::CacheMethodInfo> MethodCache::s_mthod_ctor_signature_cache;
+robin_hood::unordered_map<string, MethodCache::CacheMethodInfo> MethodCache::s_mthod_ctor_signature_cache;
 jclass MethodCache::RUNTIME_CLASS = nullptr;
 jmethodID MethodCache::RESOLVE_METHOD_OVERLOAD_METHOD_ID = nullptr;
 jmethodID MethodCache::RESOLVE_CONSTRUCTOR_SIGNATURE_ID = nullptr;

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

@@ -59,7 +59,7 @@ class MethodCache {
          *  Used for caching the resolved constructor or method signature.
          * The encoded signature has template: <className>.S/I.<methodName>.<argsCount>.<arg1class>.<...>
          */
-        static std::map<std::string, CacheMethodInfo> s_mthod_ctor_signature_cache;
+        static robin_hood::unordered_map<std::string, CacheMethodInfo> s_mthod_ctor_signature_cache;
 };
 }
 

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

@@ -132,7 +132,7 @@ Local<Function> ModuleInternal::GetRequireFunction(Isolate* isolate, const strin
 
         auto poFunc = new Persistent<Function>(isolate, requireFunc);
 
-        m_requireCache.insert(make_pair(dirName, poFunc));
+        m_requireCache.emplace(dirName, poFunc);
     }
 
     return requireFunc;
@@ -446,7 +446,7 @@ Local<Object> ModuleInternal::LoadData(Isolate* isolate, const string& path) {
 
     auto poObj = new Persistent<Object>(isolate, json);
 
-    m_loadedModules.insert(make_pair(path, ModuleCacheEntry(poObj, true /* isData */)));
+    m_loadedModules.emplace(path, ModuleCacheEntry(poObj, true /* isData */));
 
     return json;
 }