yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复OsQueueMailFree提早释放内存的问题 

Signed-off-by: lurix <lurix@foxmail.com>
This commit is contained in:
lurix 2021-09-13 10:01:45 +00:00
parent c77c178ec1
commit ec88d16289
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/src/los_queue.c
View File

@ -526,12 +526,6 @@ LITE_OS_SEC_TEXT UINT32 OsQueueMailFree(UINT32 queueID, VOID *mailPool, VOID *ma
} }
intSave = LOS_IntLock(); intSave = LOS_IntLock();
if (LOS_MemboxFree(mailPool, mailMem)) {
LOS_IntRestore(intSave);
return LOS_ERRNO_QUEUE_MAIL_FREE_ERROR;
}
queueCB = GET_QUEUE_HANDLE(queueID); queueCB = GET_QUEUE_HANDLE(queueID);
if (queueCB->queueState == OS_QUEUE_UNUSED) { if (queueCB->queueState == OS_QUEUE_UNUSED) {
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
@ -541,17 +535,24 @@ LITE_OS_SEC_TEXT UINT32 OsQueueMailFree(UINT32 queueID, VOID *mailPool, VOID *ma
if (!LOS_ListEmpty(&queueCB->memList)) { if (!LOS_ListEmpty(&queueCB->memList)) {
resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&queueCB->memList)); resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&queueCB->memList));
OsSchedTaskWake(resumedTask); OsSchedTaskWake(resumedTask);
mem = LOS_MemboxAlloc(mailPool); /* When enters the current branch, means the resumed task already can get a available membox,
if (mem == NULL) { * so the resumedTask->msg can not be NULL.
LOS_IntRestore(intSave); */
return LOS_ERRNO_QUEUE_NO_MEMORY; resumedTask->msg = mailMem;
}
resumedTask->msg = mem;
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
LOS_Schedule(); LOS_Schedule();
} else { } else {
/* No task waiting for the mailMem,
* so free it.
*/
if (LOS_MemboxFree(mailPool, mailMem)) {
LOS_IntRestore(intSave);
return LOS_ERRNO_QUEUE_MAIL_FREE_ERROR;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
} }
return LOS_OK; return LOS_OK;
} }