Wrap __init__ functions of Base submodules in try/catch

Prevents them from throwing any InitError exceptions that will not get handled
JuliaLang · Aug 22, 2015 · 419539d · 419539d
1 parent 478be64
commit 419539d
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 28 deletions.
diff --git a/base/gmp.jl b/base/gmp.jl
@@ -53,19 +53,24 @@ _gmp_clear_func = C_NULL
 _mpfr_clear_func = C_NULL
 
 function __init__()
-    if gmp_version().major != GMP_VERSION.major || gmp_bits_per_limb() != GMP_BITS_PER_LIMB
-        error(string("The dynamically loaded GMP library (version $(gmp_version()) with __gmp_bits_per_limb == $(gmp_bits_per_limb()))\n",
-                     "does not correspond to the compile time version (version $GMP_VERSION with __gmp_bits_per_limb == $GMP_BITS_PER_LIMB).\n",
-                     "Please rebuild Julia."))
-    end
+    try
+        if gmp_version().major != GMP_VERSION.major || gmp_bits_per_limb() != GMP_BITS_PER_LIMB
+            error(string("The dynamically loaded GMP library (version $(gmp_version()) with __gmp_bits_per_limb == $(gmp_bits_per_limb()))\n",
+                         "does not correspond to the compile time version (version $GMP_VERSION with __gmp_bits_per_limb == $GMP_BITS_PER_LIMB).\n",
+                         "Please rebuild Julia."))
+        end
 
-    global _gmp_clear_func = cglobal((:__gmpz_clear, :libgmp))
-    global _mpfr_clear_func = cglobal((:mpfr_clear, :libmpfr))
-    ccall((:__gmp_set_memory_functions, :libgmp), Void,
-          (Ptr{Void},Ptr{Void},Ptr{Void}),
-          cglobal(:jl_gc_counted_malloc),
-          cglobal(:jl_gc_counted_realloc_with_old_size),
-          cglobal(:jl_gc_counted_free))
+        global _gmp_clear_func = cglobal((:__gmpz_clear, :libgmp))
+        global _mpfr_clear_func = cglobal((:mpfr_clear, :libmpfr))
+        ccall((:__gmp_set_memory_functions, :libgmp), Void,
+              (Ptr{Void},Ptr{Void},Ptr{Void}),
+              cglobal(:jl_gc_counted_malloc),
+              cglobal(:jl_gc_counted_realloc_with_old_size),
+              cglobal(:jl_gc_counted_free))
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module GMP:\n")
+    end
 end
 
 widen(::Type{Int128})  = BigInt

diff --git a/base/linalg.jl b/base/linalg.jl
@@ -236,9 +236,14 @@ include("linalg/arpack.jl")
 include("linalg/arnoldi.jl")
 
 function __init__()
-    Base.check_blas()
-    if Base.blas_vendor() == :mkl
-        ccall((:MKL_Set_Interface_Layer, Base.libblas_name), Void, (Cint,), USE_BLAS64 ? 1 : 0)
+    try
+        Base.check_blas()
+        if Base.blas_vendor() == :mkl
+            ccall((:MKL_Set_Interface_Layer, Base.libblas_name), Void, (Cint,), USE_BLAS64 ? 1 : 0)
+        end
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module LinAlg")
     end
 end
 

diff --git a/base/mpfr.jl b/base/mpfr.jl
@@ -30,9 +30,14 @@ import Base.GMP: ClongMax, CulongMax, CdoubleMax
 import Base.Math.lgamma_r
 
 function __init__()
-    # set exponent to full range by default
-    set_emin!(get_emin_min())
-    set_emax!(get_emax_max())
+    try
+        # set exponent to full range by default
+        set_emin!(get_emin_min())
+        set_emax!(get_emax_max())
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module MPFR:\n")
+    end
 end
 
 const ROUNDING_MODE = Cint[0]

diff --git a/base/pcre.jl b/base/pcre.jl
@@ -12,15 +12,20 @@ global JIT_STACK = C_NULL
 global MATCH_CONTEXT = C_NULL
 
 function __init__()
