fixup! debug

Author: JamesWrigley

src/process_messages.jl

@@ -66,7 +66,10 @@ function showerror(io::IO, re::RemoteException)
     showerror(io, re.captured)
 end
 
+const thunk_counter = Threads.Atomic{Int}(0)
+
 function run_work_thunk(thunk::Function, print_error::Bool)
+    Threads.atomic_add!(thunk_counter, 1)
     local result
     try
         result = thunk()
@@ -75,6 +78,7 @@ function run_work_thunk(thunk::Function, print_error::Bool)
         result = RemoteException(ce)
         print_error && showerror(stderr, ce)
     end
+    Threads.atomic_add!(thunk_counter, -1)
     return result
 end
 function run_work_thunk(rv::RemoteValue, thunk)
@@ -208,7 +212,7 @@ function message_handler_loop(r_stream::IO, w_stream::IO, incoming::Bool)
             end
             readbytes!(r_stream, boundary, length(MSG_BOUNDARY))
 
-            println("$(now()) got msg: ", typeof(msg))
+            println("$(now()) (thunk counter: $(thunk_counter[])) got msg: ", typeof(msg))
             handle_msg(msg, header, r_stream, w_stream, version)
         end
     catch e

test/topology.jl

@@ -125,7 +125,7 @@ using Random
     end
 
     # Initially only master-worker connections ought to be setup
-    expected_num_conns = 4
+    expected_num_conns = 8
     let num_conns = sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers()))
         @test num_conns == expected_num_conns
     end