JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cygwin: Implement pthread_rwlock_timedrdlock, pthread_rwlock_timedwrlock

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2017-08-03 21:31:38 +02:00
parent eb206317a8
commit 8128f5482f
7 changed files with 84 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
winsup/cygwin/thread.cc
View File

@@ -1413,7 +1413,7 @@ pthread_rwlock::~pthread_rwlock ()
}
int
pthread_rwlock::rdlock ()
pthread_rwlock::rdlock (PLARGE_INTEGER timeout)
{
int result = 0;
struct RWLOCK_READER *reader;
@@ -1435,7 +1435,7 @@ pthread_rwlock::rdlock ()
pthread_cleanup_push (pthread_rwlock::rdlock_cleanup, this);
++waiting_readers;
cond_readers.wait (&mtx);
cond_readers.wait (&mtx, timeout);
--waiting_readers;
pthread_cleanup_pop (0);
@@ -1481,7 +1481,7 @@ pthread_rwlock::tryrdlock ()
}
int
pthread_rwlock::wrlock ()
pthread_rwlock::wrlock (PLARGE_INTEGER timeout)
{
int result = 0;
pthread_t self = pthread::self ();
@@ -1499,7 +1499,7 @@ pthread_rwlock::wrlock ()
pthread_cleanup_push (pthread_rwlock::wrlock_cleanup, this);
++waiting_writers;
cond_writers.wait (&mtx);
cond_writers.wait (&mtx, timeout);
--waiting_writers;
pthread_cleanup_pop (0);
@@ -3045,6 +3045,37 @@ pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
return (*rwlock)->rdlock ();
}
extern "C" int
pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
LARGE_INTEGER timeout;
pthread_testcancel ();
if (pthread_rwlock::is_initializer (rwlock))
pthread_rwlock::init (rwlock, NULL);
if (!pthread_rwlock::is_good_object (rwlock))
return EINVAL;
/* According to SUSv3, abstime need not be checked for validity,
if the rwlock can be locked immediately. */
if (!(*rwlock)->tryrdlock ())
return 0;
__try
{
int err = pthread_convert_abstime (CLOCK_REALTIME, abstime, &timeout);
if (err)
return err;
return (*rwlock)->rdlock (&timeout);
}
__except (NO_ERROR) {}
__endtry
return EINVAL;
}
extern "C" int
pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
{
@@ -3069,6 +3100,37 @@ pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
return (*rwlock)->wrlock ();
}
extern "C" int
pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
LARGE_INTEGER timeout;
pthread_testcancel ();
if (pthread_rwlock::is_initializer (rwlock))
pthread_rwlock::init (rwlock, NULL);
if (!pthread_rwlock::is_good_object (rwlock))
return EINVAL;
/* According to SUSv3, abstime need not be checked for validity,
if the rwlock can be locked immediately. */
if (!(*rwlock)->trywrlock ())
return 0;
__try
{
int err = pthread_convert_abstime (CLOCK_REALTIME, abstime, &timeout);
if (err)
return err;
return (*rwlock)->wrlock (&timeout);
}
__except (NO_ERROR) {}
__endtry
return EINVAL;
}
extern "C" int
pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
{