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

!235 fix: 修复QUEUE_INFO_S中waitReadTask无法保存大于32的任务编号

Browse Source 
Merge pull request !235 from kenneth/master
This commit is contained in:
openharmony_ci
2021-08-02 02:07:12 +00:00
committed by Gitee
parent 23d56f4b2a 704cca97b1
commit 4fd6a663ac
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testsuits/sample/kernel/queue/LLt_los_queue_003.c
View File

@@ -69,7 +69,7 @@ static UINT32 Testcase(VOID)
ret = LOS_QueueCreate("Q122", 1, &g_uwQueueID122, 0, QUEUE_BASE_MSGSIZE);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = LOS_MemboxInit((VOID *)g_aucMailBoxPool, sizeof(g_aucMailBoxPool) * 1, sizeof(g_aucMailBoxPool));
ret = LOS_MemboxInit((VOID *)g_aucMailBoxPool, sizeof(g_aucMailBoxPool) * 2, sizeof(g_aucMailBoxPool));
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
memBox = OsQueueMailAlloc(g_uwQueueID122, (VOID *)g_aucMailBoxPool, LOS_NO_WAIT);

4
testsuits/sample/kernel/queue/Llt_los_queue_001.c
View File

@@ -55,14 +55,14 @@ static UINT32 Testcase(VOID)
ret = LOS_QueueInfoGet(g_testQueueID01, &queueInfo);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2);
ICUNIT_GOTO_EQUAL(queueInfo.waitReadTask, (1 << g_testTaskID01), queueInfo.waitReadTask, EXIT2);
ICUNIT_GOTO_EQUAL(queueInfo.waitReadTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(g_testTaskID01)], 1 << (g_testTaskID01 & OS_WAIT_TASK_ARRAY_ELEMENT_MASK), queueInfo.waitReadTask, EXIT2);
ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2);
ret = LOS_QueueInfoGet(g_testQueueID01, &queueInfo);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2);
ICUNIT_GOTO_EQUAL(queueInfo.waitWriteTask, (1 << g_testTaskID01), queueInfo.waitWriteTask, EXIT2);
ICUNIT_GOTO_EQUAL(queueInfo.waitWriteTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(g_testTaskID01)], 1 << (g_testTaskID01 & OS_WAIT_TASK_ARRAY_ELEMENT_MASK), queueInfo.waitWriteTask, EXIT2);
EXIT2:
ret = LOS_TaskDelete(g_testTaskID01);