[CancellationToken] Speed up ThrowIfCancellationRequested operation

[mono.git] / mcs / class / corlib / System.Threading / CancellationTokenSource.cs

diff --git a/mcs/class/corlib/System.Threading/CancellationTokenSource.cs b/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
index 12f59a5d190bc19f2dcea0a90b9676c88e005764..05ca53a182f1f85e389adf6278282b35e0ff1e0c 100644 (file)
--- a/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
+++ b/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
@@ -33,8 +33,8 @@ namespace System.Threading
        
        public sealed class CancellationTokenSource : IDisposable
        {
-               volatile bool canceled;
-               volatile bool processed;
+               bool canceled;
+               bool processed;
                
                int currId = int.MinValue;
                
@@ -76,6 +76,7 @@ namespace System.Threading
                                }
                        }
                        
+                       Thread.MemoryBarrier ();
                        processed = true;
                        
                        if (exceptions != null && exceptions.Count > 0)
@@ -155,13 +156,7 @@ namespace System.Threading
                                sw.SpinOnce ();
                        
                }
-               
-               internal void ThrowIfCancellationRequested ()
-               {
-                       if (canceled)
-                               throw new OperationCanceledException (CreateToken ());
-               }
-               
+
                CancellationTokenRegistration GetTokenReg ()
                {
                        CancellationTokenRegistration registration