Changeset 793:fea44dadc477

Timestamp:

07/24/16 08:46:13 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for marking requests as unimportant, and if marked so, to ignore TypeError exceptions (re #303).

File:

• src/mlx/fsuipc.py (modified) (7 diffs)

src/mlx/fsuipc.py

@@ -118 +118 @@
 
     @staticmethod
-    def _performRead(data, callback, extra, validator):
+    def _performRead(data, callback, extra, validator, unimportant = False):
         """Perform a read request.
 
@@ -130 +130 @@
         attemptsLeft = Handler.NUM_READATTEMPTS
         while attemptsLeft>0:
-            values = pyuipc.read(data)
-            if validator is None or \
-               Handler._callSafe(lambda: validator(values, extra)):
+            exception = None
+            try:
+                values = pyuipc.read(data)
+            except TypeError, e:
+                exception = e
+
+            failed = True
+            if (exception is None or unimportant) and \
+               (validator is None or \
+                Handler._callSafe(lambda: validator(values, extra))):
                 Handler._callSafe(lambda: callback(values, extra))
+                failed = False
+
+            if exception is not None:
+                raise exception
+
+            if failed:
+                attemptsLeft -= 1
+            else:
                 return True
-            else:
-                attemptsLeft -= 1
         return False
 
     class Request(object):
         """A simple, one-shot request."""
-        def __init__(self, forWrite, data, callback, extra, validator = None):
+        def __init__(self, forWrite, data, callback, extra,
+                     validator = None, unimportant = False):
             """Construct the request."""
             self._forWrite = forWrite
@@ -148 +162 @@
             self._extra = extra
             self._validator = validator
+            self.unimportant = unimportant
 
         def process(self, time):
@@ -156 +171 @@
             if there is some lower-level communication problem."""
             if self._forWrite:
-                pyuipc.write(self._data)
-                Handler._callSafe(lambda: self._callback(True, self._extra))
+                exception = None
+                try:
+                    pyuipc.write(self._data)
+                except TypeError, e:
+                    exception = e
+
+                if exception is None or self.unimportant:
+                    Handler._callSafe(lambda: self._callback(True,
+                                                             self._extra))
+
+                if exception is not None:
+                    raise exception
+
                 return True
             else:
                 return Handler._performRead(self._data, self._callback,
-                                            self._extra, self._validator)
+                                            self._extra, self._validator,
+                                            self.unimportant)
 
         def fail(self):
@@ -267 +294 @@
             self._requestCondition.notify()
 
-    def requestWrite(self, data, callback, extra = None):
+    def requestWrite(self, data, callback, extra = None, unimportant = False):
         """Request the writing of some data.
 
@@ -281 +308 @@
         """
         with self._requestCondition:
-            request = Handler.Request(True, data, callback, extra)
+            request = Handler.Request(True, data, callback, extra,
+                                      unimportant = unimportant)
             #print "fsuipc.Handler.requestWrite", request
             self._requests.append(request)
@@ -451 +479 @@
                     print "fsuipc.Handler._processRequest: FSUIPC returned invalid data too many times, reconnecting"
                     needReconnect = True
+            except TypeError as e:
+                print "fsuipc.Handler._processRequest: type error: " + \
+                      util.utf2unicode(str(e)) + \
+                      ("." if request.unimportant else
+                       (", reconnecting (attempts=%d)." % (attempts,)))
+                needReconnect = not request.unimportant
             except Exception as e:
                 print "fsuipc.Handler._processRequest: FSUIPC connection failed (" + \