Changeset 26:77a23a961301 in xplra

Timestamp:

02/07/13 18:58:46 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The multi-dataref buffers are managed by the XPlane object

Files:

• src/client/c/hu/varadiistvan/xplra/MultiBuffer.cc (modified) (1 diff)
• src/client/c/hu/varadiistvan/xplra/MultiBuffer.h (modified) (4 diffs)
• src/client/c/hu/varadiistvan/xplra/MultiGetter.h (modified) (2 diffs)
• src/client/c/hu/varadiistvan/xplra/MultiSetter.h (modified) (2 diffs)
• src/client/c/hu/varadiistvan/xplra/XPlane.cc (modified) (4 diffs)
• src/client/c/hu/varadiistvan/xplra/XPlane.h (modified) (6 diffs)
• test/multigettest.cc (modified) (2 diffs)
• test/multisettest.cc (modified) (2 diffs)

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

@@ -141 +141 @@
 //------------------------------------------------------------------------------
 
+void MultiBuffer::forgetRegistration() throw()
+{
+    registeredID = -1;
+}
+
+//------------------------------------------------------------------------------
+
 inline const MultiBuffer::DataRef* MultiBuffer::getLastDataRef() const throw()
 {

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

@@ -155 +155 @@
                 uint8_t unregisterCommand) throw();
 
-public:
     /**
      * Destroy the buffer. If it is registered, an attempt will be
@@ -162 +161 @@
     virtual ~MultiBuffer() throw(Exception);
 
+public:
     /**
      * Add an integer dataref.
@@ -477 +477 @@
 
     /**
+     * Forget the registration of this buffer. This is called from the
+     * destructor of the XPlane object, since that closes the
+     * connection anyway, so there is no need to unregister the
+     * multi-buffers.
+     */
+    void forgetRegistration() throw();
+
+    /**
      * Get the last dataref, or 0 if there are not datarefs yet.
      */
@@ -524 +532 @@
     getArray(size_t id, size_t offset) const
         throw(InvalidIDException, TypeMismatchException);
+
+    friend class XPlane;
 };
 

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

@@ -44 +44 @@
 class MultiGetter : public MultiBuffer
 {
-public:
+private:
     /**
      * Construct the object for the given XPlane instance.
@@ -67 +67 @@
      */
     void read(const DataRef& dataRef) throw(Exception);
+
+    friend class XPlane;
 };
 

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

@@ -44 +44 @@
 class MultiSetter : public MultiBuffer
 {
-public:
+private:
     /**
      * Construct the object for the given XPlane instance.
@@ -67 +67 @@
      */
     void write(const DataRef& dataRef) const throw(Exception);
+
+    friend class XPlane;
 };
 

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

@@ -31 +31 @@
 #include "XPlane.h"
 
+#include "MultiGetter.h"
+#include "MultiSetter.h"
+
 #include <hu/varadiistvan/scpl/io/LocalClientSocket.h>
 #include <hu/varadiistvan/scpl/io/DataStream.h>
@@ -41 +44 @@
 
 using hu::varadiistvan::xplra::XPlane;
+using hu::varadiistvan::xplra::MultiGetter;
+using hu::varadiistvan::xplra::MultiSetter;
 
 using hu::varadiistvan::scpl::io::LocalClientSocket;
@@ -104 +109 @@
 {
     disconnect();
+    for(multiBuffers_t::iterator i = multiBuffers.begin();
+        i!=multiBuffers.end(); ++i)
+    {
+        MultiBuffer* buffer = *i;
+        buffer->forgetRegistration();
+        delete buffer;
+    }
 }
 
@@ -138 +150 @@
     delete stream; stream = 0;
     delete socket; socket = 0;
+}
+
+//------------------------------------------------------------------------------
+
+MultiGetter& XPlane::createMultiGetter() throw()
+{
+    MultiGetter* getter = new MultiGetter(*this);
+    multiBuffers.insert(getter);
+    return *getter;
+}
+
+//------------------------------------------------------------------------------
+
+MultiSetter& XPlane::createMultiSetter() throw()
+{
+    MultiSetter* setter = new MultiSetter(*this);
+    multiBuffers.insert(setter);
+    return *setter;
+}
+
+//------------------------------------------------------------------------------
+
+bool XPlane::destroyMultiBuffer(MultiBuffer& buffer) throw(Exception)
+{
+    multiBuffers_t::iterator i = multiBuffers.find(&buffer);
+    if (i==multiBuffers.end()) return false;
+
+    multiBuffers.erase(i);
+    delete &buffer;
+
+    return true;
 }
 

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

@@ -35 +35 @@
 #include <hu/varadiistvan/scpl/io/Waiter.h>
 
+#include <set>
+
 #include <inttypes.h>
 
@@ -49 +51 @@
 
 namespace hu { namespace varadiistvan { namespace xplra {
+
+//------------------------------------------------------------------------------
+
+class MultiBuffer;
+class MultiGetter;
+class MultiSetter;
 
 //------------------------------------------------------------------------------
@@ -61 +69 @@
 private:
     /**
+     * Type for the set of multi-dataref buffers.
+     */
+    typedef std::set<MultiBuffer*> multiBuffers_t;
+
+    /**
      * The waiter to use.
      */
@@ -74 +87 @@
      */
     scpl::io::DataStream* stream;
+
+    /**
+     * The buffers created by this object.
+     */
+    multiBuffers_t multiBuffers;
 
 public:
@@ -84 +102 @@
     /**
      * Destroy the object. If connected, the connection will be
-     * closed.
+     * closed. It destroys all existing buffers, so their references
+     * become invalid.
      */
     ~XPlane() throw();
@@ -102 +121 @@
      */
     void disconnect() throw();
+
+    /**
+     * Create a new getter of multiple datarefs and return a reference
+     * to it.
+     */
+    MultiGetter& createMultiGetter() throw();
+
+    /**
+     * Create a new setter of multiple datarefs and return a reference
+     * to it.
+     */
+    MultiSetter& createMultiSetter() throw();
+
+    /**
+     * Destroy the given getter or setter of multiple datarefs. As the
+     * buffer is unregistered, if it has been registered previously,
+     * and  unregistration may fail, this function might throw an
+     * exception.
+     *
+     * @return if the buffer was found and could be destroyed
+     */
+    bool destroyMultiBuffer(MultiBuffer& buffer) throw(Exception);
 
     /**

test/multigettest.cc

@@ -63 +63 @@
         printf("Connected to X-Plane.\n\n");
 
-        MultiGetter getter(xplane);
+        MultiGetter& getter = xplane.createMultiGetter();
 
         const size_t tailnumID = getter.addByteArray("sim/aircraft/view/acf_tailnum", 40);
@@ -182 +182 @@
         }
 
+        //xplane.destroyMultiBuffer(getter);
+
         return 0;
     } catch(Exception& exception) {

test/multisettest.cc

@@ -63 +63 @@
         printf("Connected to X-Plane.\n\n");
 
-        MultiSetter setter(xplane);
+        MultiSetter& setter = xplane.createMultiSetter();
 
         try {
@@ -98 +98 @@
             printf("Done.\n");
 
+            //xplane.destroyMultiBuffer(setter);
+
             return 0;
         } catch(Exception& exception) {