Minor code cleanup

Author: JamesWrigley

src/cluster.jl

@@ -826,24 +826,19 @@ function cluster_cookie(cookie)
     cookie
 end
 
-
-let next_pid = 2    # 1 is reserved for the client (always)
-    global get_next_pid
-    function get_next_pid()
-        retval = next_pid
-        next_pid += 1
-        retval
-    end
-end
+# 1 is reserved for the client (always)
+const next_pid = Threads.Atomic{Int}(2)
+# Note that atomic_add!() returns the old value, which is what we want
+get_next_pid() = Threads.atomic_add!(next_pid, 1)
 
 mutable struct ProcessGroup
     name::String
-    workers::Array{Any,1}
+    workers::Vector{Union{Worker, LocalProcess}}
     refs::Dict{RRID,Any}                  # global references
     topology::Symbol
     lazy::Union{Bool, Nothing}
 
-    ProcessGroup(w::Array{Any,1}) = new("pg-default", w, Dict(), :all_to_all, nothing)
+    ProcessGroup(w::Vector) = new("pg-default", w, Dict(), :all_to_all, nothing)
 end
 const PGRP = ProcessGroup([])
 

src/macros.jl

@@ -1,11 +1,9 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
-let nextidx = Threads.Atomic{Int}(0)
-    global nextproc
-    function nextproc()
-        idx = Threads.atomic_add!(nextidx, 1)
-        return workers()[(idx % nworkers()) + 1]
-    end
+const nextidx = Threads.Atomic{Int}(0)
+function nextproc()
+    idx = Threads.atomic_add!(nextidx, 1)
+    return workers()[(idx % nworkers()) + 1]
 end
 
 spawnat(p, thunk) = remotecall(thunk, p)

src/managers.jl

@@ -414,18 +414,9 @@ function manage(manager::SSHManager, id::Integer, config::WorkerConfig, op::Symb
     end
 end
 
-let tunnel_port = 9201
-    global next_tunnel_port
-    function next_tunnel_port()
-        retval = tunnel_port
-        if tunnel_port > 32000
-            tunnel_port = 9201
-        else
-            tunnel_port += 1
-        end
-        retval
-    end
-end
+const tunnel_counter = Threads.Atomic{Int}(1)
+# This is defined such that the port numbers start at 9201 and wrap around at 32,000
+next_tunnel_port() = (Threads.atomic_add!(tunnel_counter, 1) % 22_800) + 9200
 
 
 """