Modify interrupt handling

Author: BenLauwens

docs/src/examples/ross.md

@@ -37,7 +37,7 @@ const G = Exponential(MU)
         get_spare = Get(spares)
         @yield get_spare | Timeout(env)
         if state(get_spare) != SimJulia.idle 
-            interrupt(value(get_spare))
+            @yield interrupt(value(get_spare))
         else
             throw(SimJulia.StopSimulation("No more spares!"))
         end
@@ -55,7 +55,7 @@ end
     end
     @yield Timeout(env)
     for proc in procs 
-        interrupt(proc)
+        @yield interrupt(proc)
     end
     for i in 1:S 
         @yield Put(spares, @process machine(env, repair_facility, spares)) 

docs/src/tutorial.md

@@ -184,7 +184,7 @@ julia> using SimJulia
 
 julia> @resumable function driver(env::Environment, car_process::Process)
          @yield Timeout(env, 3)
-         interrupt(car_process)
+         @yield interrupt(car_process)
        end
 driver (generic function with 1 method)
 ```
@@ -233,7 +233,7 @@ DocTestSetup = quote
 
   @resumable function driver(env::Environment, car_process::Process)
     @yield Timeout(env, 3)
-    interrupt(car_process)
+    @yield interrupt(car_process)
   end
 
   @resumable function charge(env::Environment, duration::Number)

src/old/processes.jl

@@ -61,7 +61,7 @@ end
 function interrupt(proc::OldProcess, cause::Any=nothing)
   if !istaskdone(proc.task)
     remove_callback(proc.resume, proc.target)
-    proc.target = Timeout(environment(proc); priority=typemax(Int8), value=InterruptException(proc, cause))
+    proc.target = schedule(Interrupt(environment(proc)); priority=typemax(Int8), value=InterruptException(proc, cause))
     proc.resume = @callback execute(proc.target, proc)
   end
 end

src/processes.jl

@@ -36,9 +36,11 @@ function execute(ev::AbstractEvent, proc::Process)
 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(environment(proc)); priority=typemax(Int8), value=InterruptException(proc, cause))
+    proc.target = schedule(Interrupt(env); priority=typemax(Int8), value=InterruptException(proc, cause))
     proc.resume = @callback execute(proc.target, proc)
   end
+  Timeout(env; priority=typemax(Int8))
 end

test/processes.jl

@@ -25,7 +25,7 @@ end
 
 @resumable function test_interrupter(sim::Simulation, proc::Process)
   @yield Timeout(sim, 2)
-  interrupt(proc)
+  @yield interrupt(proc)
 end
 
 @resumable function test_interrupted(sim::Simulation)