Changeset 3514

Timestamp:

03/03/10 03:28:36 (14 years ago)

Author:

jerome

Message:

Try to do something about deadlock, not sure it happens there though...

Files:

• tea4cups/trunk/tea4cups (modified) (4 diffs)

tea4cups/trunk/tea4cups

@@ -76 +76 @@
 import pwd
 import errno
+import random
 import md5
 import cStringIO
@@ -914 +915 @@
     def waitForLock(self) :
         """Waits until we can acquire the lock file."""
+        random.seed()
         lockfilename = self.DeviceURI.replace("/", ".")
         lockfilename = lockfilename.replace(":", ".")
@@ -925 +927 @@
             try :
                 # open the lock file, optionally creating it if needed.
+                self.LockFile = None
                 self.LockFile = open(lockfilename, "a+")
 
@@ -944 +947 @@
             except IOError :
                 self.logDebug("I/O Error while waiting for lock %s" % lockfilename)
-                time.sleep(0.25)
+                if self.LockFile is not None :
+                    self.LockFile.close()
+                time.sleep(0.25 + random.random())
 
     def readConfig(self) :