From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 30 Oct 2009 14:40:08 +0000 (+0100)
Subject: Merge commit 'stew/knownchanges' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4bb08a11d2dcf16dfe48109bcfe749d0dccab7d9;hp=c16123ef7acfa534bb4b2b95a586f84de3dd95e8;p=dak.git

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  split read and write locks

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py
index 0b238626..cdb1d3af 100755
--- a/dak/import_known_changes.py
+++ b/dak/import_known_changes.py
@@ -128,37 +128,48 @@ class OneAtATime(object):
     """
     def __init__(self):
         self.next_in_line = None
-        self.next_lock = threading.Condition()
+        self.read_lock = threading.Condition()
+        self.write_lock = threading.Condition()
         self.die = False
 
     def plsDie(self):
         self.die = True
-        self.next_lock.notify()
+        self.write_lock.acquire()
+        self.write_lock.notifyAll()
+        self.write_lock.release()
+
+        self.read_lock.acquire()
+        self.read_lock.notifyAll()
+        self.read_lock.release()
 
     def enqueue(self, next):
-        self.next_lock.acquire()
+        self.write_lock.acquire()
         while self.next_in_line:
             if self.die:
                 return
-            self.next_lock.wait()
+            self.write_lock.wait()
 
         assert( not self.next_in_line )
         self.next_in_line = next
-        self.next_lock.notifyAll()
-        self.next_lock.release()
+        self.write_lock.release()
+        self.read_lock.acquire()
+        self.read_lock.notify()
+        self.read_lock.release()
 
     def dequeue(self):
-        self.next_lock.acquire()
+        self.read_lock.acquire()
         while not self.next_in_line:
             if self.die:
                 return
-            self.next_lock.wait()
+            self.read_lock.wait()
 
         result = self.next_in_line
 
         self.next_in_line = None
-        self.next_lock.notifyAll()
-        self.next_lock.release()
+        self.read_lock.release()
+        self.write_lock.acquire()
+        self.write_lock.notify()
+        self.write_lock.release()
 
         if isinstance(result, EndOfChanges):
             return None