Merge pull request #44 from BenLauwens/release-0.4

Update containers

Author: BenLauwens

src/resources/containers.jl

@@ -38,18 +38,6 @@ const Request = Put
 
 Request(res::Resource; priority::Int=0) = Put(res, 1; priority=priority)
 
-macro request(res, req, expr)
-  esc(quote
-    $req = Request($res)
-    $expr
-    if state($req) == SimJulia.triggered
-      @yield Release($res)
-    else
-      cancel($res, $req)
-    end
-  end)
-end
-
 function request(func::Function, res::Resource; priority::Int=0)
   req = Request(res; priority=priority)
   try

test/containers.jl

@@ -57,4 +57,28 @@ con = Container(sim, 10.0; level=5.0)
 @coroutine my_producer(sim, con)
 run(sim)
 
- 
+function source(sim::Simulation, server::Resource)
+  i = 0
+  while true
+    i += 1
+    yield(Timeout(sim, rand()))
+    @process customer(sim, server, i)
+  end
+end
+
+function customer(sim::Simulation, server::Resource, i::Int)
+  request(server) do req
+    println(now(sim), ", customer $i arrives")
+    yield(req | Timeout(sim, rand()))
+    if state(req) != SimJulia.idle
+      println(now(sim), ", customer $i starts being served")
+      yield(Timeout(sim, rand()))
+    end
+    println(now(sim), ", customer $i leaves")
+  end
+end
+
+sim = Simulation()
+server = Resource(sim, 1)
+@process source(sim, server)
+run(sim, 10.0)