Changeset 39:44eda5bbbdfb in xplra

Timestamp:

02/14/13 16:09:27 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Implemented a plugin reload command

Files:

• misc/client.py (modified) (1 diff)
• src/plugin/src/xplra/Makefile.am (modified) (2 diffs)
• src/plugin/src/xplra/Protocol.h (modified) (1 diff)
• src/plugin/src/xplra/ReloadPluginsRequest.cc (added)
• src/plugin/src/xplra/ReloadPluginsRequest.h (added)
• src/plugin/src/xplra/ServerThread.cc (modified) (3 diffs)
• src/plugin/src/xplra/ServerThread.h (modified) (1 diff)

misc/client.py

@@ -429 +429 @@
         self._writeString(message)
         self._writeFloat(duration)
+        self._flush()
+
+        result = self._readU8()
+        if result!=0:
+            print >> sys.stderr, "Error code:", result
+
+    def do_reload(self, args):
+        self._writeU8(0x32)
         self._flush()
 

src/plugin/src/xplra/Makefile.am

@@ -17 +17 @@
         GetMultiDataRefRequest.cc       \
         SetMultiDataRefRequest.cc       \
+        ReloadPluginsRequest.cc         \
         MessageWindow.cc                \
         MessageRequest.cc
@@ -34 +35 @@
         GetMultiDataRefRequest.h        \
         SetMultiDataRefRequest.h        \
+        ReloadPluginsRequest.h          \
         MessageWindow.h                 \
         MessageRequest.h

src/plugin/src/xplra/Protocol.h

@@ -97 +97 @@
 
     /**
+     * Command: reload the plugins
+     */
+    static const uint8_t COMMAND_RELOAD_PLUGINS = 0x32;
+
+    /**
      * Command: show a message in the message window.
      */

src/plugin/src/xplra/ServerThread.cc

@@ -39 +39 @@
 #include "GetMultiDataRefRequest.h"
 #include "SetMultiDataRefRequest.h"
+#include "ReloadPluginsRequest.h"
 #include "MessageRequest.h"
 
@@ -153 +154 @@
         } else if (command==Protocol::COMMAND_GET_VERSIONS) {
             if (!handleGetVersions()) break;
+        } else if (command==Protocol::COMMAND_RELOAD_PLUGINS) {
+            if (!handleReloadPlugins()) break;
         } else if (command==Protocol::COMMAND_SHOW_MESSAGE) {
             if (!handleShowMessage()) break;
@@ -409 +412 @@
 //------------------------------------------------------------------------------
 
+bool ServerThread::handleReloadPlugins()
+{
+    ReloadPluginsRequest request;
+    if (!requestQueue.execute(&request)) return false;
+
+    stream.writeU8(Protocol::RESULT_OK);
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
 bool ServerThread::handleShowMessage()
 {

src/plugin/src/xplra/ServerThread.h

@@ -243 +243 @@
 
     /**
+     * Handle the COMMAND_RELOAD_PLUGINS command.
+     *
+     * @return true, if we can continue, false if the thread should quit
+     */
+    bool handleReloadPlugins();
+
+    /**
      * Handle the COMMAND_SHOW_MESSAGE command
      *