Priorities are now Int8 values.

Int8(0) is neutral, higher values have priority over lower values.

Author: BenLauwens

src/coroutines.jl

@@ -78,7 +78,7 @@ end
 function interrupt(proc::Coroutine, cause::Any=nothing)
   if !iscoroutinedone(proc.fsm)
     remove_callback(proc.resume, proc.target)
-    proc.target = Timeout(environment(proc), priority=true, value=InterruptException(proc, cause))
+    proc.target = Timeout(environment(proc), priority=typemax(Int8), value=InterruptException(proc, cause))
     proc.resume = append_callback(execute, proc.target, proc)
   end
 end

src/events.jl

@@ -9,7 +9,7 @@ function Event{E<:Environment}(env::E)
   Event{E}(env)
 end
 
-function succeed{E<:Environment}(ev::Event{E}; priority::Bool=false, value::Any=nothing) :: Event{E}
+function succeed{E<:Environment}(ev::Event{E}; priority::Int8=Int8(0), value::Any=nothing) :: Event{E}
   sta = state(ev)
   if sta == scheduled || sta == triggered
     throw(EventNotIdle(ev))
@@ -18,7 +18,7 @@ function succeed{E<:Environment}(ev::Event{E}; priority::Bool=false, value::Any=
   return ev
 end
 
-function fail{E<:Environment}(ev::Event{E}, exc::Exception; priority::Bool=false) :: Event{E}
+function fail{E<:Environment}(ev::Event{E}, exc::Exception; priority::Int8=Int8(0)) :: Event{E}
   succeed(ev, priority=priority, value=exc)
 end
 
@@ -43,17 +43,17 @@ Timeout{E<:Environment} <: AbstractEvent{E}
 
 struct Timeout{E<:Environment} <: AbstractEvent{E}
   bev :: BaseEvent{E}
-  function Timeout{E}(env::E, delay::Union{Period, Number}, priority::Bool, value::Any) where E<:Environment
+  function Timeout{E}(env::E, delay::Union{Period, Number}, priority::Int8, value::Any) where E<:Environment
     ev = new(BaseEvent(env))
     schedule(ev.bev, delay, priority=priority, value=value)
     return ev
   end
 end
 
-function Timeout{E<:Environment}(env::E, delay::Period; priority::Bool=false, value::Any=nothing) :: Timeout{E}
+function Timeout{E<:Environment}(env::E, delay::Period; priority::Int8=Int8(0), value::Any=nothing) :: Timeout{E}
   Timeout{E}(env, delay, priority, value)
 end
 
-function Timeout{E<:Environment}(env::E, delay::Number=0; priority::Bool=false, value::Any=nothing) :: Timeout{E}
+function Timeout{E<:Environment}(env::E, delay::Number=0; priority::Int8=Int8(0), value::Any=nothing) :: Timeout{E}
   Timeout{E}(env, delay, priority, value)
 end

src/operators.jl

@@ -38,7 +38,7 @@ function check{E<:Environment}(ev::AbstractEvent{E}, op::Operator{E}, event_stat
     end
   elseif state(op) == scheduled
     if isa(val, Exception)
-      schedule(op.bev, priority=true, value=val)
+      schedule(op.bev, priority=typemax(Int8), value=val)
     else
       event_state_values[ev] = StateValue(state(ev), val)
     end

src/processes.jl

@@ -87,7 +87,7 @@ end
 function interrupt(proc::Process, cause::Any=nothing)
   if !istaskdone(proc.task)
     remove_callback(proc.resume, proc.target)
-    proc.target = Timeout(environment(proc), priority=true, value=InterruptException(proc, cause))
+    proc.target = Timeout(environment(proc), priority=typemax(Int8), value=InterruptException(proc, cause))
     proc.resume = append_callback(execute, proc.target, proc)
   end
 end

src/simulation.jl

@@ -1,6 +1,6 @@
 struct EventKey{T<:TimeType}
   time :: T
-  priority :: Bool
+  priority :: Int8
   id :: UInt
 end
 
@@ -154,13 +154,13 @@ function run(sim::Simulation) :: Any
   run(sim, typemax(sim.time)-sim.time)
 end
 
-function schedule{T<:TimeType}(bev::BaseEvent{Simulation{T}}, delay::Period; priority::Bool=false, value::Any=nothing)
+function schedule{T<:TimeType}(bev::BaseEvent{Simulation{T}}, delay::Period; priority::Int8=Int8(0), value::Any=nothing)
   bev.value = value
   bev.env.heap[bev] = EventKey{T}(bev.env.time + delay, priority, bev.env.sid+=one(UInt))
   bev.state = scheduled
 end
 
-function schedule{T<:TimeType}(bev::BaseEvent{Simulation{T}}, delay::Number=0; priority::Bool=false, value::Any=nothing)
+function schedule{T<:TimeType}(bev::BaseEvent{Simulation{T}}, delay::Number=0; priority::Int8=Int8(0), value::Any=nothing)
   P = typeof(eps(bev.env.time))
   schedule(bev, P(delay), priority=priority, value=value)
 end