Changeset 213:206190c8a76e

Timestamp:

05/31/12 17:33:47 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed some minor problems with the PyUIPC simulator

File:

• src/mlx/pyuipc_sim.py (modified) (4 diffs)

src/mlx/pyuipc_sim.py

@@ -781 +781 @@
 #------------------------------------------------------------------------------
 
-def prepare_data(pattern, forRead = True):
+def prepare_data(pattern, forRead = True, checkOpened = True):
     """Prepare the given pattern for reading and/or writing."""
-    if opened:
+    if not checkOpened or opened:
         return pattern
     else:
-        raise FSUIPCException(ERR_OPEN)
-        
-#------------------------------------------------------------------------------
-
-def read(data):
+        raise FSUIPCException(ERR_NOTOPEN)
+        
+#------------------------------------------------------------------------------
+
+def read(data, checkOpened = True):
     """Read the given data."""
-    if opened:
+    if not checkOpened or opened:
         return [values.read(offset, type) for (offset, type) in data]
     else:
-        raise FSUIPCException(ERR_OPEN)
+        raise FSUIPCException(ERR_NOTOPEN)
             
 #------------------------------------------------------------------------------
 
-def write(data):
+def write(data, checkOpened = True):
     """Write the given data."""
-    if opened:
+    if not checkOpened or opened:
         for (offset, type, value) in data:
             values.write(offset, value, type)
     else:
-        raise FSUIPCException(ERR_OPEN)
+        raise FSUIPCException(ERR_NOTOPEN)
             
 #------------------------------------------------------------------------------
@@ -863 +863 @@
                 try:
                     if call==CALL_READ:
-                        result = read(args[0])
+                        result = read(args[0], checkOpened = False)
                     elif call==CALL_WRITE:
-                        result = write(args[0])
+                        result = write(args[0], checkOpened = False)
                     elif call==CALL_SETVERSION:
                         global fs_version
@@ -886 +886 @@
                     data = cPickle.dumps((RESULT_RETURNED, result))
                 else:
-                    data = cPickle.dumps((RESULT_EXCEPTION, exception))
+                    data = cPickle.dumps((RESULT_EXCEPTION, str(exception)))
                 clientSocket.send(struct.pack("I", len(data)) + data)
         except Exception, e:
@@ -944 +944 @@
             return result
         else:
-            raise result        
+            raise Exception(result)
 
 #------------------------------------------------------------------------------