cleanup

Author: Krastanov

examples/repeatergrid/1a_async_interactive_visualization.jl

@@ -1,5 +1,4 @@
-#using GLMakie
-using CairoMakie
+using GLMakie
 # TODO significant code duplication with the other examples
 
 include("setup.jl")

src/ProtocolZoo/cutoff.jl

@@ -45,7 +45,6 @@ end
             end
             if now(prot.sim) - reg.tag_info[info.id][3] > prot.retention_time # TODO this should be part of the query interface, not using non-public implementation details
                 untag!(slot, info.id)
-                println("EntanglementDelete in CutoffProt traceout $(prot.node).$(slot.idx)")
                 traceout!(slot)
                 msg = Tag(EntanglementDelete, prot.node, slot.idx, info.tag[2], info.tag[3])
                 tag!(slot, msg)

src/ProtocolZoo/swapping.jl

@@ -95,7 +95,6 @@ end
         uptotime!((q1, q2), now(prot.sim))
         swapcircuit = LocalEntanglementSwap()
         xmeas, zmeas = swapcircuit(q1, q2)
-        println("$(now(prot.sim)) SwapperProt on $(prot.node).$(q1.idx) and $(q2.idx) and forwarding to $(tag1[2]).$(tag1[3]) and $(tag2[2]).$(tag2[3])")
         # send from here to new entanglement counterpart:
         # tag with EntanglementUpdateX past_local_node, past_local_slot_idx past_remote_slot_idx new_remote_node, new_remote_slot, correction
         msg1 = Tag(EntanglementUpdateX, prot.node, q1.idx, tag1[3], tag2[2], tag2[3], Int(xmeas))

src/semaphore.jl

@@ -66,6 +66,7 @@ function islocked(s::AsymmetricSemaphore)
 end
 
 function nbwaiters(s::AsymmetricSemaphore)
-    s1, s2 = s.semaphorepair
-    return s1.nbwaiters + s2.nbwaiters
+    #s1, s2 = s.semaphorepair
+    #return s1.nbwaiters + s2.nbwaiters
+    return s.semaphorepair[s.current_semaphore].nbwaiters
 end

test/test_messagebuffer.jl

@@ -43,4 +43,35 @@ proc4 = put!(messagebuffer(net[1]), SwitchRequest(2,3))
 run(sim, 10)
 @test QuantumSavory.peektags(messagebuffer(net,1)) == [Tag(SwitchRequest(2,3)), Tag(SwitchRequest(2,3)), Tag(SwitchRequest(2,3)), Tag(SwitchRequest(2,3))]
 @test_throws "does not support `tag!`" tag!(messagebuffer(net, 1), EntanglementCounterpart, 1, 10)
+
+##
+
+reg = Register(10)
+net = RegisterNet([reg])
+sim = get_time_tracker(net)
+mb = messagebuffer(reg)
+put!(mb, Tag(:something, 1, 2))
+put!(mb, Tag(:something, 1, 2))
+put!(mb, Tag(:something, 1, 2))
+put!(mb, Tag(:something, 1, 2))
+@resumable function receiver(sim, LOG)
+    @yield wait(mb)
+    push!(LOG, "got result immediately")
+end
+LOG = []
+@process receiver(sim, LOG)
+put!(mb, Tag(:something, 1, 2))
+@process receiver(sim, LOG)
+@process receiver(sim, LOG)
+@process receiver(sim, LOG)
+run(sim, 1.0)
+@process receiver(sim, LOG)
+@process receiver(sim, LOG)
+put!(mb, Tag(:something, 1, 2))
+put!(mb, Tag(:something, 1, 2))
+@process receiver(sim, LOG)
+@process receiver(sim, LOG)
+run(sim, 2.0)
+@test length(LOG) == 7
+
 end

test/test_protocolzoo_entanglement_tracker_grid.jl

@@ -230,8 +230,7 @@ end
 # but also now with an unlimited number of rounds and an entanglement consumer.
 
 
-using Random; Random.seed!(12)
-n = 5 # the size of the square grid network (n × n)
+n = 6 # the size of the square grid network (n × n)
 regsize = 20 # the size of the quantum registers at each node
 
 graph = grid([n,n])
@@ -270,8 +269,7 @@ for v in vertices(net)
     cutoffprot = CutoffProt(sim, net, v, retention_time=10, period=nothing)
     @process cutoffprot()
 end
-run(sim, 18.249)
-run(sim, 400)
+@test_broken (run(sim, 400); true)
 
 for i in 1:length(consumer._log)
     @test consumer._log[i][2] ≈ 1.0