Some updates in resources

Author: BenLauwens

src/SimJulia.jl

@@ -9,7 +9,7 @@ module SimJulia
   using Base.Dates
   using TaylorSeries
 
-  import Base.run, Base.now, Base.isless, Base.show, Base.interrupt, Base.yield
+  import Base.run, Base.now, Base.isless, Base.show, Base.interrupt, Base.yield, Base.length
   import Base.(&), Base.(|)
   import TaylorSeries.evaluate
 

src/resources/base.jl

@@ -23,31 +23,31 @@ function isless(a::ResourceKey, b::ResourceKey)
 end
 
 function trigger_put(put_ev::ResourceEvent, res::AbstractResource)
-  queue = DataStructures.PriorityQueue(res.Put_queue)
+  queue = DataStructures.PriorityQueue(res.put_queue)
   while length(queue) > 0
     (put_ev, key) = DataStructures.peek(queue)
     proceed = do_put(res, put_ev, key)
-    state(put_ev) == scheduled && DataStructures.dequeue!(res.Put_queue, put_ev)
+    state(put_ev) == scheduled && DataStructures.dequeue!(res.put_queue, put_ev)
     proceed ? DataStructures.dequeue!(queue) : break
   end
 end
 
 function trigger_get(get_ev::ResourceEvent, res::AbstractResource)
-  queue = DataStructures.PriorityQueue(res.Get_queue)
+  queue = DataStructures.PriorityQueue(res.get_queue)
   while length(queue) > 0
     (get_ev, key) = DataStructures.peek(queue)
     proceed = do_get(res, get_ev, key)
-    state(get_ev) == scheduled && DataStructures.dequeue!(res.Get_queue, get_ev)
+    state(get_ev) == scheduled && DataStructures.dequeue!(res.get_queue, get_ev)
     proceed ? DataStructures.dequeue!(queue) : break
   end
 end
 
 function cancel(res::AbstractResource, put_ev::Put)
-  DataStructures.dequeue!(res.Put_queue, put_ev)
+  DataStructures.dequeue!(res.put_queue, put_ev)
 end
 
 function cancel(res::AbstractResource, get_ev::Get)
-  DataStructures.dequeue!(res.Get_queue, get_ev)
+  DataStructures.dequeue!(res.get_queue, get_ev)
 end
 
 function capacity(res::AbstractResource)

src/resources/containers.jl

@@ -9,8 +9,8 @@ mutable struct Container{N<:Number} <: AbstractResource
   capacity :: N
   level :: N
   seid :: UInt
-  Put_queue :: DataStructures.PriorityQueue{Put, ContainerKey{N}}
-  Get_queue :: DataStructures.PriorityQueue{Get, ContainerKey{N}}
+  put_queue :: DataStructures.PriorityQueue{Put, ContainerKey{N}}
+  get_queue :: DataStructures.PriorityQueue{Get, ContainerKey{N}}
   function Container{N}(env::Environment, capacity::N, level::N) where {N<:Number}
     new(env, capacity, level, zero(UInt), DataStructures.PriorityQueue(Put, ContainerKey{N}), DataStructures.PriorityQueue(Get, ContainerKey{N}))
   end
@@ -28,7 +28,7 @@ end
 
 function Put{N<:Number}(con::Container{N}, amount::N; priority::Int=0) :: Put
   put_ev = Put(con.env)
-  con.Put_queue[put_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
+  con.put_queue[put_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
   @callback trigger_get(put_ev, con)
   trigger_put(put_ev, con)
   put_ev
@@ -65,7 +65,7 @@ end
 
 function Get{N<:Number}(con::Container{N}, amount::N; priority::Int=0) :: Get
   get_ev = Get(con.env)
-  con.Get_queue[get_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
+  con.get_queue[get_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
   @callback trigger_put(get_ev, con)
   trigger_get(get_ev, con)
   get_ev
@@ -88,3 +88,7 @@ function do_get{N<:Number}(con::Container{N}, get_ev::Get, key::ContainerKey{N})
   con.level -= key.amount
   true
 end
+
+function length(res::Resource)
+  length(res.put_queue)
+end

src/resources/stores.jl

@@ -15,8 +15,8 @@ mutable struct Store{T} <: AbstractResource
   capacity :: UInt
   items :: Set{T}
   seid :: UInt
-  Put_queue :: DataStructures.PriorityQueue{Put, StorePutKey{T}}
-  Get_queue :: DataStructures.PriorityQueue{Get, StoreGetKey}
+  put_queue :: DataStructures.PriorityQueue{Put, StorePutKey{T}}
+  get_queue :: DataStructures.PriorityQueue{Get, StoreGetKey}
   function Store{T}(env::Environment, capacity::UInt) where {T}
     new(env, capacity, Set{T}(), zero(UInt), DataStructures.PriorityQueue(Put, StorePutKey{T}), DataStructures.PriorityQueue(Get, StoreGetKey))
   end
@@ -28,7 +28,7 @@ end
 
 function Put{T}(sto::Store{T}, item::T; priority::Int=0) :: Put
   put_ev = Put(sto.env)
-  sto.Put_queue[put_ev] = StorePutKey(priority, sto.seid+=one(UInt), item)
+  sto.put_queue[put_ev] = StorePutKey(priority, sto.seid+=one(UInt), item)
   @callback trigger_get(put_ev, sto)
   trigger_put(put_ev, sto)
   return put_ev
@@ -40,7 +40,7 @@ end
 
 function Get{T}(sto::Store{T}, filter::Function=get_any_item; priority::Int=0) :: Get
   get_ev = Get(sto.env)
-  sto.Get_queue[get_ev] = StoreGetKey(priority, sto.seid+=one(UInt), filter)
+  sto.get_queue[get_ev] = StoreGetKey(priority, sto.seid+=one(UInt), filter)
   @callback trigger_put(get_ev, sto)
   trigger_get(get_ev, sto)
   return get_ev

test/containers.jl

@@ -66,59 +66,4 @@ con = Container(sim, 10.0; level=5.0)
 @coroutine my_producer(sim, con)
 run(sim)
 
-@resumable function resource_user(sim::Simulation, res::Resource, i::Int)
-  @request res req begin
-    println("Requested $i")
-    val = @yield return req | Timeout(sim, rand())
-    if val[req].state == SimJulia.triggered
-      println("Received $i")
-      @yield return Timeout(sim, rand())
-    else
-      println("Timeout $i")
-    end
-  end
-  println("Released automatically $i")
-end
-
-@resumable function create_users(sim::Simulation)
-  res = Resource(sim)
-  i = 1
-  while true
-    @coroutine resource_user(sim, res, i)
-    @yield return Timeout(sim, rand())
-    i == 10 && break
-    i += 1
-  end
-  capacity(res)
-end
-
-sim = Simulation()
-@coroutine create_users(sim)
-run(sim)
-
-function resource_user_process(sim::Simulation, res::Resource, i::Int)
-  request(res) do req
-    println("Requested $i")
-    val = yield(req | Timeout(sim, rand()))
-    if val[req].state == SimJulia.triggered
-      println("Received $i")
-      yield(Timeout(sim, rand()))
-    else
-      println("Timeout $i")
-    end
-  end
-  println("Released automatically $i")
-end
-
-function create_users_process(sim::Simulation)
-  res = Resource(sim)
-  for i = 1:10
-    @process resource_user_process(sim, res, i)
-    yield(Timeout(sim, rand()))
-  end
-  capacity(res)
-end
-
-sim = Simulation()
-@process create_users_process(sim)
-run(sim)
+