prepare for update to newer QP release

Author: mattheweshleman

cpputest-for-qpcpp-lib/include/qp_port.hpp

@@ -33,6 +33,7 @@
 
 // QF_LOG2 not defined -- use the internal LOG2() implementation
 
+#include <array> //needed by qp.hpp below, starting at 8.1.2
 #include "qequeue.hpp" // QP event queue (for deferring events)
 #include "qmpool.hpp"  // QP memory pool (for event pools)
 #include "qp.hpp"      // QP platform-independent public interface

cpputest-for-qpcpp-lib/src/cms_cpputest_qf_ctrl.cpp

@@ -29,6 +29,8 @@
 #include <cassert>
 #include <vector>
 #include "CppUTest/TestHarness.h"
+
+#define QP_IMPL  //need internal access from QP 8.1.0
 #include "qp_pkg.hpp"
 
 namespace cms {
@@ -111,8 +113,8 @@ void Teardown()
 
                 const size_t poolNumOfEvents =
                   l_pubSubEventMemPoolConfigs->at(i).config.numberOfEvents;
-
-                if (poolNumOfEvents != QP::QF::priv_.ePool_[i].getNFree())
+                const auto freeEvents = QP::QF::priv_.ePool_[i].getNFree();
+                if (poolNumOfEvents != freeEvents)
                 {
                     leakDetected = true;
                     fprintf(stderr, "Memory leak in pool: %zu\n", i);

cpputest-for-qpcpp-lib/src/cpputest_qf_port.cpp

@@ -27,8 +27,13 @@ QPSet cpputest_readySet_;   // ready set of active objects
 void QF::init()
 {
     priv_.maxPool_ = static_cast<uint_fast8_t>(0);
-    QP::QF::bzero_(&QP::QTimeEvt::timeEvtHead_[0], sizeof(QP::QTimeEvt::timeEvtHead_));
+#if QP_VERSION < 810
+    QP::QF::bzero_(&QP::QTimeEvt::timeEvtHead_[0],sizeof(QP::QTimeEvt::timeEvtHead_));
     QP::QF::bzero_(&QP::QActive::registry_[0], sizeof(QP::QActive::registry_));
+#else
+    QP::QTimeEvt_head_.fill({});
+    QP::QActive_registry_.fill(nullptr);
+#endif
 }
 
 #if PURPOSEFULLY_NOT_IMPLEMENTED_
@@ -62,13 +67,13 @@ void RunUntilNoReadyActiveObjects()
 {
     while (cpputest_readySet_.notEmpty()) {
         std::uint_fast8_t p = cpputest_readySet_.findMax();
-        #if QP_VERSION > 800
-        QActive* a          = QP::QActive::fromRegistry(p);
-        #elif QP_VERSION > 700
-        QActive* a          = QP::QActive::registry_[p];
-        #else
-        #error "unsupported QP version"
-        #endif
+#if QP_VERSION > 800
+        QActive* a = QP::QActive::fromRegistry(p);
+#elif QP_VERSION > 700
+        QActive* a = QP::QActive::registry_[p];
+#else
+    #error "unsupported QP version"
+#endif
 
         // the active object 'a' must still be registered in QF
         // (e.g., it must not be stopped)

cpputest-for-qpcpp-lib/tests/backedQueueTests.cpp

@@ -28,10 +28,7 @@
 
 using namespace cms;
 
-TEST_GROUP(BackedQueueTests) {
-  void setup() final {}
-  void teardown() final {}
-};
+TEST_GROUP(BackedQueueTests) {void setup() final {} void teardown() final {}};
 
 TEST(BackedQueueTests, can_create_vector_backed_qequeue)
 {
@@ -89,7 +86,11 @@ TEST(BackedQueueTests, can_push_up_to_max_events)
 
     // confirm full
     CHECK_FALSE(underTest->isEmpty());
+#if QP_VERSION < 810
     CHECK_EQUAL(0, underTest->getNFree());
+#else
+    CHECK_EQUAL(0, underTest->getFree());
+#endif
 
     // empty the queue
     for (size_t i = 0; i < underTest->capacity(); ++i) {
@@ -98,5 +99,9 @@ TEST(BackedQueueTests, can_push_up_to_max_events)
 
     // confirm empty
     CHECK_TRUE(underTest->isEmpty());
+#if QP_VERSION < 810
     CHECK_EQUAL(MaxStorageForEvents + 1, underTest->getNFree());
+#else
+    CHECK_EQUAL(MaxStorageForEvents + 1, underTest->getFree());
+#endif
 }

cpputest-for-qpcpp-lib/tests/cms_cpputest_qf_ctrlTests.cpp

@@ -25,6 +25,8 @@
 #include "cms_cpputest_qf_ctrl.hpp"
 #include "qpcpp.hpp"
 #include "CppUTest/TestHarness.h"
+
+#define QP_IMPL //need internal access from QP 8.1.0
 #include "qp_pkg.hpp"
 
 using namespace cms::test;