7.4.0-rc.2

Author: quantum-leaps

3rd_party

@@ -417,6 +417,7 @@ bool QMsm_isIn_(
     QAsm * const me,
     QStateHandler const state);
 
+//! @private @memberof QMsm
 //! @deprecated instead use: QASM_IS_IN()
 bool QMsm_isInState(QMsm const * const me,
     QMState const * const stateObj);

examples

@@ -22,8 +22,8 @@
 // <www.state-machine.com>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2023-11-15
-//! @version Last updated for: @ref qpc_7_3_1
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QF/C port to embOS RTOS kernel, generic C11 compiler

include/qp.h

@@ -22,8 +22,8 @@
 // <www.state-machine.com>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2023-11-15
-//! @version Last updated for: @ref qpc_7_3_1
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QF/C port to FreeRTOS 10.x, generic C11 compiler

ports/embos/qf_port.c

@@ -22,8 +22,8 @@
 // <www.state-machine.com>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2023-12-12
-//! @version Last updated for version: 7.3.1
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for version: 7.4.0
 //!
 //! @file
 //! @brief PC-Lint-Plus option file for analysing both **QP/C**
@@ -69,8 +69,7 @@
 //! PCLP definition of macro ends in semicolon
 //! @tr{DVP-QP-PCLP-823}
 -esym(823,
- Q_DEFINE_THIS_MODULE,
- Q_DEFINE_THIS_FILE)
+ Q_DEFINE_THIS_MODULE)
 
 //! BARR-C(R1.8b) parameter of function could be const
 -efunc(952,

ports/freertos/qf_port.c

@@ -27,8 +27,8 @@
 // <www.state-machine.com/licensing>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2023-09-07
-//! @version Last updated for: @ref qpc_7_3_0
+//! @date Last updated on: 2024-06-10
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QP/C "port" for QUTEST unit test harness, generic C11 compiler
@@ -52,13 +52,13 @@
 // QACTIVE_THREAD_TYPE not used in this port
 
 // QF interrupt disable/enable
-#define QF_INT_DISABLE()     (++QS_tstPriv_.intLock)
-#define QF_INT_ENABLE()      (--QS_tstPriv_.intLock)
+#define QF_INT_DISABLE()     (QS_onIntDisable())
+#define QF_INT_ENABLE()      (QS_onIntEnable())
 
 // QF critical section
 #define QF_CRIT_STAT
-#define QF_CRIT_ENTRY()         QF_INT_DISABLE()
-#define QF_CRIT_EXIT()          QF_INT_ENABLE()
+#define QF_CRIT_ENTRY()      QF_INT_DISABLE()
+#define QF_CRIT_EXIT()       QF_INT_ENABLE()
 
 // QF_LOG2 not defined -- use the internal LOG2() implementation
 
@@ -67,6 +67,9 @@
 #include "qmpool.h"    // QUTest port uses QMPool memory-pool
 #include "qp.h"        // QP platform-independent public interface
 
+void QS_onIntDisable(void);
+void QS_onIntEnable(void);
+
 //============================================================================
 // interface used only inside QF implementation, but not in applications
 
@@ -90,7 +93,7 @@
 #endif
 
     // native QF event pool operations
-    #define QF_EPOOL_TYPE_            QMPool
+    #define QF_EPOOL_TYPE_  QMPool
     #define QF_EPOOL_INIT_(p_, poolSto_, poolSize_, evtSize_) \
         (QMPool_init(&(p_), (poolSto_), (poolSize_), (evtSize_)))
     #define QF_EPOOL_EVENT_SIZE_(p_)  ((uint_fast16_t)(p_).blockSize)

ports/lint-plus/qpc.lnt

@@ -22,8 +22,8 @@
 // <www.state-machine.com>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2024-02-16
-//! @version Last updated for: @ref qpc_7_3_3
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QS/C "port" to QUTest with POSIX
@@ -61,7 +61,7 @@
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR   -1
 
-//Q_DEFINE_THIS_MODULE("qutest_port")
+Q_DEFINE_THIS_MODULE("qutest_port")
 
 // local variables ...........................................................
 static int l_sock = INVALID_SOCKET;
@@ -112,6 +112,8 @@ uint8_t QS_onStartup(void const *arg) {
     if (*src == ':') {
         serviceName = src + 1;
     }
+    //printf("<TARGET> Connecting to QSPY on Host=%s:%s...\n",
+    //       hostName, serviceName);
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_INET;
@@ -243,19 +245,20 @@ void QS_onFlush(void) {
         nBytes = QS_TX_CHUNK;
     }
 }
+
 //............................................................................
 void QS_onTestLoop() {
     fd_set readSet;
     FD_ZERO(&readSet);
 
-    struct timeval timeout = {
-        (long)0, (long)(QS_TIMEOUT_MS * 1000)
-    };
-
     QS_rxPriv_.inTestLoop = true;
     while (QS_rxPriv_.inTestLoop) {
         FD_SET(l_sock, &readSet);
 
+        struct timeval timeout = {
+            (long)0, (long)(QS_TIMEOUT_MS * 1000)
+        };
+
         // selective, timed blocking on the TCP/IP socket...
         timeout.tv_usec = (long)(QS_TIMEOUT_MS * 1000);
         int status = select(l_sock + 1, &readSet,
@@ -270,7 +273,7 @@ void QS_onTestLoop() {
                           (char *)QS_rxPriv_.buf, (int)QS_rxPriv_.end, 0);
             if (status > 0) { // any data received?
                 QS_rxPriv_.tail = 0U;
-                QS_rxPriv_.head = status; // # bytes received
+                QS_rxPriv_.head = (QSCtr)status; // # bytes received
                 QS_rxParse(); // parse all received bytes
             }
         }
@@ -282,3 +285,17 @@ void QS_onTestLoop() {
     QS_rxPriv_.inTestLoop = true;
 }
 
+//............................................................................
+void QS_onIntDisable(void) {
+    if (QS_tstPriv_.intLock != 0U) {
+         Q_onError(&Q_this_module_[0], 998);
+    }
+    ++QS_tstPriv_.intLock;
+}
+//............................................................................
+void QS_onIntEnable(void) {
+    --QS_tstPriv_.intLock;
+    if (QS_tstPriv_.intLock != 0U) {
+        Q_onError(&Q_this_module_[0], 999);
+    }
+}

ports/posix-qutest/qp_port.h

@@ -22,8 +22,8 @@
 // <www.state-machine.com/licensing>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2024-02-16
-//! @version Last updated for: @ref qpc_7_3_3
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QF/C port to POSIX-QV (single-threaded)

ports/posix-qutest/qutest_port.c

@@ -22,8 +22,8 @@
 // <www.state-machine.com>
 // <[email protected]>
 //============================================================================
-//! @date Last updated on: 2023-12-13
-//! @version Last updated for: @ref qpc_7_3_2
+//! @date Last updated on: 2024-06-11
+//! @version Last updated for: @ref qpc_7_4_0
 //!
 //! @file
 //! @brief QS/C port to POSIX