From 98cb2efd8279ec48eee1be37dad263e16552fafb Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 28 Nov 2006 21:05:16 +0000 Subject: [PATCH] Make the non-threaded-RTS threadDelay wait at least as long as asked --- rts/PrimOps.cmm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 3252993..bfb0b86 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -2052,8 +2052,11 @@ delayzh_fast #else W_ time; + W_ divisor; time = foreign "C" getourtimeofday() [R1]; - target = (R1 / (TO_W_(RtsFlags_MiscFlags_tickInterval(RtsFlags))*1000)) + time; + divisor = TO_W_(RtsFlags_MiscFlags_tickInterval(RtsFlags))*1000; + target = ((R1 + divisor - 1) / divisor) /* divide rounding up */ + + time + 1; /* Add 1 as getourtimeofday rounds down */ StgTSO_block_info(CurrentTSO) = target; /* Insert the new thread in the sleeping queue. */ -- 1.7.10.4