594e1d9812
Fixed a bug that caused the host to not respond to any commands when a module is present. CmdExecutor::loadMods() had a malformed 'for' loop that caused the command executor to infinite loop. Also re-formed the way the external command loaders (modules) are constructed. Instead, the modules are also intialized at the same time as the internal command loader. The CmdExecutor::loadModFile() and CmdExecutor::unloadModFile() functions now load and unload modules via the module name instead of the path to the module main file. The documentation for ASYNC_ENABLE_MOD and ASYNC_DISABLE_MOD updated to reflect this change. Also part of the module contruction re-form, it fixed a bug that caused the command loaders to operate in a thread different from the command executor. CmdExecutor::loadMods() was refactored into cmdExecutor::buildCmdLoaders(), added the internal command loader to it and have it so this function gets called only when the command executor successfully moves to it's own thread. Fixed a bug that caused the session to crash only when a module is present. It turns out the qobject_cast() function used in CmdExecutor::loadModFile() only pulled the surface class ModCommandLoader so any attempt to access the base class functions from CommandLoader caused the session to crash so to fix this, ModCommandLoader was merged into CommandLoader. The Command loader documentation and test module were updated to reflect this change. Fixed a bug that auto removed any modules that were installed when the host is restarted. The issue was in TCPServer::syncModPath() that used the modules's main file without a suffix when the file did indeed have a suffix, causing the function to think the module no longer exists and remove all of it's files from the host file system. The original intent for this function was to keep the module database table in sync with what was actually in the host file system. It was decided that this is not necessary so the function was removed altogether. Also changed up the way the module files are deleted. The TCPSever class will now use the module name instead of the path to the module's main library file and will use a single use ModDeleteTimer for each module that was requested to be deleted instead of a single continuous timer constantly checking for modules to delete. The ls_cmds command will now list the commands in alphabetical order of the command names and fixed a bug with the -find option that would display nothing if an exact match to any text in the table could not be found. Fixed a bug found in the deployed application that would segmentation fault on startup due to certain library files being included in the deployed installation directory. Updated the linux_build.sh script to include only libsqlite, libQT5, libssl and libicu files. It will no longer blindly copy all library files from the dev machine and then remove files the setup script thinks the application might or might not need. Any module built on import rev1 will simply not work and no attempt will be made to make it work so the host new minimum import rev is now rev2. this update is mustly just bug fixes; nothing that would require any client behaviour changes so just the host patch is bumped. 1.0.0 --> 1.0.1
132 lines
3.1 KiB
C++
132 lines
3.1 KiB
C++
#ifndef MOD_TESTER_H
|
|
#define MOD_TESTER_H
|
|
|
|
// This file is part of MRCI.
|
|
|
|
// MRCI is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// MRCI is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with MRCI under the LICENSE.md file. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
#include <QPluginLoader>
|
|
#include <QtPlugin>
|
|
#include <QObject>
|
|
|
|
#include "command.h"
|
|
|
|
#define IMPORT_REV 2
|
|
|
|
// the import revision is a module compatibility version number
|
|
// used by the host to determine if it can successfully load and
|
|
// run this library or not. as of right now, the host supports rev1
|
|
// and up.
|
|
|
|
#define LIB_VERSION "1.0.1"
|
|
#define LIB_NAME "MRCITestMod"
|
|
|
|
// the versioning system for the library itself can be completely
|
|
// different from the host import revision.
|
|
|
|
QString libName();
|
|
|
|
class Loader : public CommandLoader
|
|
{
|
|
Q_OBJECT
|
|
Q_PLUGIN_METADATA(IID "MRCI.host.module")
|
|
Q_INTERFACES(CommandLoader)
|
|
|
|
public:
|
|
|
|
bool hostRevOk(quint64 minRev);
|
|
quint64 rev();
|
|
ExternCommand *cmdObj(const QString &name);
|
|
QStringList cmdList();
|
|
|
|
explicit Loader(QObject *parent = nullptr);
|
|
};
|
|
|
|
//-----------------
|
|
|
|
class ModText : public ExternCommand
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
explicit ModText(QObject *parent = nullptr);
|
|
|
|
void procBin(const SharedObjs *sharedObjs, const QByteArray &data, uchar dType);
|
|
QString shortText();
|
|
QString ioText();
|
|
QString longText();
|
|
QString libText();
|
|
};
|
|
|
|
//--------------------
|
|
|
|
class ModInput : public ExternCommand
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
explicit ModInput(QObject *parent = nullptr);
|
|
|
|
void procBin(const SharedObjs *sharedObjs, const QByteArray &data, uchar dType);
|
|
QString shortText();
|
|
QString ioText();
|
|
QString longText();
|
|
QString libText();
|
|
};
|
|
|
|
//-----------------------
|
|
|
|
class ModLoop : public ExternCommand
|
|
{
|
|
Q_OBJECT
|
|
|
|
private:
|
|
|
|
int index;
|
|
|
|
public:
|
|
|
|
explicit ModLoop(QObject *parent = nullptr);
|
|
|
|
void term();
|
|
void procBin(const SharedObjs *sharedObjs, const QByteArray &data, uchar dType);
|
|
QString shortText();
|
|
QString ioText();
|
|
QString longText();
|
|
QString libText();
|
|
};
|
|
|
|
//--------------------------
|
|
|
|
class ModInherit : public ExternCommand
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
explicit ModInherit(QObject *parent = nullptr);
|
|
|
|
void procBin(const SharedObjs *sharedObjs, const QByteArray &data, uchar dType);
|
|
QString shortText();
|
|
QString ioText();
|
|
QString longText();
|
|
QString libText();
|
|
QStringList internRequest();
|
|
};
|
|
|
|
#endif // MOD_TESTER_H
|