openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-02-21 11:41:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:Synchronize time units

Browse Source 
Signed-off-by: wangboyi <wangboyi4@huawei.com>
This commit is contained in:
wangboyi 2025-02-17 21:07:22 +08:00
parent 4413eb9c55
commit cdb1b912c9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adapter/common/net/bluetooth/broadcast/manager/src/softbus_broadcast_mgr.c
View File

@ -203,7 +203,7 @@ static void DelayReportBroadcast(void *para)
extra.minInterval = g_bcManagerExtra[managerId].minInterval;
extra.maxInterval = g_bcManagerExtra[managerId].maxInterval;
extra.bcOverMaxCnt = g_bcOverMaxNum;
DISC_LOGI(DISC_BROADCAST, "startTime=%{public}d, advHandle=%{public}d, serverType=%{public}s, "
DISC_LOGI(DISC_BROADCAST, "startTime=%{public}lld, advHandle=%{public}d, serverType=%{public}s, "
"minInterval=%{public}d, maxInterval=%{public}d, bcOverMaxCnt=%{public}d", extra.startTime,
extra.advHandle, extra.serverType, extra.minInterval, extra.maxInterval, extra.bcOverMaxCnt);
DISC_EVENT(EVENT_SCENE_BLE, EVENT_STAGE_BROADCAST, extra);
@ -321,7 +321,7 @@ static void ReportCurrentBroadcast(bool startBcResult)
if (startBcResult) {
extra.currentNum = g_bcCurrentNum;
}
DISC_LOGI(DISC_BROADCAST, "startTime=%{public}d, advHandle=%{public}d, serverType=%{public}s, "
DISC_LOGI(DISC_BROADCAST, "startTime=%{public}lld, advHandle=%{public}d, serverType=%{public}s, "
"minInterval=%{public}d, maxInterval=%{public}d", extra.startTime,
extra.advHandle, extra.serverType, extra.minInterval, extra.maxInterval);
DISC_EVENT(EVENT_SCENE_BLE, EVENT_STAGE_BROADCAST, extra);

4
core/broadcast/common/src/broadcast_dfx_event.c
View File

@ -25,7 +25,7 @@ void BroadcastDiscEvent(int32_t eventScene, int32_t eventStage, DiscEventExtra *
}
DiscEventExtra extra = { 0 };
int32_t stamptime = (int32_t)SoftBusGetSysTimeMs();
int32_t stamptime = SoftBusGetSysTimeMs();
for (int32_t i = 0; i < size; i++) {
extra.capabilityBit = discExtra[i].capabilityBit;
extra.discType = discExtra[i].discType;
@ -42,7 +42,7 @@ void BroadcastDiscEvent(int32_t eventScene, int32_t eventStage, DiscEventExtra *
discExtra[i].startTime = stamptime;
}
DISC_LOGI(DISC_BLE, "capa=%{public}d, discType=%{public}d, broadcastType=%{public}d, minInterval=%{public}d, "
"maxInterval=%{public}d, succCnt=%{public}d, failCnt=%{public}d, costTime=%{public}d, Scene=%{public}d",
"maxInterval=%{public}d, succCnt=%{public}d, failCnt=%{public}d, costTime=%{public}lld, Scene=%{public}d",
extra.capabilityBit, extra.discType, extra.broadcastType, extra.minInterval, extra.maxInterval,
extra.successCnt, extra.failCnt, extra.costTime, eventScene);
DISC_EVENT(eventScene, eventStage, extra);

2
core/discovery/ble/softbus_ble/src/disc_ble.c
View File

@ -1065,7 +1065,7 @@ static void CalcDurationTime(int32_t adv, uint32_t capabilityBitmap)
{
uint32_t tempCap = 0;
DeConvertBitMap(&tempCap, &capabilityBitmap, 1);
int32_t stamptime = (int32_t)SoftBusGetSysTimeMs();
int32_t stamptime = SoftBusGetSysTimeMs();
const uint32_t event[] = {
adv == CON_ADV_ID ? CAST_EVENT_CON : CAST_EVENT_NON,

2
core/discovery/manager/src/disc_manager.c
View File

@ -205,7 +205,7 @@ static void DfxRecordDeviceFound(DiscInfo *infoNode, const DeviceInfo *device, c
DiscEventExtraInit(&extra);
extra.discMode = infoNode == NULL ? 0 : infoNode->mode;
extra.discType = additions == NULL ? 0 : additions->medium + 1;
extra.costTime = (int32_t)costTime;
extra.costTime = costTime;
extra.result = EVENT_STAGE_RESULT_OK;
UpdateDiscEventAndReport(&extra, device);
}

8
dfx/event/src/convert/disc_event_converter.h
View File

@ -59,8 +59,8 @@ DISC_ASSIGNER(Int32, DiscType, discType)
DISC_ASSIGNER(Int32, DiscMode, discMode)
DISC_ASSIGNER(Int32, SuccessCnt, successCnt)
DISC_ASSIGNER(Int32, FailCnt, failCnt)
DISC_ASSIGNER(Int32, StartTime, startTime)
DISC_ASSIGNER(Int32, CostTime, costTime)
DISC_ASSIGNER(Int64, StartTime, startTime)
DISC_ASSIGNER(Int64, CostTime, costTime)
DISC_ASSIGNER(AnonymizeString, LocalNetworkId, localNetworkId)
DISC_ASSIGNER(AnonymizeString, PeerIp, peerIp)
DISC_ASSIGNER(AnonymizeString, PeerBrMac, peerBrMac)
@ -97,8 +97,8 @@ static HiSysEventParamAssigner g_discAssigners[] = {
{ "DISC_MODE", HISYSEVENT_INT32, DiscAssignerDiscMode },
{ "SUCCESS_CNT", HISYSEVENT_INT32, DiscAssignerSuccessCnt },
{ "FAIL_CNT", HISYSEVENT_INT32, DiscAssignerFailCnt },
{ "START_TIME", HISYSEVENT_INT32, DiscAssignerStartTime },
{ "COST_TIME", HISYSEVENT_INT32, DiscAssignerCostTime },
{ "START_TIME", HISYSEVENT_INT64, DiscAssignerStartTime },
{ "COST_TIME", HISYSEVENT_INT64, DiscAssignerCostTime },
{ "LOCAL_NET_ID", HISYSEVENT_STRING, DiscAssignerLocalNetworkId },
{ "PEER_IP", HISYSEVENT_STRING, DiscAssignerPeerIp },
{ "PEER_BR_MAC", HISYSEVENT_STRING, DiscAssignerPeerBrMac },

6
dfx/interface/include/form/disc_event_form.h
View File

@ -142,9 +142,9 @@ typedef struct {
const char *scanCycle; // SCAN_CYCLE
int32_t discType; // DISC_TYPE
int32_t discMode; // DISC_MODE
int32_t startTime; // BROADCAST_START_TIME
int32_t stopTime; // BROADCAST_STOP_TIME
int32_t costTime; // COST_TIME
int64_t startTime; // BROADCAST_START_TIME
int64_t stopTime; // BROADCAST_STOP_TIME
int64_t costTime; // COST_TIME
int32_t successCnt; // SUCCESS_COUNT
int32_t failCnt; // FAIL_COUNT
const char *localNetworkId; // LOCAL_NET_ID