Skip to content

Add port number to assertions caused by disconnected ports #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 19, 2025
Merged

Add port number to assertions caused by disconnected ports #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe16411
check if an output port is connected before calling invoke function
jwest115 Feb 14, 2025
f3b71a3
regenerate test ref files
jwest115 Feb 19, 2025
3812da4
Merge branch 'main' into fprime-3000
jwest115 Feb 19, 2025
44cdc8d
Revise fpp-to-cpp tests
bocchino Feb 19, 2025
657dd1f
Merge remote-tracking branch 'upstream/check-cpp-alias' into fprime-3000
bocchino Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentOutputPorts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ case class ComponentOutputPorts(
| static_cast<FwAssertArgType>(portNum)
|);
|
|FW_ASSERT(
| this->${portVariableName(p)}[portNum].isConnected(),
| static_cast<FwAssertArgType>(portNum)
|);
|
|"""
),
writeFunctionCall(
Expand Down
10 changes: 10 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,11 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
portNum < this->getNum_productRequestOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productRequestOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productRequestOut_OutputPort[portNum].invoke(
id,
dataSize
Expand All @@ -425,6 +430,11 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
portNum < this->getNum_productSendOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productSendOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productSendOut_OutputPort[portNum].invoke(
id,
buffer
Expand Down
30 changes: 30 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2754,6 +2754,11 @@ void ActiveAsyncProductsComponentBase ::
portNum < this->getNum_productRequestOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productRequestOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productRequestOut_OutputPort[portNum].invoke(
id,
dataSize
Expand All @@ -2771,6 +2776,11 @@ void ActiveAsyncProductsComponentBase ::
portNum < this->getNum_productSendOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productSendOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productSendOut_OutputPort[portNum].invoke(
id,
buffer
Expand All @@ -2788,6 +2798,11 @@ void ActiveAsyncProductsComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -2798,6 +2813,11 @@ U32 ActiveAsyncProductsComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand All @@ -2817,6 +2837,11 @@ void ActiveAsyncProductsComponentBase ::
portNum < this->getNum_typedOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_typedOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down Expand Up @@ -2844,6 +2869,11 @@ F32 ActiveAsyncProductsComponentBase ::
portNum < this->getNum_typedReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_typedReturnOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down
20 changes: 20 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,11 @@ void ActiveCommandsComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -2355,6 +2360,11 @@ U32 ActiveCommandsComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand All @@ -2374,6 +2384,11 @@ void ActiveCommandsComponentBase ::
portNum < this->getNum_typedOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_typedOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down Expand Up @@ -2401,6 +2416,11 @@ F32 ActiveCommandsComponentBase ::
portNum < this->getNum_typedReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_typedReturnOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down
20 changes: 20 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2264,6 +2264,11 @@ void ActiveEventsComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -2274,6 +2279,11 @@ U32 ActiveEventsComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand All @@ -2293,6 +2303,11 @@ void ActiveEventsComponentBase ::
portNum < this->getNum_typedOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_typedOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down Expand Up @@ -2320,6 +2335,11 @@ F32 ActiveEventsComponentBase ::
portNum < this->getNum_typedReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_typedReturnOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down
30 changes: 30 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,6 +2602,11 @@ Fw::Success ActiveGetProductsComponentBase ::
portNum < this->getNum_productGetOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productGetOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_productGetOut_OutputPort[portNum].invoke(
id,
dataSize,
Expand All @@ -2620,6 +2625,11 @@ void ActiveGetProductsComponentBase ::
portNum < this->getNum_productSendOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productSendOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productSendOut_OutputPort[portNum].invoke(
id,
buffer
Expand All @@ -2637,6 +2647,11 @@ void ActiveGetProductsComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -2647,6 +2662,11 @@ U32 ActiveGetProductsComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand All @@ -2666,6 +2686,11 @@ void ActiveGetProductsComponentBase ::
portNum < this->getNum_typedOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_typedOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down Expand Up @@ -2693,6 +2718,11 @@ F32 ActiveGetProductsComponentBase ::
portNum < this->getNum_typedReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_typedReturnOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down
30 changes: 30 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2691,6 +2691,11 @@ void ActiveGuardedProductsComponentBase ::
portNum < this->getNum_productRequestOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productRequestOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productRequestOut_OutputPort[portNum].invoke(
id,
dataSize
Expand All @@ -2708,6 +2713,11 @@ void ActiveGuardedProductsComponentBase ::
portNum < this->getNum_productSendOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_productSendOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_productSendOut_OutputPort[portNum].invoke(
id,
buffer
Expand All @@ -2725,6 +2735,11 @@ void ActiveGuardedProductsComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -2735,6 +2750,11 @@ U32 ActiveGuardedProductsComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand All @@ -2754,6 +2774,11 @@ void ActiveGuardedProductsComponentBase ::
portNum < this->getNum_typedOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_typedOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down Expand Up @@ -2781,6 +2806,11 @@ F32 ActiveGuardedProductsComponentBase ::
portNum < this->getNum_typedReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_typedReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_typedReturnOut_OutputPort[portNum].invoke(
u32,
f32,
Expand Down
10 changes: 10 additions & 0 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,11 @@ void ActiveNoArgsPortsOnlyComponentBase ::
portNum < this->getNum_noArgsOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
this->m_noArgsOut_OutputPort[portNum].invoke();
}

Expand All @@ -540,6 +545,11 @@ U32 ActiveNoArgsPortsOnlyComponentBase ::
portNum < this->getNum_noArgsReturnOut_OutputPorts(),
static_cast<FwAssertArgType>(portNum)
);

FW_ASSERT(
this->m_noArgsReturnOut_OutputPort[portNum].isConnected(),
static_cast<FwAssertArgType>(portNum)
);
return this->m_noArgsReturnOut_OutputPort[portNum].invoke();
}

Expand Down
Loading