## 🎉 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>
148 lines
4.9 KiB
Rust
148 lines
4.9 KiB
Rust
//! Minimal NyashRuntime skeleton shared by interpreter and VM
|
|
//!
|
|
//! Focused on dependency inversion: core models + runtime services,
|
|
//! while execution strategies live in interpreter/VM layers.
|
|
|
|
use std::collections::HashMap;
|
|
use std::sync::{Arc, Mutex, RwLock};
|
|
|
|
use crate::box_factory::builtin::BuiltinBoxFactory;
|
|
#[cfg(feature = "plugins")]
|
|
use crate::box_factory::plugin::PluginBoxFactory;
|
|
use crate::box_factory::{BoxFactory, UnifiedBoxRegistry};
|
|
use crate::core::model::BoxDeclaration;
|
|
|
|
/// Core runtime container for executing Nyash programs
|
|
pub struct NyashRuntime {
|
|
/// Unified registry that can create any Box type
|
|
pub box_registry: Arc<Mutex<UnifiedBoxRegistry>>,
|
|
/// User-defined box declarations collected from source
|
|
pub box_declarations: Arc<RwLock<HashMap<String, BoxDeclaration>>>,
|
|
/// GC hooks (switchable runtime). Default is no-op.
|
|
pub gc: Arc<dyn crate::runtime::gc::GcHooks>,
|
|
/// Optional scheduler (single-thread by default is fine)
|
|
pub scheduler: Option<Arc<dyn crate::runtime::scheduler::Scheduler>>,
|
|
}
|
|
|
|
impl NyashRuntime {
|
|
/// Create a new runtime with defaults
|
|
pub fn new() -> Self {
|
|
Self {
|
|
box_registry: create_default_registry(),
|
|
box_declarations: Arc::new(RwLock::new(HashMap::new())),
|
|
gc: Arc::new(crate::runtime::gc::NullGc),
|
|
scheduler: Some(Arc::new(
|
|
crate::runtime::scheduler::SingleThreadScheduler::new(),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Builder for NyashRuntime allowing DI without globals (future-proof)
|
|
pub struct NyashRuntimeBuilder {
|
|
box_registry: Option<Arc<Mutex<UnifiedBoxRegistry>>>,
|
|
box_declarations: Option<Arc<RwLock<HashMap<String, BoxDeclaration>>>>,
|
|
gc: Option<Arc<dyn crate::runtime::gc::GcHooks>>,
|
|
scheduler: Option<Arc<dyn crate::runtime::scheduler::Scheduler>>,
|
|
}
|
|
|
|
impl NyashRuntimeBuilder {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
box_registry: None,
|
|
box_declarations: None,
|
|
gc: None,
|
|
scheduler: None,
|
|
}
|
|
}
|
|
|
|
/// Inject a BoxFactory implementation directly into a private registry
|
|
pub fn with_factory(mut self, factory: Arc<dyn BoxFactory>) -> Self {
|
|
let registry = self
|
|
.box_registry
|
|
.take()
|
|
.unwrap_or_else(|| create_default_registry());
|
|
if let Ok(mut reg) = registry.lock() {
|
|
reg.register(factory);
|
|
}
|
|
self.box_registry = Some(registry);
|
|
self
|
|
}
|
|
|
|
pub fn with_box_declarations(
|
|
mut self,
|
|
decls: Arc<RwLock<HashMap<String, BoxDeclaration>>>,
|
|
) -> Self {
|
|
self.box_declarations = Some(decls);
|
|
self
|
|
}
|
|
|
|
pub fn build(self) -> NyashRuntime {
|
|
let registry = self
|
|
.box_registry
|
|
.unwrap_or_else(|| create_default_registry());
|
|
|
|
NyashRuntime {
|
|
box_registry: registry,
|
|
box_declarations: self
|
|
.box_declarations
|
|
.unwrap_or_else(|| Arc::new(RwLock::new(HashMap::new()))),
|
|
gc: self
|
|
.gc
|
|
.unwrap_or_else(|| Arc::new(crate::runtime::gc::NullGc)),
|
|
scheduler: Some(self.scheduler.unwrap_or_else(|| {
|
|
Arc::new(crate::runtime::scheduler::SingleThreadScheduler::new())
|
|
})),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn create_default_registry() -> Arc<Mutex<UnifiedBoxRegistry>> {
|
|
let mut registry = UnifiedBoxRegistry::new();
|
|
// Default: enable builtins unless explicitly building with feature "plugins-only"
|
|
#[cfg(not(feature = "plugins-only"))]
|
|
{
|
|
registry.register(Arc::new(BuiltinBoxFactory::new()));
|
|
}
|
|
#[cfg(feature = "plugins")]
|
|
{
|
|
registry.register(Arc::new(PluginBoxFactory::new()));
|
|
}
|
|
Arc::new(Mutex::new(registry))
|
|
}
|
|
|
|
impl NyashRuntimeBuilder {
|
|
/// Inject custom GC hooks (switchable runtime). Default is no-op.
|
|
pub fn with_gc_hooks(mut self, gc: Arc<dyn crate::runtime::gc::GcHooks>) -> Self {
|
|
self.gc = Some(gc);
|
|
self
|
|
}
|
|
|
|
/// Convenience: use CountingGc for development metrics
|
|
pub fn with_counting_gc(mut self) -> Self {
|
|
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
|
|
}
|
|
|
|
/// Inject a custom scheduler implementation
|
|
pub fn with_scheduler(mut self, sched: Arc<dyn crate::runtime::scheduler::Scheduler>) -> Self {
|
|
self.scheduler = Some(sched);
|
|
self
|
|
}
|
|
|
|
/// Convenience: use SingleThreadScheduler
|
|
pub fn with_single_thread_scheduler(mut self) -> Self {
|
|
self.scheduler = Some(Arc::new(
|
|
crate::runtime::scheduler::SingleThreadScheduler::new(),
|
|
));
|
|
self
|
|
}
|
|
}
|