From 030852de463803005bae8a163e849e79d8c1c9e3 Mon Sep 17 00:00:00 2001 From: QL Date: Mon, 5 Oct 2020 11:34:50 -0400 Subject: [PATCH] 6.9.1 --- examples/qt/dpp-gui/bsp.cpp | 33 +++++++++++++++++++-------------- ports/qt/guiactive.hpp | 4 ++-- ports/qt/guiapp.cpp | 13 +++++++------ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/examples/qt/dpp-gui/bsp.cpp b/examples/qt/dpp-gui/bsp.cpp index 398a14e0..e23b47fa 100644 --- a/examples/qt/dpp-gui/bsp.cpp +++ b/examples/qt/dpp-gui/bsp.cpp @@ -170,23 +170,28 @@ static int custParserFun(QSpyRecord * const qrec) { //............................................................................ bool QP::QS::onStartup(void const *) { static uint8_t qsBuf[4*1024]; // 4K buffer for Quantum Spy + QSpyConfig qsc; + initBuf(qsBuf, sizeof(qsBuf)); - QSPY_config(QP_VERSION, // version - QS_OBJ_PTR_SIZE, // objPtrSize - QS_FUN_PTR_SIZE, // funPtrSize - QS_TIME_SIZE, // tstampSize - Q_SIGNAL_SIZE, // sigSize, - QF_EVENT_SIZ_SIZE, // evtSize - QF_EQUEUE_CTR_SIZE, // queueCtrSize - QF_MPOOL_CTR_SIZE, // poolCtrSize - QF_MPOOL_SIZ_SIZE, // poolBlkSize - QF_TIMEEVT_CTR_SIZE,// tevtCtrSize - nullptr, // matFile, - nullptr, - &custParserFun); // customized parser function + qsc.version = QP_VERSION; + qsc.endianness = 0U; + qsc.objPtrSize = QS_OBJ_PTR_SIZE; + qsc.funPtrSize = QS_FUN_PTR_SIZE; + qsc.tstampSize = QS_TIME_SIZE; + qsc.sigSize = Q_SIGNAL_SIZE; + qsc.evtSize = QF_EVENT_SIZ_SIZE; + qsc.queueCtrSize = QF_EQUEUE_CTR_SIZE; + qsc.poolCtrSize = QF_MPOOL_CTR_SIZE; + qsc.poolBlkSize = QF_MPOOL_SIZ_SIZE; + qsc.tevtCtrSize = QF_TIMEEVT_CTR_SIZE; - l_time.start(); // start the time stamp + QSPY_config(&qsc, + nullptr, // matFile, + nullptr, nullptr, // sequence file and list + &custParserFun); // customized parser function + + l_time.start(); // start the time stamp return true; // success } diff --git a/ports/qt/guiactive.hpp b/ports/qt/guiactive.hpp index c7c202af..b8bb5273 100644 --- a/ports/qt/guiactive.hpp +++ b/ports/qt/guiactive.hpp @@ -3,7 +3,7 @@ /// @cond ///*************************************************************************** /// Last updated for version 6.9.1 / Qt 5.x -/// Last updated on 2020-10-04 +/// Last updated on 2020-10-05 /// /// Q u a n t u m L e a P s /// ------------------------ @@ -71,7 +71,7 @@ public: std::uint_fast16_t const margin) noexcept override; #else bool post_(QEvt const * const e, std::uint_fast16_t const margin, - void const * const sender) override; + void const * const sender) noexcept override; #endif // Q_SPY void postLIFO(QEvt const * const e) noexcept override; }; diff --git a/ports/qt/guiapp.cpp b/ports/qt/guiapp.cpp index aef821e4..431bfa59 100644 --- a/ports/qt/guiapp.cpp +++ b/ports/qt/guiapp.cpp @@ -3,7 +3,7 @@ /// @cond ///*************************************************************************** /// Last updated for version 6.9.1 / Qt 5.x -/// Last updated on 2020-09-21 +/// Last updated on 2020-10-05 /// /// Q u a n t u m L e a P s /// ------------------------ @@ -41,6 +41,7 @@ #include "qassert.h" #ifdef Q_SPY // QS software tracing enabled? #include "qs_port.hpp" // include QS port + #include "qs_pkg.hpp" // QS package-scope internal interface #else #include "qs_dummy.hpp" // disable the QS software tracing #endif // Q_SPY @@ -128,7 +129,7 @@ bool GuiQActive::post_(QEvt const * const e, QF_EVT_REF_CTR_INC_(e); // increment the reference counter } - QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST, me_prio) + QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST, m_prio) QS_TIME_PRE_(); // timestamp QS_OBJ_PRE_(sender); // the sender object QS_SIG_PRE_(e->sig); // the signal of the event @@ -155,7 +156,7 @@ void GuiQActive::postLIFO(QEvt const * const e) noexcept { QF_EVT_REF_CTR_INC_(e); // increment the reference counter } - QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST_LIFO, me_prio) + QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST_LIFO, m_prio) QS_TIME_PRE_(); // timestamp QS_SIG_PRE_(e->sig); // the signal of this event QS_OBJ_PRE_(this); // this active object @@ -199,7 +200,7 @@ bool GuiQMActive::post_(QEvt const * const e, #else bool GuiQMActive::post_(QEvt const * const e, std::uint_fast16_t const /*margin*/, - void const * const sender) + void const * const sender) noexcept #endif { QF_CRIT_STAT_ @@ -210,7 +211,7 @@ bool GuiQMActive::post_(QEvt const * const e, QF_EVT_REF_CTR_INC_(e); // increment the reference counter } - QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST, me_prio) + QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST, m_prio) QS_TIME_PRE_(); // timestamp QS_OBJ_PRE_(sender); // the sender object QS_SIG_PRE_(e->sig); // the signal of the event @@ -237,7 +238,7 @@ void GuiQMActive::postLIFO(QEvt const * const e) noexcept { QF_EVT_REF_CTR_INC_(e); // increment the reference counter } - QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST_LIFO, me_prio) + QS_BEGIN_NOCRIT_PRE_(QS_QF_ACTIVE_POST_LIFO, m_prio) QS_TIME_PRE_(); // timestamp QS_SIG_PRE_(e->sig); // the signal of this event QS_OBJ_PRE_(this); // this active object