Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Fix race condition for the shared evaluator when any active input handler is threaded.

Browse Source
This commit is contained in:
PopSlime
2023-04-22 21:16:17 +08:00
parent a1fd420493
commit 72a93721f9
4 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Cryville/Crtr/InputProxy.cs
View File

@@ -18,7 +18,7 @@ namespace Cryville.Crtr {
_vecsrcs[i] = vecsrc;
_vecops[i] = new InputVectorOp(vecsrc);
}
_etor = ChartPlayer.etor;
_etor = judge != null ? judge._etor : ChartPlayer.etor;
_ruleset = ruleset;
_judge = judge;
foreach (var i in ruleset.inputs) {
@@ -172,7 +172,6 @@ namespace Cryville.Crtr {
}
}
readonly object _lock = new object();
static readonly int _var_value = IdentifierManager.SharedInstance.Request("value");
const int MAX_DEPTH = 15;
const int MAX_DIMENSION = 3;
@@ -228,7 +227,7 @@ namespace Cryville.Crtr {
readonly Dictionary<ProxiedInputIdentifier, PropSrc> _vecs = new Dictionary<ProxiedInputIdentifier, PropSrc>();
double? _lockTime = null;
unsafe void OnInput(InputIdentifier id, InputVector vec) {
lock (_lock) {
lock (_etor) {
InputProxyEntry proxy;
if (_sproxies.TryGetValue(id.Source, out proxy)) {
_etor.ContextCascadeInsert();
@@ -258,10 +257,10 @@ namespace Cryville.Crtr {
_etor.ContextCascadeInsert();
bool newNullFlag = nullflag;
if (!newNullFlag) {
ChartPlayer.etor.Evaluate(_vecops[depth + 1], p.Value);
_etor.Evaluate(_vecops[depth + 1], p.Value);
newNullFlag = _vecsrcs[depth + 1].IsNull;
if (newNullFlag) ChartPlayer.etor.ContextCascadeUpdate(_var_value, PropSrc.Null);
else ChartPlayer.etor.ContextCascadeUpdate(_var_value, _vecsrcs[depth + 1]);
if (newNullFlag) _etor.ContextCascadeUpdate(_var_value, PropSrc.Null);
else _etor.ContextCascadeUpdate(_var_value, _vecsrcs[depth + 1]);
}
OnInput(id, p.Key, ft, tt, newNullFlag, depth + 1);
_etor.ContextCascadeDiscard();