flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #875, adjusted servicetool (DBus samples)

Browse Source 
* use functions from blackcore/test
* show signatures
This commit is contained in:
Klaus Basan
2017-02-07 19:00:33 +01:00
committed by Mathew Sutcliffe
parent 9beb6c79e1
commit f2e49987e0
3 changed files with 186 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
samples/blackmiscdbus/main.cpp
View File

@@ -12,8 +12,9 @@
#include "blackmisc/dbusserver.h"
#include "blackmisc/registermetadata.h"
#include "blackmisc/network/networkutils.h"
#include "blackcore/test/testutils.h"
#include "servicetool.h"
#include <stdio.h>
#include <QCoreApplication>
#include <QDBusServer>
@@ -33,6 +34,9 @@ int main(int argc, char *argv[])
BlackMisc::registerMetadata();
QCoreApplication a(argc, argv);
QTextStream out(stdout, QIODevice::WriteOnly);
QTextStream qtin(stdin);
const bool verbose = false;
// trying to get the arguments into a list
const QStringList cmdlineArgs = QCoreApplication::arguments();
@@ -69,19 +73,34 @@ int main(int argc, char *argv[])
// Create a Testservice instance and register it with the session bus only if
// the service isn't already available.
if (!clientFlag)
if (clientFlag)
{
// 2nd Process !!! Running on the client's side
// This runs in a second process, hence cannot be directly debugged within Qt Creators
out << "Running client side " << QCoreApplication::applicationPid() << endl;
// run tests
if (cmdlineArgs.contains("testservice", Qt::CaseInsensitive))
{
BlackSample::ServiceTool::dataTransferTestClient(address);
}
// loop
return a.exec();
}
else
{
// Configure tests
Menu:
qDebug() << "1 .. Run testservice to test data transfer" << addressTcp;
qDebug() << "1sb. Run testservice via session bus";
qDebug() << "----- Change address / port (no validation, do before starting server)";
qDebug() << "loop Address to loopback, 127.0.0.1";
qDebug() << "ip some IP address, e.g 192.168.100.100";
qDebug() << "port some port, e.g 12345";
qDebug() << "-----";
qDebug() << "x .. Bye";
QTextStream qtin(stdin);
out << "Pid: " << QCoreApplication::applicationPid() << endl;
out << "1 .. Run testservice to test data transfer" << addressTcp << endl;
out << "1sb. Run testservice via session bus" << endl;
out << "2 .. Show signatures" << endl;
out << "----- Change address / port (no validation, do before starting server)" << endl;
out << "loop Address to loopback, 127.0.0.1" << endl;
out << "ip some IP address, e.g " << ip << endl;
out << "port some port, e.g 12345" << endl;
out << "-----" << endl;
out << "x .. Bye" << endl;
QString mode = qtin.readLine().toLower().trimmed();
if (mode.startsWith("l"))
@@ -92,7 +111,7 @@ int main(int argc, char *argv[])
}
if (mode.startsWith("i"))
{
QStringList p = mode.split(QRegExp("\\s"));
const QStringList p = mode.split(QRegExp("\\s"));
if (p.length() > 1)
{
ip = p.at(1);
@@ -102,7 +121,7 @@ int main(int argc, char *argv[])
}
if (mode.startsWith("p"))
{
QStringList p = mode.split(QRegExp("\\s"));
const QStringList p = mode.split(QRegExp("\\s"));
if (p.length() > 1)
{
port = p.at(1);
@@ -110,6 +129,13 @@ int main(int argc, char *argv[])
}
goto Menu;
}
if (mode.startsWith("2"))
{
out << "---------------------------------" << endl;
BlackCore::Test::CTestUtils::showDBusSignatures(out);
out << "---------------------------------" << endl;
goto Menu;
}
// start DBus
address = QString(useSessionBusForServer ? "session" : addressTcp); // testing with real transfer
@@ -125,13 +151,13 @@ int main(int argc, char *argv[])
// I know I am in the "server process here", so I can safely create a CDBusServer
// this runs in the original process and can be directly debugged
qDebug();
qDebug("--------------------------------------------------------");
out << "--------------------------------------------------------" << endl;
BlackMisc::CDBusServer *dBusServer = new BlackMisc::CDBusServer(useSessionBusForServer ? "session" : address);
if (dBusServer->hasQDBusServer())
{
qDebug() << "server" << dBusServer->qDBusServer()->address() << "connected:" << dBusServer->qDBusServer()->isConnected();
out << "server" << dBusServer->qDBusServer()->address() <<
" connected:" << dBusServer->qDBusServer()->isConnected() << endl;
}
// start client process
QStringList args;
@@ -139,7 +165,7 @@ int main(int argc, char *argv[])
args << mode;
if (address == "session")
{
args << address; // set session as cmd arg
args << "session"; // set session as cmd arg
}
else
{
@@ -150,29 +176,15 @@ int main(int argc, char *argv[])
// run tests
if (mode == "testservice")
{
BlackSample::ServiceTool::dataTransferTestServer(dBusServer);
BlackSample::ServiceTool::dataTransferTestServer(dBusServer, verbose);
}
// in new process
// testing in new process
BlackSample::ServiceTool::startNewProcess(executable, args, &a);
// in same process
// testing in same process
// BlackSample::ServiceTool::dataTransferTestClient(address);
// loop
return a.exec();
}
else
{
// 2nd Process !!! Running on the client's side
// This runs in a second process, hence cannot be directly debugged within Qt Creators
// run tests
if (cmdlineArgs.contains("testservice", Qt::CaseInsensitive))
{
BlackSample::ServiceTool::dataTransferTestClient(address);
}
// loop
return a.exec();
}