fix library

youknowone · youknowone · commit fba63bd31369 · 2025-12-23T13:13:01.000+09:00
diff --git a/crates/vm/src/stdlib/ctypes.rs b/crates/vm/src/stdlib/ctypes.rs
@@ -625,17 +625,12 @@ pub(crate) mod _ctypes {
 
     #[cfg(not(windows))]
     #[pyfunction]
-    fn dlclose(handle: usize, vm: &VirtualMachine) -> PyResult<()> {
-        let result = unsafe { libc::dlclose(handle as *mut libc::c_void) };
-        if result != 0 {
-            let err = unsafe { libc::dlerror() };
-            let msg = if err.is_null() {
-                "dlclose() error".to_string()
-            } else {
-                unsafe { std::ffi::CStr::from_ptr(err).to_string_lossy().into_owned() }
-            };
-            return Err(vm.new_os_error(msg));
-        }
+    fn dlclose(handle: usize, _vm: &VirtualMachine) -> PyResult<()> {
+        // Remove from cache, which triggers SharedLibrary drop.
+        // libloading::Library calls dlclose automatically on Drop.
+        let cache = library::libcache();
+        let mut cache_write = cache.write();
+        cache_write.drop_lib(handle);
         Ok(())
     }
 
diff --git a/crates/vm/src/stdlib/ctypes/function.rs b/crates/vm/src/stdlib/ctypes/function.rs
@@ -316,11 +316,10 @@ impl ArgumentType for PyTypeRef {
             return Ok(FfiArgValue::Pointer(0));
         }
 
-        // For pointer types (POINTER(T)), we need to pass the ADDRESS of the value's buffer
+        // For pointer types (POINTER(T)), we need to pass the pointer VALUE stored in buffer
         if self.fast_issubclass(PyCPointer::static_type()) {
-            if let Some(cdata) = converted.downcast_ref::<PyCData>() {
-                let addr = cdata.buffer.read().as_ptr() as usize;
-                return Ok(FfiArgValue::Pointer(addr));
+            if let Some(pointer) = converted.downcast_ref::<PyCPointer>() {
+                return Ok(FfiArgValue::Pointer(pointer.get_ptr_value()));
             }
             return convert_to_pointer(&converted, vm);
         }
diff --git a/crates/vm/src/stdlib/ctypes/library.rs b/crates/vm/src/stdlib/ctypes/library.rs
@@ -64,16 +64,6 @@ impl SharedLibrary {
         let lib_lock = self.lib.lock();
         lib_lock.is_none()
     }
-
-    fn close(&self) {
-        *self.lib.lock() = None;
-    }
-}
-
-impl Drop for SharedLibrary {
-    fn drop(&mut self) {
-        self.close();
-    }
 }
 
 pub(super) struct ExternalLibs {
@@ -119,17 +109,17 @@ impl ExternalLibs {
         let new_lib = SharedLibrary::new_with_mode(library_path, mode)?;
         let key = new_lib.get_pointer();
 
-        match self.libraries.get(&key) {
-            Some(l) => {
-                if l.is_closed() {
-                    self.libraries.insert(key, new_lib);
-                }
-            }
-            _ => {
-                self.libraries.insert(key, new_lib);
-            }
-        };
+        // Check if library already exists and is not closed
+        let should_use_cached = self.libraries.get(&key).is_some_and(|l| !l.is_closed());
 
+        if should_use_cached {
+            // new_lib will be dropped, calling dlclose (decrements refcount)
+            // But library stays loaded because cached version maintains refcount
+            drop(new_lib);
+            return Ok((key, self.libraries.get(&key).expect("just checked")));
+        }
+
+        self.libraries.insert(key, new_lib);
         Ok((key, self.libraries.get(&key).expect("just inserted")))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -316,11 +316,10 @@ impl ArgumentType for PyTypeRef {`
`316`	`316`	`return Ok(FfiArgValue::Pointer(0));`
`317`	`317`	`}`
`318`	`318`
`319`		`- // For pointer types (POINTER(T)), we need to pass the ADDRESS of the value's buffer`
	`319`	`+ // For pointer types (POINTER(T)), we need to pass the pointer VALUE stored in buffer`
`320`	`320`	`if self.fast_issubclass(PyCPointer::static_type()) {`
`321`		`- if let Some(cdata) = converted.downcast_ref::<PyCData>() {`
`322`		`- let addr = cdata.buffer.read().as_ptr() as usize;`
`323`		`- return Ok(FfiArgValue::Pointer(addr));`
	`321`	`+ if let Some(pointer) = converted.downcast_ref::<PyCPointer>() {`
	`322`	`+ return Ok(FfiArgValue::Pointer(pointer.get_ptr_value()));`
`324`	`323`	`}`
`325`	`324`	`return convert_to_pointer(&converted, vm);`
`326`	`325`	`}`