Skip to content

Commit

Permalink
[Fabric-Bridge] Instrument log to debug issues during state transitio…
Browse files Browse the repository at this point in the history
…ns (#35301)

* Instrument log to debug state transitions

* Restyled by whitespace

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
  • Loading branch information
2 people authored and pull[bot] committed Jan 31, 2025
1 parent 42b0009 commit 1009180
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
13 changes: 12 additions & 1 deletion examples/fabric-bridge-app/linux/CommissionerControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ namespace CommissionerControl {

void CommissionerControlDelegate::ResetDelegateState()
{
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: Resetting delegate state");

// Reset the step to the initial state
mNextStep = Step::kIdle;

Expand All @@ -71,6 +73,9 @@ void CommissionerControlDelegate::ResetDelegateState()

CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request)
{
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: Entering HandleCommissioningApprovalRequest, current state: %s",
GetStateString(mNextStep));

VerifyOrReturnError(mNextStep == Step::kIdle, CHIP_ERROR_INCORRECT_STATE);

CommissionerControl::Events::CommissioningRequestResult::Type result;
Expand Down Expand Up @@ -116,6 +121,7 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const
if (err == CHIP_NO_ERROR)
{
mNextStep = Step::kWaitCommissionNodeRequest;
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: State transitioned to %s", GetStateString(mNextStep));
}
else
{
Expand All @@ -127,6 +133,9 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const

CHIP_ERROR CommissionerControlDelegate::ValidateCommissionNodeCommand(NodeId clientNodeId, uint64_t requestId)
{
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: Entering ValidateCommissionNodeCommand, current state: %s",
GetStateString(mNextStep));

CHIP_ERROR err = CHIP_NO_ERROR;

VerifyOrReturnError(mNextStep == Step::kWaitCommissionNodeRequest, CHIP_ERROR_INCORRECT_STATE);
Expand All @@ -138,6 +147,7 @@ CHIP_ERROR CommissionerControlDelegate::ValidateCommissionNodeCommand(NodeId cli
VerifyOrExit(mRequestId == requestId, err = CHIP_ERROR_INCORRECT_STATE);

mNextStep = Step::kStartCommissionNode;
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: State transitioned to %s", GetStateString(mNextStep));

exit:
return err;
Expand Down Expand Up @@ -170,7 +180,8 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissionNode(const Commissioning
{
CHIP_ERROR err = CHIP_NO_ERROR;

ChipLogProgress(NotSpecified, "CommissionerControlDelegate::HandleCommissionNode");
ChipLogProgress(NotSpecified, "CommissionerControlDelegate: Entering HandleCommissionNode, current state: %s",
GetStateString(mNextStep));

VerifyOrReturnError(mNextStep == Step::kStartCommissionNode, CHIP_ERROR_INCORRECT_STATE);

Expand Down
15 changes: 15 additions & 0 deletions examples/fabric-bridge-app/linux/include/CommissionerControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ class CommissionerControlDelegate : public Delegate
kStartCommissionNode,
};

static const char * GetStateString(Step step)
{
switch (step)
{
case Step::kIdle:
return "kIdle";
case Step::kWaitCommissionNodeRequest:
return "kWaitCommissionNodeRequest";
case Step::kStartCommissionNode:
return "kStartCommissionNode";
default:
return "Unknown";
}
}

void ResetDelegateState();

static constexpr size_t kLabelBufferSize = 64;
Expand Down

0 comments on commit 1009180

Please sign in to comment.