developer
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair the timeout for sem and mutex

This commit is contained in:
Wang_Weigen 2022-04-26 11:27:44 +08:00
parent 587c2d595e
commit afc4b58b74
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Ubiquitous/XiZi/kernel/thread/msgqueue.c
View File

@ -96,7 +96,12 @@ static x_err_t _MsgQueueSend(struct MsgQueue *mq,
tick_delta = 0; tick_delta = 0;
task = GetKTaskDescriptor(); task = GetKTaskDescriptor();
timeout = CalculteTickFromTimeMs(msec);
if(WAITING_FOREVER == msec)
timeout = WAITING_FOREVER;
else
timeout = CalculteTickFromTimeMs(msec);
lock = CriticalAreaLock(); lock = CriticalAreaLock();
if (mq->num_msgs >= mq->max_msgs && timeout == 0) { if (mq->num_msgs >= mq->max_msgs && timeout == 0) {
CriticalAreaUnLock(lock); CriticalAreaUnLock(lock);

8
Ubiquitous/XiZi/kernel/thread/semaphore.c
View File

@ -94,8 +94,12 @@ static int32 _SemaphoreObtain(struct Semaphore *sem, int32 msec)
struct TaskDescriptor *task = NONE; struct TaskDescriptor *task = NONE;
NULL_PARAM_CHECK(sem); NULL_PARAM_CHECK(sem);
wait_time = CalculteTickFromTimeMs(msec); if(WAITING_FOREVER == msec)
wait_time = WAITING_FOREVER;
else
wait_time = CalculteTickFromTimeMs(msec);
lock = CriticalAreaLock(); lock = CriticalAreaLock();
SYS_KDEBUG_LOG(KDBG_IPC, ("obtain semaphore: id %d, value %d, by task %s\n", SYS_KDEBUG_LOG(KDBG_IPC, ("obtain semaphore: id %d, value %d, by task %s\n",