Skip to content
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

posix: rwlock: Refactor locking using k_timepoint_t #87488

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −14
Open

posix: rwlock: Refactor locking using k_timepoint_t #87488

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
18 changes: 4 additions & 14 deletions lib/posix/options/rwlock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,24 +363,14 @@ static uint32_t read_lock_acquire(struct posix_rwlock *rwl, int32_t timeout)
static uint32_t write_lock_acquire(struct posix_rwlock *rwl, int32_t timeout)
{
uint32_t ret = 0U;
int64_t elapsed_time, st_time = k_uptime_get();
k_timeout_t k_timeout;
k_timepoint_t deadline;

k_timeout = SYS_TIMEOUT_MS(timeout);
deadline = sys_timepoint_calc(SYS_TIMEOUT_MS(timeout));

/* waiting for release of write lock */
if (sys_sem_take(&rwl->wr_sem, k_timeout) == 0) {
/* update remaining timeout time for 2nd sem */
if (timeout != SYS_FOREVER_MS) {
elapsed_time = k_uptime_get() - st_time;
timeout = timeout <= elapsed_time ? 0 :
timeout - elapsed_time;
}

k_timeout = SYS_TIMEOUT_MS(timeout);

if (sys_sem_take(&rwl->wr_sem, sys_timepoint_timeout(deadline)) == 0) {
/* waiting for reader to complete operation */
if (sys_sem_take(&rwl->reader_active, k_timeout) == 0) {
if (sys_sem_take(&rwl->reader_active, sys_timepoint_timeout(deadline)) == 0) {
rwl->wr_owner = k_current_get();
} else {
(void)sys_sem_give(&rwl->wr_sem);
Expand Down
Loading