In JavaScriptEngineSwitcher.ChakraCore improved a performance in version for Unix

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>ChakraCore was updated to version 1.11.0.</releaseNotes>
+		<releaseNotes>Improved a performance in version for Unix.</releaseNotes>
 		<copyright>Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,7 +30,7 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.11.0.
+   Improved a performance in version for Unix.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore.Net4/JavaScriptEngineSwitcher.ChakraCore.Net40.csproj

@@ -79,6 +79,9 @@
     <Compile Include="..\JavaScriptEngineSwitcher.ChakraCore\ChakraCoreSettings.cs">
       <Link>ChakraCoreSettings.cs</Link>
     </Compile>
+    <Compile Include="..\JavaScriptEngineSwitcher.ChakraCore\DefaultExternalBufferFinalizeCallback.cs">
+      <Link>JsRt\DefaultExternalBufferFinalizeCallback.cs</Link>
+    </Compile>
     <Compile Include="..\JavaScriptEngineSwitcher.ChakraCore\Helpers\NumericHelpers.cs">
       <Link>Helpers\NumericHelpers.cs</Link>
     </Compile>

src/JavaScriptEngineSwitcher.ChakraCore/DefaultExternalBufferFinalizeCallback.cs

@@ -0,0 +1,15 @@
+using System.Runtime.InteropServices;
+
+namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
+{
+	/// <summary>
+	/// Default callback for finalization of external buffer
+	/// </summary>
+	internal static class DefaultExternalBufferFinalizeCallback
+	{
+		/// <summary>
+		/// Gets a instance of default callback for finalization of external buffer
+		/// </summary>
+		public static readonly JsObjectFinalizeCallback Instance = Marshal.FreeHGlobal;
+	}
+}

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 
 using JavaScriptEngineSwitcher.Core.Utilities;
 
@@ -144,32 +145,33 @@ public static uint Idle()
 		}
 
 		/// <summary>
-		/// Parses a script and returns a <c>Function</c> representing the script
+		/// Parses a script and returns a function representing the script
 		/// </summary>
 		/// <remarks>
 		/// Requires an active script context.
 		/// </remarks>
 		/// <param name="script">The script to parse</param>
