Merge pull request #21 from medegor44/ChakraCore_multithreading

Fix multithreading issue for ChakraCore, add multithreading tests for runners.

Author: Egor

Src/EmbeddedScripts.CSharp.MonoEvaluator/EmbeddedScripts.CSharp.MonoEvaluator.csproj

@@ -2,6 +2,7 @@
 
  <PropertyGroup>
  <TargetFramework>net461</TargetFramework>
+ <LangVersion>latest</LangVersion>
  </PropertyGroup>
 
  <ItemGroup>

Src/EmbeddedScripts.CSharp.MonoEvaluator/MonoCSharpRunner.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Data;
-using System.IO;
+using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using EmbeddedScripts.CSharp.MonoEvaluator.CodeGeneration;
 using EmbeddedScripts.CSharp.MonoEvaluator.Hosting;
@@ -13,10 +12,11 @@ namespace EmbeddedScripts.CSharp.MonoEvaluator
 {
  public class MonoCSharpRunner : ICodeRunner, IEvaluator
  {
- private readonly StringBuilder _errorLogBuilder = new StringBuilder();
+ private static int _nextRunnerId;
+ private readonly StringBuilder _errorLogBuilder = new();
  private readonly Evaluator _evaluator;
- private readonly MonoSpecificCodeGenerator _codeGenerator = new MonoSpecificCodeGenerator();
- private readonly int _runnerId = new Random().Next(0, int.MaxValue);
+ private readonly MonoSpecificCodeGenerator _codeGenerator = new();
+ private readonly int _runnerId;
 
  /// <summary>
  /// Evaluator doesn't throw any syntax exceptions. Instead, it just logged errors into StreamReportPrinter. So we using
@@ -42,6 +42,8 @@ public MonoCSharpRunner()
  _evaluator = new Evaluator(new CompilerContext(
  defaultSettings, new StreamReportPrinter(new StringWriter(_errorLogBuilder))));
 
+ _runnerId = Interlocked.Increment(ref _nextRunnerId);
+
  HostFields.CreateNewEntry(_runnerId);
  var hostFieldsType = typeof(HostFields);
  _evaluator.ReferenceAssembly(hostFieldsType.Assembly);
@@ -61,9 +63,11 @@ public Task RunAsync(string code)
  public ICodeRunner Register<T>(T instance, string alias)
  {
  var instanceType = typeof(T);
+ 
  HostFields.Get(_runnerId).Add(alias, instance);
 
  _evaluator.TryReferenceAssembly(instanceType.Assembly);
+ 
  var resolveLine =_codeGenerator.GenerateResolveLine(alias, instanceType, _runnerId);
  RunAsync(resolveLine);
 

Src/EmbeddedScripts.JS.ChakraCore/ChakraCoreRunner.cs

@@ -6,38 +6,69 @@ namespace EmbeddedScripts.JS.ChakraCore
 {
  public class ChakraCoreRunner : ICodeRunner, IEvaluator, IDisposable
  {
- private readonly JsRuntime _runtime = new();
- private readonly TypeMapper _mapper;
- private readonly JsContext _context;
+ private JsRuntime _runtime;
+ private TypeMapper _mapper;
+ private JsContext _context;
+ private readonly ScriptDispatcher _dispatcher = new();
 
  public ChakraCoreRunner()
  {
- _context = _runtime.CreateContext();
- _mapper = new(_context);
+ _dispatcher.Invoke(() =>
+ {
+ _runtime = new();
+ _context = _runtime.CreateContext();
+ if (_context.IsValid)
+ _context.AddRef();
+ _mapper = new(_context);
+ });
  }
 
  public Task<T> EvaluateAsync<T>(string expression)
- {
- var val = _context.Evaluate(expression);
+ { 
+ return Task.FromResult(_dispatcher.Invoke(() =>
+ {
+ var val = _context.Evaluate(expression);
 
- return Task.FromResult(new TypeMapper(_context).Map<T>(val));
+ return _mapper.Map<T>(val);
+ }));
  }
- 
+
  public Task RunAsync(string code)
  {
- _context.Evaluate(code);
+ _dispatcher.Invoke(() =>
+ {
+ _context.Evaluate(code);
+ });
 
  return Task.CompletedTask;
  }
 
  public ICodeRunner Register<T>(T obj, string alias)
  {
- _context.GlobalObject.AddProperty(alias, _mapper.Map(obj));
-
+ _dispatcher.Invoke(() =>
+ {
+ var val = _mapper.Map(obj);
+ 
+ val.AddRef();
+ 
+ _context.GlobalObject.AddProperty(alias, val);
+ });
+ 
  return this;
  }
 
- public void Dispose() =>
- _runtime?.Dispose();
+ public void Dispose()
+ {
+ _dispatcher.Invoke(() =>
+ {
+ if (_context.IsValid)
+ _context.Release();
+
+ _runtime?.Dispose();
+ });
+ 
+ _dispatcher.Dispose();
+ _mapper.Dispose();
+ }
  }
 }

Src/EmbeddedScripts.JS.ChakraCore/Hosting/JavaScriptContext.cs

@@ -220,6 +220,7 @@ public static JavaScriptValue RunScript(string script, JavaScriptSourceContext s
  JavaScriptValue result;
  Native.ThrowIfError(Native.JsRunScript(JavaScriptValue.FromString(script), 
  sourceContext, JavaScriptValue.FromString(sourceName), Native.JsParseScriptAttributes.None, out result));
+
  return result;
  }
 

Src/EmbeddedScripts.JS.ChakraCore/JsContext.cs

@@ -12,11 +12,21 @@ public JsContext(JavaScriptContext context)
  {
  _context = context;
  using (Scope)
- {
  GlobalObject = new JsValue(this, JavaScriptValue.GlobalObject);
- }
  }
 
+ public void AddRef()
+ {
+ _context.AddRef();
+ }
+
+ public void Release()
+ {
+ _context.Release();
+ }
+
+ public bool IsValid => _context.IsValid;
+ 
  public JsScope Scope =>
  new (new (_context));
 
@@ -26,7 +36,9 @@ public JsValue Evaluate(string expression)
  {
  try
  {
- return new JsValue(this, JavaScriptContext.RunScript(expression));
+ var t = JavaScriptContext.RunScript(expression);
+
+ return new JsValue(this, t);
  }
  catch (JavaScriptScriptException e)
  {

Src/EmbeddedScripts.JS.ChakraCore/JsValue.cs

@@ -13,13 +13,25 @@ internal JsValue(JsContext context)
  using (_context.Scope)
  _innerValue = JavaScriptValue.CreateObject();
  }
- 
+
  internal JsValue(JsContext context, JavaScriptValue value)
  {
  _context = context;
  _innerValue = value;
  }
 
+ public void AddRef()
+ {
+ using (_context.Scope)
+ _innerValue.AddRef();
+ }
+
+ public void Release()
+ {
+ using (_context.Scope)
+ _innerValue.Release();
+ }
+
  public JsValue AddProperty(string name, JsValue value)
  {
  using (_context.Scope)
@@ -37,7 +49,7 @@ public JsValue GetProperty(string name)
  public override string ToString() =>
  _innerValue.ConvertToString().ToString();
 
- public static implicit operator JavaScriptValue(JsValue value) => 
+ public static implicit operator JavaScriptValue(JsValue value) =>
  value._innerValue;
  }
 }