-    JIT_STACK_START_SIZE = 32768
-    JIT_STACK_MAX_SIZE = 1048576
-    global JIT_STACK = ccall((:pcre2_jit_stack_create_8, PCRE_LIB), Ptr{Void},
-                             (Cint, Cint, Ptr{Void}),
-                             JIT_STACK_START_SIZE, JIT_STACK_MAX_SIZE, C_NULL)
-    global MATCH_CONTEXT = ccall((:pcre2_match_context_create_8, PCRE_LIB),
-                                 Ptr{Void}, (Ptr{Void},), C_NULL)
-    ccall((:pcre2_jit_stack_assign_8, PCRE_LIB), Void,
-          (Ptr{Void}, Ptr{Void}, Ptr{Void}), MATCH_CONTEXT, C_NULL, JIT_STACK)
+    try
+        JIT_STACK_START_SIZE = 32768
+        JIT_STACK_MAX_SIZE = 1048576
+        global JIT_STACK = ccall((:pcre2_jit_stack_create_8, PCRE_LIB), Ptr{Void},
+                                 (Cint, Cint, Ptr{Void}),
+                                 JIT_STACK_START_SIZE, JIT_STACK_MAX_SIZE, C_NULL)
+        global MATCH_CONTEXT = ccall((:pcre2_match_context_create_8, PCRE_LIB),
+                                     Ptr{Void}, (Ptr{Void},), C_NULL)
+        ccall((:pcre2_jit_stack_assign_8, PCRE_LIB), Void,
+              (Ptr{Void}, Ptr{Void}, Ptr{Void}), MATCH_CONTEXT, C_NULL, JIT_STACK)
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module PCRE:\n")
+    end
 end
 
 # supported options for different use cases

diff --git a/base/random.jl b/base/random.jl
@@ -128,7 +128,14 @@ randjump(r::MersenneTwister, jumps::Integer) = randjump(r, jumps, dSFMT.JPOLY1e2
 
 ## initialization
 
-__init__() = srand()
+function __init__()
+    try
+        srand()
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module Random:\n")
+    end
+end
 
 
 ## make_seed()

diff --git a/base/replutil.jl b/base/replutil.jl
@@ -191,6 +191,16 @@ function showerror(io::IO, ex::MethodError)
     show_method_candidates(io, ex)
 end
 
+#Show an error by directly calling jl_printf.
+#Useful in Base submodule __init__ functions where STDERR isn't defined yet.
+function showerror_nostdio(err, msg::AbstractString)
+    stderr_stream = ccall(:jl_stderr_stream, Ptr{Void}, ())
+    ccall(:jl_printf, UInt, (Ptr{Void},Cstring), stderr_stream, msg)
+    ccall(:jl_static_show, UInt, (Ptr{Void},Ptr{Void}), stderr_stream,
+          pointer_from_objref(err))
+    ccall(:jl_printf, UInt, (Ptr{Void},Cstring), stderr_stream, "\n")
+end
+
 const UNSHOWN_METHODS = ObjectIdDict(
     which(call, Tuple{Type, Vararg{Any}}) => true
 )

diff --git a/base/sparse/cholmod.jl b/base/sparse/cholmod.jl
@@ -63,6 +63,7 @@ end
 const version = VersionNumber(version_array...)
 
 function __init__()
+    try
     ### Check if the linked library is compatible with the Julia code
     if Libdl.dlsym(Libdl.dlopen("libcholmod"), :cholmod_version) == C_NULL
         hasversion = false
@@ -151,6 +152,10 @@ function __init__()
         unsafe_store!(cnfg, cglobal(:jl_free, Ptr{Void}), 4)
     end
 
+    catch ex
+        Base.showerror_nostdio(ex,
+            "WARNING: Error during initialization of module CHOLMOD:\n")
+    end
 end
 
 function set_print_level(cm::Array{UInt8}, lev::Integer)