diff --git a/src/shared/trk/launcher.cpp b/src/shared/trk/launcher.cpp
index a984cee40d5fd4b9e9e00b8983e96adfa6cdd832..0ff118ec12c87234ee522205f9beb6cfaada989e 100644
--- a/src/shared/trk/launcher.cpp
+++ b/src/shared/trk/launcher.cpp
@@ -138,7 +138,7 @@ bool Launcher::startServer(QString *errorMessage)
void Launcher::setVerbose(int v)
{
d->m_verbose = v;
- d->m_device.setVerbose(v > 1);
+ d->m_device.setVerbose(v);
}
void Launcher::installAndRun()
diff --git a/src/shared/trk/trkdevice.cpp b/src/shared/trk/trkdevice.cpp
index 78f121434154d6cc672043ea743215c55202554d..c17a4532f19299868f4717246a792db601e64e4b 100644
--- a/src/shared/trk/trkdevice.cpp
+++ b/src/shared/trk/trkdevice.cpp
@@ -35,6 +35,10 @@
#include <QtCore/QQueue>
#include <QtCore/QHash>
#include <QtCore/QMap>
+#include <QtCore/QThread>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QSharedPointer>
#ifdef Q_OS_WIN
# include <windows.h>
@@ -90,7 +94,7 @@ BOOL WINAPI TryReadFile(HANDLE hFile,
if (comStat.cbInQue == 0) {
*lpNumberOfBytesRead = 0;
return FALSE;
- }
+ }
return ReadFile(hFile,
lpBuffer,
qMin(comStat.cbInQue, nNumberOfBytesToRead),
@@ -128,6 +132,7 @@ TrkMessage::TrkMessage(byte c, byte t, TrkCallback cb) :
{
}
+
///////////////////////////////////////////////////////////////////////
//
// TrkWriteQueue
@@ -252,29 +257,179 @@ void TrkWriteQueue::queueTrkInitialPing()
m_trkWriteQueue.append(TrkMessage(0, 0));
}
+///////////////////////////////////////////////////////////////////////
+//
+// DeviceContext to be shared between threads
+//
+///////////////////////////////////////////////////////////////////////
+
+struct DeviceContext {
+ DeviceContext();
+#ifdef Q_OS_WIN
+ HANDLE device;
+#else
+ QFile file;
+#endif
+ bool serialFrame;
+};
+
+DeviceContext::DeviceContext() :
+#ifdef Q_OS_WIN
+ device(INVALID_HANDLE_VALUE),
+#endif
+ serialFrame(true)
+{
+}
///////////////////////////////////////////////////////////////////////
//
-// TrkDevicePrivate
+// TrkWriterThread: A thread operating a TrkWriteQueue.
//
///////////////////////////////////////////////////////////////////////
-struct TrkDevicePrivate
+class WriterThread : public QThread {
+ Q_OBJECT
+ Q_DISABLE_COPY(WriterThread)
+public:
+ explicit WriterThread(const QSharedPointer<DeviceContext> &context);
+
+ // Enqueue messages.
+ void queueTrkMessage(byte code, TrkCallback callback,
+ const QByteArray &data, const QVariant &cookie);
+ void queueTrkInitialPing();
+
+ // Call this from the device read notification with the results.
+ void slotHandleResult(const TrkResult &result);
+
+ virtual void run();
+
+signals:
+ void error(const QString &);
+
+public slots:
+ bool trkWriteRawMessage(const TrkMessage &msg);
+ void terminate();
+ void tryWrite();
+
+private:
+ bool write(const QByteArray &data, QString *errorMessage);
+
+ const QSharedPointer<DeviceContext> m_context;
+ QMutex m_dataMutex;
+ QMutex m_waitMutex;
+ QWaitCondition m_waitCondition;
+ TrkWriteQueue m_queue;
+ bool m_terminate;
+};
+
+WriterThread::WriterThread(const QSharedPointer<DeviceContext> &context) :
+ m_context(context),
+ m_terminate(false)
{
- TrkDevicePrivate();
+}
- TrkWriteQueue queue;
+void WriterThread::run()
+{
+ while (true) {
+ // Wait. Use a timeout in case something is already queued before we
+ // start up or some weird hanging exit condition
+ m_waitMutex.lock();
+ m_waitCondition.wait(&m_waitMutex, 100);
+ m_waitMutex.unlock();
+ if (m_terminate)
+ break;
+ // Send off message
+ m_dataMutex.lock();
+ TrkMessage message;
+ if (m_queue.pendingMessage(&message)) {
+ const bool success = trkWriteRawMessage(message);
+ m_queue.notifyWriteResult(success);
+ }
+ m_dataMutex.unlock();
+ }
+}
+
+void WriterThread::terminate()
+{
+ m_terminate = true;
+ m_waitCondition.wakeAll();
+ wait();
+}
+
+bool WriterThread::write(const QByteArray &data, QString *errorMessage)
+{
#ifdef Q_OS_WIN
- HANDLE hdevice;
+ DWORD charsWritten;
+ if (!WriteFile(m_context->device, data.data(), data.size(), &charsWritten, NULL)) {
+ *errorMessage = QString::fromLatin1("Error writing data: %1").arg(winErrorMessage(GetLastError()));
+ return false;
+ }
+ FlushFileBuffers(m_context->device);
+ return true;
#else
- QFile file;
+ if (m_context->file.write(data) == -1 || !m_context->file.flush()) {
+ *errorMessage = QString::fromLatin1("Cannot write: %1").arg(m_context->file.errorString());
+ return false;
+ }
+ return true;
#endif
+}
+
+bool WriterThread::trkWriteRawMessage(const TrkMessage &msg)
+{
+ const QByteArray ba = frameMessage(msg.code, msg.token, msg.data, m_context->serialFrame);
+ QString errorMessage;
+ const bool rc = write(ba, &errorMessage);
+ if (!rc)
+ emit error(errorMessage);
+ return rc;
+}
+
+void WriterThread::tryWrite()
+{
+ m_waitCondition.wakeAll();
+}
+
+void WriterThread::queueTrkMessage(byte code, TrkCallback callback,
+ const QByteArray &data, const QVariant &cookie)
+{
+ m_dataMutex.lock();
+ m_queue.queueTrkMessage(code, callback, data, cookie);
+ m_dataMutex.unlock();
+ tryWrite();
+}
+
+void WriterThread::queueTrkInitialPing()
+{
+ m_dataMutex.lock();
+ m_queue.queueTrkInitialPing();
+ m_dataMutex.unlock();
+ tryWrite();
+}
+
+// Call this from the device read notification with the results.
+void WriterThread::slotHandleResult(const TrkResult &result)
+{
+ m_queue.slotHandleResult(result);
+ tryWrite(); // Have messages been enqueued in-between?
+}
+
+///////////////////////////////////////////////////////////////////////
+//
+// TrkDevicePrivate
+//
+///////////////////////////////////////////////////////////////////////
+
+struct TrkDevicePrivate
+{
+ TrkDevicePrivate();
+
+ QSharedPointer<DeviceContext> deviceContext;
+ QSharedPointer<WriterThread> writerThread;
QByteArray trkReadBuffer;
- bool m_trkWriteBusy;
int timerId;
- bool serialFrame;
- bool verbose;
+ int verbose;
QString errorString;
};
@@ -285,13 +440,9 @@ struct TrkDevicePrivate
///////////////////////////////////////////////////////////////////////
TrkDevicePrivate::TrkDevicePrivate() :
-#ifdef Q_OS_WIN
- hdevice(INVALID_HANDLE_VALUE),
-#endif
- m_trkWriteBusy(false),
+ deviceContext(new DeviceContext),
timerId(-1),
- serialFrame(true),
- verbose(false)
+ verbose(0)
{
}
@@ -316,7 +467,7 @@ bool TrkDevice::open(const QString &port, QString *errorMessage)
{
close();
#ifdef Q_OS_WIN
- d->hdevice = CreateFile(port.toStdWString().c_str(),
+ d->deviceContext->device = CreateFile(port.toStdWString().c_str(),
GENERIC_READ | GENERIC_WRITE,
0,
NULL,
@@ -324,21 +475,19 @@ bool TrkDevice::open(const QString &port, QString *errorMessage)
FILE_ATTRIBUTE_NORMAL,
NULL);
- if (INVALID_HANDLE_VALUE == d->hdevice) {
+ if (INVALID_HANDLE_VALUE == d->deviceContext->device) {
*errorMessage = QString::fromLatin1("Could not open device '%1': %2").arg(port, winErrorMessage(GetLastError()));
return false;
}
- d->timerId = startTimer(TimerInterval);
- return true;
#else
- d->file.setFileName(port);
- if (!d->file.open(QIODevice::ReadWrite|QIODevice::Unbuffered)) {
- *errorMessage = QString::fromLatin1("Cannot open %1: %2").arg(port, d->file.errorString());
+ d->deviceContext->file.setFileName(port);
+ if (!d->deviceContext->file.open(QIODevice::ReadWrite|QIODevice::Unbuffered)) {
+ *errorMessage = QString::fromLatin1("Cannot open %1: %2").arg(port, d->deviceContext->file.errorString());
return false;
}
struct termios termInfo;
- if (tcgetattr(d->file.handle(), &termInfo) < 0) {
+ if (tcgetattr(d->deviceContext->file.handle(), &termInfo) < 0) {
*errorMessage = QString::fromLatin1("Unable to retrieve terminal settings: %1 %2").arg(errno).arg(QString::fromAscii(strerror(errno)));
return false;
}
@@ -353,13 +502,19 @@ bool TrkDevice::open(const QString &port, QString *errorMessage)
termInfo.c_cc[VSTART] = _POSIX_VDISABLE;
termInfo.c_cc[VSTOP] = _POSIX_VDISABLE;
termInfo.c_cc[VSUSP] = _POSIX_VDISABLE;
- if (tcsetattr(d->file.handle(), TCSAFLUSH, &termInfo) < 0) {
+ if (tcsetattr(d->deviceContext->file.handle(), TCSAFLUSH, &termInfo) < 0) {
*errorMessage = QString::fromLatin1("Unable to apply terminal settings: %1 %2").arg(errno).arg(QString::fromAscii(strerror(errno)));
return false;
}
+#endif
d->timerId = startTimer(TimerInterval);
+ d->writerThread = QSharedPointer<WriterThread>(new WriterThread(d->deviceContext));
+ connect(d->writerThread.data(), SIGNAL(error(QString)), this, SIGNAL(error(QString)),
+ Qt::QueuedConnection);
+ d->writerThread->start();
+ if (d->verbose)
+ qDebug() << "Opened" << port;
return true;
-#endif
}
void TrkDevice::close()
@@ -371,21 +526,22 @@ void TrkDevice::close()
d->timerId = -1;
}
#ifdef Q_OS_WIN
- CloseHandle(d->hdevice);
- d->hdevice = INVALID_HANDLE_VALUE;
+ CloseHandle(d->deviceContext->device);
+ d->deviceContext->device = INVALID_HANDLE_VALUE;
#else
- d->file.close();
+ d->deviceContext->file.close();
#endif
- if (verbose())
- logMessage("Close");
+ d->writerThread->terminate();
+ if (d->verbose)
+ emitLogMessage("Close");
}
bool TrkDevice::isOpen() const
{
#ifdef Q_OS_WIN
- return d->hdevice != INVALID_HANDLE_VALUE;
+ return d->deviceContext->device != INVALID_HANDLE_VALUE;
#else
- return d->file.isOpen();
+ return d->deviceContext->file.isOpen();
#endif
}
@@ -396,43 +552,24 @@ QString TrkDevice::errorString() const
bool TrkDevice::serialFrame() const
{
- return d->serialFrame;
+ return d->deviceContext->serialFrame;
}
void TrkDevice::setSerialFrame(bool f)
{
- d->serialFrame = f;
+ d->deviceContext->serialFrame = f;
}
-bool TrkDevice::verbose() const
+int TrkDevice::verbose() const
{
- return true || d->verbose;
+ return d->verbose;
}
-void TrkDevice::setVerbose(bool b)
+void TrkDevice::setVerbose(int b)
{
d->verbose = b;
}
-bool TrkDevice::write(const QByteArray &data, QString *errorMessage)
-{
-#ifdef Q_OS_WIN
- DWORD charsWritten;
- if (!WriteFile(d->hdevice, data.data(), data.size(), &charsWritten, NULL)) {
- *errorMessage = QString::fromLatin1("Error writing data: %1").arg(winErrorMessage(GetLastError()));
- return false;
- }
- FlushFileBuffers(d->hdevice);
- return true;
-#else
- if (d->file.write(data) == -1 || !d->file.flush()) {
- *errorMessage = QString::fromLatin1("Cannot write: %1").arg(d->file.errorString());
- return false;
- }
- return true;
-#endif
-}
-
#ifndef Q_OS_WIN
static inline int bytesAvailable(int fileNo)
{
@@ -452,31 +589,31 @@ void TrkDevice::tryTrkRead()
DWORD charsRead;
DWORD totalCharsRead = 0;
- while (TryReadFile(d->hdevice, buffer, BUFFERSIZE, &charsRead, NULL)) {
+ while (TryReadFile(d->deviceContext->device, buffer, BUFFERSIZE, &charsRead, NULL)) {
totalCharsRead += charsRead;
d->trkReadBuffer.append(buffer, charsRead);
- if (isValidTrkResult(d->trkReadBuffer, d->serialFrame))
+ if (isValidTrkResult(d->trkReadBuffer, d->deviceContext->serialFrame))
break;
}
- if (verbose() && totalCharsRead)
- logMessage("Read" + d->trkReadBuffer.toHex());
+ if (d->verbose > 1 && totalCharsRead)
+ emitLogMessage("Read" + d->trkReadBuffer.toHex());
if (!totalCharsRead)
return;
- const ushort len = isValidTrkResult(d->trkReadBuffer, d->serialFrame);
+ const ushort len = isValidTrkResult(d->trkReadBuffer, d->deviceContext->serialFrame);
if (!len) {
const QString msg = QString::fromLatin1("Partial message: %1").arg(stringFromArray(d->trkReadBuffer));
emitError(msg);
return;
}
#else
- const int size = bytesAvailable(d->file.handle());
+ const int size = bytesAvailable(d->deviceContext->file.handle());
if (!size)
return;
- const QByteArray data = d->file.read(size);
- if (verbose())
- logMessage("trk: <- " + stringFromArray(data));
+ const QByteArray data = d->deviceContext->file.read(size);
+ if (d->verbose > 1)
+ emitLogMessage("trk: <- " + stringFromArray(data));
d->trkReadBuffer.append(data);
- const ushort len = isValidTrkResult(d->trkReadBuffer, d->serialFrame);
+ const ushort len = isValidTrkResult(d->trkReadBuffer, d->deviceContext->serialFrame);
if (!len) {
if (d->trkReadBuffer.size() > 10) {
const QString msg = QString::fromLatin1("Unable to extract message from '%1' '%2'").
@@ -488,10 +625,10 @@ void TrkDevice::tryTrkRead()
#endif // Q_OS_WIN
TrkResult r;
QByteArray rawData;
- while (extractResult(&d->trkReadBuffer, d->serialFrame, &r, &rawData)) {
- //if (verbose())
- // logMessage("Read TrkResult " + r.data.toHex());
- d->queue.slotHandleResult(r);
+ while (extractResult(&d->trkReadBuffer, d->deviceContext->serialFrame, &r, &rawData)) {
+ if (d->verbose > 1)
+ emitLogMessage("Read TrkResult " + r.data.toHex());
+ d->writerThread->slotHandleResult(r);
emit messageReceived(r);
if (!rawData.isEmpty())
emit rawDataReceived(rawData);
@@ -500,7 +637,6 @@ void TrkDevice::tryTrkRead()
void TrkDevice::timerEvent(QTimerEvent *)
{
- tryTrkWrite();
tryTrkRead();
}
@@ -514,44 +650,35 @@ void TrkDevice::emitError(const QString &s)
void TrkDevice::sendTrkMessage(byte code, TrkCallback callback,
const QByteArray &data, const QVariant &cookie)
{
- d->queue.queueTrkMessage(code, callback, data, cookie);
+ if (!d->writerThread.isNull())
+ d->writerThread->queueTrkMessage(code, callback, data, cookie);
}
void TrkDevice::sendTrkInitialPing()
{
- d->queue.queueTrkInitialPing();
+ if (!d->writerThread.isNull())
+ d->writerThread->queueTrkInitialPing();
}
bool TrkDevice::sendTrkAck(byte token)
{
+ if (d->writerThread.isNull())
+ return false;
// The acknowledgement must not be queued!
TrkMessage msg(0x80, token);
msg.token = token;
msg.data.append('\0');
- return trkWriteRawMessage(msg);
+ return d->writerThread->trkWriteRawMessage(msg);
// 01 90 00 07 7e 80 01 00 7d 5e 7e
}
-void TrkDevice::tryTrkWrite()
-{
- TrkMessage message;
- if (!d->queue.pendingMessage(&message))
- return;
- const bool success = trkWriteRawMessage(message);
- d->queue.notifyWriteResult(success);
-}
-
-bool TrkDevice::trkWriteRawMessage(const TrkMessage &msg)
+void TrkDevice::emitLogMessage(const QString &msg)
{
- const QByteArray ba = frameMessage(msg.code, msg.token, msg.data, serialFrame());
- if (verbose())
- logMessage("trk: -> " + stringFromArray(ba));
- QString errorMessage;
- const bool rc = write(ba, &errorMessage);
- if (!rc)
- emitError(errorMessage);
- return rc;
+ if (d->verbose)
+ qDebug("%s\n", qPrintable(msg));
+ emit logMessage(msg);
}
} // namespace trk
+#include "trkdevice.moc"
diff --git a/src/shared/trk/trkdevice.h b/src/shared/trk/trkdevice.h
index 9c9116d99bc5f2d4a2db2a1c210328068052c54a..a4da14fccb034b5fa598b7c44e5a9718161d3a4a 100644
--- a/src/shared/trk/trkdevice.h
+++ b/src/shared/trk/trkdevice.h
@@ -52,7 +52,7 @@ struct TrkDevicePrivate;
* read operation.
* The serialFrames property specifies whether packets are encapsulated in
* "0x90 <length>" frames, which is currently the case for serial ports.
- * Contains write message queue allowing
+ * Contains a write message queue allowing
* for queueing messages with a notification callback. If the message receives
* an ACK, the callback is invoked.
* The special message TRK_WRITE_QUEUE_NOOP_CODE code can be used for synchronisation.
@@ -80,24 +80,8 @@ public:
bool serialFrame() const;
void setSerialFrame(bool f);
- bool verbose() const;
- void setVerbose(bool b);
-
- bool write(const QByteArray &data, QString *errorMessage);
-
-signals:
- void messageReceived(const trk::TrkResult &result);
- // Emitted with the contents of messages enclosed in 07e, not for log output
- void rawDataReceived(const QByteArray &data);
- void error(const QString &msg);
- void logMessage(const QString &msg);
-
-protected:
- void emitError(const QString &msg);
- virtual void timerEvent(QTimerEvent *ev);
-
-public:
- void tryTrkRead();
+ int verbose() const;
+ void setVerbose(int b);
// Enqueue a message with a notification callback.
void sendTrkMessage(unsigned char code,
@@ -111,10 +95,21 @@ public:
// Send an Ack synchronously, bypassing the queue
bool sendTrkAck(unsigned char token);
-private:
- void tryTrkWrite();
- bool trkWriteRawMessage(const TrkMessage &msg);
+ void tryTrkRead(); // TODO: Why public?
+signals:
+ void messageReceived(const trk::TrkResult &result);
+ // Emitted with the contents of messages enclosed in 07e, not for log output
+ void rawDataReceived(const QByteArray &data);
+ void error(const QString &msg);
+ void logMessage(const QString &msg);
+
+protected:
+ void emitError(const QString &msg);
+ void emitLogMessage(const QString &msg);
+ virtual void timerEvent(QTimerEvent *ev);
+
+private:
TrkDevicePrivate *d;
};
diff --git a/tests/manual/trklauncher/main.cpp b/tests/manual/trklauncher/main.cpp
index e4900feb01bb38f76f2e0da1f984df1fcc932f5a..372a2d87b40e23c191db5699d1b7f05ea7977a14 100644
--- a/tests/manual/trklauncher/main.cpp
+++ b/tests/manual/trklauncher/main.cpp
@@ -13,9 +13,9 @@ static const char *usageC =
"\nRemote launch:\n"
"%1 COM5 C:\\sys\\bin\\test.exe\n"
"\nInstallation and remote launch:\n"
-"%1 COM5 -i C:\\Data\\test_gcce_udeb.sisx C:\\sys\\bin\\test.exe\n"
+"%1 -i COM5 C:\\Data\\test_gcce_udeb.sisx C:\\sys\\bin\\test.exe\n"
"\nCopy from local file, installation and remote launch:\n"
-"%1 COM5 -I C:\\Projects\\test\\test_gcce_udeb.sisx C:\\Data\\test_gcce_udeb.sisx C:\\sys\\bin\\test.exe\n";
+"%1 -I COM5 C:\\Projects\\test\\test_gcce_udeb.sisx C:\\Data\\test_gcce_udeb.sisx C:\\sys\\bin\\test.exe\n";
static void usage()
{