tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: GC機能復活＆VM整理＆json_native調査完了

Browse Source 
## 🎉 ChatGPT×Claude協働成果
- ✅ **GC機能復活**: vm-legacy削除で失われたGC機能を新実装で復活
  - GCメトリクス追跡システム実装（alloc/collect/pause計測）
  - 3種類のGCモード対応（counting/mark_sweep/generational）
  - host_handles.rsでハンドル管理復活

- ✅ **VM整理とエイリアス追加**: 混乱していた名前を整理
  - MirInterpreter = NyashVm = VM のエイリアス統一
  - vm-legacyとインタープリターの違いを明確化
  - 壊れていたvm.rsの互換性修復

- ✅ **スモークテスト整理**: v2構造でプラグイン/コア分離
  - plugins/ディレクトリにプラグインテスト移動
  - gc_metrics.sh, gc_mode_off.sh, async_await.sh追加
  - _ensure_fixture.shでプラグイン事前ビルド確認

## 📊 json_native調査結果
- **現状**: 25%完成（配列/オブジェクトパース未実装）
- **将来性**: 並行処理でyyjson超えの可能性大
  - 100KB以上のJSONで2-10倍速の可能性
  - Nyash ABI実装後はゼロコピー最適化
- **判断**: 現時点では置換不可、将来の大きな足場

## 🔍 技術的発見
- vm-legacy = 完全なVM実装（GC付き）だった
- MirInterpreter = 現在のRust VM（712行、Arc使用）
- 200行簡易JSONは既に削除済み（存在しない）

ChatGPT爆速修復×Claude詳細調査の完璧な協働！

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Selfhosting Dev
2025-09-24 23:27:59 +09:00
parent e5f6d51b3c
commit 9b9a91c859
36 changed files with 556 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/backend/mir_interpreter.rs
View File

