scheduler-aware sleep(). fixes JuliaLang#2577

old sleep renamed usleep(), not exported. not sure if we need it.
jiahao · Mar 16, 2013 · 471828a · 471828a
1 parent ac44d6a
commit 471828a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/base/libc.jl b/base/libc.jl
@@ -1,8 +1,8 @@
 ## time-related functions ##
 
 # TODO: check for usleep errors?
-@unix_only sleep(s::Real) = ccall(:usleep, Int32, (Uint32,), uint32(iround(s*1e6)))
-@windows_only sleep(s::Real) = (ccall(:Sleep, stdcall, Void, (Uint32,), uint32(iround(s*1e3))); return int32(0))
+@unix_only usleep(s::Real) = ccall(:usleep, Int32, (Uint32,), uint32(iround(s*1e6)))
+@windows_only usleep(s::Real) = (ccall(:Sleep, stdcall, Void, (Uint32,), uint32(iround(s*1e3))); return int32(0))
 
 strftime(t) = strftime("%c", t)
 function strftime(fmt::ByteString, t)

diff --git a/base/stream.jl b/base/stream.jl
@@ -275,6 +275,18 @@ function stop_timer(timer::TimeoutAsyncWork)
  ccall(:jl_timer_stop,Int32,(Ptr{Void},),timer.handle)
 end
 
+function sleep(sec::Real)
+ timer = TimeoutAsyncWork(status->tasknotify([wt], status))
+ wt = WaitTask(timer, false)
+ start_timer(timer, iround(sec*1000), 0)
+ args = yield(wt)
+ if isa(args,InterruptException)
+ stop_timer(timer)
+ error(args)
+ end
+ nothing
+end
+
 assignIdleAsyncWork(work::IdleAsyncWork,cb::Function) = ccall(:jl_idle_start,Ptr{Void},(Ptr{Void},),work.handle)
 
 function add_idle_cb(loop::Ptr{Void},cb::Function)