已合并
fix broadcast log #10857
wangJE创建于 2025年9月8日
fix broadcast log #10857
已合并
从refs/pull/10857/head合入到master
共 2 个文件变更+18-18
| @@ -337,7 +337,7 @@ static void WrapperScanResultCb(uint8_t channelId, BtScanResultData *data) | |||
| 337 | } | 337 | } |
| 338 | ScanChannel *scanChannel = &g_scanChannel[channelId]; | 338 | ScanChannel *scanChannel = &g_scanChannel[channelId]; |
| 339 | if (!scanChannel->isUsed || !scanChannel->isScanning) { | 339 | if (!scanChannel->isUsed || !scanChannel->isScanning) { |
| 340 | - DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, bt-scannerId=%{public}d", channelId, | 340 | + DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, btScanId=%{public}d", channelId, |
| 341 | scanChannel->scannerId); | 341 | scanChannel->scannerId); |
| 342 | SoftBusMutexUnlock(&g_scannerLock); | 342 | SoftBusMutexUnlock(&g_scannerLock); |
| 343 | return; | 343 | return; |
| @@ -382,13 +382,13 @@ static void WrapperScanStateChangeCb(uint8_t channelId, int32_t resultCode, bool | |||
| 382 | } | 382 | } |
| 383 | ScanChannel *scanChannel = &g_scanChannel[channelId]; | 383 | ScanChannel *scanChannel = &g_scanChannel[channelId]; |
| 384 | if (!scanChannel->isUsed) { | 384 | if (!scanChannel->isUsed) { |
| 385 | - DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, bt-scannerId=%{public}d", channelId, | 385 | + DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, btScanId=%{public}d", channelId, |
| 386 | scanChannel->scannerId); | 386 | scanChannel->scannerId); |
| 387 | SoftBusMutexUnlock(&g_scannerLock); | 387 | SoftBusMutexUnlock(&g_scannerLock); |
| 388 | return; | 388 | return; |
| 389 | } | 389 | } |
| 390 | DISC_LOGD(DISC_BLE_ADAPTER, | 390 | DISC_LOGD(DISC_BLE_ADAPTER, |
| 391 | - "scannerId=%{public}d, bt-scannerId=%{public}d, resultCode=%{public}d, isStartScan=%{public}d", channelId, | 391 | + "scannerId=%{public}d, btScanId=%{public}d, resultCode=%{public}d, isStartScan=%{public}d", channelId, |
| 392 | scanChannel->scannerId, resultCode, isStartScan); | 392 | scanChannel->scannerId, resultCode, isStartScan); |
| 393 | if (scanChannel->scanCallback == NULL || scanChannel->scanCallback->OnScanStateChanged == NULL) { | 393 | if (scanChannel->scanCallback == NULL || scanChannel->scanCallback->OnScanStateChanged == NULL) { |
| 394 | DISC_LOGE(DISC_BLE_ADAPTER, "scanner callback is null"); | 394 | DISC_LOGE(DISC_BLE_ADAPTER, "scanner callback is null"); |
| @@ -411,7 +411,7 @@ static void WrapperLpDeviceInfoCb(uint8_t channelId, BtUuid *uuid, int32_t type, | |||
| 411 | } | 411 | } |
| 412 | ScanChannel *scanChannel = &g_scanChannel[channelId]; | 412 | ScanChannel *scanChannel = &g_scanChannel[channelId]; |
| 413 | if (!scanChannel->isUsed) { | 413 | if (!scanChannel->isUsed) { |
| 414 | - DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, bt-scannerId=%{public}d", channelId, | 414 | + DISC_LOGE(DISC_BLE_ADAPTER, "scanner is not in used, scannerId=%{public}u, btScanId=%{public}d", channelId, |
| 415 | scanChannel->scannerId); | 415 | scanChannel->scannerId); |
| 416 | SoftBusMutexUnlock(&g_scannerLock); | 416 | SoftBusMutexUnlock(&g_scannerLock); |
| 417 | return; | 417 | return; |
| @@ -553,7 +553,7 @@ static int32_t SoftbusRegisterScanCb(int32_t *scannerId, const SoftbusScanCallba | |||
| 553 | g_scanChannel[channelId].isScanning = false; | 553 | g_scanChannel[channelId].isScanning = false; |
| 554 | g_scanChannel[channelId].scanCallback = (SoftbusScanCallback *)cb; | 554 | g_scanChannel[channelId].scanCallback = (SoftbusScanCallback *)cb; |
| 555 | *scannerId = channelId; | 555 | *scannerId = channelId; |
| 556 | - DISC_LOGI(DISC_BLE_ADAPTER, "scannerId=%{public}u, bt-scannerId=%{public}d", channelId, | 556 | + DISC_LOGI(DISC_BLE_ADAPTER, "scannerId=%{public}u, btScanId=%{public}d", channelId, |
| 557 | g_scanChannel[channelId].scannerId); | 557 | g_scanChannel[channelId].scannerId); |
| 558 | SoftBusMutexUnlock(&g_scannerLock); | 558 | SoftBusMutexUnlock(&g_scannerLock); |
| 559 | return SOFTBUS_OK; | 559 | return SOFTBUS_OK; |
| @@ -574,13 +574,13 @@ static int32_t SoftbusUnRegisterScanCb(int32_t scannerId) | |||
| 574 | return SOFTBUS_LOCK_ERR; | 574 | return SOFTBUS_LOCK_ERR; |
| 575 | } | 575 | } |
| 576 | if (!g_scanChannel[scannerId].isUsed) { | 576 | if (!g_scanChannel[scannerId].isUsed) { |
| 577 | - DISC_LOGI(DISC_BLE_ADAPTER, "already unregistered, scannerId=%{public}d, bt-scannerId=%{public}d", scannerId, | 577 | + DISC_LOGI(DISC_BLE_ADAPTER, "already unregistered, scannerId=%{public}d, btScanId=%{public}d", scannerId, |
| 578 | g_scanChannel[scannerId].scannerId); | 578 | g_scanChannel[scannerId].scannerId); |
| 579 | SoftBusMutexUnlock(&g_scannerLock); | 579 | SoftBusMutexUnlock(&g_scannerLock); |
| 580 | return SOFTBUS_OK; | 580 | return SOFTBUS_OK; |
| 581 | } | 581 | } |
| 582 | int32_t ret = BleDeregisterScanCallbacks(g_scanChannel[scannerId].scannerId); | 582 | int32_t ret = BleDeregisterScanCallbacks(g_scanChannel[scannerId].scannerId); |
| 583 | - DISC_LOGI(DISC_BLE_ADAPTER, "scannerId=%{public}d, bt-scannerId=%{public}d, result=%{public}d", | 583 | + DISC_LOGI(DISC_BLE_ADAPTER, "scannerId=%{public}d, btScanId=%{public}d, result=%{public}d", |
| 584 | scannerId, g_scanChannel[scannerId].scannerId, ret); | 584 | scannerId, g_scanChannel[scannerId].scannerId, ret); |
| 585 | g_scanChannel[scannerId].scannerId = -1; | 585 | g_scanChannel[scannerId].scannerId = -1; |
| 586 | g_scanChannel[scannerId].isUsed = false; | 586 | g_scanChannel[scannerId].isUsed = false; |
| @@ -869,7 +869,7 @@ static bool CheckScanChannelInUsed(int32_t scannerId) | |||
| 869 | return false; | 869 | return false; |
| 870 | } | 870 | } |
| 871 | if (!g_scanChannel[scannerId].isUsed) { | 871 | if (!g_scanChannel[scannerId].isUsed) { |
| 872 | - DISC_LOGE(DISC_BLE_ADAPTER, "scannerId=%{public}d, bt-scannerId=%{public}d", scannerId, | 872 | + DISC_LOGE(DISC_BLE_ADAPTER, "scannerId=%{public}d, btScanId=%{public}d", scannerId, |
| 873 | g_scanChannel[scannerId].scannerId); | 873 | g_scanChannel[scannerId].scannerId); |
| 874 | return false; | 874 | return false; |
| 875 | } | 875 | } |
| @@ -926,7 +926,7 @@ static int32_t SoftbusStartScan(int32_t scannerId, const SoftBusBcScanParams *pa | |||
| 926 | } | 926 | } |
| 927 | int32_t btScannerId = g_scanChannel[scannerId].scannerId; | 927 | int32_t btScannerId = g_scanChannel[scannerId].scannerId; |
| 928 | if (g_scanChannel[scannerId].isScanning) { | 928 | if (g_scanChannel[scannerId].isScanning) { |
| 929 | - DISC_LOGE(DISC_BLE_ADAPTER, "already scanning, scannerId=%{public}d, bt-scannerId=%{public}d", | 929 | + DISC_LOGE(DISC_BLE_ADAPTER, "already scanning, scannerId=%{public}d, btScanId=%{public}d", |
| 930 | scannerId, btScannerId); | 930 | scannerId, btScannerId); |
| 931 | SoftBusMutexUnlock(&g_scannerLock); | 931 | SoftBusMutexUnlock(&g_scannerLock); |
| 932 | return SOFTBUS_ALREADY_TRIGGERED; | 932 | return SOFTBUS_ALREADY_TRIGGERED; |
| @@ -936,7 +936,7 @@ static int32_t SoftbusStartScan(int32_t scannerId, const SoftBusBcScanParams *pa | |||
| 936 | BleScanNativeFilter *nativeFilter = | 936 | BleScanNativeFilter *nativeFilter = |
| 937 | (BleScanNativeFilter *)SoftBusCalloc(sizeof(BleScanNativeFilter) * filterSize); | 937 | (BleScanNativeFilter *)SoftBusCalloc(sizeof(BleScanNativeFilter) * filterSize); |
| 938 | if (nativeFilter == NULL) { | 938 | if (nativeFilter == NULL) { |
| 939 | - DISC_LOGE(DISC_BLE_ADAPTER, "malloc filter failed, scannerId=%{public}d, bt-scannerId=%{public}d", | 939 | + DISC_LOGE(DISC_BLE_ADAPTER, "malloc filter failed, scannerId=%{public}d, btScanId=%{public}d", |
| 940 | scannerId, btScannerId); | 940 | scannerId, btScannerId); |
| 941 | return SOFTBUS_MALLOC_ERR; | 941 | return SOFTBUS_MALLOC_ERR; |
| 942 | } | 942 | } |
| @@ -947,10 +947,10 @@ static int32_t SoftbusStartScan(int32_t scannerId, const SoftBusBcScanParams *pa | |||
| 947 | scanConfig.phy = (int)param->scanPhy; | 947 | scanConfig.phy = (int)param->scanPhy; |
| 948 | int32_t ret = BleStartScanEx(btScannerId, &scanConfig, nativeFilter, (uint32_t)filterSize); | 948 | int32_t ret = BleStartScanEx(btScannerId, &scanConfig, nativeFilter, (uint32_t)filterSize); |
| 949 | FreeBtFilter(nativeFilter, filterSize); | 949 | FreeBtFilter(nativeFilter, filterSize); |
| 950 | - DISC_LOGD(DISC_BLE_ADAPTER, "scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d", | 950 | + DISC_LOGD(DISC_BLE_ADAPTER, "scannerId=%{public}d, btScanId=%{public}d, ret=%{public}d", |
| 951 | scannerId, btScannerId, ret); | 951 | scannerId, btScannerId, ret); |
| 952 | if (SoftBusMutexLock(&g_scannerLock) != SOFTBUS_OK) { | 952 | if (SoftBusMutexLock(&g_scannerLock) != SOFTBUS_OK) { |
| 953 | - DISC_LOGE(DISC_BLE_ADAPTER, "lock failed, scannerId=%{public}d, bt-scannerId=%{public}d", | 953 | + DISC_LOGE(DISC_BLE_ADAPTER, "lock failed, scannerId=%{public}d, btScanId=%{public}d", |
| 954 | scannerId, btScannerId); | 954 | scannerId, btScannerId); |
| 955 | return SOFTBUS_LOCK_ERR; | 955 | return SOFTBUS_LOCK_ERR; |
| 956 | } | 956 | } |
| @@ -975,7 +975,7 @@ static int32_t SoftbusStopScan(int32_t scannerId) | |||
| 975 | } | 975 | } |
| 976 | int32_t btScannerId = g_scanChannel[scannerId].scannerId; | 976 | int32_t btScannerId = g_scanChannel[scannerId].scannerId; |
| 977 | if (!g_scanChannel[scannerId].isScanning) { | 977 | if (!g_scanChannel[scannerId].isScanning) { |
| 978 | - DISC_LOGI(DISC_BLE_ADAPTER, "already stopped, scannerId=%{public}d, bt-scannerId=%{public}d", | 978 | + DISC_LOGI(DISC_BLE_ADAPTER, "already stopped, scannerId=%{public}d, btScanId=%{public}d", |
| 979 | scannerId, btScannerId); | 979 | scannerId, btScannerId); |
| 980 | SoftBusMutexUnlock(&g_scannerLock); | 980 | SoftBusMutexUnlock(&g_scannerLock); |
| 981 | return SOFTBUS_ALREADY_TRIGGERED; | 981 | return SOFTBUS_ALREADY_TRIGGERED; |
| @@ -983,7 +983,7 @@ static int32_t SoftbusStopScan(int32_t scannerId) | |||
| 983 | g_scanChannel[scannerId].isScanning = false; | 983 | g_scanChannel[scannerId].isScanning = false; |
| 984 | SoftBusMutexUnlock(&g_scannerLock); | 984 | SoftBusMutexUnlock(&g_scannerLock); |
| 985 | int32_t ret = BleStopScan(btScannerId); | 985 | int32_t ret = BleStopScan(btScannerId); |
| 986 | - DISC_LOGD(DISC_BLE_ADAPTER, "stop scan, scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d", | 986 | + DISC_LOGD(DISC_BLE_ADAPTER, "stop scan, scannerId=%{public}d, btScanId=%{public}d, ret=%{public}d", |
| 987 | scannerId, btScannerId, ret); | 987 | scannerId, btScannerId, ret); |
| 988 | if (ret != OHOS_BT_STATUS_SUCCESS) { | 988 | if (ret != OHOS_BT_STATUS_SUCCESS) { |
| 989 | return ret; | 989 | return ret; |
| @@ -1139,7 +1139,7 @@ static int32_t SoftbusSetScanReportChanToLp(int32_t scannerId, bool enable) | |||
| 1139 | SoftBusMutexUnlock(&g_scannerLock); | 1139 | SoftBusMutexUnlock(&g_scannerLock); |
| 1140 | int32_t ret = SetScanReportChannelToLpDevice(btScannerId, enable); | 1140 | int32_t ret = SetScanReportChannelToLpDevice(btScannerId, enable); |
| 1141 | if (ret != OHOS_BT_STATUS_SUCCESS) { | 1141 | if (ret != OHOS_BT_STATUS_SUCCESS) { |
| 1142 | - DISC_LOGW(DISC_BLE_ADAPTER, "set channel failed, scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d", | 1142 | + DISC_LOGW(DISC_BLE_ADAPTER, "set channel failed, scannerId=%{public}d, btScanId=%{public}d, ret=%{public}d", |
| 1143 | scannerId, btScannerId, ret); | 1143 | scannerId, btScannerId, ret); |
| 1144 | return ret; | 1144 | return ret; |
| 1145 | } | 1145 | } |
| @@ -941,7 +941,7 @@ static void BcReportScanDataCallback(BroadcastProtocol protocol, | |||
| 941 | callback.OnReportScanDataCallback((int32_t)managerId, &bcInfo); | 941 | callback.OnReportScanDataCallback((int32_t)managerId, &bcInfo); |
| 942 | } | 942 | } |
| 943 | if (!isFindMatchFiter) { | 943 | if (!isFindMatchFiter) { |
| 944 | - DISC_LOGW(DISC_BROADCAST, "not find matched filter, adapterScanId=%{public}d", adapterScanId); | 944 | + DISC_LOGD(DISC_BROADCAST, "not find matched filter, adapterScanId=%{public}d", adapterScanId); |
| 945 | } | 945 | } |
| 946 | ReleaseBroadcastReportInfo(&bcInfo); | 946 | ReleaseBroadcastReportInfo(&bcInfo); |
| 947 | } | 947 | } |
| @@ -2278,7 +2278,7 @@ int32_t PerformSetBroadcastingParam(int32_t bcId, SoftbusBroadcastParam *softbus | |||
| 2278 | if (!g_bcManager[bcId].isDisableCb) { | 2278 | if (!g_bcManager[bcId].isDisableCb) { |
| 2279 | ret = DisableBroadcastingWaitSignal(bcId, &g_bcLock); | 2279 | ret = DisableBroadcastingWaitSignal(bcId, &g_bcLock); |
| 2280 | SoftBusMutexUnlock(&g_bcLock); | 2280 | SoftBusMutexUnlock(&g_bcLock); |
| 2281 | - DISC_CHECK_AND_RETURN_RET_LOGE(ret == SOFTBUS_OK, ret, DISC_BROADCAST, | 2281 | + DISC_CHECK_AND_RETURN_RET_LOGD(ret == SOFTBUS_OK, ret, DISC_BROADCAST, |
| 2282 | "wait pausecondition fail managerId=%{public}d", bcId); | 2282 | "wait pausecondition fail managerId=%{public}d", bcId); |
| 2283 | } else { | 2283 | } else { |
| 2284 | SoftBusMutexUnlock(&g_bcLock); | 2284 | SoftBusMutexUnlock(&g_bcLock); |
| @@ -2525,7 +2525,7 @@ static int32_t ProcessFliterChanged(int32_t listenerId, SoftBusBcScanParams *ada | |||
| 2525 | GetSrvType(scanManager->srvType), listenerId, scanManager->adapterScanId, | 2525 | GetSrvType(scanManager->srvType), listenerId, scanManager->adapterScanId, |
| 2526 | adapterParam->scanInterval, adapterParam->scanWindow); | 2526 | adapterParam->scanInterval, adapterParam->scanWindow); |
| 2527 | } else { | 2527 | } else { |
| 2528 | - DISC_LOGI(DISC_BROADCAST, "channel is scanning, add filter"); | 2528 | + DISC_LOGI(DISC_BROADCAST, "sanId=%{public}d is scanning, add filter", scanManager->adapterScanId); |
| 2529 | ret = GetScanFiltersForOneListener(listenerId, &adapterFilter, &filterSize); | 2529 | ret = GetScanFiltersForOneListener(listenerId, &adapterFilter, &filterSize); |
| 2530 | DISC_CHECK_AND_RETURN_RET_LOGE(ret == SOFTBUS_OK, ret, DISC_BROADCAST, "get bc scan filters failed"); | 2530 | DISC_CHECK_AND_RETURN_RET_LOGE(ret == SOFTBUS_OK, ret, DISC_BROADCAST, "get bc scan filters failed"); |
| 2531 | ret = g_interface[protocol]->SetScanParams(scanManager->adapterScanId, adapterParam, | 2531 | ret = g_interface[protocol]->SetScanParams(scanManager->adapterScanId, adapterParam, |