In JavaScriptEngineSwitcher.ChakraCore reduced a memory consumption in cases, where not used the embedding of objects and types

Author: Taritsyn

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj

@@ -22,8 +22,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_ChakraCore_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;ChakraCore</PackageTags>
-		<PackageReleaseNotes>1. ChakraCore was updated to version 1.11.5;
-2. Fixed a error #65 “Memory leak using EmbedHostObject”.</PackageReleaseNotes>
+		<PackageReleaseNotes>Reduced a memory consumption in cases, where not used the embedding of objects and types.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/JsRt/TypeMapper.cs

@@ -24,25 +24,43 @@ internal sealed class TypeMapper : IDisposable
 		/// <summary>
 		/// Storage for lazy-initialized embedded objects
 		/// </summary>
-		private ConcurrentDictionary<EmbeddedObjectKey, Lazy<EmbeddedObject>> _lazyEmbeddedObjects =
-			new ConcurrentDictionary<EmbeddedObjectKey, Lazy<EmbeddedObject>>();
+		private ConcurrentDictionary<EmbeddedObjectKey, Lazy<EmbeddedObject>> _lazyEmbeddedObjects;
 
 		/// <summary>
 		/// Callback for finalization of embedded object
 		/// </summary>
 		private JsFinalizeCallback _embeddedObjectFinalizeCallback;
 
+		/// <summary>
+		/// Synchronizer of embedded object storage's initialization
+		/// </summary>
+		private readonly object _embeddedObjectStorageInitializationSynchronizer = new object();
+
+		/// <summary>
+		/// Flag indicating whether the embedded object storage is initialized
+		/// </summary>
+		private bool _embeddedObjectStorageInitialized;
+
 		/// <summary>
 		/// Storage for lazy-initialized embedded types
 		/// </summary>
-		private ConcurrentDictionary<string, Lazy<EmbeddedType>> _lazyEmbeddedTypes =
-			new ConcurrentDictionary<string, Lazy<EmbeddedType>>();
+		private ConcurrentDictionary<string, Lazy<EmbeddedType>> _lazyEmbeddedTypes;
 
 		/// <summary>
 		/// Callback for finalization of embedded type
 		/// </summary>
 		private JsFinalizeCallback _embeddedTypeFinalizeCallback;
 
+		/// <summary>
+		/// Synchronizer of embedded type storage's initialization
+		/// </summary>
+		private readonly object _embeddedTypeStorageInitializationSynchronizer = new object();
+
+		/// <summary>
+		/// Flag indicating whether the embedded type storage is initialized
+		/// </summary>
+		private bool _embeddedTypeStorageInitialized;
+
 		/// <summary>
 		/// Flag indicating whether this object is disposed
 		/// </summary>
@@ -53,10 +71,7 @@ internal sealed class TypeMapper : IDisposable
 		/// Constructs an instance of type mapper
 		/// </summary>
 		public TypeMapper()
-		{
-			_embeddedObjectFinalizeCallback = EmbeddedObjectFinalizeCallback;
-			_embeddedTypeFinalizeCallback = EmbeddedTypeFinalizeCallback;
-		}
+		{ }
 
 
 		/// <summary>
@@ -66,6 +81,20 @@ public TypeMapper()
 		/// <returns>JavaScript value created from an host object</returns>
 		public JsValue GetOrCreateScriptObject(object obj)
 		{
+			if (!_embeddedObjectStorageInitialized)
+			{
+				lock (_embeddedObjectStorageInitializationSynchronizer)
+				{
+					if (!_embeddedObjectStorageInitialized)
+					{
+						_lazyEmbeddedObjects = new ConcurrentDictionary<EmbeddedObjectKey, Lazy<EmbeddedObject>>();
+						_embeddedObjectFinalizeCallback = EmbeddedObjectFinalizeCallback;
+
+						_embeddedObjectStorageInitialized = true;
+					}
+				}
+			}
+
 			var embeddedObjectKey = new EmbeddedObjectKey(obj);
 			EmbeddedObject embeddedObject = _lazyEmbeddedObjects.GetOrAdd(
 				embeddedObjectKey,
@@ -82,6 +111,20 @@ public JsValue GetOrCreateScriptObject(object obj)
 		/// <returns>JavaScript value created from an host type</returns>
 		public JsValue GetOrCreateScriptType(Type type)
 		{
+			if (!_embeddedTypeStorageInitialized)
+			{
+				lock (_embeddedTypeStorageInitializationSynchronizer)
+				{
+					if (!_embeddedTypeStorageInitialized)
+					{
+						_lazyEmbeddedTypes = new ConcurrentDictionary<string, Lazy<EmbeddedType>>();
+						_embeddedTypeFinalizeCallback = EmbeddedTypeFinalizeCallback;
+
+						_embeddedTypeStorageInitialized = true;
+					}
+				}
+			}
+
 			string embeddedTypeKey = type.AssemblyQualifiedName;
 			EmbeddedType embeddedType = _lazyEmbeddedTypes.GetOrAdd(
 				embeddedTypeKey,

Diff for: src/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,8 +30,8 @@
    =============
    RELEASE NOTES
    =============
-   1. ChakraCore was updated to version 1.11.5;
-   2. Fixed a error #65 “Memory leak using EmbedHostObject”.
+   Reduced a memory consumption in cases, where not used the embedding of objects
+   and types.
 
    =============
    DOCUMENTATION