Closedown

script/device/Image.py

@@ -53,73 +53,6 @@ class ImageMatrix(ReadonlyRegisterBase, ReadonlyRegisterMatrix, Readable.Integer
    
         
 
-def is_locked(filepath):
-    """Checks if a file is locked by opening it in append mode.
-    If no exception thrown, then the file is not locked.
-    """
-    locked = None
-    file_object = None
-    filepath = os.path.abspath(filepath)
-    if os.path.exists(filepath):        
-        try:
-            print "Trying to open %s." % filepath
-            buffer_size = 8
-            # Opening file in append mode and read the first 8 characters.
-            file_object = open(filepath, 'a', buffer_size)
-            if file_object:
-                print "%s is not locked." % filepath
-                locked = False
-        except IOError, message:
-            print "File is locked (unable to open in append mode). %s." % \
-                  message
-            locked = True
-        finally:
-            if file_object:
-                file_object.close()
-                print "%s closed." % filepath
-    else:
-        print "%s not found." % filepath
-    return locked
-
-def wait_for_files(filepaths, timeout = None):
-    """Checks if the files are ready.
-
-    For a file to be ready it must exist and can be opened in append
-    mode.
-    """
-    wait_time = 0.01
-    for filepath in filepaths:
-        filepath = os.path.abspath(filepath)
-        # If the file doesn't exist, wait wait_time seconds and try again
-        # until it's found.
-        while not os.path.exists(filepath):
-            if (timeout is not None) and  (time.time() -start  > timeout):
-                raise Exception(filepath + " hasn't arrived in time")
-            time.sleep(wait_time)
-            
-        # If the file exists but locked, wait wait_time seconds and check
-        # again until it's no longer locked by another process.
-        while is_locked(filepath):
-            if (timeout is not None) and  (time.time() -start  > timeout):
-                raise Exception(filepath + " hasn't arrived in time")
-            time.sleep(wait_time)            
-
-
-def wait_for_file_size(filepath, size, timeout = None):
-    """Wait for a file to exist, and reach a given size.
-    """
-
-    wait_time = 0.01
-    filepath = os.path.abspath(filepath)
-    start = time.time()
-    # If the file doesn't exist, wait wait_time seconds and try again
-    # until it's found.
-    while not os.path.exists(filepath) or size > os.path.getsize(filepath):
-        if (timeout is not None) and  (time.time() -start  > timeout):
-                raise Exception(filepath + " hasn't arrived in time")
-        time.sleep(wait_time)
-
-
 class Image(DeviceBase, Readable):
     def __init__(self, name, pixel):
         DeviceBase.__init__(self, name)
@@ -140,7 +73,7 @@ class Image(DeviceBase, Readable):
 
         file_size = 4 * self.pixel.PIX_XDIM * self.pixel.PIX_YDIM
         print "Waiting image file: " , filename, " size=", file_size
-        wait_for_file_size(filename, file_size)
+        wait_for_file_size(filename, file_size, 20.0)
                 
         threshold1 = self.pixel.threshold1
         threshold2 = self.pixel.threshold2