Merge pull request #61 from krynju/kr/finalizer-fixup

[swap-to-disk] Task switch in finalizer fix

Author: jpsamaroo

Project.toml

@@ -2,7 +2,7 @@ name = "MemPool"
 uuid = "f9f48841-c794-520a-933b-121f7ba6ed94"
 license = "MIT"
 desc = "a simple distributed data store"
-version = "0.4.0"
+version = "0.4.1"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

src/datastore.jl

@@ -503,19 +503,19 @@ function _getlocal(id, remote)
 end
 
 function datastore_delete(id; force=false)
-    with_lock(datastore_counters_lock) do
+    @safe_lock_spin datastore_counters_lock begin
         DEBUG_REFCOUNTING[] && _enqueue_work(Core.print, "-- (", myid(), ", ", id, ") with ", string(datastore_counters[(myid(), id)]), "\n"; gc_context=true)
         delete!(datastore_counters, (myid(), id))
     end
-    state = with_lock(datastore_lock) do
+    state = @safe_lock_spin datastore_lock begin
         haskey(datastore, id) ? datastore[id] : nothing
     end
     (state === nothing) && return
     device = storage_read(state).root
     if device !== nothing
         errormonitor(Threads.@spawn delete_from_device!(device, state, id))
     end
-    with_lock(datastore_lock) do
+    @safe_lock_spin datastore_lock begin
         haskey(datastore, id) && delete!(datastore, id)
     end
     # TODO: maybe cleanup from the who_has_read list?