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

Cygwin: Implement pthread_tryjoin_np and pthread_timedjoin_np

Browse Source 
- Move pthread_join to thread.cc to have all `join' calls in
  the same file (pthread_timedjoin_np needs pthread_convert_abstime
  which is static inline in thread.cc)
- Bump API version

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2018-06-27 17:56:59 +02:00
parent 006520ca2b
commit 732e0b395d
7 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
winsup/cygwin/thread.cc
View File

@@ -2421,7 +2421,7 @@ pthread_attr_destroy (pthread_attr_t *attr)
}
int
pthread::join (pthread_t *thread, void **return_val)
pthread::join (pthread_t *thread, void **return_val, PLARGE_INTEGER timeout)
{
pthread_t joiner = self ();
@@ -2453,7 +2453,7 @@ pthread::join (pthread_t *thread, void **return_val)
(*thread)->attr.joinable = PTHREAD_CREATE_DETACHED;
(*thread)->mutex.unlock ();
switch (cygwait ((*thread)->win32_obj_id, cw_infinite,
switch (cygwait ((*thread)->win32_obj_id, timeout,
cw_sig | cw_sig_restart | cw_cancel))
{
case WAIT_OBJECT_0:
@@ -2468,6 +2468,11 @@ pthread::join (pthread_t *thread, void **return_val)
joiner->cancel_self ();
// never reached
break;
case WAIT_TIMEOUT:
// set joined thread back to joinable since we got canceled
(*thread)->joiner = NULL;
(*thread)->attr.joinable = PTHREAD_CREATE_JOINABLE;
return EBUSY;
default:
// should never happen
return EINVAL;
@@ -2574,6 +2579,32 @@ pthread_convert_abstime (clockid_t clock_id, const struct timespec *abstime,
return 0;
}
extern "C" int
pthread_join (pthread_t thread, void **return_val)
{
return pthread::join (&thread, (void **) return_val, NULL);
}
extern "C" int
pthread_tryjoin_np (pthread_t thread, void **return_val)
{
LARGE_INTEGER timeout = { 0, 0 };
return pthread::join (&thread, (void **) return_val, &timeout);
}
extern "C" int
pthread_timedjoin_np (pthread_t thread, void **return_val,
const struct timespec *abstime)
{
LARGE_INTEGER timeout;
int err = pthread_convert_abstime (CLOCK_REALTIME, abstime, &timeout);
if (err)
return err;
return pthread::join (&thread, (void **) return_val, &timeout);
}
extern "C" int
pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
{