replace volatile locks with Interlocked methods

tainicom · May 6, 2018 · 830cdbd · 830cdbd
1 parent a842fb9
commit 830cdbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Physics2D/Dynamics/Contacts/ContactSolver.cs b/Physics2D/Dynamics/Contacts/ContactSolver.cs
@@ -459,7 +459,7 @@ private void SolveVelocityConstraints(int start, int end)
                     {
                         if (Interlocked.CompareExchange(ref _velocities[orderedIndexB].Lock, 1, 0) == 0)
                             break;
-                        _velocities[orderedIndexA].Lock = 0;
+                        System.Threading.Interlocked.Exchange(ref _velocities[orderedIndexA].Lock, 0);
                     }
 #if NET40 || NET45
                     Thread.Sleep(0);
@@ -770,8 +770,8 @@ private void SolveVelocityConstraints(int start, int end)
                 _velocities[indexB].w = wB;
 
 #if NET40 || NET45 || PORTABLE40 || PORTABLE45 || W10 || W8_1 || WP8_1
-                _velocities[orderedIndexB].Lock = 0;
-                _velocities[orderedIndexA].Lock = 0;
+                System.Threading.Interlocked.Exchange(ref _velocities[orderedIndexB].Lock, 0);
+                System.Threading.Interlocked.Exchange(ref _velocities[orderedIndexA].Lock, 0);
 #endif
             }
         }
@@ -853,7 +853,7 @@ private bool SolvePositionConstraints(int start, int end)
                     {
                         if (Interlocked.CompareExchange(ref _positions[orderedIndexB].Lock, 1, 0) == 0)
                             break;
-                        _positions[orderedIndexA].Lock = 0;
+                        System.Threading.Interlocked.Exchange(ref _positions[orderedIndexA].Lock, 0);
                     }
 #if NET40 || NET45
                     Thread.Sleep(0);
@@ -924,8 +924,8 @@ private bool SolvePositionConstraints(int start, int end)
 
 #if NET40 || NET45 || PORTABLE40 || PORTABLE45 || W10 || W8_1 || WP8_1
                 // Unlock bodies.
-                _positions[orderedIndexB].Lock = 0;
-                _positions[orderedIndexA].Lock = 0;
+                System.Threading.Interlocked.Exchange(ref _positions[orderedIndexB].Lock, 0);
+                System.Threading.Interlocked.Exchange(ref _positions[orderedIndexA].Lock, 0);
 #endif
             }
 

diff --git a/Physics2D/Dynamics/TimeStep.cs b/Physics2D/Dynamics/TimeStep.cs
@@ -54,15 +54,15 @@ public struct Position
     {
         public Vector2 c;
         public float a;
-        internal volatile int Lock;
+        internal int Lock;
     }
 
     /// This is an internal structure.
     public struct Velocity
     {
         public Vector2 v;
         public float w;
-        internal volatile int Lock;
+        internal int Lock;
     }
 
     /// Solver Data