@ -242,6 +242,47 @@ impl MirInterpreter {
.insert(fname, valv);
continue;
}
// Builtin StringBox minimal methods (length/concat) to bridge plugin-first gaps
{
let recv = self.reg_load(*box_val)?;
let recv_box_any: Box<dyn crate::box_trait::NyashBox> = match recv.clone() {
VMValue::BoxRef(b) => b.share_box(),
other => other.to_nyash_box(),
};
if let Some(sb) = recv_box_any
.as_any()
.downcast_ref::<crate::box_trait::StringBox>()
{
match method.as_str() {
"length" => {
let ret = sb.length();
if let Some(d) = dst {
self.regs.insert(*d, VMValue::from_nyash_box(ret));
}
continue;
}
"concat" => {
if args.len() != 1 {
return Err(VMError::InvalidInstruction(
"concat expects 1 arg".into(),
));
}
let rhs = self.reg_load(args[0])?;
let new_s = format!("{}{}", sb.value, rhs.to_string());
if let Some(d) = dst {
self.regs.insert(
*d,
VMValue::from_nyash_box(Box::new(
crate::box_trait::StringBox::new(new_s),
)),
);
}
continue;
}
_ => { /* fallthrough to plugin or error */ }
}
}
}
// Fallback: treat like PluginInvoke for plugin-backed boxes
let recv = self.reg_load(*box_val)?;
let recv_box: Box<dyn crate::box_trait::NyashBox> = match recv.clone() {
@ -322,20 +363,87 @@ impl MirInterpreter {
args,
..
} => {
// Minimal env.console.log bridge
if iface_name == "env.console" && method_name == "log" {
if let Some(a0) = args.get(0) {
let v = self.reg_load(*a0)?;
println!("{}", v.to_string());
match (iface_name.as_str(), method_name.as_str()) {
("env.console", "log") => {
if let Some(a0) = args.get(0) {
let v = self.reg_load(*a0)?;
println!("{}", v.to_string());
}
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Void);
}
}
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Void);
("env.future", "new") => {
let fut = crate::boxes::future::NyashFutureBox::new();
if let Some(a0) = args.get(0) {
let v = self.reg_load(*a0)?;
fut.set_result(v.to_nyash_box());
}
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Future(fut));
}
}
("env.future", "set") => {
if args.len() >= 2 {
let f = self.reg_load(args[0])?;
let v = self.reg_load(args[1])?;
if let VMValue::Future(fut) = f {
fut.set_result(v.to_nyash_box());
} else {
return Err(VMError::TypeError("env.future.set expects Future".into()));
}
}
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Void);
}
}
("env.future", "await") => {
if let Some(a0) = args.get(0) {
let f = self.reg_load(*a0)?;
match f {
VMValue::Future(fut) => {
// Coarse safepoint while blocking
let v = fut.get();
if let Some(d) = dst {
self.regs.insert(*d, VMValue::from_nyash_box(v));
}
}
_ => return Err(VMError::TypeError("await expects Future".into())),
}
}
}
("env.runtime", "checkpoint") => {
crate::runtime::global_hooks::safepoint_and_poll();
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Void);
}
}
("env.modules", "set") => {
if args.len() >= 2 {
let k = self.reg_load(args[0])?.to_string();
let v = self.reg_load(args[1])?.to_nyash_box();
crate::runtime::modules_registry::set(k, v);
}
if let Some(d) = dst {
self.regs.insert(*d, VMValue::Void);
}
}
("env.modules", "get") => {
if let Some(a0) = args.get(0) {
let k = self.reg_load(*a0)?.to_string();
let vb = crate::runtime::modules_registry::get(&k)
.unwrap_or_else(|| Box::new(crate::box_trait::VoidBox::new()));
if let Some(d) = dst {
self.regs.insert(*d, VMValue::from_nyash_box(vb));
}
}
}
_ => {
return Err(VMError::InvalidInstruction(format!(
"ExternCall {}.{} not supported",
iface_name, method_name
)));
}
} else {
return Err(VMError::InvalidInstruction(format!(
"ExternCall {}.{} not supported",
iface_name, method_name
)));
}
}
MirInstruction::RefSet {

7
src/backend/mod.rs
View File

@ -14,7 +14,7 @@ pub mod vm {
// Core backend modules
pub mod abi_util; // Shared ABI/utility helpers
pub mod gc_helpers;
pub mod mir_interpreter; // Lightweight MIR interpreter
pub mod mir_interpreter; // Lightweight MIR interpreter (Rust VM core)
#[cfg(feature = "wasm-backend")]
pub mod aot;
@ -31,7 +31,12 @@ pub mod cranelift;
#[cfg(feature = "llvm-inkwell-legacy")]
pub mod llvm;
// Public aliases to make the role of the VM clear in runner/tests
pub use mir_interpreter::MirInterpreter;
/// Primary Rust VM executor alias (preferred name)
pub type NyashVm = mir_interpreter::MirInterpreter;
/// Back-compat shim used across runner/tests
pub type VM = NyashVm;
// Always re-export VMError/VMValue from vm_types
pub use vm_types::{VMError, VMValue};

9
src/runtime/gc.rs
View File

@ -35,12 +35,9 @@ pub struct CountingGc {
}
impl CountingGc {
pub fn new() -> Self {
// Default to rc+cycle mode for development metrics
let mode = crate::runtime::gc_mode::GcMode::RcCycle;
Self {
inner: crate::runtime::gc_controller::GcController::new(mode),
}
pub fn new() -> Self { Self::new_with_mode(crate::runtime::gc_mode::GcMode::RcCycle) }
pub fn new_with_mode(mode: crate::runtime::gc_mode::GcMode) -> Self {
Self { inner: crate::runtime::gc_controller::GcController::new(mode) }
}
pub fn snapshot(&self) -> (u64, u64, u64) {
self.inner.snapshot()

12
src/runtime/gc_controller.rs
View File

@ -133,17 +133,15 @@ impl GcController {
// Reset windows
self.sp_since_last.store(0, Ordering::Relaxed);
self.bytes_since_last.store(0, Ordering::Relaxed);
// PoC: no object graph; report current handles as leak candidates and return.
if self.mode == GcMode::Off {
return;
}
// Only run for rc/rc+cycle/stw; rc+cycle is default.
match self.mode {
GcMode::Rc | GcMode::RcCycle | GcMode::STW => {
let started = std::time::Instant::now();
// Roots: Runtime handle registry snapshot
// ARCHIVED: JIT handle implementation moved to archive/jit-cranelift/ during Phase 15
let roots: Vec<std::sync::Arc<dyn crate::box_trait::NyashBox>> = Vec::new(); // TODO: Implement handle registry for Phase 15
// Roots: HostHandle registry + modules_registry (Arc<dyn NyashBox>)
let mut roots: Vec<std::sync::Arc<dyn crate::box_trait::NyashBox>> =
crate::runtime::host_handles::snapshot();
let mut mod_roots = crate::runtime::modules_registry::snapshot_boxes();
roots.append(&mut mod_roots);
let mut visited: HashSet<u64> = HashSet::new();
let mut q: VecDeque<std::sync::Arc<dyn crate::box_trait::NyashBox>> =
VecDeque::new();

3
src/runtime/host_api.rs
View File

@ -181,7 +181,8 @@ pub extern "C" fn nyrt_host_call_name(
crate::backend::vm::VMValue::String(s) => s.clone(),
v => v.to_string(),
};
// VM-legacy removed - no GC barrier needed
// GC barrier (Write) — revive minimal barrier on host setField
crate::runtime::global_hooks::gc_barrier(crate::runtime::gc::BarrierKind::Write);
// Accept primitives only for now
let nv_opt = match argv[1].clone() {
crate::backend::vm::VMValue::Integer(i) => {

11
src/runtime/host_handles.rs
View File

@ -37,6 +37,12 @@ impl Registry {
fn get(&self, h: u64) -> Option<Arc<dyn NyashBox>> {
self.map.read().ok().and_then(|m| m.get(&h).cloned())
}
fn snapshot(&self) -> Vec<Arc<dyn NyashBox>> {
if let Ok(m) = self.map.read() {
return m.values().cloned().collect();
}
Vec::new()
}
#[allow(dead_code)]
fn drop_handle(&self, h: u64) {
if let Ok(mut m) = self.map.write() {
@ -62,3 +68,8 @@ pub fn to_handle_arc(arc: Arc<dyn NyashBox>) -> u64 {
pub fn get(h: u64) -> Option<Arc<dyn NyashBox>> {
reg().get(h)
}
/// Snapshot all current handles as Arc<dyn NyashBox> roots for diagnostics/GC traversal.
pub fn snapshot() -> Vec<Arc<dyn NyashBox>> {
reg().snapshot()
}

13
src/runtime/modules_registry.rs
View File

@ -38,3 +38,16 @@ pub fn snapshot_names_and_strings() -> Vec<(String, String)> {
}
out
}
/// Snapshot all Box values as GC roots (Arc<dyn NyashBox>), best‑effort.
/// Uses clone_box() to obtain owned copies and wraps them into Arc for traversal.
pub fn snapshot_boxes() -> Vec<std::sync::Arc<dyn NyashBox>> {
let mut out = Vec::new();
if let Ok(mut map) = REGISTRY.lock() {
for (_k, v) in map.iter_mut() {
let arc: std::sync::Arc<dyn NyashBox> = std::sync::Arc::from(v.clone_box());
out.push(arc);
}
}
out
}

8
src/runtime/nyash_runtime.rs
View File

@ -120,7 +120,13 @@ impl NyashRuntimeBuilder {
/// Convenience: use CountingGc for development metrics
pub fn with_counting_gc(mut self) -> Self {
let gc = Arc::new(crate::runtime::gc::CountingGc::new());
let mode = crate::runtime::gc_mode::GcMode::from_env();
if mode == crate::runtime::gc_mode::GcMode::Off {
// Respect GC_MODE=off: keep NullGc
self.gc = Some(Arc::new(crate::runtime::gc::NullGc));
return self;
}
let gc = Arc::new(crate::runtime::gc::CountingGc::new_with_mode(mode));
self.gc = Some(gc);
self
}

2
src/runtime/plugin_loader_v2/enabled/loader.rs
View File

@ -991,6 +991,8 @@ impl PluginLoaderV2 {
finalized: std::sync::atomic::AtomicBool::new(false),
}),
};
// Diagnostics: register for leak tracking (optional)
crate::runtime::leak_tracker::register_plugin(box_type, instance_id);
Ok(Box::new(bx))
}