Merge pull request #21 from brenhinkeller/dlopenext

Match extension-appending behaviour of `Libdl.dlopen`

Author: brenhinkeller

src/abstractstaticstring.jl

@@ -112,3 +112,13 @@
         c[end] = 0x00 # Null-terminate
         return c
     end
+
+    # Other handy functions
+    @inline function Base.contains(haystack::AbstractStaticString, needle::AbstractStaticString)
+        lₕ, lₙ = length(haystack), length(needle)
+        lₕ < lₙ && return false
+        for i ∈ 0:(lₕ-lₙ)
+            (haystack[1+i:lₙ+i] == needle) && return true
+        end
+        return false
+    end

src/llvmio.jl

@@ -232,7 +232,7 @@
     10
     ```
     """
-@static if Sys.isapple()
+@static if Sys.isbsd()
     @inline function stdoutp()
         Base.llvmcall(("""
         @__stdoutp = external global i8*
@@ -283,7 +283,7 @@ end
     10
     ```
     """
-@static if Sys.isapple()
+@static if Sys.isbsd()
     @inline function stderrp()
         Base.llvmcall(("""
         @__stderrp = external global i8*
@@ -330,7 +330,7 @@ end
     Ptr{StaticTools.FILE} @0x00007fffc92b9110
     ```
     """
-@static if Sys.isapple()
+@static if Sys.isbsd()
     @inline function stdinp()
         Base.llvmcall(("""
         @__stdinp = external global i8*

src/llvmlibc.jl

@@ -640,8 +640,22 @@ julia> StaticTools.dlclose(lib)
 0
 ```
 """
+@inline function dlopen(name, flag=RTLD_LOCAL|RTLD_LAZY)
+    dlext = @static if Sys.isapple()
+        c".dylib"
+    elseif Sys.iswindows()
+        c".dll"
+    else
+        c".so"
+    end
+    namext = name*dlext
+    if contains(name, dlext)
+        GC.@preserve name dlopen(pointer(name), flag)
+    else
+        GC.@preserve namext dlopen(pointer(namext), flag)
+    end
+end
 @inline dlopen(name::AbstractMallocdMemory, flag=RTLD_LOCAL|RTLD_LAZY) = dlopen(pointer(name), flag)
-@inline dlopen(name, flag=RTLD_LOCAL|RTLD_LAZY) = GC.@preserve name dlopen(pointer(name), flag)
 @inline function dlopen(name::Ptr{UInt8}, flag::Int32)
     Base.llvmcall(("""
     ; External declaration of the dlopen function
