Changeset 9:953cd606427c in xplra for src/xplra/ServerThread.cc

Timestamp:

01/04/13 16:12:21 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Registering multi-data update requests works

File:

• src/xplra/ServerThread.cc (modified) (6 diffs)

src/xplra/ServerThread.cc

@@ -37 +37 @@
 #include "TaskRequest.h"
 #include "GetMultiDataRefRequest.h"
+#include "SetMultiDataRefRequest.h"
 
 #include <xplcommon/Util.h>
@@ -76 +77 @@
     bufferedStream(acceptor.getSocket(&waiter)),
     stream(*bufferedStream),
-    nextGetMultiRequestID(1)
+    nextGetMultiRequestID(1),
+    nextSetMultiRequestID(1)
 {
     instancesMutex.lock();
@@ -91 +93 @@
     for(getMultiRequests_t::iterator i = getMultiRequests.begin();
         i!=getMultiRequests.end(); ++i)
+    {
+        delete i->second;
+    }
+
+    for(setMultiRequests_t::iterator i = setMultiRequests.begin();
+        i!=setMultiRequests.end(); ++i)
     {
         delete i->second;
@@ -129 +137 @@
         } else if (command==Protocol::COMMAND_EXECUTE_GET_MULTI) {
             if (!handleExecuteGetMulti()) break;
+        } else if (command==Protocol::COMMAND_REGISTER_SET_MULTI) {
+            if (!handleRegisterSetMulti()) break;
+        } else if (command==Protocol::COMMAND_UNREGISTER_SET_MULTI) {
+            if (!handleUnregisterSetMulti()) break;
+        } else if (command==Protocol::COMMAND_EXECUTE_SET_MULTI) {
+            if (!handleExecuteSetMulti()) break;
         } else {
             stream.writeU8(Protocol::RESULT_INVALID_COMMAND);
@@ -177 +191 @@
         stream.writeU8(result);
         return true;
+    }
+
+    task->readValue(stream);
+    if (!stream) {
+        delete task;
+        return false;
     }
 
@@ -258 +278 @@
 //------------------------------------------------------------------------------
 
+bool ServerThread::handleRegisterSetMulti()
+{
+    uint8_t result = Protocol::RESULT_OK;
+    SetMultiDataRefRequest* request =
+        new SetMultiDataRefRequest(result, stream);
+    if (result!=Protocol::RESULT_OK || !stream) {
+        delete request;
+        stream.writeU8(result);
+        return stream;
+    }
+
+    size_t id = nextSetMultiRequestID++;
+    setMultiRequests[id] = request;
+
+    stream.writeU8(Protocol::RESULT_OK);
+    stream.writeU32(id);
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
+bool ServerThread::handleUnregisterSetMulti()
+{
+    uint32_t id = stream.readU32();
+    if (!stream) return false;
+
+    setMultiRequests_t::iterator i = setMultiRequests.find(id);
+    if (i==setMultiRequests.end()) {
+        stream.writeU8(Protocol::RESULT_INVALID_ID);
+    } else {
+        SetMultiDataRefRequest* request = i->second;
+        setMultiRequests.erase(i);
+        delete request;
+        stream.writeU8(Protocol::RESULT_OK);
+    }
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
+bool ServerThread::handleExecuteSetMulti()
+{
+    uint32_t id = stream.readU32();
+    if (!stream) return false;
+
+    setMultiRequests_t::iterator i = setMultiRequests.find(id);
+    if (i==setMultiRequests.end()) {
+        stream.writeU8(Protocol::RESULT_INVALID_ID);
+    } else {
+        SetMultiDataRefRequest* request = i->second;
+        request->readValues(stream);
+        if (!stream || !requestQueue.execute(request)) return false;
+        request->writeResult(stream);
+    }
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++