Skip to content

Commit

Permalink
Restyled by clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@restyled-commits @andy31415
restyled-commits authored and andy31415 committed Jun 19, 2023
1 parent 7a56b24 commit 287b044
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 66 deletions.
12 changes: 6 additions & 6 deletions src/protocols/secure_channel/CASESession.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,11 @@ CHIP_ERROR CASESession::SendSigma1()
MATTER_TRACE_SCOPE("SendSigma1", "CASESession");
const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0;
size_t data_len = TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize, // initiatorRandom
sizeof(uint16_t), // initiatorSessionId,
kSHA256_Hash_Length, // destinationId
kP256_PublicKey_Length, // InitiatorEphPubKey,
mrpParamsSize, // initiatorMRPParams
SessionResumptionStorage::kResumptionIdSize, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES);
sizeof(uint16_t), // initiatorSessionId,
kSHA256_Hash_Length, // destinationId
kP256_PublicKey_Length, // InitiatorEphPubKey,
mrpParamsSize, // initiatorMRPParams
SessionResumptionStorage::kResumptionIdSize, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES);

System::PacketBufferTLVWriter tlvWriter;
System::PacketBufferHandle msg_R1;
Expand Down Expand Up @@ -1017,7 +1017,7 @@ CHIP_ERROR CASESession::SendSigma2()
// Construct Sigma2 Msg
const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0;
size_t data_len = TLV::EstimateStructOverhead(kSigmaParamRandomNumberSize, sizeof(uint16_t), kP256_PublicKey_Length,
msg_r2_signed_enc_len, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, mrpParamsSize);
msg_r2_signed_enc_len, CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, mrpParamsSize);

System::PacketBufferHandle msg_R2 = System::PacketBufferHandle::New(data_len);
VerifyOrReturnError(!msg_R2.IsNull(), CHIP_ERROR_NO_MEMORY);
Expand Down
10 changes: 5 additions & 5 deletions src/protocols/secure_channel/PASESession.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,11 @@ CHIP_ERROR PASESession::SendPBKDFParamRequest()

const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0;
const size_t max_msg_len = TLV::EstimateStructOverhead(kPBKDFParamRandomNumberSize, // initiatorRandom,
sizeof(uint16_t), // initiatorSessionId
sizeof(PasscodeId), // passcodeId,
sizeof(uint8_t), // hasPBKDFParameters
mrpParamsSize // MRP Parameters
);
sizeof(uint16_t), // initiatorSessionId
sizeof(PasscodeId), // passcodeId,
sizeof(uint8_t), // hasPBKDFParameters
mrpParamsSize // MRP Parameters
);

System::PacketBufferHandle req = System::PacketBufferHandle::New(max_msg_len);
VerifyOrReturnError(!req.IsNull(), CHIP_ERROR_NO_MEMORY);
Expand Down
6 changes: 3 additions & 3 deletions src/tracing/backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Backend : public ::chip::IntrusiveListNodeBase<>
/// Begin a trace for the specified scope.
///
/// Scope WILL be completed by a corresponding TraceEnd call.
virtual void TraceBegin(const char *label, const char *group) {}
virtual void TraceBegin(const char * label, const char * group) {}

/// Tracing end assumes completing a previously started scope with TraceBegin
/// and nesting is assumed.
Expand All @@ -47,10 +47,10 @@ class Backend : public ::chip::IntrusiveListNodeBase<>
///
/// TraceEnd("bar", "A") // ends "BAR"
/// TraceEnd("foo", "A") // ends "FOO"
virtual void TraceEnd(const char *label, const char *group) {}
virtual void TraceEnd(const char * label, const char * group) {}

/// Trace a zero-sized event
virtual void TraceInstant(const char *label, const char *group) {}
virtual void TraceInstant(const char * label, const char * group) {}

virtual void LogMessageSend(MessageSendInfo &) { TraceInstant("MessageSent", "Messaging"); }
virtual void LogMessageReceived(MessageReceivedInfo &) { TraceInstant("MessageReceived", "Messaging"); }
Expand Down
7 changes: 3 additions & 4 deletions src/tracing/log_json/log_json_tracing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ void DecodePayloadData(Json::Value & value, chip::ByteSpan payload)

} // namespace


void LogJsonBackend::TraceBegin(const char *label, const char *group)
void LogJsonBackend::TraceBegin(const char * label, const char * group)
{
Json::Value value;
value["event"] = "TraceBegin";
Expand All @@ -118,7 +117,7 @@ void LogJsonBackend::TraceBegin(const char *label, const char *group)
LogJsonValue(value);
}

void LogJsonBackend::TraceEnd(const char *label, const char *group)
void LogJsonBackend::TraceEnd(const char * label, const char * group)
{
Json::Value value;
value["event"] = "TraceEnd";
Expand All @@ -127,7 +126,7 @@ void LogJsonBackend::TraceEnd(const char *label, const char *group)
LogJsonValue(value);
}