@@ -659,12 +673,13 @@ julia> StaticTools.dlclose(lib)
     """, "main"), Ptr{DYLIB}, Tuple{Ptr{UInt8}, Int32}, name, flag)
 end
 
+# Prevent this from getting converted into a bare pointer by making it a function
 @static if Sys.isapple()
-    const DLEXT = c".dylib"
+    @inline DLEXT() = c".dylib"
 elseif Sys.iswindows()
-    const DLEXT = c".dll"
+    @inline DLEXT() = c".dll"
 else
-    const DLEXT = c".so"
+    @inline DLEXT() = c".so"
 end
 
 ## --- dylsym

test/scripts/interop.jl

@@ -0,0 +1,16 @@
+using StaticCompiler
+using StaticTools
+
+function interop(argc, argv)
+    lib = StaticTools.dlopen(c"libm")
+    printf(lib)
+    sin = StaticTools.dlsym(lib, c"sin")
+    printf(sin)
+    x = @ptrcall sin(5.0::Float64)::Float64
+    printf(x)
+    newline()
+    StaticTools.dlclose(lib)
+end
+
+# Attempt to compile
+path = compile_executable(interop, (Int64, Ptr{Ptr{UInt8}}), "./", cflags=`-ldl -lm`)

test/scripts/rand_matrix.jl

@@ -19,4 +19,5 @@ function rand_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
 end
 
 # Attempt to compile
-path = compile_executable(rand_matrix, (Int64, Ptr{Ptr{UInt8}}), "./")
+# cflags=`-lm`: need to explicitly include libm math library on linux
+path = compile_executable(rand_matrix, (Int64, Ptr{Ptr{UInt8}}), "./", cflags=`-lm`)

test/scripts/randn_matrix.jl

@@ -18,4 +18,5 @@ function randn_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
 end
 
 # Attempt to compile
-path = compile_executable(randn_matrix, (Int64, Ptr{Ptr{UInt8}}), "./")
+# cflags=`-lm`: need to explicitly include libm math library on linux
+path = compile_executable(randn_matrix, (Int64, Ptr{Ptr{UInt8}}), "./", cflags=`-lm`)

test/scripts/withmallocarray.jl

@@ -27,4 +27,5 @@ function withmallocarray(argc::Int, argv::Ptr{Ptr{UInt8}})
 end
 
 # Attempt to compile
+# cflags=`-lm`: need to explicitly include libm math library on linux
 path = compile_executable(withmallocarray, (Int64, Ptr{Ptr{UInt8}}), "./", cflags=`-lm`)

test/testllvminterop.jl

@@ -9,7 +9,7 @@
 
 ## --- dlopen / dlsym / dlclose / @ptrcall / @symbolcall
 
-    dlpath = c"libc" * StaticTools.DLEXT
+    dlpath = c"libc" * StaticTools.DLEXT()
     if Sys.islinux()
         dlpath *= c".6"
     end
@@ -55,6 +55,13 @@
 
     @test StaticTools.dlclose(lib) == 0
 
+    # Try opening without specifying extension
+    if Sys.isbsd()
+        lib = StaticTools.dlopen(c"libm")
+        @test lib != C_NULL
+        @test (lib != C_NULL) && StaticTools.dlclose(lib) == 0
+    end
+
 ## --- more ``@symbolcall`s
 
     cmalloc(nbytes) = @symbolcall malloc(nbytes::Int)::Ptr{Float64}
@@ -71,14 +78,14 @@
 
 ## --- @externptr / @externload
 
-    if Sys.isapple()
+    if Sys.isbsd()
         foo() = @externload __stderrp::Ptr{UInt8}
     else
         foo() = @externload stderr::Ptr{UInt8}
     end
     @test foo() == stderrp()
 
-    if Sys.isapple()
+    if Sys.isbsd()
         fooptr() = @externptr __stderrp::Ptr{UInt8}
     else
         fooptr() = @externptr stderr::Ptr{UInt8}

test/testllvmio.jl

@@ -180,7 +180,7 @@
     @test free(str) == 0
 
     @test fclose(fp) == 0
-    # @static if fp != 0 && Sys.isapple()
+    # @static if fp != 0 && Sys.isbsd()
     #     @test getchar(fp) === UInt8('1')
     #     @test getchar(fp) === UInt8('\n')
     #     @test fclose(fp) == 0

test/teststaticcompiler.jl

@@ -101,7 +101,7 @@ let
         @warn "Could not compile $testpath/scripts/randn_matrix.jl"
         println(e)
     end
-    @static if Sys.isapple()
+    @static if Sys.isbsd()
         @test isa(status, Base.Process)
         @test isa(status, Base.Process) && status.exitcode == 0
     end
@@ -115,7 +115,7 @@ let
         @warn "Could not run $(scratch)/randn_matrix"
         println(e)
     end
-    @static if Sys.isapple()
+    @static if Sys.isbsd()
         @test isa(status, Base.Process)
         @test isa(status, Base.Process) && status.exitcode == 0
     end
@@ -239,6 +239,36 @@ let
     @test isa(status, Base.Process) && status.exitcode == 0
 end
 
+## --- Test interop
+
+@static if Sys.isbsd()
+let
+    # Compile...
+    status = -1
+    try
+        isfile("interop") && rm("interop")
+        status = run(`julia --compile=min $testpath/scripts/interop.jl`)
+    catch e
+        @warn "Could not compile $testpath/scripts/interop.jl"
+        println(e)
+    end
+    @test isa(status, Base.Process)
+    @test isa(status, Base.Process) && status.exitcode == 0
+
+    # Run...
+    println("Interop:")
+    status = -1
+    try
+        status = run(`./interop`)
+    catch e
+        @warn "Could not run $(scratch)/interop"
+        println(e)
+    end
+    @test isa(status, Base.Process)
+    @test isa(status, Base.Process) && status.exitcode == 0
+end
+end
+
 ## --- Clean up
 
 cd(testpath)