diff Implab/Parallels/BlockingQueue.cs @ 139:041b77711262 v2

fixed blocking queue
author cin
date Wed, 18 Feb 2015 18:02:02 +0300
parents 238e15580926
children d6fe09f5592c
line wrap: on
line diff
--- a/Implab/Parallels/BlockingQueue.cs	Tue Feb 17 18:16:26 2015 +0300
+++ b/Implab/Parallels/BlockingQueue.cs	Wed Feb 18 18:02:02 2015 +0300
@@ -23,16 +23,21 @@
 
         public T GetItem(int timeout) {
             T item;
-            var t1 = Environment.TickCount;
-            var dt = timeout;
-            while (!TryDequeue(out item)) {
-                lock (m_lock)
-                    if (!Monitor.Wait(m_lock, dt))
-                        throw new TimeoutException();
-                if (timeout >= 0) {
-                    dt = timeout - Environment.TickCount + t1;
-                    if (dt < 0)
-                        throw new TimeoutException();
+
+            if (!TryDequeue(out item)) {
+                var t1 = Environment.TickCount;
+                var dt = timeout;
+
+                lock (m_lock) {
+                    while (!TryDequeue(out item)) {
+                        if (!Monitor.Wait(m_lock, dt))
+                            throw new TimeoutException();
+                        if (timeout >= 0) {
+                            dt = timeout - Environment.TickCount + t1;
+                            if (dt < 0)
+                                throw new TimeoutException();
+                        }
+                    }
                 }
             }
             return item;
@@ -40,9 +45,11 @@
 
         public T GetItem() {
             T item;
-            while (!TryDequeue(out item))
-                lock (m_lock)
-                    Monitor.Wait(m_lock);
+            if (!TryDequeue(out item))
+                lock (m_lock) {
+                    while (!TryDequeue(out item))
+                        Monitor.Wait(m_lock);
+                }
             return item;
         }
 
@@ -51,16 +58,22 @@
 
             var buffer = new T[max];
             int actual;
-            var t1 = Environment.TickCount;
-            var dt = timeout;
-            while (!TryDequeueRange(buffer,0,max,out actual)) {
-                lock (m_lock)
-                    if (!Monitor.Wait(m_lock, dt))
-                        throw new TimeoutException();
-                if (timeout >= 0) {
-                    dt = timeout - Environment.TickCount + t1;
-                    if (dt < 0)
-                        throw new TimeoutException();
+            if (!TryDequeueRange(buffer, 0, max, out actual)) {
+                var t1 = Environment.TickCount;
+                var dt = timeout;
+
+                lock (m_lock) {
+                    while (!TryDequeueRange(buffer, 0, max, out actual)) {
+                
+                        if (!Monitor.Wait(m_lock, dt))
+                            throw new TimeoutException();
+
+                        if (timeout >= 0) {
+                            dt = timeout - Environment.TickCount + t1;
+                            if (dt < 0)
+                                throw new TimeoutException();
+                        }
+                    }
                 }
             }
 
@@ -74,9 +87,10 @@
 
             var buffer = new T[max];
             int actual;
-            while (!TryDequeueRange(buffer, 0, max, out actual))
+            if (!TryDequeueRange(buffer, 0, max, out actual))
                 lock (m_lock)
-                    Monitor.Wait(m_lock);
+                    while (!TryDequeueRange(buffer, 0, max, out actual))
+                        Monitor.Wait(m_lock);
 
             var data = new T[actual];
             Array.Copy(buffer, data, actual);