-		/// <param name="sourceContext">The cookie identifying the script that can be used
-		/// by script contexts that have debugging enabled</param>
-		/// <param name="sourceName">The location the script came from</param>
-		/// <returns>The <c>Function</c> representing the script code</returns>
-		public static JsValue ParseScript(string script, JsSourceContext sourceContext, string sourceName)
+		/// <param name="sourceContext">A cookie identifying the script that can be used
+		/// by debuggable script contexts</param>
+		/// <param name="sourceUrl">The location the script came from</param>
+		/// <returns>A function representing the script code</returns>
+		public static JsValue ParseScript(string script, JsSourceContext sourceContext, string sourceUrl)
 		{
 			JsValue result;
 			JsErrorCode errorCode;
 
 			if (Utils.IsWindows())
 			{
-				errorCode = NativeMethods.JsParseScript(script, sourceContext, sourceName, out result);
+				errorCode = NativeMethods.JsParseScript(script, sourceContext, sourceUrl, out result);
 				JsErrorHelpers.ThrowIfError(errorCode);
 			}
 			else
 			{
-				JsValue scriptValue = JsValue.FromString(script);
+				byte[] scriptBytes = Encoding.GetEncoding(0).GetBytes(script);
+				JsValue scriptValue = JsValue.CreateExternalArrayBuffer(scriptBytes);
 				scriptValue.AddRef();
 
-				JsValue sourceUrlValue = JsValue.FromString(sourceName);
+				JsValue sourceUrlValue = JsValue.FromString(sourceUrl);
 				sourceUrlValue.AddRef();
 
 				try
@@ -188,46 +190,34 @@ public static JsValue ParseScript(string script, JsSourceContext sourceContext,
 			return result;
 		}
 
-		/// <summary>
-		/// Parses a script and returns a <c>Function</c> representing the script
-		/// </summary>
-		/// <remarks>
-		/// Requires an active script context.
-		/// </remarks>
-		/// <param name="script">The script to parse</param>
-		/// <returns>The <c>Function</c> representing the script code</returns>
-		public static JsValue ParseScript(string script)
-		{
-			return ParseScript(script, JsSourceContext.None, string.Empty);
-		}
-
 		/// <summary>
 		/// Executes a script
 		/// </summary>
 		/// <remarks>
 		/// Requires an active script context.
 		/// </remarks>
 		/// <param name="script">The script to run</param>
-		/// <param name="sourceContext">The cookie identifying the script that can be used
-		/// by script contexts that have debugging enabled</param>
-		/// <param name="sourceName">The location the script came from</param>
+		/// <param name="sourceContext">A cookie identifying the script that can be used
+		/// by debuggable script contexts</param>
+		/// <param name="sourceUrl">The location the script came from</param>
 		/// <returns>The result of the script, if any</returns>
-		public static JsValue RunScript(string script, JsSourceContext sourceContext, string sourceName)
+		public static JsValue RunScript(string script, JsSourceContext sourceContext, string sourceUrl)
 		{
 			JsValue result;
 			JsErrorCode errorCode;
 
 			if (Utils.IsWindows())
 			{
-				errorCode = NativeMethods.JsRunScript(script, sourceContext, sourceName, out result);
+				errorCode = NativeMethods.JsRunScript(script, sourceContext, sourceUrl, out result);
 				JsErrorHelpers.ThrowIfError(errorCode);
 			}
 			else
 			{
-				JsValue scriptValue = JsValue.FromString(script);
+				byte[] scriptBytes = Encoding.GetEncoding(0).GetBytes(script);
+				JsValue scriptValue = JsValue.CreateExternalArrayBuffer(scriptBytes);
 				scriptValue.AddRef();
 
-				JsValue sourceUrlValue = JsValue.FromString(sourceName);
+				JsValue sourceUrlValue = JsValue.FromString(sourceUrl);
 				sourceUrlValue.AddRef();
 
 				try
@@ -246,25 +236,12 @@ public static JsValue RunScript(string script, JsSourceContext sourceContext, st
 			return result;
 		}
 
-		/// <summary>
-		/// Executes a script
-		/// </summary>
-		/// <remarks>
-		/// Requires an active script context
-		/// </remarks>
-		/// <param name="script">The script to run</param>
-		/// <returns>The result of the script, if any</returns>
-		public static JsValue RunScript(string script)
-		{
-			return RunScript(script, JsSourceContext.None, string.Empty);
-		}
-
 		/// <summary>
 		/// Serializes a parsed script to a buffer than can be reused
 		/// </summary>
 		/// <remarks>
 		/// <para>
-		/// SerializeScript parses a script and then stores the parsed form of the script in a
+		/// <c>SerializeScript</c> parses a script and then stores the parsed form of the script in a
 		/// runtime-independent format. The serialized script then can be deserialized in any
 		/// runtime without requiring the script to be re-parsed.
 		/// </para>
@@ -273,41 +250,47 @@ public static JsValue RunScript(string script)
 		/// </para>
 		/// </remarks>
 		/// <param name="script">The script to serialize</param>
-		/// <param name="buffer">The buffer to put the serialized script into. Can be null</param>
-		/// <returns>The size of the buffer, in bytes, required to hold the serialized script</returns>
-		public static ulong SerializeScript(string script, byte[] buffer)
+		/// <returns>The buffer to put the serialized script into</returns>
+		public static byte[] SerializeScript(string script)
 		{
-			var bufferSize = (ulong)buffer.Length;
+			byte[] buffer;
 			JsErrorCode errorCode;
 
 			if (Utils.IsWindows())
 			{
+				buffer = null;
+				uint bufferSize = 0;
+
+				errorCode = NativeMethods.JsSerializeScript(script, buffer, ref bufferSize);
+				JsErrorHelpers.ThrowIfError(errorCode);
+
+				buffer = new byte[(int)bufferSize];
+
 				errorCode = NativeMethods.JsSerializeScript(script, buffer, ref bufferSize);
 				JsErrorHelpers.ThrowIfError(errorCode);
 			}
 			else
 			{
-				JsValue scriptValue = JsValue.FromString(script);
+				byte[] scriptBytes = Encoding.GetEncoding(0).GetBytes(script);
+				JsValue scriptValue = JsValue.CreateExternalArrayBuffer(scriptBytes);
 				scriptValue.AddRef();
 
 				JsValue bufferValue;
 
 				try
 				{
-					errorCode = NativeMethods.JsSerialize(scriptValue, out bufferValue,
-						JsParseScriptAttributes.None);
+					errorCode = NativeMethods.JsSerialize(scriptValue, out bufferValue, JsParseScriptAttributes.None);
 					JsErrorHelpers.ThrowIfError(errorCode);
 				}
 				finally
 				{
 					scriptValue.Release();
 				}
 
-				JsValue lengthValue = bufferValue.GetProperty("length");
-				bufferSize = Convert.ToUInt64(lengthValue.ConvertToNumber().ToDouble());
+				buffer = bufferValue.ArrayBufferBytes;
 			}
 
-			return bufferSize;
+			return buffer;
 		}
 
 		/// <summary>

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsValue.cs

@@ -234,6 +234,39 @@ public IntPtr ExternalData
 			}
 		}
 
+		/// <summary>
+		/// Gets a bytes from an <c>ArrayBuffer</c>
+		/// </summary>
+		/// <remarks>
+		/// Requires an active script context.
+		/// </remarks>
+		public byte[] ArrayBufferBytes
+		{
+			get
+			{
+				IntPtr bufferPtr;
+				uint bufferLength;
+
+				JsErrorCode errorCode = NativeMethods.JsGetArrayBufferStorage(this, out bufferPtr, out bufferLength);
+				JsErrorHelpers.ThrowIfError(errorCode);
+
+				if (bufferPtr == IntPtr.Zero)
+				{
+					return null;
+				}
+
+				if (bufferLength == 0)
+				{
+					return new byte[0];
+				}
+
+				byte[] buffer = new byte[bufferLength];
+				Marshal.Copy(bufferPtr, buffer, 0, (int)bufferLength);
+
+				return buffer;
+			}
+		}
+
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsValue"/> struct
@@ -403,6 +436,42 @@ public static JsValue CreateArray(uint length)
 			return reference;
 		}
 
+		/// <summary>
+		/// Creates a Javascript <c>ArrayBuffer</c> object to access external memory
+		/// </summary>
+		/// <remarks>Requires an active script context.</remarks>
+		/// <param name="buffer">Buffer for an external memory</param>
+		/// <returns>The new <c>ArrayBuffer</c> object</returns>
+		public static JsValue CreateExternalArrayBuffer(byte[] buffer)
+		{
+			IntPtr bufferPtr;
+			int bufferLength;
+			JsObjectFinalizeCallback finalizeCallback;
+
+			if (buffer != null)
+			{
+				bufferLength = buffer.Length;
+
+				bufferPtr = Marshal.AllocHGlobal(bufferLength);
+				Marshal.Copy(buffer, 0, bufferPtr, bufferLength);
+
+				finalizeCallback = DefaultExternalBufferFinalizeCallback.Instance;
+			}
+			else
+			{
+				bufferLength = 0;
+				bufferPtr = IntPtr.Zero;
+				finalizeCallback = null;
+			}
+
+			JsValue reference;
+			JsErrorCode errorCode = NativeMethods.JsCreateExternalArrayBuffer(bufferPtr, (uint)bufferLength,
+				finalizeCallback, bufferPtr, out reference);
+			JsErrorHelpers.ThrowIfError(errorCode);
+
+			return reference;
+		}
+
 		/// <summary>
 		/// Creates a new JavaScript error object
 		/// </summary>

src/JavaScriptEngineSwitcher.ChakraCore/JsRt/NativeMethods.cs

@@ -240,7 +240,7 @@ internal static extern JsErrorCode JsSetIndexedPropertiesToExternalData(JsValue
 
 		[DllImport(DllName)]
 		internal static extern JsErrorCode JsCreateExternalArrayBuffer(IntPtr data, uint byteLength,
-			JsObjectFinalizeCallback finalizeCallback, IntPtr callbackState, out bool result);
+			JsObjectFinalizeCallback finalizeCallback, IntPtr callbackState, out JsValue result);
 
 		[DllImport(DllName)]
 		internal static extern JsErrorCode JsCreateTypedArray(JsTypedArrayType arrayType, JsValue arrayBuffer,
@@ -255,7 +255,7 @@ internal static extern JsErrorCode JsGetTypedArrayInfo(JsValue typedArray, out J
 			out JsValue arrayBuffer, out uint byteOffset, out uint byteLength);
 
 		[DllImport(DllName)]
-		internal static extern JsErrorCode JsGetArrayBufferStorage(JsValue arrayBuffer, out byte[] buffer,
+		internal static extern JsErrorCode JsGetArrayBufferStorage(JsValue arrayBuffer, out IntPtr buffer,
 			out uint bufferLength);
 
 		[DllImport(DllName)]
@@ -375,7 +375,7 @@ internal static extern JsErrorCode JsRunScript(string script, JsSourceContext so
 			string sourceUrl, out JsValue result);
 
 		[DllImport(DllName, CharSet = CharSet.Unicode)]
-		internal static extern JsErrorCode JsSerializeScript(string script, byte[] buffer, ref ulong bufferSize);
+		internal static extern JsErrorCode JsSerializeScript(string script, byte[] buffer, ref uint bufferSize);
 
 		[DllImport(DllName)]
 		internal static extern JsErrorCode JsParseSerializedScriptWithCallback(