Merge branch 'master' into dpa/jet

Author: DilumAluthge

.github/workflows/ci.yml

@@ -20,31 +20,37 @@ permissions:
 
 jobs:
   test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
+          - '1.10'
+          - '1.11'
+          - '1.12'
           - 'nightly'
-          - '1'
-          - '1.9'
         os:
           - ubuntu-latest
           - windows-latest
-        arch:
-          - x64
-          - x86
-        include:
-          - os: macOS-latest
-            arch: aarch64
-            version: '1'
-          - os: macOS-latest
-            arch: aarch64
-            version: 'nightly'
+          - macos-15-intel # Intel
+          - macos-latest # Apple Silicon
+        julia-wordsize:
+          # The value here only affects the version of Julia binary that we download.
+          # It does not affect the architecture of the GitHub Runner (virtual machine) that
+          # we run on.
+          - '32' # 32-bit Julia. Only available on x86_64. Not available on aarch64.
+          - '64' # 64-bit Julia.
         exclude:
-          - os: windows-latest # Killing workers doesn't work on windows in 1.9
-            version: '1.9'
+          # Killing workers doesn't work on Windows in Julia 1.10:
+          - os: windows-latest
+            version: '1.10'
+          # We don't have 32-bit builds of Julia for Intel macOS:
+          - os: macos-15-intel # Intel
+            julia-wordsize: '32'
+          #
+          # We don't have 32-bit builds of Julia for Apple Silicon macOS:
+          - os: macos-latest # Apple Silicon
+            julia-wordsize: '32'
 
     steps:
       - uses: actions/checkout@v6
@@ -53,7 +59,13 @@ jobs:
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
+          # If `julia-wordsize` is 32, then we set `arch` to `x86`, because we know that
+          # 32-bit builds of Julia are only available for x86.
+          #
+          # If `julia-wordsize` is 64, then we set `arch` to `${{ runner.arch }}`, which
+          # GitHub will automatically expand to the correct value (`x86_64` or `aarch64`)
+          # based on the architecture of the underlying GitHub Runner (virtual machine).
+          arch: ${{ github.ref == '32' && 'x86' || runner.arch }}
       - uses: actions/cache@v5
         env:
           cache-name: cache-artifacts
@@ -65,9 +77,26 @@ jobs:
             ${{ runner.os }}-test-${{ matrix.os }}
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
+      - name: Decide what the value of JULIA_NUM_THREADS should be
+        id: decide-numthreads-str
+        run: |
+          if Base.VERSION >= v"1.12-"
+              # The x,y format for threadpools requires Julia 1.9 or above.
+              # However, Julia didn't begin starting with 1 interactive thread by default until Julia 1.12
+              # So we don't need to bother with this on Julia 1.11 and earlier
+              value = "1,0"
+          else
+              value = "1"
+          end
+          open(ENV["GITHUB_OUTPUT"], "a") do io
+              name = "numthreads"
+              line = "$(name)=$(value)"
+              println(io, line)
+          end
+        shell: julia --color=yes {0}
       - uses: julia-actions/julia-runtest@v1
         env:
-          JULIA_NUM_THREADS: 4,4
+          JULIA_NUM_THREADS: ${{ steps.decide-numthreads-str.outputs.numthreads }}
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v5
         with:

docs/src/_changelog.md

@@ -7,6 +7,12 @@ CurrentModule = DistributedNext
 This documents notable changes in DistributedNext.jl. The format is based on
 [Keep a Changelog](https://keepachangelog.com).
 
+## Unreleased
+
+### Fixed
+- Backported various fixes from Distributed ([#25]).
+- Fixed a lingering task that could cause hangs when exiting Distributed ([#51]).
+
 ## [v1.1.0] - 2025-08-02
 
 ### Fixed

src/DistributedNext.jl

@@ -132,7 +132,10 @@ include("pmap.jl")
 include("managers.jl")    # LocalManager and SSHManager
 include("precompile.jl")
 
+_stdlib_watcher_timer::Union{Timer, Nothing} = nothing
+
 function __init__()
+    global _stdlib_watcher_timer
     init_parallel()
 
     if ccall(:jl_generating_output, Cint, ()) == 0
@@ -141,20 +144,12 @@ function __init__()
         # cluster cookie has been set, which is most likely to have been done
         # through Distributed.init_multi() being called by Distributed.addprocs() or
         # something.
-        watcher_task = Threads.@spawn while true
+        _stdlib_watcher_timer = Timer(0; interval=1) do timer
             if _check_distributed_active()
-                return
-            end
-
-            try
-                sleep(1)
-            catch
-                # sleep() may throw when the internal object it waits on is closed
-                # as the process exits.
-                return
+                close(timer)
             end
         end
-        errormonitor(watcher_task)
+        atexit(() -> close(_stdlib_watcher_timer))
     end
 end
 

test/runtests.jl

@@ -10,10 +10,19 @@ include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))
 
 cmd = `$test_exename $test_exeflags`
 
-# LibSSH.jl currently only works on unixes
-if Sys.isunix()
+# LibSSH.jl currently only works on unixes, and the latest release currently
+# doesn't pass CI on MacOS.
+if Sys.islinux()
     # Run the SSH tests with a single thread because LibSSH.jl is not thread-safe
     sshtestfile = joinpath(@__DIR__, "sshmanager.jl")
+    if Base.VERSION >= v"1.12-"
+        # The x,y format for threadpools requires Julia 1.9 or above.
+        # However, Julia didn't begin starting with 1 interactive thread by default until Julia 1.12
+        # So we don't need to bother with this on Julia 1.11 and earlier
+        JULIA_NUM_THREADS = "1,0"
+    else
+        JULIA_NUM_THREADS = "1"
+    end
     run(addenv(`$cmd $sshtestfile`, "JULIA_NUM_THREADS" => "1"))
 else
     @warn "Skipping the SSH tests because this platform is not supported"