aboutsummaryrefslogtreecommitdiff
path: root/pthreads/pthread_delay_np.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:33:05 +0200
commit88101146f2ec7d53ffb793e365f05097ffd35fd3 (patch)
treedb77eef572a00c62c8d9485c4786f682e20a2fd0 /pthreads/pthread_delay_np.c
parent772373ccc8da2b2019555228f4972cc0c5a885a4 (diff)
downloadvcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2
vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip
cvs version of pthreads
Diffstat (limited to 'pthreads/pthread_delay_np.c')
-rw-r--r--pthreads/pthread_delay_np.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/pthreads/pthread_delay_np.c b/pthreads/pthread_delay_np.c
index 7fe9ae016..e6c96d807 100644
--- a/pthreads/pthread_delay_np.c
+++ b/pthreads/pthread_delay_np.c
@@ -102,7 +102,7 @@ pthread_delay_np (struct timespec *interval)
}
/* convert secs to millisecs */
- secs_in_millisecs = interval->tv_sec * 1000L;
+ secs_in_millisecs = (DWORD)interval->tv_sec * 1000L;
/* convert nanosecs to millisecs (rounding up) */
millisecs = (interval->tv_nsec + 999999L) / 1000000L;
@@ -141,20 +141,21 @@ pthread_delay_np (struct timespec *interval)
if (WAIT_OBJECT_0 ==
(status = WaitForSingleObject (sp->cancelEvent, wait_time)))
{
+ ptw32_mcs_local_node_t stateLock;
/*
* Canceling!
*/
- (void) pthread_mutex_lock (&sp->cancelLock);
+ ptw32_mcs_lock_acquire (&sp->stateLock, &stateLock);
if (sp->state < PThreadStateCanceling)
{
sp->state = PThreadStateCanceling;
sp->cancelState = PTHREAD_CANCEL_DISABLE;
- (void) pthread_mutex_unlock (&sp->cancelLock);
+ ptw32_mcs_lock_release (&stateLock);
ptw32_throw (PTW32_EPS_CANCEL);
}
- (void) pthread_mutex_unlock (&sp->cancelLock);
+ ptw32_mcs_lock_release (&stateLock);
return ESRCH;
}
else if (status != WAIT_TIMEOUT)