Changeset 3:459106f9bf9a in xplra

Timestamp:

01/03/13 15:45:33 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Very basic client and server functionality works

Files:

• misc/client.py (added)
• src/xplra/DataRefTask.cc (added)
• src/xplra/DataRefTask.h (added)
• src/xplra/GetDataRefTask.cc (added)
• src/xplra/GetDataRefTask.h (added)
• src/xplra/ListenThread.cc (modified) (1 diff)
• src/xplra/Makefile.am (modified) (2 diffs)
• src/xplra/ServerThread.cc (modified) (4 diffs)
• src/xplra/ServerThread.h (modified) (6 diffs)
• src/xplra/Task.h (added)
• src/xplra/TaskRequest.cc (added)
• src/xplra/TaskRequest.h (added)

src/xplra/ListenThread.cc

@@ -55 +55 @@
     while(!quitEvent.check() && !quitEvent.failed() && !acceptor.failed()) {
         if (acceptor.accept()) {
-            ServerThread* serverThread = new ServerThread(acceptor);
+            ServerThread* serverThread = new ServerThread(requestQueue,
+                                                          acceptor);
             serverThread->start();
         }

src/xplra/Makefile.am

@@ -24 +24 @@
 
 libxplra_la_SOURCES= \
-        plugin.cc       \
-        ListenThread.cc \
-        RequestQueue.cc \
-        ServerThread.cc
+        plugin.cc               \
+        ListenThread.cc         \
+        RequestQueue.cc         \
+        ServerThread.cc         \
+        TaskRequest.cc          \
+        DataRefTask.cc          \
+        GetDataRefTask.cc
 
 libxplra_la_LIBADD=$(LIBXPLCOMMON_LIBS)
@@ -35 +38 @@
         Request.h               \
         RequestQueue.h          \
-        ServerThread.h
+        ServerThread.h          \
+        Task.h                  \
+        TaskRequest.h           \
+        DataRefTask.h           \
+        GetDataRefTask.h

src/xplra/ServerThread.cc

@@ -31 +31 @@
 #include "ServerThread.h"
 
+#include "RequestQueue.h"
+#include "GetDataRefTask.h"
+#include "TaskRequest.h"
+
+#include <xplcommon/Util.h>
+
+#include <cstdio>
+
 //------------------------------------------------------------------------------
 
@@ -37 +45 @@
 using xplcommon::LocalAcceptor;
 using xplcommon::Mutex;
+using xplcommon::Util;
+
+using std::string;
 
 //------------------------------------------------------------------------------
@@ -57 +68 @@
 //------------------------------------------------------------------------------
 
-ServerThread::ServerThread(LocalAcceptor& acceptor) :
+ServerThread::ServerThread(RequestQueue& requestQueue, LocalAcceptor& acceptor) :
     Thread(true),
+    requestQueue(requestQueue),
     bufferedStream(acceptor.getSocket(&waiter)),
     stream(*bufferedStream)
@@ -89 +101 @@
 void ServerThread::run()
 {
-    stream.write("Hello, world!", 13);
-    stream.flush();
+    Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run\n", this);
+    while(stream) {
+        uint8_t command = stream.readU8();
+        if (!stream) continue;
+
+        // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: command=0x%02x\n",
+        //             this, command);
+
+        if (command==CMD_GET_SINGLE) {
+            string name = stream.readString();
+            uint8_t type = stream.readU8();
+            if (!stream) continue;
+            // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: name='%s', type=0x%02x\n",
+            //             this, name.c_str(), type);
+            if (type==TYPE_BYTE_ARRAY) {
+                int length = stream.readS32();
+                if (!stream) continue;
+
+                // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: length=%lu\n",
+                //             this, static_cast<unsigned long>(length));
+
+                GetByteArrayDataRefTask* task =
+                    new GetByteArrayDataRefTask(name, length);
+                TaskRequest request(task);
+
+                if (requestQueue.execute(&request)) {
+                    // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: request executed\n");
+                    stream.writeU8(RESULT_OK);
+                    int length = task->getLength();
+                    stream.writeS32(length);
+                    if (length>0) {
+                        stream.write(task->getData(), length);
+                    }
+                } else {
+                    break;
+                }
+            } else {
+                stream.writeU8(RESULT_OTHER_ERROR);
+            }
+        } else {
+            stream.writeU8(RESULT_INVALID_COMMAND);
+        }
+        stream.flush();
+    }
+
+    Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: quitting\n", this);
 }
 

src/xplra/ServerThread.h

@@ -37 +37 @@
 #include <xplcommon/Waiter.h>
 #include <xplcommon/BufferedStream.h>
-#include <xplcommon/BlockingStream.h>
+#include <xplcommon/DataStream.h>
 #include <xplcommon/LocalAcceptor.h>
 
@@ -48 +48 @@
 //------------------------------------------------------------------------------
 
+class RequestQueue;
+
+//------------------------------------------------------------------------------
+
 /**
  * A thread serving a client.
@@ -53 +57 @@
 class ServerThread : public xplcommon::Thread
 {
+public:
+    /**
+     * Command: get the value of a single dataref.
+     */
+    static const uint8_t CMD_GET_SINGLE = 0x01;
+
+    /**
+     * Data type: int
+     */
+    static const uint8_t TYPE_INT = 0x01;
+
+    /**
+     * Data type: float
+     */
+    static const uint8_t TYPE_FLOAT = 0x02;
+
+    /**
+     * Data type: double
+     */
+    static const uint8_t TYPE_DOUBLE = 0x03;
+
+    /**
+     * Data type: float array
+     */
+    static const uint8_t TYPE_FLOAT_ARRAY = 0x11;
+
+    /**
+     * Data type: int array
+     */
+    static const uint8_t TYPE_INT_ARRAY = 0x12;
+
+    /**
+     * Data type: byte array
+     */
+    static const uint8_t TYPE_BYTE_ARRAY = 0x13;
+
+    /**
+     * Result code: no error, everything is OK.
+     */
+    static const uint8_t RESULT_OK = 0x00;
+
+    /**
+     * Result code: invalid command
+     */
+    static const uint8_t RESULT_INVALID_COMMAND = 0x01;
+
+    /**
+     * Result code: unknown dataref
+     */
+    static const uint8_t RESULT_UNKNOWN_DATAREF = 0x02;
+
+    /**
+     * Result code: invalid type
+     */
+    static const uint8_t RESULT_INVALID_TYPE = 0x03;
+
+    /**
+     * Result code: other error
+     */
+    static const uint8_t RESULT_OTHER_ERROR = 0xff;
+
 private:
     /**
@@ -77 +142 @@
 private:
     /**
+     * The request queue to use.
+     */
+    RequestQueue& requestQueue;
+
+    /**
      * Our waiter.
      */
@@ -87 +157 @@
 
     /**
-     * The blocking stream being used for communication.
+     * The data stream being used for communication.
      */
-    xplcommon::BlockingStream stream;
+    xplcommon::DataStream stream;
 
 public:
@@ -96 +166 @@
      * given acceptor.
      */
-    ServerThread(xplcommon::LocalAcceptor& acceptor);
+    ServerThread(RequestQueue& requestQueue,
+                 xplcommon::LocalAcceptor& acceptor);
 
     /**