diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-10-14 17:19:15 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-10-14 17:19:15 +0100 |
| commit | 8af2d940c786136a29a061fa9542e39f65e6d6fb (patch) | |
| tree | d6c9b1c82c75d863379994d409705810e085d651 | |
| parent | 8f4cb4dc66ed389634f2200306663bf6292114c8 (diff) | |
| parent | 5f3c1055c2a5a59117985420909dd9148d7b2ba6 (diff) | |
| download | haskell-8af2d940c786136a29a061fa9542e39f65e6d6fb.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
| -rw-r--r-- | rts/posix/Itimer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rts/posix/Itimer.c b/rts/posix/Itimer.c index 8c9b1f8847..80b3b56945 100644 --- a/rts/posix/Itimer.c +++ b/rts/posix/Itimer.c @@ -204,6 +204,9 @@ void exitTicker (rtsBool wait STG_UNUSED) { #if defined(USE_TIMER_CREATE) + // Before deleting the timer set the signal to ignore to avoid the + // possibility of the signal being delivered after the timer is deleted. + signal(ITIMER_SIGNAL, SIG_IGN); timer_delete(timer); // ignore errors - we don't really care if it fails. #endif |