From 1f1afb27f08a8c3d403070d898a8f26bdfa92c7a Mon Sep 17 00:00:00 2001 From: rongguanlin Date: Wed, 13 Aug 2025 16:47:25 +0800 Subject: [PATCH] dfx Signed-off-by: rongguanlin Change-Id: I3e95f0cb330034cea2eb9b744de7cab4a2ed4577 --- dfx/event/src/convert/trans_event_converter.h | 44 +++++++++---------- dfx/interface/include/form/trans_event_form.h | 22 +++++----- .../unittest/mock/trans_hisysevent_matcher.h | 29 +++++++----- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/dfx/event/src/convert/trans_event_converter.h b/dfx/event/src/convert/trans_event_converter.h index af305a7cda..50b6e4ac12 100644 --- a/dfx/event/src/convert/trans_event_converter.h +++ b/dfx/event/src/convert/trans_event_converter.h @@ -81,17 +81,17 @@ TRANS_ASSIGNER(Int32, SessionId, sessionId) TRANS_ASSIGNER(Int32, MinBW, minBW) TRANS_ASSIGNER(Int32, MaxLatency, maxLatency) TRANS_ASSIGNER(Int32, MinLatency, minLatency) -TRANS_ASSIGNER(Uint8, LocalStaChload, localStaChload) -TRANS_ASSIGNER(Uint8, RemoteStaChload, remoteStaChload) -TRANS_ASSIGNER(Uint8, LocalHmlChload, localHmlChload) -TRANS_ASSIGNER(Uint8, RemoteHmlChload, remoteHmlChload) -TRANS_ASSIGNER(Uint8, LocalP2pChload, localP2pChload) -TRANS_ASSIGNER(Uint8, RemoteP2pChload, remoteP2pChload) -TRANS_ASSIGNER(Uint8, LocalStaChannel, localStaChannel) -TRANS_ASSIGNER(Uint8, RemoteStaChannel, remoteStaChannel) -TRANS_ASSIGNER(Uint8, HmlChannel, hmlChannel) -TRANS_ASSIGNER(Uint8, LocalP2pChannel, localP2pChannel) -TRANS_ASSIGNER(Uint8, RemoteP2pChannel, remoteP2pChannel) +TRANS_ASSIGNER(Uint32, LocalStaChload, localStaChload) +TRANS_ASSIGNER(Uint32, RemoteStaChload, remoteStaChload) +TRANS_ASSIGNER(Uint32, LocalHmlChload, localHmlChload) +TRANS_ASSIGNER(Uint32, RemoteHmlChload, remoteHmlChload) +TRANS_ASSIGNER(Uint32, LocalP2pChload, localP2pChload) +TRANS_ASSIGNER(Uint32, RemoteP2pChload, remoteP2pChload) +TRANS_ASSIGNER(Uint32, LocalStaChannel, localStaChannel) +TRANS_ASSIGNER(Uint32, RemoteStaChannel, remoteStaChannel) +TRANS_ASSIGNER(Uint32, HmlChannel, hmlChannel) +TRANS_ASSIGNER(Uint32, LocalP2pChannel, localP2pChannel) +TRANS_ASSIGNER(Uint32, RemoteP2pChannel, remoteP2pChannel) TRANS_ASSIGNER(Int32, LocalIsDbac, localIsDbac) TRANS_ASSIGNER(Int32, RemoteIsDbac, remoteIsDbac) TRANS_ASSIGNER(Int32, LocalIsDbdc, localIsDbdc) @@ -147,17 +147,17 @@ static const HiSysEventParamAssigner TRANS_ASSIGNERS[] = { { "MIN_BW", HISYSEVENT_INT32, TransAssignerMinBW }, { "MAX_LATENCY", HISYSEVENT_INT32, TransAssignerMaxLatency }, { "MIN_LATENCY", HISYSEVENT_INT32, TransAssignerMinLatency }, - { "LOCAL_STA_CHLOAD", HISYSEVENT_UINT8, TransAssignerLocalStaChload }, - { "REMOTE_STA_CHLOAD", HISYSEVENT_UINT8, TransAssignerRemoteStaChload }, - { "LOCAL_HML_CHLOAD", HISYSEVENT_UINT8, TransAssignerLocalHmlChload }, - { "REMOTE_HML_CHLOAD", HISYSEVENT_UINT8, TransAssignerRemoteHmlChload }, - { "LOCAL_P2P_CHLOAD", HISYSEVENT_UINT8, TransAssignerLocalP2pChload }, - { "REMOTE_P2P_CHLOAD", HISYSEVENT_UINT8, TransAssignerRemoteP2pChload }, - { "LOCAL_STA_CHANNEL", HISYSEVENT_UINT8, TransAssignerLocalStaChannel }, - { "REMOTE_STA_CHANNEL", HISYSEVENT_UINT8, TransAssignerRemoteStaChannel}, - { "HML_CHANNEL", HISYSEVENT_UINT8, TransAssignerHmlChannel }, - { "LOCAL_P2P_CHANNEL", HISYSEVENT_UINT8, TransAssignerLocalP2pChannel }, - { "REMOTE_P2P_CHANNEL", HISYSEVENT_UINT8, TransAssignerRemoteP2pChannel}, + { "LOCAL_STA_CHLOAD", HISYSEVENT_UINT32, TransAssignerLocalStaChload }, + { "REMOTE_STA_CHLOAD", HISYSEVENT_UINT32, TransAssignerRemoteStaChload }, + { "LOCAL_HML_CHLOAD", HISYSEVENT_UINT32, TransAssignerLocalHmlChload }, + { "REMOTE_HML_CHLOAD", HISYSEVENT_UINT32, TransAssignerRemoteHmlChload }, + { "LOCAL_P2P_CHLOAD", HISYSEVENT_UINT32, TransAssignerLocalP2pChload }, + { "REMOTE_P2P_CHLOAD", HISYSEVENT_UINT32, TransAssignerRemoteP2pChload }, + { "LOCAL_STA_CHANNEL", HISYSEVENT_UINT32, TransAssignerLocalStaChannel }, + { "REMOTE_STA_CHANNEL", HISYSEVENT_UINT32, TransAssignerRemoteStaChannel}, + { "HML_CHANNEL", HISYSEVENT_UINT32, TransAssignerHmlChannel }, + { "LOCAL_P2P_CHANNEL", HISYSEVENT_UINT32, TransAssignerLocalP2pChannel }, + { "REMOTE_P2P_CHANNEL", HISYSEVENT_UINT32, TransAssignerRemoteP2pChannel}, { "LOCAL_IS_DBAC", HISYSEVENT_INT32, TransAssignerLocalIsDbac }, { "REMOTE_IS_DBAC", HISYSEVENT_INT32, TransAssignerRemoteIsDbac }, { "LOCAL_IS_DBDC", HISYSEVENT_INT32, TransAssignerLocalIsDbdc }, diff --git a/dfx/interface/include/form/trans_event_form.h b/dfx/interface/include/form/trans_event_form.h index a815631944..472e494046 100644 --- a/dfx/interface/include/form/trans_event_form.h +++ b/dfx/interface/include/form/trans_event_form.h @@ -147,17 +147,17 @@ typedef struct { int32_t minBW; // MIN_BW int32_t maxLatency; // MAX_LATENCY int32_t minLatency; // MIN_LATENCY - uint8_t localStaChload; // LOCAL_STA_CHLOAD - uint8_t remoteStaChload; // REMOTE_STA_CHLOAD - uint8_t localHmlChload; // LOCAL_HML_CHLOAD - uint8_t remoteHmlChload; // REMOTE_HML_CHLOAD - uint8_t localP2pChload; // LOCAL_P2P_CHLOAD - uint8_t remoteP2pChload; // REMOTE_P2P_CHLOAD - uint8_t localStaChannel; // LOCAL_STA_CHANNEL - uint8_t remoteStaChannel; // REMOTE_STA_CHANNEL - uint8_t hmlChannel; // HML_CHANNEL - uint8_t localP2pChannel; // LOCAL_P2P_CHANNEL - uint8_t remoteP2pChannel; // REMOTE_P2P_CHANNEL + uint32_t localStaChload; // LOCAL_STA_CHLOAD + uint32_t remoteStaChload; // REMOTE_STA_CHLOAD + uint32_t localHmlChload; // LOCAL_HML_CHLOAD + uint32_t remoteHmlChload; // REMOTE_HML_CHLOAD + uint32_t localP2pChload; // LOCAL_P2P_CHLOAD + uint32_t remoteP2pChload; // REMOTE_P2P_CHLOAD + uint32_t localStaChannel; // LOCAL_STA_CHANNEL + uint32_t remoteStaChannel; // REMOTE_STA_CHANNEL + uint32_t hmlChannel; // HML_CHANNEL + uint32_t localP2pChannel; // LOCAL_P2P_CHANNEL + uint32_t remoteP2pChannel; // REMOTE_P2P_CHANNEL int32_t localIsDbac; // LOCAL_IS_DBAC int32_t remoteIsDbac; // REMOTE_IS_DBAC int32_t localIsDbdc; // LOCAL_IS_DBDC diff --git a/tests/dfx/event/unittest/mock/trans_hisysevent_matcher.h b/tests/dfx/event/unittest/mock/trans_hisysevent_matcher.h index b96ee25260..48302ea7c9 100644 --- a/tests/dfx/event/unittest/mock/trans_hisysevent_matcher.h +++ b/tests/dfx/event/unittest/mock/trans_hisysevent_matcher.h @@ -30,6 +30,13 @@ static void MatchTransEventNameTypeExtraUint8Param(const HiSysEventParam *params EXPECT_EQ(params[index].v.ui8, extraParam); } +static void MatchTransEventNameTypeExtraUint32Param(const HiSysEventParam *params, int32_t index, uint32_t extraParam) +{ + EXPECT_STREQ(params[index].name, TRANS_ASSIGNERS[index].name); + EXPECT_EQ(params[index].t, TRANS_ASSIGNERS[index].type); + EXPECT_EQ(params[index].v.ui32, extraParam); +} + static void MatchTransEventNameTypeExtraInt32Param(const HiSysEventParam *params, int32_t index, int32_t extraParam) { EXPECT_STREQ(params[index].name, TRANS_ASSIGNERS[index].name); @@ -117,17 +124,17 @@ MATCHER_P2(TransValidParamArrayMatcher, inExtra, validSize, "trans valid param a MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.minBW); MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.maxLatency); MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.minLatency); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.localStaChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.remoteStaChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.localHmlChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.remoteHmlChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.localP2pChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.remoteP2pChload); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.localStaChannel); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.remoteStaChannel); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.hmlChannel); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.localP2pChannel); - MatchTransEventNameTypeExtraUint8Param(params, ++index, extra.remoteP2pChannel); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.localStaChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.remoteStaChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.localHmlChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.remoteHmlChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.localP2pChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.remoteP2pChload); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.localStaChannel); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.remoteStaChannel); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.hmlChannel); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.localP2pChannel); + MatchTransEventNameTypeExtraUint32Param(params, ++index, extra.remoteP2pChannel); MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.localIsDbac); MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.remoteIsDbac); MatchTransEventNameTypeExtraInt32Param(params, ++index, extra.localIsDbdc); -- Gitee