Use a catalogBuilt flag to prevent runtime insertion until ready

Author: Willmac16

Svc/DpCatalog/DpCatalog.cpp

@@ -35,6 +35,7 @@ DpCatalog ::DpCatalog(const char* const compName)
       m_memPtr(nullptr),
       m_allocatorId(0),
       m_allocator(nullptr),
+      m_catalogBuilt(false),
       m_xmitInProgress(false),
       m_xmitCmdWait(false),
       m_xmitBytes(0),
@@ -129,6 +130,8 @@ void DpCatalog::resetBinaryTree() {
     // reset number of records
     this->m_pendingFiles = 0;
     this->m_pendingDpBytes = 0;
+    // Mark the catalog as un-built
+    this->m_catalogBuilt = false;
 }
 
 void DpCatalog::resetStateFileData() {
@@ -367,6 +370,9 @@ Fw::CmdResponse DpCatalog::doCatalogBuild() {
 
     this->log_ACTIVITY_HI_CatalogBuildComplete();
 
+    // Flag so addToCat knows it is good to go
+    this->m_catalogBuilt = true;
+
     return Fw::CmdResponse::OK;
 }
 
@@ -1006,8 +1012,8 @@ void DpCatalog ::addToCat_handler(FwIndexType portNum,
         return;
     }
 
-    // Check for state file init
-    if (0 == this->m_stateFileEntries) {
+    // Check the catalog has been built
+    if (not this->m_catalogBuilt) {
         this->log_WARNING_LO_NotLoaded(fileName);
         return;
     }

Svc/DpCatalog/DpCatalog.hpp

@@ -261,6 +261,7 @@ class DpCatalog final : public DpCatalogComponentBase {
     FwEnumStoreType m_allocatorId;  //!< stored for shutdown
     Fw::MemAllocator* m_allocator;  //!< stored for shutdown
 
+    bool m_catalogBuilt;                    //!< catalog build is complete (can add DPs at runtime)
     bool m_xmitInProgress;                  //!< set if DP files are in the process of being sent
     Fw::FileNameString m_currXmitFileName;  //!< current file being transmitted
     bool m_xmitCmdWait;                     //!< true if waiting for transmission complete to complete xmit command