flock: improve timeout handling

Signal ALRM raised by the timer, and the timer only, will be considered
as a timeout criteria.

Secondly time interval is made to use monotonic clock.  Documentation of
ITIMER_REAL is unclear whether that time is affected various sources of
clock skew, or does it even tick when system is suspended.

Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

1 files changed, 0 insertions, 31 deletions

diff --git a/include/timer.h b/include/timer.h
deleted file mode 100644
index 79ef64919..000000000
--- a/include/timer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef UTIL_LINUX_TIMER_H
-#define UTIL_LINUX_TIMER_H
-
-#include <signal.h>
-#include <sys/time.h>
-
-static inline int setup_timer(
-			struct itimerval *timer,
-			struct itimerval *old_timer,
-			struct sigaction *old_sa,
-			void (*timeout_handler)(int))
-{
-	struct sigaction sa;
-
-	memset(&sa, 0, sizeof sa);
-	sa.sa_handler = timeout_handler;
-	sa.sa_flags = SA_RESETHAND;
-	sigaction(SIGALRM, &sa, old_sa);
-
-	return setitimer(ITIMER_REAL, timer, old_timer);
-}
-
-static inline void cancel_timer(
-			struct itimerval *old_timer,
-			struct sigaction *old_sa)
-{
-	setitimer(ITIMER_REAL, old_timer, NULL);
-	sigaction(SIGALRM, old_sa, NULL);
-}
-
-#endif