void LogJsonBackend::TraceInstant(const char *label, const char *group)
void LogJsonBackend::TraceInstant(const char * label, const char * group)
{
Json::Value value;
value["event"] = "TraceInstant";
Expand Down
6 changes: 3 additions & 3 deletions src/tracing/log_json/log_json_tracing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class LogJsonBackend : public ::chip::Tracing::Backend
public:
LogJsonBackend() = default;

void TraceBegin(const char *label, const char *group) override;
void TraceEnd(const char *label, const char *group) override;
void TraceInstant(const char *label, const char *group) override;
void TraceBegin(const char * label, const char * group) override;
void TraceEnd(const char * label, const char * group) override;
void TraceInstant(const char * label, const char * group) override;
void LogMessageSend(MessageSendInfo &) override;
void LogMessageReceived(MessageReceivedInfo &) override;
void LogNodeLookup(NodeLookupInfo &) override;
Expand Down
8 changes: 4 additions & 4 deletions src/tracing/macros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
*/
#pragma once

#define _MATTER_TRACE_DISABLE(...) \
do \
{ \
} while (false)
#define _MATTER_TRACE_DISABLE(...) \
do \
{ \
} while (false)

#ifndef MATTER_TRACING_ENABLED

Expand Down
6 changes: 3 additions & 3 deletions src/tracing/registry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ void Unregister(Backend & backend)

namespace Internal {

void Begin(const char *label, const char *group)
void Begin(const char * label, const char * group)
{
for (auto & backend : gTracingBackends)
{
backend.TraceBegin(label, group);
}
}

void End(const char *label, const char *group)
void End(const char * label, const char * group)
{
for (auto & backend : gTracingBackends)
{
backend.TraceEnd(label, group);
}
}

void Instant(const char *label, const char *group)
void Instant(const char * label, const char * group)
{
for (auto & backend : gTracingBackends)
{
Expand Down
6 changes: 3 additions & 3 deletions src/tracing/registry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ class ScopedRegistration
// Internal calls, that will delegate to appropriate backends as needed
namespace Internal {

void Begin(const char *label, const char *group);
void End(const char *label, const char *group);
void Instant(const char *label, const char *group);
void Begin(const char * label, const char * group);
void End(const char * label, const char * group);
void Instant(const char * label, const char * group);

void LogMessageSend(::chip::Tracing::MessageSendInfo & info);
void LogMessageReceived(::chip::Tracing::MessageReceivedInfo & info);
Expand Down
6 changes: 3 additions & 3 deletions src/tracing/scope.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ namespace Tracing {
class Scoped
{
public:
inline Scoped(const char *label, const char *group) : mLabel(label), mGroup(group) { MATTER_TRACE_BEGIN(label, group); }
inline Scoped(const char * label, const char * group) : mLabel(label), mGroup(group) { MATTER_TRACE_BEGIN(label, group); }
inline ~Scoped() { MATTER_TRACE_END(mLabel, mGroup); }

private:
const char *mLabel;
const char *mGroup;
const char * mLabel;
const char * mGroup;
};

} // namespace Tracing
Expand Down
42 changes: 10 additions & 32 deletions src/tracing/tests/TestTracing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <nlunit-test.h>

#include <algorithm>
#include <vector>
#include <string>
#include <vector>

using namespace chip;
using namespace chip::Tracing;
Expand All @@ -37,15 +37,14 @@ class LoggingTraceBackend : public Backend
const std::vector<std::string> & traces() const { return mTraces; }

// Implementation
void TraceBegin(const char *label, const char *group) override {
mTraces.push_back(std::string("BEGIN:") + group + ":"+label);
void TraceBegin(const char * label, const char * group) override
{
mTraces.push_back(std::string("BEGIN:") + group + ":" + label);
}

void TraceEnd(const char *label, const char *group) override {
mTraces.push_back(std::string("END:") + group + ":" + label);
}
void TraceEnd(const char * label, const char * group) override { mTraces.push_back(std::string("END:") + group + ":" + label); }

void TraceInstant(const char *label, const char *group) override
void TraceInstant(const char * label, const char * group) override
{
mTraces.push_back(std::string("INSTANT:") + group + ":" + label);
}
Expand Down Expand Up @@ -78,17 +77,8 @@ void TestBasicTracing(nlTestSuite * inSuite, void * inContext)
}

std::vector<std::string> expected = {
"BEGIN:Group:A",
"BEGIN:Group:B",
"BEGIN:Group:C",
"BEGIN:Group:D",
"END:Group:D",
"INSTANT:Group:FOO",
"END:Group:C",
"END:Group:B",
"BEGIN:Group:E",
"END:Group:E",
"END:Group:A",
"BEGIN:Group:A", "BEGIN:Group:B", "BEGIN:Group:C", "BEGIN:Group:D", "END:Group:D", "INSTANT:Group:FOO",
"END:Group:C", "END:Group:B", "BEGIN:Group:E", "END:Group:E", "END:Group:A",
};

NL_TEST_ASSERT(inSuite, backend.traces().size() == expected.size());
Expand Down Expand Up @@ -120,26 +110,14 @@ void TestMultipleBackends(nlTestSuite * inSuite, void * inContext)
}

std::vector<std::string> expected1 = {
"BEGIN:G:1",
"BEGIN:G:2",
"BEGIN:G:3",
"END:G:3",
"BEGIN:G:4",
"END:G:4",
"END:G:2",
"END:G:1",
"BEGIN:G:1", "BEGIN:G:2", "BEGIN:G:3", "END:G:3", "BEGIN:G:4", "END:G:4", "END:G:2", "END:G:1",
};

NL_TEST_ASSERT(inSuite, b1.traces().size() == expected1.size());
NL_TEST_ASSERT(inSuite, std::equal(b1.traces().begin(), b1.traces().end(), expected1.begin(), expected1.end()));

std::vector<std::string> expected2 = {
"BEGIN:G:2",
"BEGIN:G:3",
"END:G:3",
"BEGIN:G:4",
"END:G:4",
"END:G:2",
"BEGIN:G:2", "BEGIN:G:3", "END:G:3", "BEGIN:G:4", "END:G:4", "END:G:2",
};

NL_TEST_ASSERT(inSuite, b2.traces().size() == expected2.size());
Expand Down

0 comments on commit 287b044

Please sign in to comment.