8.1.1

Author: quantum-leaps

examples

@@ -30,10 +30,10 @@
 #define QP_HPP_
 
 //============================================================================
-#define QP_VERSION_STR  "8.1.0"
-#define QP_VERSION      810U
-// <VER>=810 <DATE>=250930
-#define QP_RELEASE      0x6A6F1BB5U
+#define QP_VERSION_STR  "8.1.1"
+#define QP_VERSION      811U
+// <VER>=810 <DATE>=251008
+#define QP_RELEASE      0x6A6334D4U
 
 //----------------------------------------------------------------------------
 // default configuration settings
@@ -218,9 +218,7 @@ class QAsm {
         QEvt const * const e,
         std::uint_fast8_t const qsId) = 0;
     virtual bool isIn(QStateHandler const stateHndl) = 0;
-#ifdef Q_SPY
     virtual QStateHandler getStateHandler() const noexcept = 0;
-#endif
 
     QStateHandler state() const noexcept {
         return m_state.fun; // public "getter" for the state handler
@@ -310,11 +308,9 @@ class QHsm : public QP::QAsm {
     void dispatch(
         QEvt const * const e,
         std::uint_fast8_t const qsId) override;
-#ifdef Q_SPY
+    bool isIn(QStateHandler const stateHndl) noexcept override;
     QStateHandler getStateHandler() const noexcept override;
-#endif
 
-    bool isIn(QStateHandler const stateHndl) noexcept override;
     QStateHandler childState(QStateHandler const parentHndl) noexcept;
 
 private:
@@ -348,14 +344,12 @@ class QMsm : public QP::QAsm {
     void dispatch(
         QEvt const * const e,
         std::uint_fast8_t const qsId) override;
-#ifdef Q_SPY
+    bool isIn(QStateHandler const stateHndl) noexcept override;
     QStateHandler getStateHandler() const noexcept override;
-#endif
 
-    static QMState const * topQMState() noexcept;
-    bool isIn(QStateHandler const stateHndl) noexcept override;
     QMState const * childStateObj(QMState const * const parentHndl)
         const noexcept;
+    static QMState const * topQMState() noexcept;
 
 private:
     QState execTatbl_(
@@ -536,10 +530,9 @@ class QActive : public QP::QAsm {
     void dispatch(
         QEvt const * const e,
         std::uint_fast8_t const qsId) override;
-#ifdef Q_SPY
-    QStateHandler getStateHandler() const noexcept override;
-#endif
     bool isIn(QStateHandler const stateHndl) noexcept override;
+    QStateHandler getStateHandler() const noexcept override;
+
     QStateHandler childState(QStateHandler const parentHandler) noexcept;
     void setAttr(
         std::uint32_t attr1,
@@ -683,11 +676,9 @@ class QMActive : public QP::QActive {
         QEvt const * const e,
         std::uint_fast8_t const qsId) override;
     bool isIn(QStateHandler const stateHndl) noexcept override;
-    QMState const *childStateObj(QMState const * const parent) const noexcept;
-
-#ifdef Q_SPY
     QStateHandler getStateHandler() const noexcept override;
-#endif // def Q_SPY
+
+    QMState const *childStateObj(QMState const * const parent) const noexcept;
 }; // class QMActive
 
 //----------------------------------------------------------------------------

include/qp.hpp

@@ -1,10 +1,10 @@
 c2ac64078c92429e6ea52a527a4ee56cc106a0a9 *include/qequeue.hpp
 c222b081c4f0f5dbfcd39dcdc87f82d586ef9b15 *include/qk.hpp
 d299b9482e86b87001cee203c1f0c21293980699 *include/qmpool.hpp
-92042170e7d04b05eb9c4b2a98a79a1018a0a23d *include/qp.hpp
+fa1cc0d5136c74174198c929060a1bae8dc280be *include/qp.hpp
 8ff45f7c77045265339f6bfc4b5366c0c4bb254d *include/qp_pkg.hpp
 4764321b447e0e0ac3e50ca16c48188df5868dc6 *include/qpcpp.hpp
-a3b77b9a2e86ad7861c81c7788f819e64a97af92 *include/qs.hpp
+2093bb5bf0619b53dcb2e189f6e3fad773822c13 *include/qs.hpp
 5b07a296f7689e957b5b9e2ed3767fb67d3cf049 *include/qs_dummy.hpp
 449b8b5b8dee8baeb7bef5b63d44fb04cbd0d436 *include/qs_pkg.hpp
 6054504a150163f4a478fa4212c3816469c003dc *include/qsafe.h
@@ -13,17 +13,17 @@ a3b77b9a2e86ad7861c81c7788f819e64a97af92 *include/qs.hpp
 7610f4b25eba345a6d8c846e10c48e199cd3fbac *include/qxk.hpp
 2b05a89f7e519ef393c27e556c22edb971e1f865 *include/README.md
 71899ce74eeb04f333ed00d53f87719f722a39ab *src/qf/CMakeLists.txt
-8494d9aba98f1083c2820ce3e6ba2cc5a3664976 *src/qf/qep_hsm.cpp
-73df3c0077b68deb5b66c0e4a29fe86b2d540613 *src/qf/qep_msm.cpp
+e2b67daf3916eb8b7b2aa90437b4ca0391988410 *src/qf/qep_hsm.cpp
+91f544c88ec0909ce802da08bc981f1abcb37b3b *src/qf/qep_msm.cpp
 e32d4799c059f6504537dca502fb6908baa9a126 *src/qf/qf_act.cpp
 83e9ee8eb2b112a319532bc6c2f08ed34d877655 *src/qf/qf_actq.cpp
 386592abb28a0dff83a9ab64400d02350eb84c20 *src/qf/qf_defer.cpp
 23284ccad1dc03dca438721970b17d5ad67acba5 *src/qf/qf_dyn.cpp
 9aed73a85db1c734736404a8be6a37ebe6e35f91 *src/qf/qf_mem.cpp
 d1e62ee3c02e002e3cab4e458de683b807e644bd *src/qf/qf_ps.cpp
-f876bf6b0f1826a471c4b6cb9b6f98147eb3dd18 *src/qf/qf_qact.cpp
+3cc49360c1d69cdc33b2c08cc657889cfea5947b *src/qf/qf_qact.cpp
 6bf00dc6980960064f84750c8011d77437452e75 *src/qf/qf_qeq.cpp
-1fd5aa19bf8454ac39ce324ec458dd4fadf2c78c *src/qf/qf_qmact.cpp
+71b607d20050f4a9eecd681fea1091b5a3faf510 *src/qf/qf_qmact.cpp
 0486d3abc1ec3b3dc1ea320181c4ca6bb809cad9 *src/qf/qf_time.cpp
 7cdab433e81612862fd27f0cf792d38e1197d064 *src/qk/CMakeLists.txt
 dfa59caacffb6d5c1a45b5f3e0b82f4316890ea1 *src/qk/qk.cpp
@@ -33,7 +33,7 @@ eb28260d471fc752ca54b2c1e2d763f28432c2c1 *src/qs/CMakeLists.txt
 0dd2c3c6e5ac20dc9a5a50ecba426b0516c28648 *src/qs/qs_fp.cpp
 56bdcf492f2ce83529bb24b149b8fb99aabff521 *src/qs/qs_rx.cpp
 c97bda54ac3be8da467c70440f983fa934eaa864 *src/qs/qstamp.cpp
-20b034d6b3b6dfadd5a795e8c5bda1cb4d218989 *src/qs/qutest.cpp
+006337efd40f1403b785b924a013ddf6baa85a0e *src/qs/qutest.cpp
 b6d93a16f5b176d3da4888a7efb265730337f46d *src/qv/CMakeLists.txt
 04092fcc4b555c932a4f81ace6132c2a99fe3d47 *src/qv/qv.cpp
 ff8ed0166b3d96865df8d07d92bd82301f9aa1bf *src/qxk/qxk.cpp

qpcpp_8.1.0.sha1 renamed to qpcpp_8.1.1.sha1

@@ -1,6 +1,6 @@
 @setlocal
 
-set FNAME=qpcpp_8.1.0.sha1
+set FNAME=qpcpp_8.1.1.sha1
 
 :: usage
 @echo Usage: sha1 [gen]

sha1.bat

@@ -162,7 +162,7 @@ void QHsm::init(
     QS_CRIT_ENTRY();
     bool toDo = false; // assume that dictionary not produced
     if ((QS::priv_.flags & 0x01U) == 0U) { // dictionary not produced yet?
-        QS::priv_.flags |= 0x01U; // mark the QHsm_top dictionary as produced
+        QS::priv_.flags |= 0x01U; // mark the QHsm::top dictionary as produced
         toDo = true;
     }
     QS_CRIT_EXIT();
@@ -248,7 +248,6 @@ void QHsm::dispatch(
 
     // process the event hierarchically...
     std::array <QStateHandler, QHSM_MAX_NEST_DEPTH_> path; // entry path array
-    path[0] = s; // save current state
     m_temp.fun = s;
     QState r; // state handler return value
     std::int_fast8_t ip = QHSM_MAX_NEST_DEPTH_;//path index & fixed loop bound
@@ -271,7 +270,10 @@ void QHsm::dispatch(
         }
     } while (r == Q_RET_SUPER); // loop as long as superstate returned
 
-    if (r == Q_RET_HANDLED) { // did the last handler handle event e?
+    if (r == Q_RET_IGNORED) { // was event e ignored?
+        QS_TRAN0_(QS_QEP_IGNORED, m_state.fun); // output QS record
+    }
+    else if (r == Q_RET_HANDLED) { // did the last handler handle event e?
         QS_TRAN0_(QS_QEP_INTERN_TRAN, s); // output QS record
     }
     else if ((r == Q_RET_TRAN) || (r == Q_RET_TRAN_HIST)) { // tran. taken?
@@ -304,15 +306,13 @@ void QHsm::dispatch(
         // enter the target (possibly recursively) by initial trans.
         enter_target_(&path[0], ip, qsId);
         QS_TRAN_END_(QS_QEP_TRAN, s, path[0]); // output QS record
-    }
-    else if (r == Q_RET_IGNORED) { // was event e ignored?
-        QS_TRAN0_(QS_QEP_IGNORED, m_state.fun); // output QS record
+
+        m_state.fun = path[0]; // change the current active state
     }
     else {
         Q_ERROR_LOCAL(360); // last state handler returned impossible value
     }
 
-    m_state.fun = path[0]; // change the current active state
 #ifndef Q_UNSAFE
     // establish stable state configuration
     m_temp.uint = dis_update<std::uintptr_t>(m_state.uint);
@@ -593,12 +593,10 @@ QStateHandler QHsm::childState(QStateHandler const parentHndl) noexcept {
 }
 
 //............................................................................
-#ifdef Q_SPY
 QStateHandler QHsm::getStateHandler() const noexcept {
     // NOTE: this function does NOT apply critical section, so it can
     // be safely called from an already established critical section.
     return m_state.fun; // public "getter" to the state handler (function)
 }
-#endif
 
 } // namespace QP

src/qf/qep_hsm.cpp

@@ -427,11 +427,9 @@ QMState const * QMsm::childStateObj(QMState const * const parentHndl)
     return child;
 }
 //............................................................................
-#ifdef Q_SPY
 QStateHandler QMsm::getStateHandler() const noexcept {
     // return the current state handler (function pointer)
     return m_state.obj->stateHandler;
 }
-#endif
 
 } // namespace QP

src/qf/qep_msm.cpp

@@ -162,12 +162,10 @@ QActive* QActive::fromRegistry(std::uint_fast8_t const prio) {
     return QActive_registry_[prio];
 }
 //............................................................................
-#ifdef Q_SPY
 QStateHandler QActive::getStateHandler() const noexcept {
     // delegate to the QHsm class
     return reinterpret_cast<QHsm const *>(this)->QHsm::getStateHandler();
 }
-#endif // def Q_SPY
 
 //----------------------------------------------------------------------------
 #ifndef QF_LOG2

src/qf/qf_qact.cpp

@@ -82,11 +82,9 @@ QMState const * QMActive::childStateObj(QMState const * const parent) const noex
                ->QMsm::childStateObj(parent);
 }
 //............................................................................
-#ifdef Q_SPY
 QStateHandler QMActive::getStateHandler() const noexcept {
     // delegate to the QMsm class
     return reinterpret_cast<QMsm const *>(this)->QMsm::getStateHandler();
 }
-#endif // def Q_SPY
 
 } // namespace QP