Changeset 6220

Timestamp:

05/17/11 14:02:33 (14 years ago)

Author:

epitzer

Message:

Use system wait handles instead of potential spin lock for done signal (#1350)

File:

• branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/AsyncBuffer.cs (modified) (6 diffs)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/AsyncBuffer.cs

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 
 namespace HeuristicLab.Persistence.Default.Xml {
 
-  public class AsyncBuffer<T> : IDisposable, IEnumerable<T>, IEnumerable {
+  public class AsyncBuffer<T> : IEnumerable<T>, IEnumerable {
 
     private IEnumerator<T> it;
@@ -14 +13 @@
     private object queueLock;
     private AutoResetEvent elementAdded;
+    private ManualResetEvent done;
 
     private Thread thread;
-    private ManualResetEventSlim done;
 
     private Exception exception;
@@ -30 +29 @@
       queueLock = new object();
       elementAdded = new AutoResetEvent(false);
+      done = new ManualResetEvent(false);
       thread = new Thread(Run);
-      done = new ManualResetEventSlim(false);
       thread.Start();
     }
 
     private void Run() {
+      bool hasLock = false;
       try {
         while (it.MoveNext()) {
@@ -46 +46 @@
       } catch (Exception x) {
         exception = x;
+      } finally {
+        if (hasLock)
+          Monitor.Exit(queueLock);
       }
       done.Set();
+    }
+
+    private IEnumerator<T> RealGetEnumerator(LockIndicator li) {
+      Monitor.Enter(queueLock, ref li.HasLock);
+      while (!done.WaitOne(0) || queue.Count > 0) {
+        while (queue.Count == 0 && !done.WaitOne(0)) {
+          li.HasLock = false;
+          Monitor.Exit(queueLock);
+          AutoResetEvent.WaitAny(new WaitHandle[] { done, elementAdded });
+          Monitor.Enter(queueLock, ref li.HasLock);
+        }
+        if (queue.Count > 0) {
+          T element = queue.Dequeue();
+          li.HasLock = false;
+          Monitor.Exit(queueLock);
+          yield return element;
+          Monitor.Enter(queueLock, ref li.HasLock);
+        }
+      }
+      li.HasLock = false;
+      Monitor.Exit(queueLock);
+      if (exception != null)
+        throw exception;
     }
 
@@ -61 +87 @@
       }
     }
-
-    private IEnumerator<T> RealGetEnumerator(LockIndicator li) {
-      Monitor.Enter(queueLock, ref li.HasLock);
-      while (!done.IsSet || queue.Any()) {
-        while (!queue.Any() && !done.IsSet) {
-          li.HasLock = false;
-          Monitor.Exit(queueLock);
-          AutoResetEvent.WaitAny(new WaitHandle[] { done.WaitHandle, elementAdded });
-          Monitor.Enter(queueLock, ref li.HasLock);
-        }
-        if (queue.Any()) {
-          T element = queue.Peek();
-          li.HasLock = false;
-          Monitor.Exit(queueLock);
-          yield return element;
-          Monitor.Enter(queueLock, ref li.HasLock);
-          queue.Dequeue();
-        }
-      }
-      li.HasLock = false;
-      Monitor.Exit(queueLock);
-      if (exception != null)
-        throw exception;
-    }
     #endregion
 
@@ -92 +94 @@
     }
     #endregion
-
-    #region IDisposable Members
-    public void Dispose() {
-      if (elementAdded != null)
-        elementAdded.Dispose();
-      if (done != null)
-        done.Dispose();
-    }
-    #endregion
   }
 }