Changeset 57:f52efb9ba3d8 in xplra

Timestamp:

03/07/13 18:13:05 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Implemented the C++ client part of the re-registration support

Location:

src/client

Files:

• c/hu/varadiistvan/xplra/MultiBuffer.cc (modified) (3 diffs)
• c/hu/varadiistvan/xplra/MultiBuffer.h (modified) (3 diffs)
• c/hu/varadiistvan/xplra/XPlane.cc (modified) (1 diff)
• python/xplra.py (modified) (1 diff)

src/client/c/hu/varadiistvan/xplra/MultiBuffer.cc

@@ -251 +251 @@
 //------------------------------------------------------------------------------
 
-MultiBuffer::~MultiBuffer() throw(Exception)
-{
-    unregisterFromXPlane();
+MultiBuffer::~MultiBuffer() throw()
+{
+    unregisterSafelyFromXPlane();
     delete[] data;
 }
@@ -358 +358 @@
         xplane.checkResult();
         registeredID = -1;
+    }
+}
+
+//------------------------------------------------------------------------------
+
+bool MultiBuffer::unregisterSafelyFromXPlane() throw()
+{
+    try {
+        unregisterFromXPlane();
+        return true;
+    } catch(...) {
+        registeredID = -1;
+        return false;
     }
 }
@@ -615 +628 @@
 //------------------------------------------------------------------------------
 
+void MultiBuffer::reregisterInXPlane() throw(Exception)
+{
+    if (registeredID>=0) {
+        int origRegisteredID = registeredID;
+        try {
+            registeredID = -1;
+            registerInXPlane();
+        } catch(...) {
+            registeredID = origRegisteredID;
+            throw;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/client/c/hu/varadiistvan/xplra/MultiBuffer.h

@@ -159 +159 @@
      * made to unregister it.
      */
-    virtual ~MultiBuffer() throw(Exception);
+    virtual ~MultiBuffer() throw();
 
 public:
@@ -236 +236 @@
      */
     void unregisterFromXPlane() throw(Exception);
+
+    /**
+     * Unregister this buffer from X-Plane safely, i.e. without
+     * throwing any exceptions. If unregistration fails, the
+     * registered ID will be cleared anyway.
+     *
+     * @return whether unregistration succeeded.
+     */
+    bool unregisterSafelyFromXPlane() throw();
 
     /**
@@ -480 +489 @@
      */
     void writeSpec(uint8_t command) const throw(Exception);
+
+    /**
+     * Re-register the buffer in X-Plane, if it has been registered
+     * earlier.
+     *
+     * it has not been registered, nothing is done. Otherwise the
+     * buffer gets registered, and the old ID is forgotten. This
+     * function is meant to be used by the XPlane object when it
+     * creates a new connection. If the registration fails, the
+     * original ID is restored, so that this function could be called
+     * again
+     */
+    void reregisterInXPlane() throw(Exception);
 
 private:

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -169 +169 @@
     socket = clientSocket.release();
     stream = new DataStream(*socket);
+
+    for(multiBuffers_t::iterator i = multiBuffers.begin();
+        i!=multiBuffers.end(); ++i)
+    {
+        MultiBuffer* buffer = *i;
+        buffer->reregisterInXPlane();
+    }
 }
 

src/client/python/xplra.py

@@ -508 +508 @@
             self.finalize()
         return self._values
-
-    @property
-    def wasRegistered(self):
-        """Determine if this buffer was registered."""
-        return self._wasRegistered
 
     def addInt(self, name):