Skip to content

[lwp] 修复错误码误用 #7906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2023
Merged

[lwp] 修复错误码误用 #7906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions components/lwp/lwp_pmutex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static int _pthread_mutex_init(void *umutex)
if (lock_ret != RT_EOK)
{
rt_set_errno(EAGAIN);
return -EINTR;
return -EAGAIN;
}

lwp = lwp_self();
Expand Down Expand Up @@ -262,7 +262,7 @@ static int _pthread_mutex_lock_timeout(void *umutex, struct timespec *timeout)
lock_ret = rt_mutex_take_interruptible(&_pmutex_lock, RT_WAITING_FOREVER);
if (lock_ret != RT_EOK)
{
rt_set_errno(EAGAIN);
rt_set_errno(EINTR);
return -EINTR;
}

Expand Down Expand Up @@ -323,6 +323,11 @@ static int _pthread_mutex_lock_timeout(void *umutex, struct timespec *timeout)
return -ETIMEDOUT;
}
}
else if (lock_ret == -RT_EINTR)
{
rt_set_errno(EINTR);
return -EINTR;
}
else
{
rt_set_errno(EAGAIN);
Expand All @@ -343,7 +348,7 @@ static int _pthread_mutex_unlock(void *umutex)
if (lock_ret != RT_EOK)
{
rt_set_errno(EAGAIN);
return -EINTR;
return -EAGAIN;
}

lwp = lwp_self();
Expand Down Expand Up @@ -385,7 +390,7 @@ static int _pthread_mutex_unlock(void *umutex)
if (lock_ret != RT_EOK)
{
rt_set_errno(EPERM);
return -EAGAIN;
return -EPERM;
}
return 0;
}
Expand All @@ -400,7 +405,7 @@ static int _pthread_mutex_destroy(void *umutex)
if (lock_ret != RT_EOK)
{
rt_set_errno(EAGAIN);
return -EINTR;
return -EAGAIN;
}

lwp = lwp_self();
Expand Down