summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-01-09 09:17:05 -0500
committerBen Gamari <ben@smart-cactus.org>2019-01-09 09:19:23 -0500
commit37a7a83772a643c307c06cfaba8c98e943d06fd1 (patch)
tree60e594f5d71c54864a0effc4c96f3abfa5dba504
parent65c2b249a398bcd1c53acf51f36c2018d5b78ef3 (diff)
downloadhaskell-wip/T16150.tar.gz
rts: Use always-available locking operations in pthread Itimer implementationwip/T16150
Previously we ACQUIRE_LOCK and RELEASE_LOCK but these compile to a noop in the non-threaded RTS, as noted in #16150. Use OS_ACQUIRE_LOCK and OS_RELEASE_LOCK instead.
-rw-r--r--rts/posix/itimer/Pthread.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/rts/posix/itimer/Pthread.c b/rts/posix/itimer/Pthread.c
index 817c40f218..6f9cd8f4b3 100644
--- a/rts/posix/itimer/Pthread.c
+++ b/rts/posix/itimer/Pthread.c
@@ -134,12 +134,12 @@ static void *itimer_thread_func(void *_handle_tick)
// first try a cheap test
if (stopped) {
- ACQUIRE_LOCK(&mutex);
+ OS_ACQUIRE_LOCK(&mutex);
// should we really stop?
if (stopped) {
waitCondition(&start_cond, &mutex);
}
- RELEASE_LOCK(&mutex);
+ OS_RELEASE_LOCK(&mutex);
} else {
handle_tick(0);
}
@@ -176,19 +176,19 @@ initTicker (Time interval, TickProc handle_tick)
void
startTicker(void)
{
- ACQUIRE_LOCK(&mutex);
+ OS_ACQUIRE_LOCK(&mutex);
stopped = 0;
signalCondition(&start_cond);
- RELEASE_LOCK(&mutex);
+ OS_RELEASE_LOCK(&mutex);
}
/* There may be at most one additional tick fired after a call to this */
void
stopTicker(void)
{
- ACQUIRE_LOCK(&mutex);
+ OS_ACQUIRE_LOCK(&mutex);
stopped = 1;
- RELEASE_LOCK(&mutex);
+ OS_RELEASE_LOCK(&mutex);
}
/* There may be at most one additional tick fired after a call to this */