Changeset 152:f0701a18628a for src/mlx/fsuipc.py

Timestamp:

05/05/12 11:40:28 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Made the sending of the closing message more reliable

File:

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

src/mlx/fsuipc.py

@@ -245 +245 @@
         """
         with self._requestCondition:
-            self._requests.append(Handler.Request(True, data, callback, extra))
+            request = Handler.Request(True, data, callback, extra)
+            #print "fsuipc.Handler.requestWrite", request
+            self._requests.append(request)
             self._requestCondition.notify()
 
@@ -371 +373 @@
                 timeout = self._periodicRequests[0].nextFire - time.time()
 
-            if timeout is not None and timeout <= 0.0:
+            if self._requests or \
+               (timeout is not None and timeout <= 0.0):
                 return
             
@@ -378 +381 @@
     def _disconnect(self):
         """Disconnect from the flight simulator."""
+        print "fsuipc.Handler._disconnect"
         if self._connected:
             pyuipc.close()
@@ -394 +398 @@
         whole processing the request and reconnecting."""
         self._requestCondition.release()
+
+        #print "fsuipc.Handler._processRequest", request
 
         needReconnect = False
@@ -531 +537 @@
         self._flareStart = None
         self._flareStartFS = None
-    
+
         self._latin1decoder = codecs.getdecoder("iso-8859-1")
 
@@ -600 +606 @@
             self._flareRequestID = None
 
-    def sendMessage(self, message, duration = 3):
+    def sendMessage(self, message, duration = 3,
+                    _disconnect = False):
         """Send a message to the pilot via the simulator.
 
@@ -613 +620 @@
                 (0x32fa, 'h', duration)]
 
-        self._handler.requestWrite(data, self._handleMessageSent)
+        #if _disconnect:
+        #    print "fsuipc.Simulator.sendMessage(disconnect)", message
+
+        self._handler.requestWrite(data, self._handleMessageSent,
+                                   extra = _disconnect)
 
     def getFuel(self, tanks, callback):
@@ -655 +666 @@
         self._nextSyncTime = -1
             
-    def disconnect(self):
+    def disconnect(self, closingMessage = None, duration = 3):
         """Disconnect from the simulator."""
         assert not self._monitoringRequested 
+
+        print "fsuipc.Simulator.disconnect", closingMessage, duration
         
         self._stopNormal()
-        self._handler.disconnect()
+        if closingMessage is None:
+            self._handler.disconnect()
+        else:
+            self.sendMessage(closingMessage, duration = duration,
+                             _disconnect = True)
 
     def _startDefaultNormal(self):
@@ -874 +891 @@
         callback(dow, payload, zfw, grossWeight)
 
-    def _handleMessageSent(self, success, extra):
+    def _handleMessageSent(self, success, disconnect):
         """Callback for a message sending request."""
-        pass
+        #print "fsuipc.Simulator._handleMessageSent", disconnect
+        if disconnect:
+            self._handler.disconnect()
 
     def _handleFuelRetrieved(self, data, callback):