Fix bug in interrupting not yet started process

Author: BenLauwens

docs/src/examples/ross.md

@@ -49,16 +49,13 @@ const G = Exponential(MU)
 end
 
 @resumable function start_sim(env::Environment, repair_facility::Resource, spares::Store{Process})
-    procs = Process[]
-    for i in 1:N 
-        push!(procs, @process machine(env, repair_facility, spares)) 
-    end
-    @yield timeout(env)
-    for proc in procs 
+    for i in 1:N
+        proc = @process machine(env, repair_facility, spares)
         @yield interrupt(proc)
     end
-    for i in 1:S 
-        @yield put(spares, @process machine(env, repair_facility, spares)) 
+    for i in 1:S
+        proc =  @process machine(env, repair_facility, spares)
+        @yield put(spares, proc) 
     end
 end
 

src/events.jl

@@ -28,7 +28,7 @@ end
 struct Initialize <: AbstractEvent
   bev :: BaseEvent
   function Initialize(env::Environment)
-    schedule(new(BaseEvent(env)))
+    new(BaseEvent(env))
   end
 end
 

src/old/processes.jl

@@ -23,7 +23,7 @@ mutable struct OldProcess <: DiscreteProcess
     proc = new()
     proc.bev = BaseEvent(env)
     proc.task = @task func(env, args...)
-    proc.target = timeout(env)
+    proc.target = schedule(Initialize(env))
     proc.resume = @callback execute(proc.target, proc)
     return proc
   end
@@ -58,10 +58,17 @@ function execute(ev::AbstractEvent, proc::OldProcess)
   end
 end
 
+function execute_interrupt(ev::Interrupt, proc::OldProcess)
+  remove_callback(proc.resume, proc.target)
+  execute(ev, proc)
+end
+
 function interrupt(proc::OldProcess, cause::Any=nothing)
+  env = environment(proc)
   if !istaskdone(proc.task)
-    remove_callback(proc.resume, proc.target)
-    proc.target = schedule(Interrupt(environment(proc)); priority=typemax(Int8), value=InterruptException(proc, cause))
-    proc.resume = @callback execute(proc.target, proc)
+    proc.target isa Initialize && schedule(proc.target; priority=typemax(Int8))
+    target = schedule(Interrupt(env); priority=typemax(Int8), value=InterruptException(active_process(env), cause))
+    @callback execute_interrupt(target, proc)
   end
+  timeout(env; priority=typemax(Int8))
 end

src/processes.jl

@@ -4,12 +4,12 @@ mutable struct Process <: DiscreteProcess
   target :: AbstractEvent
   resume :: Function
   function Process(func::Function, env::Environment, args::Any...)
-    cor = new()
-    cor.bev = BaseEvent(env)
-    cor.fsmi = func(env, args...)
-    cor.target = Initialize(env)
-    cor.resume = @callback execute(cor.target, cor)
-    cor
+    proc = new()
+    proc.bev = BaseEvent(env)
+    proc.fsmi = func(env, args...)
+    proc.target = schedule(Initialize(env))
+    proc.resume = @callback execute(proc.target, proc)
+    proc
   end
 end
 
@@ -35,12 +35,17 @@ function execute(ev::AbstractEvent, proc::Process)
   end
 end
 
+function execute_interrupt(ev::Interrupt, proc::Process)
+  remove_callback(proc.resume, proc.target)
+  execute(ev, proc)
+end
+
 function interrupt(proc::Process, cause::Any=nothing)
   env = environment(proc)
   if !done(proc.fsmi)
-    remove_callback(proc.resume, proc.target)
-    proc.target = schedule(Interrupt(env); priority=typemax(Int8), value=InterruptException(proc, cause))
-    proc.resume = @callback execute(proc.target, proc)
+    proc.target isa Initialize && schedule(proc.target; priority=typemax(Int8))
+    target = schedule(Interrupt(env); priority=typemax(Int8), value=InterruptException(active_process(env), cause))
+    @callback execute_interrupt(target, proc)
   end
   timeout(env; priority=typemax(Int8))
 end