From 37a7a83772a643c307c06cfaba8c98e943d06fd1 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 9 Jan 2019 09:17:05 -0500 Subject: rts: Use always-available locking operations in pthread Itimer implementation 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. --- rts/posix/itimer/Pthread.c | 12 ++++++------ 1 file 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 */ -- cgit v1.2.1