Skip to content
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

Fix in-process symbol resolution #419

Merged
merged 1 commit into from
Jul 26, 2017
Merged

Fix in-process symbol resolution #419

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
27 changes: 17 additions & 10 deletions src/startup.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# and if so do not use the deps.jl file, getting everything we need from the
# current process instead.

proc_handle = unsafe_load(@static Compat.Sys.iswindows() ? cglobal(:jl_exe_handle, Ptr{Void}) : cglobal(:jl_dl_handle, Ptr{Void}))
proc_handle = unsafe_load(@static (Compat.Sys.iswindows() || VERSION >= v"0.6.0-pre.beta.121") ? cglobal(:jl_exe_handle, Ptr{Void}) : cglobal(:jl_dl_handle, Ptr{Void}))

immutable Dl_info
dli_fname::Ptr{UInt8}
Expand Down Expand Up @@ -35,7 +35,6 @@ symbols_present = false
break
end
else
proc_handle = unsafe_load(cglobal(:jl_dl_handle, Ptr{Void}))
symbols_present = hassym(proc_handle, :Py_GetVersion)
end

Expand All @@ -56,19 +55,27 @@ else
libpy_handle, pathbuf, length(pathbuf))
@assert ret != 0
libname = String(Base.transcode(UInt8, pathbuf[1:findfirst(pathbuf, 0)-1]))
if (Libdl.dlopen_e(libname) != C_NULL)
const libpython = libname
else
const libpython = nothing
end
else
libpy_handle = proc_handle
# Now determine the name of the python library that these symbols are from
some_address_in_libpython = Libdl.dlsym(libpy_handle, :Py_GetVersion)
dlinfo = Ref{Dl_info}()
some_address_in_main_exe = Libdl.dlsym(proc_handle, :main)
dlinfo1 = Ref{Dl_info}()
dlinfo2 = Ref{Dl_info}()
ccall(:dladdr, Cint, (Ptr{Void}, Ptr{Dl_info}), some_address_in_libpython,
dlinfo)
libname = unsafe_string(dlinfo[].dli_fname)
end
if (Libdl.dlopen_e(libname) != C_NULL)
const libpython = libname
else
const libpython = nothing
dlinfo1)
ccall(:dladdr, Cint, (Ptr{Void}, Ptr{Dl_info}), some_address_in_main_exe,
dlinfo2)
if dlinfo1[].dli_fbase == dlinfo2[].dli_fbase
const libpython = nothing
else
const libpython = unsafe_string(dlinfo[].dli_fname)
end
end
# If we're not in charge, assume the user is installing necessary python
# libraries rather than messing with their configuration
Expand Down