openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-23 08:49:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify to prevent the issue of two callbacks caused by two registrations

Browse Source 
Signed-off-by: huobaobao <huobaobao@huawei.com>
This commit is contained in:
huobaobao 2024-06-19 16:51:46 +08:00
parent f3bafa7634
commit 7826ec0265
4 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c
View File

@ -75,9 +75,47 @@ static SoftBusBtAddr ConvertBtAddr(const BdAddr *bdAddr)
}
static StateListener g_stateListener[STATE_LISTENER_MAX_NUM];
static bool g_isRegCb = false;
static bool g_isBleTurnOn = false;
static bool g_isBrTurnOn = false;
static SoftBusMutex g_lock = {0};
static bool IsRepeatNotify(int status)
{
COMM_LOGI(COMM_ADAPTER, "current state=%{public}d, isbleTurnOn=%{public}d, isbrTurnOn=%{public}d",
status, g_isBleTurnOn, g_isBrTurnOn);
COMM_CHECK_AND_RETURN_RET_LOGE(SoftBusMutexLock(&g_lock) == SOFTBUS_OK, false,
COMM_ADAPTER, "try to lock failed");
bool result = false;
switch (status) {
case SOFTBUS_BLE_STATE_TURN_ON:
result = g_isBleTurnOn;
g_isBleTurnOn = true;
break;
case SOFTBUS_BR_STATE_TURN_ON:
result = g_isBrTurnOn;
g_isBrTurnOn = true;
break;
case SOFTBUS_BLE_STATE_TURN_OFF:
result = !g_isBleTurnOn;
g_isBleTurnOn = false;
break;
case SOFTBUS_BR_STATE_TURN_OFF:
result = !g_isBrTurnOn;
g_isBrTurnOn = false;
break;
default:
break;
}
(void)SoftBusMutexUnlock(&g_lock);
return result;
}
static void SoftBusOnBtSateChanged(int32_t status)
{
if (IsRepeatNotify(status)) {
COMM_LOGI(COMM_ADAPTER, "current state=%{public}d, isbleTurnOn=%{public}d, isbrTurnOn=%{public}d",
status, g_isBleTurnOn, g_isBrTurnOn);
return;
}
int listenerId;
for (listenerId = 0; listenerId < STATE_LISTENER_MAX_NUM; listenerId++) {
if (g_stateListener[listenerId].isUsed &&
@ -159,26 +197,11 @@ static BtGapCallBacks g_softbusGapCb = {
.pairConfiremedCallback = WrapperPairConfiremedCallback
};
static int RegisterListenerCallback(void)
{
if (g_isRegCb) {
return SOFTBUS_OK;
}
if (GapRegisterCallbacks(&g_softbusGapCb) != OHOS_BT_STATUS_SUCCESS) {
return SOFTBUS_COMM_BLUETOOTH_UNDERLAY_REGISTER_CB_ERR;
}
g_isRegCb = true;
return SOFTBUS_OK;
}
int SoftBusAddBtStateListener(const SoftBusBtStateListener *listener)
{
if (listener == NULL) {
return SOFTBUS_INVALID_PARAM;
}
if (RegisterListenerCallback() != SOFTBUS_OK) {
return SOFTBUS_COMM_BLUETOOTH_UNDERLAY_REGISTER_CB_ERR;
}
for (int index = 0; index < STATE_LISTENER_MAX_NUM; index++) {
if (!g_stateListener[index].isUsed) {
g_stateListener[index].isUsed = true;
@ -262,12 +285,21 @@ int SoftBusSetBtName(const char *name)
return SOFTBUS_COMM_BLUETOOTH_UNDERLAY_SET_NAME_ERR;
}
void SoftBusBtInit(void)
int SoftBusBtInit(void)
{
if (SoftBusMutexInit(&g_lock, NULL) != SOFTBUS_OK) {
COMM_LOGE(COMM_ADAPTER, "init lock error");
return SOFTBUS_LOCK_ERR;
}
if (GapRegisterCallbacks(&g_softbusGapCb) != OHOS_BT_STATUS_SUCCESS) {
SoftBusMutexDestroy(&g_lock);
return SOFTBUS_COMM_BLUETOOTH_UNDERLAY_REGISTER_CB_ERR;
}
if (SoftBusGetBtState() == BLE_ENABLE) {
SoftBusOnBtSateChanged(SOFTBUS_BLE_STATE_TURN_ON);
}
if (SoftBusGetBrState() == BR_ENABLE) {
SoftBusOnBtSateChanged(SOFTBUS_BR_STATE_TURN_ON);
}
return SOFTBUS_OK;
}

4
adapter/common/net/bluetooth/common/softbus_adapter_bt_common_virtual.c
View File

@ -60,7 +60,7 @@ int SoftBusSetBtName(const char *name)
return SOFTBUS_FUNC_NOT_SUPPORT;
}
void SoftBusBtInit(void)
int SoftBusBtInit(void)
{
return SOFTBUS_OK;
}

2
adapter/common/net/bluetooth/include/softbus_adapter_bt_common.h
View File

@ -121,7 +121,7 @@ int SoftBusAddBtStateListener(const SoftBusBtStateListener *listener);
int SoftBusRemoveBtStateListener(int listenerId);
void SoftBusBtInit(void);
int SoftBusBtInit(void);
#ifdef __cplusplus
}

7
core/frame/common/src/softbus_server_frame.c
View File

@ -141,7 +141,12 @@ void InitSoftBusServer(void)
return;
}
SoftBusBtInit();
ret = SoftBusBtInit();
if (ret != SOFTBUS_OK) {
ServerModuleDeinit();
COMM_LOGE(COMM_SVC, "softbus bt init failed, err = %{public}d", ret);
return;
}
g_isInit = true;
COMM_LOGI(COMM_SVC, "softbus framework init success.");
}