Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 9 additions & 12 deletions sched/semaphore/sem_rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,21 +170,19 @@ void up_read(FAR rw_semaphore_t *rwsem)
if (--rwsem->writer <= 0)
{
rwsem->holder = RWSEM_NO_HOLDER;
up_wait(rwsem);
}

goto out;
}

DEBUGASSERT(rwsem->reader > 0);

rwsem->reader--;

if (rwsem->waiter > 0)
else
{
up_wait(rwsem);
DEBUGASSERT(rwsem->reader > 0);

if (--rwsem->reader <= 0)
{
up_wait(rwsem);
}
}

out:
nxmutex_unlock(&rwsem->protected);
}

Expand Down Expand Up @@ -279,10 +277,9 @@ void up_write(FAR rw_semaphore_t *rwsem)
if (--rwsem->writer <= 0)
{
rwsem->holder = RWSEM_NO_HOLDER;
up_wait(rwsem);
}

up_wait(rwsem);

nxmutex_unlock(&rwsem->protected);
}

Expand Down
Loading