openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-12-18 23:38:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4830 FIX:tcp按需初始化module

Browse Source 
Merge pull request !4830 from WANGJINGEN/master
This commit is contained in:
openharmony_ci 2023-12-22 07:24:12 +00:00 committed by Gitee
commit 961d30086b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/connection/common/src/softbus_base_listener.c
View File

@ -83,13 +83,14 @@ static int32_t ShutdownBaseListener(SoftbusListenerNode *node);
static int32_t StartSelectThread(void);
static int32_t StopSelectThread(void);
static void WakeupSelectThread(void);
static SoftbusListenerNode *CreateSpecifiedListenerModule(ListenerModule module);
static SoftBusMutex g_listenerListLock = { 0 };
static SoftbusListenerNode *g_listenerList[UNUSE_BUTT] = { 0 };
static SoftBusMutex g_selectThreadStateLock = { 0 };
static SelectThreadState *g_selectThreadState = NULL;
static SoftbusListenerNode *GetListenerNode(ListenerModule module)
static SoftbusListenerNode *GetListenerNodeCommon(ListenerModule module, bool create)
{
int32_t status = SoftBusMutexLock(&g_listenerListLock);
CONN_CHECK_AND_RETURN_RET_LOGE(status == SOFTBUS_OK, NULL, CONN_COMMON,
@ -98,7 +99,13 @@ static SoftbusListenerNode *GetListenerNode(ListenerModule module)
SoftbusListenerNode *node = g_listenerList[module];
do {
if (node == NULL) {
break;
if (create) {
node = CreateSpecifiedListenerModule(module);
}
if (node == NULL) {
break;
}
g_listenerList[module] = node;
}
status = SoftBusMutexLock(&node->lock);
if (status != SOFTBUS_OK) {
@ -114,6 +121,16 @@ static SoftbusListenerNode *GetListenerNode(ListenerModule module)
return node;
}
static SoftbusListenerNode *GetListenerNode(ListenerModule module)
{
return GetListenerNodeCommon(module, false);
}
static SoftbusListenerNode *GetOrCreateListenerNode(ListenerModule module)
{
return GetListenerNodeCommon(module, true);
}
static void RemoveListenerNode(SoftbusListenerNode *node)
{
int32_t status = SoftBusMutexLock(&g_listenerListLock);
@ -196,31 +213,6 @@ static SoftbusListenerNode *CreateSpecifiedListenerModule(ListenerModule module)
return node;
}
static int32_t CreateStaticModulesUnsafe(void)
{
ListenerModule module = 0;
for (; module < LISTENER_MODULE_DYNAMIC_START; module++) {
SoftbusListenerNode *node = CreateSpecifiedListenerModule(module);
if (node == NULL) {
CONN_LOGW(CONN_COMMON, "create static module failed: create module listener node failed, module=%d",
module);
goto CLEANUP;
}
CONN_LOGI(CONN_COMMON, "create static module, create module listener node success, module=%d", module);
g_listenerList[module] = node;
}
return SOFTBUS_OK;
CLEANUP:
for (ListenerModule i = module - 1; i >= 0; i--) {
SoftbusListenerNode *node = g_listenerList[i];
g_listenerList[i] = NULL;
// cleanup
ReturnListenerNode(&node);
CONN_LOGI(CONN_COMMON, "create static module failed: clean up listener node done, module=%d", module);
}
return SOFTBUS_ERR;
}
int32_t InitBaseListener(void)
{
// stop select thread need re-enter lock
@ -254,7 +246,6 @@ int32_t InitBaseListener(void)
return SOFTBUS_LOCK_ERR;
}
(void)memset_s(g_listenerList, sizeof(g_listenerList), 0, sizeof(g_listenerList));
status = CreateStaticModulesUnsafe();
(void)SoftBusMutexUnlock(&g_listenerListLock);
if (status != SOFTBUS_OK) {
CONN_LOGE(CONN_INIT, "init base listener failed: create static module listener failed, error=%d",
@ -334,7 +325,7 @@ int32_t StartBaseClient(ListenerModule module, const SoftbusBaseListener *listen
CONN_LOGI(CONN_COMMON, "receive start base client listener request, module=%d", module);
SoftbusListenerNode *node = GetListenerNode(module);
SoftbusListenerNode *node = GetOrCreateListenerNode(module);
CONN_CHECK_AND_RETURN_RET_LOGW(node != NULL, SOFTBUS_NOT_FIND, CONN_COMMON,
"start base client listener failed: get listener node failed, dynamic module forgot register "
"first? or static module start before base listener init? module=%d",
@ -453,7 +444,7 @@ int32_t StartBaseListener(const LocalListenerInfo *info, const SoftbusBaseListen
ListenerModule module = info->socketOption.moduleId;
CONN_LOGI(CONN_COMMON, "receive start base listener request, module=%d", module);
SoftbusListenerNode *node = GetListenerNode(module);
SoftbusListenerNode *node = GetOrCreateListenerNode(module);
CONN_CHECK_AND_RETURN_RET_LOGW(node != NULL, SOFTBUS_NOT_FIND, CONN_COMMON,
"start base listener failed: get listener node failed, dynamic module should register first, module=%d",
module);