sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pthread: use cancel cleanup handlers in rwlock

Browse Source
This commit is contained in:
Juha Niskanen 2017-04-10 07:18:16 -06:00 committed by Gregory Nutt
parent 77f980e676
commit 755e9312b5
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libc/pthread/pthread_rwlock_rdlock.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* libc/pthread/pthread_rwlockread.c * libc/pthread/pthread_rwlock_rdlock.c
* *
* Copyright (C) 2017 Mark Schulte. All rights reserved. * Copyright (C) 2017 Mark Schulte. All rights reserved.
* Author: Mark Schulte <mark@mjs.pw> * Author: Mark Schulte <mark@mjs.pw>
@ -50,6 +50,15 @@
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_PTHREAD_CLEANUP
static void rdlock_cleanup(FAR void *arg)
{
FAR pthread_rwlock_t *rw_lock = (FAR pthread_rwlock_t *)arg;
pthread_mutex_unlock(&rw_lock->lock);
}
#endif
static int tryrdlock(FAR pthread_rwlock_t *rw_lock) static int tryrdlock(FAR pthread_rwlock_t *rw_lock)
{ {
int err; int err;
@ -116,6 +125,9 @@ int pthread_rwlock_timedrdlock(FAR pthread_rwlock_t *rw_lock,
return err; return err;
} }
#ifdef CONFIG_PTHREAD_CLEANUP
pthread_cleanup_push(&rdlock_cleanup, rw_lock);
#endif
while ((err = tryrdlock(rw_lock)) == EBUSY) while ((err = tryrdlock(rw_lock)) == EBUSY)
{ {
if (ts != NULL) if (ts != NULL)
@ -132,6 +144,9 @@ int pthread_rwlock_timedrdlock(FAR pthread_rwlock_t *rw_lock,
break; break;
} }
} }
#ifdef CONFIG_PTHREAD_CLEANUP
pthread_cleanup_pop(0);
#endif
pthread_mutex_unlock(&rw_lock->lock); pthread_mutex_unlock(&rw_lock->lock);
return err; return err;

27
libc/pthread/pthread_rwlock_wrlock.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* libc/pthread/pthread_rwlockwrite.c * libc/pthread/pthread_rwlock_wrlock.c
* *
* Copyright (C) 2017 Mark Schulte. All rights reserved. * Copyright (C) 2017 Mark Schulte. All rights reserved.
* Author: Mark Schulte <mark@mjs.pw> * Author: Mark Schulte <mark@mjs.pw>
@ -46,15 +46,29 @@
#include <nuttx/semaphore.h> #include <nuttx/semaphore.h>
/****************************************************************************
* Private Functions
****************************************************************************/
#ifdef CONFIG_PTHREAD_CLEANUP
static void wrlock_cleanup(FAR void *arg)
{
FAR pthread_rwlock_t *rw_lock = (FAR pthread_rwlock_t *)arg;
rw_lock->num_writers--;
pthread_mutex_unlock(&rw_lock->lock);
}
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: pthread_rwlock_rdlock * Name: pthread_rwlock_wrlock
* *
* Description: * Description:
* Locks a read/write lock for reading * Locks a read/write lock for writing
* *
* Parameters: * Parameters:
* None * None
@ -106,6 +120,9 @@ int pthread_rwlock_timedwrlock(FAR pthread_rwlock_t *rw_lock,
rw_lock->num_writers++; rw_lock->num_writers++;
#ifdef CONFIG_PTHREAD_CLEANUP
pthread_cleanup_push(&wrlock_cleanup, rw_lock);
#endif
while (rw_lock->write_in_progress || rw_lock->num_readers > 0) while (rw_lock->write_in_progress || rw_lock->num_readers > 0)
{ {
if (ts != NULL) if (ts != NULL)
@ -122,12 +139,14 @@ int pthread_rwlock_timedwrlock(FAR pthread_rwlock_t *rw_lock,
break; break;
} }
} }
#ifdef CONFIG_PTHREAD_CLEANUP
pthread_cleanup_pop(0);
#endif
if (err == 0) if (err == 0)
{ {
rw_lock->write_in_progress = true; rw_lock->write_in_progress = true;
} }
else else
{ {
/* In case of error, notify any blocked readers. */ /* In case of error, notify any blocked readers. */