Changeset 10:b0048ba6f3ca in xplra for src

Timestamp:

01/04/13 16:36:30 (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 commands querying or setting multiple datarefs directly

Location:

src/xplra

Files:

• GetMultiDataRefRequest.cc (modified) (1 diff)
• GetMultiDataRefRequest.h (modified) (1 diff)
• Protocol.h (modified) (1 diff)
• ServerThread.cc (modified) (3 diffs)
• ServerThread.h (modified) (1 diff)
• SetMultiDataRefRequest.cc (modified) (2 diffs)
• SetMultiDataRefRequest.h (modified) (1 diff)

src/xplra/GetMultiDataRefRequest.cc

@@ -39 +39 @@
 using xplra::GetMultiDataRefRequest;
 
+using xplcommon::DataStream;
 using xplcommon::Util;
 
 //------------------------------------------------------------------------------
 
-GetMultiDataRefRequest::GetMultiDataRefRequest(uint8_t& result, size_t numTasks,
-                                               xplcommon::DataStream& stream)
+GetMultiDataRefRequest::GetMultiDataRefRequest(uint8_t& result,
+                                               DataStream& stream)
 {
     result = Protocol::RESULT_OK;
+
+    uint32_t numTasks = stream.readU32();
+    if (!stream) return;
+    if (numTasks==0 || numTasks>Protocol::MAX_MULTI_COUNT) {
+        result = Protocol::RESULT_INVALID_COUNT;
+        return;
+    }
+
     for(size_t i = 0;
         i<numTasks && result==Protocol::RESULT_OK && stream; ++i)

src/xplra/GetMultiDataRefRequest.h

@@ -50 +50 @@
      * specifications from the given stream.
      */
-    GetMultiDataRefRequest(uint8_t& result, size_t numTasks,
-                           xplcommon::DataStream& stream);
+    GetMultiDataRefRequest(uint8_t& result, xplcommon::DataStream& stream);
 
     /**

src/xplra/Protocol.h

@@ -50 +50 @@
      */
     static const uint8_t COMMAND_SET_SINGLE = 0x02;
+
+    /**
+     * Command: get the value of a multiple datarefs.
+     */
+    static const uint8_t COMMAND_GET_MULTI = 0x03;
+
+    /**
+     * Command: set the value of a multiple datarefs.
+     */
+    static const uint8_t COMMAND_SET_MULTI = 0x04;
 
     /**

src/xplra/ServerThread.cc

@@ -131 +131 @@
         } else if (command==Protocol::COMMAND_SET_SINGLE) {
             if (!handleSetSingle()) break;
+        } else if (command==Protocol::COMMAND_GET_MULTI) {
+            if (!handleGetMulti()) break;
+        } else if (command==Protocol::COMMAND_SET_MULTI) {
+            if (!handleSetMulti()) break;
         } else if (command==Protocol::COMMAND_REGISTER_GET_MULTI) {
             if (!handleRegisterGetMulti()) break;
@@ -209 +213 @@
 //------------------------------------------------------------------------------
 
+bool ServerThread::handleGetMulti()
+{
+    uint8_t result = Protocol::RESULT_OK;
+    GetMultiDataRefRequest* request =
+        new GetMultiDataRefRequest(result, stream);
+    if (result!=Protocol::RESULT_OK || !stream) {
+        delete request;
+        stream.writeU8(result);
+        return stream;
+    }
+
+    bool isOK = requestQueue.execute(request);
+
+    if (isOK) {
+        request->writeResult(stream);
+    }
+
+    delete request;
+
+    return isOK;
+}
+
+//------------------------------------------------------------------------------
+
+bool ServerThread::handleSetMulti()
+{
+    uint8_t result = Protocol::RESULT_OK;
+    SetMultiDataRefRequest* request =
+        new SetMultiDataRefRequest(result, stream, true);
+    if (result!=Protocol::RESULT_OK || !stream) {
+        delete request;
+        stream.writeU8(result);
+        return stream;
+    }
+
+    bool isOK = requestQueue.execute(request);
+
+    if (isOK) {
+        request->writeResult(stream);
+    }
+
+    delete request;
+
+    return isOK;
+}
+
+//------------------------------------------------------------------------------
+
 bool ServerThread::handleRegisterGetMulti()
 {
-    uint32_t numTasks = stream.readU32();
-    if (!stream) {
-        return false;
-    } else if (numTasks==0 || numTasks>Protocol::MAX_MULTI_COUNT) {
-        stream.writeU8(Protocol::RESULT_INVALID_COUNT);
-        return true;
-    }
-
     uint8_t result = Protocol::RESULT_OK;
     GetMultiDataRefRequest* request =
-        new GetMultiDataRefRequest(result, numTasks, stream);
+        new GetMultiDataRefRequest(result, stream);
     if (result!=Protocol::RESULT_OK || !stream) {
         delete request;
@@ -282 +326 @@
     uint8_t result = Protocol::RESULT_OK;
     SetMultiDataRefRequest* request =
-        new SetMultiDataRefRequest(result, stream);
+        new SetMultiDataRefRequest(result, stream, false);
     if (result!=Protocol::RESULT_OK || !stream) {
         delete request;

src/xplra/ServerThread.h

@@ -173 +173 @@
 
     /**
+     * Handle the COMMAND_GET_MULTI command
+     *
+     * @return true, if we can continue, false if the thread should quit
+     */
+    bool handleGetMulti();
+
+    /**
+     * Handle the COMMAND_SET_MULTI command
+     *
+     * @return true, if we can continue, false if the thread should quit
+     */
+    bool handleSetMulti();
+
+    /**
      * Handle the COMMAND_REGISTER_GET_MULTI command
      *

src/xplra/SetMultiDataRefRequest.cc

@@ -42 +42 @@
 
 SetMultiDataRefRequest::SetMultiDataRefRequest(uint8_t& result,
-                                               DataStream& stream)
+                                               DataStream& stream,
+                                               bool readValues)
 {
     result = Protocol::RESULT_OK;
@@ -56 +57 @@
         i<numTasks && result==Protocol::RESULT_OK && stream; ++i) {
         SetDataRefTask* task = SetDataRefTask::create(result, stream);
-        if (task!=0) addTask(task);
+        if (task!=0) {
+            if (readValues) {
+                task->readValue(stream);
+            }
+            addTask(task);
+        }
     }
 }

src/xplra/SetMultiDataRefRequest.h

@@ -50 +50 @@
      * the given stream.
      */
-    SetMultiDataRefRequest(uint8_t& result, xplcommon::DataStream& stream);
+    SetMultiDataRefRequest(uint8_t& result, xplcommon::DataStream& stream,
+                           bool readValues);
 
     /**