Skip to content
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

TC-IDM-1.2 #27024

Merged
merged 11 commits into from
Jul 12, 2023
Merged

TC-IDM-1.2 #27024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3059aad
TC-IDM-1.2
cecille May 31, 2023
5654a21
Restyled by isort
restyled-commits Jun 1, 2023
65cffe1
Updates from review comments
cecille Jun 26, 2023
47632a6
Merge remote-tracking branch 'upstream/master' into TC_IDM_1_2
cecille Jun 26, 2023
e5935c3
Couple formatting fixes
cecille Jun 26, 2023
46ef178
Merge remote-tracking branch 'upstream/master' into TC_IDM_1_2
cecille Jun 26, 2023
5ab3e95
Cleanup.
cecille Jun 27, 2023
dae4e11
Merge remote-tracking branch 'upstream/master' into TC_IDM_1_2
cecille Jul 7, 2023
d29db67
Add a port to pase in python, fix filtering
cecille Jul 7, 2023
2301306
Consolidate CommandSender functions
cecille Jul 10, 2023
127df87
Timed invoke can be inferred
cecille Jul 12, 2023
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
49 changes: 24 additions & 25 deletions src/app/CommandSender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,9 @@ CHIP_ERROR CommandSender::AllocateBuffer()
return CHIP_NO_ERROR;
}

#if CONFIG_BUILD_FOR_HOST_UNIT_TEST
CHIP_ERROR CommandSender::TestOnlyCommandSenderTimedRequestFlagWithNoTimedInvoke(const SessionHandle & session,
Optional<System::Clock::Timeout> timeout)
CHIP_ERROR CommandSender::SendCommandRequestInternal(const SessionHandle & session, Optional<System::Clock::Timeout> timeout,
bool sendTimedRequestAction)
{
VerifyOrReturnError(mTimedRequest, CHIP_ERROR_INCORRECT_STATE);
VerifyOrReturnError(mState == State::AddedCommand, CHIP_ERROR_INCORRECT_STATE);
cecille marked this conversation as resolved.
Show resolved Hide resolved

ReturnErrorOnFailure(Finalize(mPendingInvokeData));
Expand All @@ -80,24 +78,33 @@ CHIP_ERROR CommandSender::TestOnlyCommandSenderTimedRequestFlagWithNoTimedInvoke

mExchangeCtx->SetResponseTimeout(timeout.ValueOr(session->ComputeRoundTripTimeout(app::kExpectedIMProcessingTime)));

if (sendTimedRequestAction && !mTimedInvokeTimeoutMs.HasValue())
{
ChipLogError(DataManagement, "Timed request action requested with no mTimedInteractionTimeoutMs");
return CHIP_ERROR_INTERNAL;
}

if (sendTimedRequestAction)
{
ReturnErrorOnFailure(TimedRequest::Send(mExchangeCtx.Get(), mTimedInvokeTimeoutMs.Value()));
MoveToState(State::AwaitingTimedStatus);
return CHIP_NO_ERROR;
}

return SendInvokeRequest();
}

#if CONFIG_BUILD_FOR_HOST_UNIT_TEST
CHIP_ERROR CommandSender::TestOnlyCommandSenderTimedRequestFlagWithNoTimedInvoke(const SessionHandle & session,
Optional<System::Clock::Timeout> timeout)
{
VerifyOrReturnError(mTimedRequest, CHIP_ERROR_INCORRECT_STATE);
return SendCommandRequestInternal(session, timeout, false);
cecille marked this conversation as resolved.
Show resolved Hide resolved
}
#endif

CHIP_ERROR CommandSender::SendCommandRequest(const SessionHandle & session, Optional<System::Clock::Timeout> timeout)
{
VerifyOrReturnError(mState == State::AddedCommand, CHIP_ERROR_INCORRECT_STATE);

ReturnErrorOnFailure(Finalize(mPendingInvokeData));

// Create a new exchange context.
auto exchange = mpExchangeMgr->NewContext(session, this);
VerifyOrReturnError(exchange != nullptr, CHIP_ERROR_NO_MEMORY);

mExchangeCtx.Grab(exchange);
VerifyOrReturnError(!mExchangeCtx->IsGroupExchangeContext(), CHIP_ERROR_INVALID_MESSAGE_TYPE);

mExchangeCtx->SetResponseTimeout(timeout.ValueOr(session->ComputeRoundTripTimeout(app::kExpectedIMProcessingTime)));

if (mTimedRequest != mTimedInvokeTimeoutMs.HasValue())
{
Expand All @@ -107,15 +114,7 @@ CHIP_ERROR CommandSender::SendCommandRequest(const SessionHandle & session, Opti
mTimedRequest, mTimedInvokeTimeoutMs.HasValue());
return CHIP_ERROR_INCORRECT_STATE;
}

if (mTimedInvokeTimeoutMs.HasValue())
{
ReturnErrorOnFailure(TimedRequest::Send(mExchangeCtx.Get(), mTimedInvokeTimeoutMs.Value()));
MoveToState(State::AwaitingTimedStatus);
return CHIP_NO_ERROR;
}

return SendInvokeRequest();
return SendCommandRequestInternal(session, timeout, mTimedInvokeTimeoutMs.HasValue());
}

CHIP_ERROR CommandSender::SendGroupCommandRequest(const SessionHandle & session)
Expand Down
3 changes: 3 additions & 0 deletions src/app/CommandSender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ class CommandSender final : public Messaging::ExchangeDelegate

CHIP_ERROR Finalize(System::PacketBufferHandle & commandPacket);

CHIP_ERROR SendCommandRequestInternal(const SessionHandle & session, Optional<System::Clock::Timeout> timeout,
bool sendTimedRequestAction);

Messaging::ExchangeHolder mExchangeCtx;
Callback * mpCallback = nullptr;
Messaging::ExchangeManager * mpExchangeMgr = nullptr;
Expand Down