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

!904 Fix : 内核告警清理 

Merge pull request !904 from yinjiaming/fix
This commit is contained in:
openharmony_ci 2022-11-14 08:35:08 +00:00 committed by Gitee
parent aec7a45411 098c5ea24d
commit 5e8225273f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/los_queue.c
View File

@ -452,7 +452,8 @@ LITE_OS_SEC_TEXT UINT32 LOS_QueueReadCopy(UINT32 queueID,
operateType = OS_QUEUE_OPERATE_TYPE(OS_QUEUE_READ, OS_QUEUE_HEAD, OS_QUEUE_NOT_POINT); operateType = OS_QUEUE_OPERATE_TYPE(OS_QUEUE_READ, OS_QUEUE_HEAD, OS_QUEUE_NOT_POINT);
OsHookCall(LOS_HOOK_TYPE_QUEUE_READ_COPY, (LosQueueCB *)GET_QUEUE_HANDLE(queueID), operateType, *bufferSize, timeOut); OsHookCall(LOS_HOOK_TYPE_QUEUE_READ_COPY, (LosQueueCB *)GET_QUEUE_HANDLE(queueID),
operateType, *bufferSize, timeOut);
return OsQueueOperate(queueID, operateType, bufferAddr, bufferSize, timeOut); return OsQueueOperate(queueID, operateType, bufferAddr, bufferSize, timeOut);
} }
@ -489,7 +490,8 @@ LITE_OS_SEC_TEXT UINT32 LOS_QueueWriteCopy(UINT32 queueID,
operateType = OS_QUEUE_OPERATE_TYPE(OS_QUEUE_WRITE, OS_QUEUE_TAIL, OS_QUEUE_NOT_POINT); operateType = OS_QUEUE_OPERATE_TYPE(OS_QUEUE_WRITE, OS_QUEUE_TAIL, OS_QUEUE_NOT_POINT);
OsHookCall(LOS_HOOK_TYPE_QUEUE_WRITE_COPY, (LosQueueCB *)GET_QUEUE_HANDLE(queueID), operateType, bufferSize, timeOut); OsHookCall(LOS_HOOK_TYPE_QUEUE_WRITE_COPY, (LosQueueCB *)GET_QUEUE_HANDLE(queueID),
operateType, bufferSize, timeOut);
return OsQueueOperate(queueID, operateType, bufferAddr, &bufferSize, timeOut); return OsQueueOperate(queueID, operateType, bufferAddr, &bufferSize, timeOut);
} }

2
testsuites/sample/posix/pthread/It_posix_pthread_004.c
View File

@ -42,7 +42,7 @@ static UINT32 Testcase(VOID)
ret = pthread_attr_setdetachstate(NULL, PTHREAD_CREATE_DETACHED); ret = pthread_attr_setdetachstate(NULL, PTHREAD_CREATE_DETACHED);
ICUNIT_GOTO_EQUAL(ret, EINVAL, ret, EXIT); ICUNIT_GOTO_EQUAL(ret, EINVAL, ret, EXIT);
ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE - 2); ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE - 2); // 2: used to create a invalid argument
ICUNIT_GOTO_EQUAL(ret, EINVAL, ret, EXIT); ICUNIT_GOTO_EQUAL(ret, EINVAL, ret, EXIT);
ret = pthread_attr_setdetachstate(&attr, 3); // 3, test the param of function. ret = pthread_attr_setdetachstate(&attr, 3); // 3, test the param of function.