refactor: 将基础类型定义放在单独 crate 以解决循环依赖

This commit is contained in:
2026-06-05 22:50:06 +08:00
parent fecdd981f9
commit 7b862023a7
20 changed files with 64 additions and 65 deletions
+1 -33
View File
@@ -1,13 +1,12 @@
#![allow(clippy::arc_with_non_send_sync)]
use std::sync::{Arc, Mutex};
use std::sync::Arc;
use crate::builtin::BuiltinWorld;
use crate::code_forge::CodeForge;
use crate::prop_forge::PropForge;
use crate::shape_forge::ShapeForge;
use crate::string_forge::Interner;
use crate::vm_pool::{VmGuard, VmPool};
pub struct KernelConfig {
pub min_pool_size: usize,
@@ -66,8 +65,6 @@ pub struct OxideKernel {
pub code_forge: Arc<CodeForge>,
pub prop_forge: Arc<PropForge>,
pub builtin_world: Arc<BuiltinWorld>,
#[allow(dead_code)]
vm_pool: Mutex<Option<Arc<VmPool>>>,
}
impl OxideKernel {
@@ -85,28 +82,9 @@ impl OxideKernel {
code_forge,
prop_forge,
builtin_world,
vm_pool: Mutex::new(None),
}
}
pub fn init_vm_pool(self: &Arc<Self>) {
let pool = VmPool::new(
Arc::clone(self),
self.config.min_pool_size,
self.config.max_pool_size,
);
*self.vm_pool.lock().unwrap() = Some(pool);
}
pub fn spawn(&self) -> VmGuard {
self.vm_pool
.lock()
.unwrap()
.as_ref()
.expect("vm_pool not initialized — call init_vm_pool() first")
.spawn()
}
pub fn string_forge(&self) -> &Arc<Interner> {
&self.string_forge
}
@@ -173,14 +151,4 @@ mod tests {
assert!(KernelConfig::full().warmup_builtin_ic);
assert_eq!(KernelConfig::full().max_pool_size, None);
}
#[test]
fn test_kernel_spawn() {
let kernel = Arc::new(OxideKernel::new(KernelConfig::minimal()));
kernel.init_vm_pool();
let guard = kernel.spawn();
drop(guard);
let guard2 = kernel.spawn();
drop(guard2);
}
}