Skip to content

fix crashes using multithreaded julia from python #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpinol wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

fix crashes using multithreaded julia from python #758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/JlWrap/C.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ const PyJuliaBase_Type = Ref(C.PyNULL)
const PYJLVALUES = []
# unused indices in PYJLVALUES
const PYJLFREEVALUES = Int[]
# lock protecting PYJLVALUES and PYJLFREEVALUES from concurrent modification
const PYJL_LOCK = Threads.SpinLock()

function _pyjl_new(t::C.PyPtr, ::C.PyPtr, ::C.PyPtr)
alloc = C.PyType_GetSlot(t, C.Py_tp_alloc)
Expand All @@ -39,8 +41,16 @@ end
function _pyjl_dealloc(o::C.PyPtr)
idx = C.@ft UnsafePtr{PyJuliaValueObject}(o).value[]
if idx != 0
# Disable GC to prevent push! from triggering a GC that runs finalizers
# re-entrantly (the finalizer chain: push! → alloc → GC → py_finalizer →
# enqueue → Py_DecRef → _pyjl_dealloc → push! on same vector →
# ConcurrencyViolationError). The lock guards against true multi-thread races.
prev = Base.GC.enable(false)
lock(PYJL_LOCK)
PYJLVALUES[idx] = nothing
push!(PYJLFREEVALUES, idx)
unlock(PYJL_LOCK)
Base.GC.enable(prev)
end
(C.@ft UnsafePtr{PyJuliaValueObject}(o).weaklist[!]) == C.PyNULL || C.PyObject_ClearWeakRefs(o)
freeptr = C.PyType_GetSlot(C.Py_Type(o), C.Py_tp_free)
Expand Down Expand Up @@ -375,13 +385,19 @@ PyJuliaValue_SetValue(_o, @nospecialize(v)) = Base.GC.@preserve _o begin
o = C.asptr(_o)
idx = C.@ft UnsafePtr{PyJuliaValueObject}(o).value[]
if idx == 0
# Disable GC to prevent push!/pop! from triggering a GC whose finalizers
# re-entrantly resize the same vectors (see _pyjl_dealloc comment).
prev = Base.GC.enable(false)
lock(PYJL_LOCK)
if isempty(PYJLFREEVALUES)
push!(PYJLVALUES, v)
idx = length(PYJLVALUES)
else
idx = pop!(PYJLFREEVALUES)
PYJLVALUES[idx] = v
end
unlock(PYJL_LOCK)
Base.GC.enable(prev)
C.@ft UnsafePtr{PyJuliaValueObject}(o).value[] = idx
else
PYJLVALUES[idx] = v
Expand Down
Loading