Merge pull request #772 from jwest115/issue-759

Use dynamic serialized size for array records of structs and arrays

Author: jwest115

compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala

@@ -496,6 +496,13 @@ case class ComponentDataProducts (
               |  FW_ASSERT(sbPtr != nullptr);
               |  sizeDelta += sbPtr->serializedTruncatedSize(stringSize);
               |}"""
+        case ts: (Type.Array | Type.Struct)  => {
+          s"""|FwSizeType sizeDelta =
+              |  sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+              |for (FwSizeType i = 0; i < size; i++) {
+              |  sizeDelta += array[i].serializedSize();
+              |}"""
+        }
         case _ =>
           val eltSize = if s.isPrimitive(t, typeName)
                         then s"sizeof($typeName)"

compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp

@@ -103,10 +103,11 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * ActiveAsyncProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp

@@ -101,10 +101,11 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * ActiveGetProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp

@@ -101,10 +101,11 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * ActiveGuardedProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp

@@ -101,10 +101,11 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * ActiveSyncProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp

@@ -139,10 +139,11 @@ namespace M {
   {
     FW_ASSERT(array != nullptr);
     // Compute the size delta
-    const FwSizeType sizeDelta =
-      sizeof(FwDpIdType) +
-      sizeof(FwSizeStoreType) +
-      size * M::ActiveTest_Data::SERIALIZED_SIZE;
+    FwSizeType sizeDelta =
+      sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+    for (FwSizeType i = 0; i < size; i++) {
+      sizeDelta += array[i].serializedSize();
+    }
     // Serialize the elements if they will fit
     Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
     if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp

@@ -43,10 +43,11 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * PassiveGetProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp

@@ -43,10 +43,11 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * PassiveGuardedProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp

@@ -43,10 +43,11 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * PassiveSyncProducts_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {

compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp

@@ -43,10 +43,11 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer ::
 {
   FW_ASSERT(array != nullptr);
   // Compute the size delta
-  const FwSizeType sizeDelta =
-    sizeof(FwDpIdType) +
-    sizeof(FwSizeStoreType) +
-    size * PassiveTest_Data::SERIALIZED_SIZE;
+  FwSizeType sizeDelta =
+    sizeof(FwDpIdType) + sizeof(FwSizeStoreType);
+  for (FwSizeType i = 0; i < size; i++) {
+    sizeDelta += array[i].serializedSize();
+  }
   // Serialize the elements if they will fit
   Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
   if ((this->m_dataBuffer.getBuffLength() + sizeDelta) <= this->m_dataBuffer.getBuffCapacity()) {