Merge pull request #170 from SpiceSharp/thread-safety-fixes

marcin-golebiowski · web-flow · commit 73117ba39e2c · 2025-09-27T23:13:45.000+02:00
Few thread-safety fixes
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -55,7 +55,7 @@ jobs:
           args:
             # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu)
             # mandatory
-            -Dsonar.projectKey="SpiceSharp_SpiceSharpParser"
+            -Dsonar.projectKey="SpiceSharp_SpiceSharpParserNew"
             -Dsonar.organization="spicesharp"
             # Comma-separated paths to directories containing main source files.
             #-Dsonar.sources= # optional, default is project base directory
diff --git a/src/SpiceSharpParser/Common/Mathematics/Probability/DefaultRandomNumberProviderFactory.cs b/src/SpiceSharpParser/Common/Mathematics/Probability/DefaultRandomNumberProviderFactory.cs
@@ -48,10 +48,17 @@ public IRandomNumberProvider GetRandom(int? randomSeed)
                         _cacheLock.EnterWriteLock();
                         try
                         {
-                            var randomGenerator = new DefaultRandomNumberProvider(new Random(randomSeed.Value));
-                            _randomGenerators[randomSeed.Value] = randomGenerator;
-
-                            return randomGenerator;
+                            // Double-check after entering write lock
+                            if (!_randomGenerators.ContainsKey(randomSeed.Value))
+                            {
+                                var randomGenerator = new DefaultRandomNumberProvider(new Random(randomSeed.Value));
+                                _randomGenerators[randomSeed.Value] = randomGenerator;
+                                return randomGenerator;
+                            }
+                            else
+                            {
+                                return _randomGenerators[randomSeed.Value];
+                            }
                         }
                         finally
                         {
diff --git a/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Context/Updates/EntityUpdates.cs b/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Context/Updates/EntityUpdates.cs
@@ -103,19 +103,14 @@ public void Add(IEntity entity, string parameterName, string expression, bool be
                 throw new ArgumentNullException(nameof(expression));
             }
 
-            if (!SimulationSpecificUpdates.ContainsKey(simulation))
-            {
-                SimulationSpecificUpdates[simulation] = new Dictionary<IEntity, EntityUpdate>();
-            }
-
-            if (!SimulationSpecificUpdates[simulation].ContainsKey(entity))
-            {
-                SimulationSpecificUpdates[simulation][entity] = new EntityUpdate();
-            }
+            var simulationUpdates = SimulationSpecificUpdates.GetOrAdd(simulation, _ => new Dictionary<IEntity, EntityUpdate>());
+            var entityUpdate = simulationUpdates.ContainsKey(entity)
+                ? simulationUpdates[entity]
+                : (simulationUpdates[entity] = new EntityUpdate());
 
             if (beforeTemperature)
             {
-                SimulationSpecificUpdates[simulation][entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()
+                entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()
                 {
                     Expression = new DynamicExpression(expression),
                     ParameterName = parameterName,
@@ -140,14 +135,11 @@ public void Add(IEntity entity, string parameterName, string expression, bool be
                 throw new ArgumentNullException(nameof(expression));
             }
 
-            if (!CommonUpdates.ContainsKey(entity))
-            {
-                CommonUpdates[entity] = new EntityUpdate();
-            }
+            var entityUpdate = CommonUpdates.GetOrAdd(entity, _ => new EntityUpdate());
 
             if (beforeTemperature)
             {
-                CommonUpdates[entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()
+                entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()
                 {
                     Expression = new DynamicExpression(expression),
                     ParameterName = parameterName,
@@ -167,14 +159,11 @@ public void Add(IEntity entity, string parameterName, double value, bool beforeT
                 throw new ArgumentNullException(nameof(parameterName));
             }
 
-            if (!CommonUpdates.ContainsKey(entity))
-            {
-                CommonUpdates[entity] = new EntityUpdate();
-            }
+            var entityUpdate = CommonUpdates.GetOrAdd(entity, _ => new EntityUpdate());
 
             if (beforeTemperature)
             {
-                CommonUpdates[entity].ParameterUpdatesBeforeTemperature.Add(
+                entityUpdate.ParameterUpdatesBeforeTemperature.Add(
                     new EntityParameterDoubleValueUpdate() { ParameterName = parameterName, Value = value });
             }
         }
@@ -196,19 +185,14 @@ public void Add(IEntity entity, string parameterName, double value, bool beforeT
                 throw new ArgumentNullException(nameof(parameterName));
             }
 
-            if (!SimulationSpecificUpdates.ContainsKey(simulation))
-            {
-                SimulationSpecificUpdates[simulation] = new Dictionary<IEntity, EntityUpdate>();
-            }
-
-            if (!SimulationSpecificUpdates[simulation].ContainsKey(entity))
-            {
-                SimulationSpecificUpdates[simulation][entity] = new EntityUpdate();
-            }
+            var simulationUpdates = SimulationSpecificUpdates.GetOrAdd(simulation, _ => new Dictionary<IEntity, EntityUpdate>());
+            var entityUpdate = simulationUpdates.ContainsKey(entity)
+                ? simulationUpdates[entity]
+                : (simulationUpdates[entity] = new EntityUpdate());
 
             if (beforeTemperature)
             {
-                SimulationSpecificUpdates[simulation][entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterDoubleValueUpdate { ParameterName = parameterName, Value = value });
+                entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterDoubleValueUpdate { ParameterName = parameterName, Value = value });
             }
         }
 
diff --git a/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Context/Updates/SimulationUpdates.cs b/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Context/Updates/SimulationUpdates.cs
@@ -83,14 +83,8 @@ public void AddBeforeSetup(ISimulationWithEvents simulation, Action<ISimulationW
                 throw new ArgumentNullException(nameof(simulation));
             }
 
-            if (!SimulationBeforeSetupActions.ContainsKey(simulation))
-            {
-                SimulationBeforeSetupActions[simulation] = new List<SimulationUpdateAction>() { new SimulationUpdateAction(action) };
-            }
-            else
-            {
-                SimulationBeforeSetupActions[simulation].Add(new SimulationUpdateAction(action));
-            }
+            var actions = SimulationBeforeSetupActions.GetOrAdd(simulation, _ => new List<SimulationUpdateAction>());
+            actions.Add(new SimulationUpdateAction(action));
         }
 
         public void AddBeforeTemperature(ISimulationWithEvents simulation, Action<ISimulationWithEvents, SimulationEvaluationContexts> action)
@@ -100,14 +94,8 @@ public void AddBeforeTemperature(ISimulationWithEvents simulation, Action<ISimul
                 throw new ArgumentNullException(nameof(simulation));
             }
 
-            if (!SimulationBeforeTemperatureActions.ContainsKey(simulation))
-            {
-                SimulationBeforeTemperatureActions[simulation] = new List<SimulationUpdateAction>() { new SimulationUpdateAction(action) };
-            }
-            else
-            {
-                SimulationBeforeTemperatureActions[simulation].Add(new SimulationUpdateAction(action));
-            }
+            var actions = SimulationBeforeTemperatureActions.GetOrAdd(simulation, _ => new List<SimulationUpdateAction>());
+            actions.Add(new SimulationUpdateAction(action));
         }
 
         public void AddBeforeSetup(Action<ISimulationWithEvents, SimulationEvaluationContexts> action)
diff --git a/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Simulations/Decorators/EnableStochasticModelsSimulationDecorator.cs b/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Simulations/Decorators/EnableStochasticModelsSimulationDecorator.cs
@@ -1,5 +1,4 @@
 ﻿using SpiceSharp.Entities;
-using SpiceSharp.Simulations;
 using SpiceSharpParser.Common;
 using SpiceSharpParser.ModelReaders.Netlist.Spice.Context;
 using SpiceSharpParser.ModelReaders.Netlist.Spice.Context.Models;
@@ -14,7 +13,7 @@ namespace SpiceSharpParser.ModelReaders.Netlist.Spice.Readers.Controls.Simulatio
     public class EnableStochasticModelsSimulationDecorator
     {
         private readonly IReadingContext _context;
-        private readonly ConcurrentDictionary<string, Dictionary<string, double>> _lotValues = new ();
+        private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, double>> _lotValues = new ();
 
         public EnableStochasticModelsSimulationDecorator(IReadingContext context)
         {
@@ -98,22 +97,13 @@ private void SetModelDevModelParameters(ISimulationWithEvents simulation, IEntit
 
         private double GetValueForLotParameter(EvaluationContext evaluationContext, string baseModel, string parameterName, double currentValue, double percentValue, string distributionName, IEqualityComparer<string> comparer)
         {
-            if (_lotValues.ContainsKey(baseModel) && _lotValues[baseModel].ContainsKey(parameterName))
-            {
-                return _lotValues[baseModel][parameterName];
-            }
-
-            var random = evaluationContext.Randomizer.GetRandomProvider(distributionName);
-            double newValue = currentValue + ((percentValue / 100.0) * currentValue * random.NextSignedDouble());
+            var modelValues = _lotValues.GetOrAdd(baseModel, _ => new ConcurrentDictionary<string, double>(comparer));
 
-            if (!_lotValues.ContainsKey(baseModel))
+            return modelValues.GetOrAdd(parameterName, _ =>
             {
-                _lotValues[baseModel] = new Dictionary<string, double>(comparer);
-            }
-
-            _lotValues[baseModel][parameterName] = newValue;
-
-            return newValue;
+                var random = evaluationContext.Randomizer.GetRandomProvider(distributionName);
+                return currentValue + ((percentValue / 100.0) * currentValue * random.NextSignedDouble());
+            });
         }
     }
 }
diff --git a/src/SpiceSharpParser/SpiceSharpParser.csproj b/src/SpiceSharpParser/SpiceSharpParser.csproj
@@ -22,7 +22,7 @@
     <StartupObject />
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <LangVersion>latest</LangVersion>
-    <Version>3.2.5</Version>
+    <Version>3.2.6</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.5|AnyCPU'">

Original file line number	Diff line number	Diff line change
`@@ -103,19 +103,14 @@ public void Add(IEntity entity, string parameterName, string expression, bool be`
`103`	`103`	`throw new ArgumentNullException(nameof(expression));`
`104`	`104`	`}`
`105`	`105`
`106`		`- if (!SimulationSpecificUpdates.ContainsKey(simulation))`
`107`		`- {`
`108`		`- SimulationSpecificUpdates[simulation] = new Dictionary<IEntity, EntityUpdate>();`
`109`		`- }`
`110`		`-`
`111`		`- if (!SimulationSpecificUpdates[simulation].ContainsKey(entity))`
`112`		`- {`
`113`		`- SimulationSpecificUpdates[simulation][entity] = new EntityUpdate();`
`114`		`- }`
	`106`	`+ var simulationUpdates = SimulationSpecificUpdates.GetOrAdd(simulation, _ => new Dictionary<IEntity, EntityUpdate>());`
	`107`	`+ var entityUpdate = simulationUpdates.ContainsKey(entity)`
	`108`	`+ ? simulationUpdates[entity]`
	`109`	`+ : (simulationUpdates[entity] = new EntityUpdate());`
`115`	`110`
`116`	`111`	`if (beforeTemperature)`
`117`	`112`	`{`
`118`		`- SimulationSpecificUpdates[simulation][entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()`
	`113`	`+ entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()`
`119`	`114`	`{`
`120`	`115`	`Expression = new DynamicExpression(expression),`
`121`	`116`	`ParameterName = parameterName,`
`@@ -140,14 +135,11 @@ public void Add(IEntity entity, string parameterName, string expression, bool be`
`140`	`135`	`throw new ArgumentNullException(nameof(expression));`
`141`	`136`	`}`
`142`	`137`
`143`		`- if (!CommonUpdates.ContainsKey(entity))`
`144`		`- {`
`145`		`- CommonUpdates[entity] = new EntityUpdate();`
`146`		`- }`
	`138`	`+ var entityUpdate = CommonUpdates.GetOrAdd(entity, _ => new EntityUpdate());`
`147`	`139`
`148`	`140`	`if (beforeTemperature)`
`149`	`141`	`{`
`150`		`- CommonUpdates[entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()`
	`142`	`+ entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterExpressionValueUpdate()`
`151`	`143`	`{`
`152`	`144`	`Expression = new DynamicExpression(expression),`
`153`	`145`	`ParameterName = parameterName,`
`@@ -167,14 +159,11 @@ public void Add(IEntity entity, string parameterName, double value, bool beforeT`
`167`	`159`	`throw new ArgumentNullException(nameof(parameterName));`
`168`	`160`	`}`
`169`	`161`
`170`		`- if (!CommonUpdates.ContainsKey(entity))`
`171`		`- {`
`172`		`- CommonUpdates[entity] = new EntityUpdate();`
`173`		`- }`
	`162`	`+ var entityUpdate = CommonUpdates.GetOrAdd(entity, _ => new EntityUpdate());`
`174`	`163`
`175`	`164`	`if (beforeTemperature)`
`176`	`165`	`{`
`177`		`- CommonUpdates[entity].ParameterUpdatesBeforeTemperature.Add(`
	`166`	`+ entityUpdate.ParameterUpdatesBeforeTemperature.Add(`
`178`	`167`	`new EntityParameterDoubleValueUpdate() { ParameterName = parameterName, Value = value });`
`179`	`168`	`}`
`180`	`169`	`}`
`@@ -196,19 +185,14 @@ public void Add(IEntity entity, string parameterName, double value, bool beforeT`
`196`	`185`	`throw new ArgumentNullException(nameof(parameterName));`
`197`	`186`	`}`
`198`	`187`
`199`		`- if (!SimulationSpecificUpdates.ContainsKey(simulation))`
`200`		`- {`
`201`		`- SimulationSpecificUpdates[simulation] = new Dictionary<IEntity, EntityUpdate>();`
`202`		`- }`
`203`		`-`
`204`		`- if (!SimulationSpecificUpdates[simulation].ContainsKey(entity))`
`205`		`- {`
`206`		`- SimulationSpecificUpdates[simulation][entity] = new EntityUpdate();`
`207`		`- }`
	`188`	`+ var simulationUpdates = SimulationSpecificUpdates.GetOrAdd(simulation, _ => new Dictionary<IEntity, EntityUpdate>());`
	`189`	`+ var entityUpdate = simulationUpdates.ContainsKey(entity)`
	`190`	`+ ? simulationUpdates[entity]`
	`191`	`+ : (simulationUpdates[entity] = new EntityUpdate());`
`208`	`192`
`209`	`193`	`if (beforeTemperature)`
`210`	`194`	`{`
`211`		`- SimulationSpecificUpdates[simulation][entity].ParameterUpdatesBeforeTemperature.Add(new EntityParameterDoubleValueUpdate { ParameterName = parameterName, Value = value });`
	`195`	`+ entityUpdate.ParameterUpdatesBeforeTemperature.Add(new EntityParameterDoubleValueUpdate { ParameterName = parameterName, Value = value });`
`212`	`196`	`}`
`213`	`197`	`}`
`214`	`198`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using SpiceSharp.Entities;`
`2`		`-using SpiceSharp.Simulations;`
`3`	`2`	`using SpiceSharpParser.Common;`
`4`	`3`	`using SpiceSharpParser.ModelReaders.Netlist.Spice.Context;`
`5`	`4`	`using SpiceSharpParser.ModelReaders.Netlist.Spice.Context.Models;`
`@@ -14,7 +13,7 @@ namespace SpiceSharpParser.ModelReaders.Netlist.Spice.Readers.Controls.Simulatio`
`14`	`13`	`public class EnableStochasticModelsSimulationDecorator`
`15`	`14`	`{`
`16`	`15`	`private readonly IReadingContext _context;`
`17`		`- private readonly ConcurrentDictionary<string, Dictionary<string, double>> _lotValues = new ();`
	`16`	`+ private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, double>> _lotValues = new ();`
`18`	`17`
`19`	`18`	`public EnableStochasticModelsSimulationDecorator(IReadingContext context)`
`20`	`19`	`{`
`@@ -98,22 +97,13 @@ private void SetModelDevModelParameters(ISimulationWithEvents simulation, IEntit`
`98`	`97`
`99`	`98`	`private double GetValueForLotParameter(EvaluationContext evaluationContext, string baseModel, string parameterName, double currentValue, double percentValue, string distributionName, IEqualityComparer<string> comparer)`
`100`	`99`	`{`
`101`		`- if (_lotValues.ContainsKey(baseModel) && _lotValues[baseModel].ContainsKey(parameterName))`
`102`		`- {`
`103`		`- return _lotValues[baseModel][parameterName];`
`104`		`- }`
`105`		`-`
`106`		`- var random = evaluationContext.Randomizer.GetRandomProvider(distributionName);`
`107`		`- double newValue = currentValue + ((percentValue / 100.0) * currentValue * random.NextSignedDouble());`
	`100`	`+ var modelValues = _lotValues.GetOrAdd(baseModel, _ => new ConcurrentDictionary<string, double>(comparer));`
`108`	`101`
`109`		`- if (!_lotValues.ContainsKey(baseModel))`
	`102`	`+ return modelValues.GetOrAdd(parameterName, _ =>`
`110`	`103`	`{`
`111`		`- _lotValues[baseModel] = new Dictionary<string, double>(comparer);`
`112`		`- }`
`113`		`-`
`114`		`- _lotValues[baseModel][parameterName] = newValue;`
`115`		`-`
`116`		`- return newValue;`
	`104`	`+ var random = evaluationContext.Randomizer.GetRandomProvider(distributionName);`
	`105`	`+ return currentValue + ((percentValue / 100.0) * currentValue * random.NextSignedDouble());`
	`106`	`+ });`
`117`	`107`	`}`
`118`	`108`	`}`
`119`	`109`	`}`