move Libdl to stdlib (#25459)

JuliaLang · Jan 11, 2018 · 9ca03c6 · 9ca03c6
1 parent 931dc51
commit 9ca03c6
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 49 deletions.
diff --git a/base/exports.jl b/base/exports.jl
@@ -8,7 +8,6 @@ export
     StackTraces,
     Sys,
     Libc,
-    Libdl,
     LinAlg,
     BLAS,
     LAPACK,

diff --git a/base/linalg/blas.jl b/base/linalg/blas.jl
@@ -65,6 +65,8 @@ const liblapack = Base.liblapack_name
 
 import ..LinAlg: BlasReal, BlasComplex, BlasFloat, BlasInt, DimensionMismatch, checksquare, stride1, chkstride1, axpy!
 
+import Libdl
+
 # utility routines
 function vendor()
     lib = Libdl.dlopen_e(Base.libblas_name)

diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -294,8 +294,13 @@ include("version.jl")
 include("sysinfo.jl")
 include("libc.jl")
 using .Libc: getpid, gethostname, time
-include("libdl.jl")
-using .Libdl: DL_LOAD_PATH
+
+const DL_LOAD_PATH = String[]
+if Sys.isapple()
+    push!(DL_LOAD_PATH, "@loader_path/julia")
+    push!(DL_LOAD_PATH, "@loader_path")
+end
+
 include("env.jl")
 
 # Scheduling
@@ -409,12 +414,6 @@ include("client.jl")
 # misc useful functions & macros
 include("util.jl")
 
-# dense linear algebra
-include("linalg/linalg.jl")
-using .LinAlg
-const ⋅ = dot
-const × = cross
-
 # statistics
 include("statistics.jl")
 
@@ -427,12 +426,6 @@ include("libgit2/libgit2.jl")
 # package manager
 include("pkg/pkg.jl")
 
-# sparse matrices, vectors, and sparse linear algebra
-include("sparse/sparse.jl")
-using .SparseArrays
-
-include("asyncmap.jl")
-
 # worker threads
 include("threadcall.jl")
 
@@ -448,6 +441,18 @@ import Base64
 
 INCLUDE_STATE = 2
 
+# dense linear algebra
+include("linalg/linalg.jl")
+using .LinAlg
+const ⋅ = dot
+const × = cross
+
+# sparse matrices, vectors, and sparse linear algebra
+include("sparse/sparse.jl")
+using .SparseArrays
+
+include("asyncmap.jl")
+
 include("multimedia.jl")
 using .Multimedia
 
@@ -505,6 +510,7 @@ Base.require(:Unicode)
 Base.require(:Distributed)
 Base.require(:Printf)
 Base.require(:Future)
+Base.require(:Libdl)
 
 @eval Base begin
     @deprecate_binding Test root_module(:Test) true ", run `using Test` instead"

diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl
@@ -1,6 +1,8 @@
 #!/usr/bin/env julia
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
+import Libdl
+
 const options = [
     "--cflags",
     "--ldflags",

diff --git a/doc/make.jl b/doc/make.jl
@@ -100,7 +100,6 @@ const PAGES = [
         "base/iterators.md",
         "base/c.md",
         "base/libc.md",
-        "base/libdl.md",
         "base/stacktraces.md",
         "base/simd-types.md",
     ],

diff --git a/doc/src/base/base.md b/doc/src/base/base.md
@@ -92,7 +92,6 @@ Base.Iterators
 Base.LAPACK
 Base.LibGit2
 Base.Libc
-Base.Libdl
 Base.LinAlg
 Base.Markdown
 Base.Meta

diff --git a/doc/src/base/constants.md b/doc/src/base/constants.md
@@ -25,12 +25,3 @@ See also:
   * `Libc.MS_ASYNC`
   * `Libc.MS_INVALIDATE`
   * `Libc.MS_SYNC`
-  * [`Libdl.DL_LOAD_PATH`](@ref)
-  * [`Libdl.RTLD_DEEPBIND`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_LOCAL`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_NOLOAD`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_LAZY`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_NOW`](@ref)
-  * [`Libdl.RTLD_GLOBAL`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_NODELETE`](@ref Base.Libdl.RTLD_NOW)
-  * [`Libdl.RTLD_FIRST`](@ref Base.Libdl.RTLD_NOW)
diff --git a/doc/src/base/libdl.md b/doc/src/base/libdl.md
diff --git a/stdlib/Libdl/docs/src/index.md b/stdlib/Libdl/docs/src/index.md
@@ -0,0 +1,13 @@
+# Dynamic Linker
+
+```@docs
+Libdl.dlopen
+Libdl.dlopen_e
+Libdl.RTLD_NOW
+Libdl.dlsym
+Libdl.dlsym_e
+Libdl.dlclose
+Libdl.dlext
+Libdl.find_library
+Libdl.DL_LOAD_PATH
+```
diff --git a/base/libdl.jl → stdlib/Libdl/src/Libdl.jl b/base/libdl.jl → stdlib/Libdl/src/Libdl.jl
@@ -1,10 +1,14 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
+__precompile__(true)
+
 module Libdl
 @doc """
 Interface to libdl. Provides dynamic linking support.
 """ -> Libdl
 
+import Base.DL_LOAD_PATH
+
 export DL_LOAD_PATH, RTLD_DEEPBIND, RTLD_FIRST, RTLD_GLOBAL, RTLD_LAZY, RTLD_LOCAL,
     RTLD_NODELETE, RTLD_NOLOAD, RTLD_NOW, dlclose, dlopen, dlopen_e, dlsym, dlsym_e,
     dlpath, find_library, dlext, dllist
@@ -15,11 +19,7 @@ export DL_LOAD_PATH, RTLD_DEEPBIND, RTLD_FIRST, RTLD_GLOBAL, RTLD_LAZY, RTLD_LOC
 When calling [`dlopen`](@ref), the paths in this list will be searched first, in
 order, before searching the system locations for a valid library handle.
 """
-const DL_LOAD_PATH = String[]
-if Sys.isapple()
-    push!(DL_LOAD_PATH, "@loader_path/julia")
-    push!(DL_LOAD_PATH, "@loader_path")
-end
+DL_LOAD_PATH
 
 # note: constants to match JL_RTLD_* in src/julia.h, translated
 #       to system-specific values by JL_RTLD macro in src/dlload.c
@@ -47,7 +47,6 @@ applicable.
 """ ->
 (RTLD_DEEPBIND, RTLD_FIRST, RTLD_GLOBAL, RTLD_LAZY, RTLD_LOCAL, RTLD_NODELETE, RTLD_NOLOAD, RTLD_NOW)
 
-
 """
     dlsym(handle, sym)
 

diff --git a/test/libdl.jl → stdlib/Libdl/test/runtests.jl b/test/libdl.jl → stdlib/Libdl/test/runtests.jl
@@ -1,5 +1,7 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
+import Libdl
+
 # these could fail on an embedded installation
 # but for now, we don't handle that case
 dlls = Libdl.dllist()

diff --git a/stdlib/SuiteSparse/src/cholmod.jl b/stdlib/SuiteSparse/src/cholmod.jl
@@ -12,6 +12,8 @@ import Base.LinAlg: (\),
 using ..SparseArrays
 using Base.Printf.@printf
 
+import Libdl
+
 export
     Dense,
     Factor,

diff --git a/test/ccall.jl b/test/ccall.jl
@@ -2,6 +2,8 @@
 
 import Base.copy, Base.==
 
+import Libdl
+
 const libccalltest = "libccalltest"
 
 const verbose = false

diff --git a/test/choosetests.jl b/test/choosetests.jl
@@ -48,7 +48,7 @@ function choosetests(choices = [])
         "replutil", "sets", "goto", "llvmcall", "llvmcall2", "grisu",
         "some", "meta", "stacktraces", "libgit2", "docs",
         "markdown", "serialize", "misc", "threads",
-        "enums", "cmdlineargs", "i18n", "libdl", "int",
+        "enums", "cmdlineargs", "i18n", "int",
         "checked", "bitset", "floatfuncs", "compile", "inline",
         "boundscheck", "error", "ambiguous", "cartesian", "asmvariant", "osutils",
         "channels", "iostream", "specificity", "codegen", "codevalidation",

diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -1,5 +1,7 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
+import Libdl
+
 catcmd = `cat`
 if Sys.iswindows()
     busybox = joinpath(Sys.BINDIR, "busybox.exe")

diff --git a/test/compile.jl b/test/compile.jl
@@ -220,7 +220,7 @@ try
             Dict(s => Base.module_uuid(Base.root_module(s)) for s in
                 [:Base64, :CRC32c, :Dates, :DelimitedFiles, :FileWatching, :Future,
                  :IterativeEigensolvers, :Logging, :Mmap, :Printf, :Profile, :SharedArrays,
-                 :SuiteSparse, :Test, :Unicode, :Distributed]))
+                 :SuiteSparse, :Test, :Unicode, :Distributed, :Libdl]))
         @test discard_module.(deps) == deps1
 
         @test current_task()(0x01, 0x4000, 0x30031234) == 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ export @@
         StackTraces,
         Sys,
         Libc,
-        Libdl,
         LinAlg,
         BLAS,
         LAPACK,
@@ Expand Down @@