Use fptr in destructor, add __init__

Author: johroj

src/FFTW.jl

@@ -36,7 +36,7 @@ mutable struct FakeLazyLibrary{T}
     on_load_callback::T
     @atomic h::Ptr{Cvoid}
 end
-import Libdl: LazyLibrary, dlopen
+import Libdl: LazyLibrary, dlopen, dlsym
 function dlopen(lib::FakeLazyLibrary{T}) where T
     h = @atomic :monotonic lib.h
     h != C_NULL && return h
@@ -60,7 +60,13 @@ end
 const libfftw3 = FakeLazyLibrary(:libfftw3_no_init, fftw_init_check, C_NULL)
 const libfftw3f = FakeLazyLibrary(:libfftw3f_no_init, fftw_init_check, C_NULL)
 
-else
+if VERSION >= v"1.12.0"
+function __init__()
+    dlopen(libfftw3) # Ensure that dlopen(::FakeLazyLibrary) is built by JuliaC
+end
+end
+
+else # !(VERSION >= v"1.11.0")
 @static if fftw_provider == "fftw"
     import FFTW_jll: libfftw3_path as libfftw3_no_init,
                      libfftw3f_path as libfftw3f_no_init,

src/fft.jl

@@ -322,20 +322,18 @@ unsafe_convert(::Type{PlanPtr}, p::FFTWPlan) = p.plan
 
 struct FFTWPlanDestructor
     ptr::PlanPtr
-    use_32bit_lib::Bool
+    fptr::Ptr{Cvoid}
 end
 
-FFTWPlanDestructor(plan::FFTWPlan{<:fftwSingle}) = FFTWPlanDestructor(plan.plan, true)
-FFTWPlanDestructor(plan::FFTWPlan{<:fftwDouble}) = FFTWPlanDestructor(plan.plan, false)
+FFTWPlanDestructor(plan::FFTWPlan{<:fftwSingle}) =
+    FFTWPlanDestructor(plan.plan, dlsym(dlopen(libfftw3f), :fftwf_destroy_plan))
+FFTWPlanDestructor(plan::FFTWPlan{<:fftwDouble}) = 
+    FFTWPlanDestructor(plan.plan, dlsym(dlopen(libfftw3), :fftw_destroy_plan))
 
 # these functions should only be called while the fftwlock is held
 unsafe_destroy_plan(plan::FFTWPlan) = unsafe_destroy_plan(FFTWPlanDestructor(plan))
 function unsafe_destroy_plan(destructor::FFTWPlanDestructor)
-    if destructor.use_32bit_lib
-        ccall((:fftwf_destroy_plan,libfftw3f), Cvoid, (PlanPtr,), destructor.ptr)
-    else
-        ccall((:fftw_destroy_plan,libfftw3), Cvoid, (PlanPtr,), destructor.ptr)
-    end
+    ccall(destructor.fptr, Cvoid, (PlanPtr, ), destructor.ptr)
 end
 
 const deferred_destroy_lock = ReentrantLock() # lock protecting the deferred_destroy_plans list