From 627645acc074eab7a3694a267bc2a643d8b3e57a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 5 Feb 2016 15:05:30 +0100 Subject: First steps in make signals more abstract from the underlying mechanism; replace epoll with poll. We now don't assume that a signal equals a single fd (eventfd on Linux). The next step would be to create a version of signal.c that uses a pipe internally, so it can be used on other platforms, like *BSD. This is also the reason epoll was replaced with poll in uplink.c --- src/server/locks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/locks.c') diff --git a/src/server/locks.c b/src/server/locks.c index bc8b18e..294f862 100644 --- a/src/server/locks.c +++ b/src/server/locks.c @@ -50,7 +50,7 @@ static int init_done = 0; static pthread_spinlock_t initdestory; static int lockId = 0; static pthread_t watchdog = 0; -static int watchdogSignal = -1; +static dnbd3_signal_t* watchdogSignal = NULL; static void *debug_thread_watchdog(void *something); @@ -278,7 +278,7 @@ static void *debug_thread_watchdog(void *something UNUSED) } pthread_spin_unlock( &initdestory ); } - if ( watchdogSignal == -1 || signal_wait( watchdogSignal, 5000 ) == SIGNAL_ERROR ) sleep( 5 ); + if ( watchdogSignal == NULL || signal_wait( watchdogSignal, 5000 ) == SIGNAL_ERROR ) sleep( 5 ); } return NULL ; } -- cgit v1.2.3-55-g7522