fix compilation of trace CTF

eclipse-4diac#198 broke the interface used by the trace CTF implementation
ernstblechaPT · Aug 5, 2024 · 1b018d5 · 1b018d5
1 parent ea68a4c
commit 1b018d5
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/core/basicfb.cpp b/src/core/basicfb.cpp
@@ -160,12 +160,19 @@ size_t CBasicFB::getToStringBufferSize() const {
 }
 
 #ifdef FORTE_TRACE_CTF
-void CBasicFB::traceInstanceData() {
+size_t internalFBCount(CBasicFB* me) {
+  size_t i = 0;
+  for(CBasicFB::TFBContainerList::iterator it(me->getChildren().begin()); it != me->getChildren().end(); ++it){
+    ++i;
+  }
+  return i;
+}
 
+void CBasicFB::traceInstanceData() {
   std::vector<std::string> inputs(mInterfaceSpec->mNumDIs);
   std::vector<std::string> outputs(mInterfaceSpec->mNumDOs);
   std::vector<std::string> internals(cmVarInternals ? cmVarInternals->mNumIntVars : 0);
-  std::vector<std::string> internalFbs(getInternalFBNum());
+  std::vector<std::string> internalFbs(internalFBCount(this));
   std::vector<const char *> inputs_c_str(inputs.size());
   std::vector<const char *> outputs_c_str(outputs.size());
   std::vector<const char *> internals_c_str(internals.size());
@@ -195,12 +202,14 @@ void CBasicFB::traceInstanceData() {
     internals_c_str[i] = valueString.c_str();
   }
 
-  for(TPortId i = 0; i < internalFbs.size(); ++i) {
-    CFunctionBlock *value = getInternalFB(i);
+  TPortId i = 0;
+  for(TFBContainerList::iterator it(getChildren().begin()); it != getChildren().end(); ++it){
+    CFunctionBlock &value = static_cast<CFunctionBlock &>(**it);
     std::string &valueString = internalFbs[i];
-    valueString.reserve(value->getToStringBufferSize());
-    value->toString(valueString.data(), valueString.capacity());
+    valueString.reserve(value.getToStringBufferSize());
+    value.toString(valueString.data(), valueString.capacity());
     internalFbs_c_str[i] = valueString.c_str();
+    ++i;
   }
 
   barectf_default_trace_instanceData(getResource()->getTracePlatformContext().getContext(),