feat: using system完全実装+旧スモークテストアーカイブ完了
✅ using nyashstd完全動作(ChatGPT実装) - builtin:nyashstd自動解決 - 環境変数不要でデフォルト有効 - console.log等の基本機能完備 ✅ Fixture plugin追加(テスト用最小構成) ✅ v2スモークテスト構造への移行 ✅ 旧tools/test/smoke/削除(100+ファイル) 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@ -35,9 +35,7 @@ static INSTANCES: Lazy<Mutex<HashMap<u32, CounterInstance>>> =
|
||||
Lazy::new(|| Mutex::new(HashMap::new()));
|
||||
static INSTANCE_COUNTER: AtomicU32 = AtomicU32::new(1);
|
||||
|
||||
// legacy v1 abi/init removed
|
||||
|
||||
/* legacy v1 entry removed
|
||||
// legacy v1 abi entry (kept for compatibility with host shim)
|
||||
#[no_mangle]
|
||||
pub extern "C" fn nyash_plugin_invoke(
|
||||
type_id: u32,
|
||||
@ -116,7 +114,103 @@ pub extern "C" fn nyash_plugin_invoke(
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// ===== Nyash ABI v2 TypeBox FFI =====
|
||||
#[allow(non_camel_case_types)]
|
||||
type InvokeFn = extern "C" fn(
|
||||
u32, /* instance_id */
|
||||
u32, /* method_id */
|
||||
*const u8,
|
||||
usize,
|
||||
*mut u8,
|
||||
*mut usize,
|
||||
) -> i32;
|
||||
|
||||
#[repr(C)]
|
||||
pub struct NyashTypeBoxFfi {
|
||||
pub abi_tag: u32,
|
||||
pub version: u16,
|
||||
pub struct_size: u16,
|
||||
pub name: *const std::os::raw::c_char,
|
||||
pub resolve: Option<extern "C" fn(*const std::os::raw::c_char) -> u32>,
|
||||
pub invoke_id: Option<InvokeFn>,
|
||||
pub capabilities: u64,
|
||||
}
|
||||
|
||||
// The FFI descriptor is immutable and contains only function pointers and a const c-string pointer.
|
||||
// Mark it Sync to allow use as a shared static.
|
||||
unsafe impl Sync for NyashTypeBoxFfi {}
|
||||
|
||||
extern "C" fn counter_resolve(name: *const std::os::raw::c_char) -> u32 {
|
||||
unsafe {
|
||||
if name.is_null() { return 0; }
|
||||
let s = std::ffi::CStr::from_ptr(name).to_string_lossy();
|
||||
match s.as_ref() {
|
||||
"birth" => METHOD_BIRTH,
|
||||
"inc" => METHOD_INC,
|
||||
"get" => METHOD_GET,
|
||||
"fini" => METHOD_FINI,
|
||||
_ => 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" fn counter_invoke(
|
||||
instance_id: u32,
|
||||
method_id: u32,
|
||||
_args: *const u8,
|
||||
_args_len: usize,
|
||||
result: *mut u8,
|
||||
result_len: *mut usize,
|
||||
) -> i32 {
|
||||
unsafe {
|
||||
match method_id {
|
||||
METHOD_BIRTH => {
|
||||
// Return new instance handle (u32 id) as raw 4 bytes (not TLV)
|
||||
if result_len.is_null() { return NYB_E_INVALID_ARGS; }
|
||||
if preflight(result, result_len, 4) { return NYB_E_SHORT_BUFFER; }
|
||||
let id = INSTANCE_COUNTER.fetch_add(1, Ordering::Relaxed);
|
||||
if let Ok(mut map) = INSTANCES.lock() {
|
||||
map.insert(id, CounterInstance { count: 0 });
|
||||
} else { return NYB_E_PLUGIN_ERROR; }
|
||||
let bytes = id.to_le_bytes();
|
||||
std::ptr::copy_nonoverlapping(bytes.as_ptr(), result, 4);
|
||||
*result_len = 4;
|
||||
NYB_SUCCESS
|
||||
}
|
||||
METHOD_FINI => {
|
||||
if let Ok(mut map) = INSTANCES.lock() { map.remove(&instance_id); NYB_SUCCESS } else { NYB_E_PLUGIN_ERROR }
|
||||
}
|
||||
METHOD_INC => {
|
||||
if let Ok(mut map) = INSTANCES.lock() {
|
||||
if let Some(inst) = map.get_mut(&instance_id) {
|
||||
inst.count += 1;
|
||||
return write_tlv_i32(inst.count, result, result_len);
|
||||
} else { return NYB_E_INVALID_HANDLE; }
|
||||
} else { return NYB_E_PLUGIN_ERROR; }
|
||||
}
|
||||
METHOD_GET => {
|
||||
if let Ok(map) = INSTANCES.lock() {
|
||||
if let Some(inst) = map.get(&instance_id) {
|
||||
return write_tlv_i32(inst.count, result, result_len);
|
||||
} else { return NYB_E_INVALID_HANDLE; }
|
||||
} else { return NYB_E_PLUGIN_ERROR; }
|
||||
}
|
||||
_ => NYB_E_INVALID_METHOD,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
pub static nyash_typebox_CounterBox: NyashTypeBoxFfi = NyashTypeBoxFfi {
|
||||
abi_tag: 0x5459_4258, // 'TYBX'
|
||||
version: 1,
|
||||
struct_size: std::mem::size_of::<NyashTypeBoxFfi>() as u16,
|
||||
name: b"CounterBox\0".as_ptr() as *const std::os::raw::c_char,
|
||||
resolve: Some(counter_resolve),
|
||||
invoke_id: Some(counter_invoke),
|
||||
capabilities: 0,
|
||||
};
|
||||
|
||||
// ===== TLV helpers =====
|
||||
fn write_tlv_result(payloads: &[(u8, &[u8])], result: *mut u8, result_len: *mut usize) -> i32 {
|
||||
|
||||
11
plugins/nyash-fixture-plugin/Cargo.toml
Normal file
11
plugins/nyash-fixture-plugin/Cargo.toml
Normal file
@ -0,0 +1,11 @@
|
||||
[package]
|
||||
name = "nyash-fixture-plugin"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
name = "nyash_fixture_plugin"
|
||||
crate-type = ["cdylib", "staticlib"]
|
||||
|
||||
[dependencies]
|
||||
once_cell = "1"
|
||||
38
plugins/nyash-fixture-plugin/README.md
Normal file
38
plugins/nyash-fixture-plugin/README.md
Normal file
@ -0,0 +1,38 @@
|
||||
# Nyash Fixture Plugin
|
||||
|
||||
Minimal, deterministic plugin for smoke tests. Provides `FixtureBox` with:
|
||||
|
||||
- Methods
|
||||
- `birth` (id=0): creates an instance; returns instance id as raw u32 (4 bytes)
|
||||
- `echo` (id=1): returns the input string (TLV tag=6)
|
||||
- `get` (id=2): returns constant string "ok"
|
||||
- `fini` (id=0xFFFF_FFFF): destroys the instance
|
||||
|
||||
- TypeBox FFI symbol: `nyash_typebox_FixtureBox`
|
||||
- Legacy entry (compat): `nyash_plugin_invoke`
|
||||
- Spec file: `nyash_box.toml` (type_id=101, method ids)
|
||||
|
||||
Build
|
||||
|
||||
```
|
||||
cargo build --release -p nyash-fixture-plugin
|
||||
```
|
||||
|
||||
Resulting artifacts (by platform):
|
||||
- Linux: `target/release/libnyash_fixture_plugin.so`
|
||||
- macOS: `target/release/libnyash_fixture_plugin.dylib`
|
||||
- Windows: `target/release/nyash_fixture_plugin.dll`
|
||||
|
||||
Copy the built file to the project plugin folder (platform name preserved):
|
||||
- Linux: `plugins/nyash-fixture-plugin/libnyash_fixture_plugin.so`
|
||||
- macOS: `plugins/nyash-fixture-plugin/libnyash_fixture_plugin.dylib`
|
||||
- Windows: `plugins/nyash-fixture-plugin/nyash_fixture_plugin.dll`
|
||||
|
||||
Use in smokes
|
||||
- Profile: `tools/smokes/v2/run.sh --profile plugins`
|
||||
- Test: Fixture autoload is auto-detected and run when the platform file is present
|
||||
- The smoke script auto-detects extension: `.so` (Linux), `.dylib` (macOS), `.dll` (Windows)
|
||||
|
||||
Notes
|
||||
- On Windows, plugin filenames do not start with `lib`.
|
||||
- The plugins smoke uses `using kind="dylib"` autoload; it is safe by default and only enabled when `NYASH_USING_DYLIB_AUTOLOAD=1` is set (the runner handles this).
|
||||
11
plugins/nyash-fixture-plugin/nyash_box.toml
Normal file
11
plugins/nyash-fixture-plugin/nyash_box.toml
Normal file
@ -0,0 +1,11 @@
|
||||
[FixtureBox]
|
||||
type_id = 101
|
||||
|
||||
[FixtureBox.lifecycle]
|
||||
birth.id = 0
|
||||
fini.id = 4294967295
|
||||
|
||||
[FixtureBox.methods]
|
||||
echo.id = 1
|
||||
get.id = 2
|
||||
|
||||
206
plugins/nyash-fixture-plugin/src/lib.rs
Normal file
206
plugins/nyash-fixture-plugin/src/lib.rs
Normal file
@ -0,0 +1,206 @@
|
||||
//! Nyash FixtureBox Plugin — Minimal stable fixture for tests
|
||||
|
||||
use once_cell::sync::Lazy;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{atomic::{AtomicU32, Ordering}, Mutex};
|
||||
|
||||
// ===== Error Codes (BID-1 alignment) =====
|
||||
const NYB_SUCCESS: i32 = 0;
|
||||
const NYB_E_SHORT_BUFFER: i32 = -1;
|
||||
const NYB_E_INVALID_TYPE: i32 = -2;
|
||||
const NYB_E_INVALID_METHOD: i32 = -3;
|
||||
const NYB_E_INVALID_ARGS: i32 = -4;
|
||||
const NYB_E_PLUGIN_ERROR: i32 = -5;
|
||||
const NYB_E_INVALID_HANDLE: i32 = -8;
|
||||
|
||||
// ===== Method IDs =====
|
||||
const METHOD_BIRTH: u32 = 0; // constructor
|
||||
const METHOD_ECHO: u32 = 1; // echo string arg
|
||||
const METHOD_GET: u32 = 2; // returns a constant string
|
||||
const METHOD_FINI: u32 = u32::MAX; // destructor
|
||||
|
||||
// Assign a unique type_id for FixtureBox (avoid collisions with known IDs)
|
||||
const TYPE_ID_FIXTURE: u32 = 101;
|
||||
|
||||
// ===== Instance state (optional) =====
|
||||
struct FixtureInstance {
|
||||
alive: bool,
|
||||
}
|
||||
|
||||
static INSTANCES: Lazy<Mutex<HashMap<u32, FixtureInstance>>> =
|
||||
Lazy::new(|| Mutex::new(HashMap::new()));
|
||||
static INSTANCE_COUNTER: AtomicU32 = AtomicU32::new(1);
|
||||
|
||||
// ===== v1 legacy entry (kept for loader shim compatibility) =====
|
||||
#[no_mangle]
|
||||
pub extern "C" fn nyash_plugin_invoke(
|
||||
type_id: u32,
|
||||
method_id: u32,
|
||||
instance_id: u32,
|
||||
args: *const u8,
|
||||
args_len: usize,
|
||||
result: *mut u8,
|
||||
result_len: *mut usize,
|
||||
) -> i32 {
|
||||
if type_id != TYPE_ID_FIXTURE { return NYB_E_INVALID_TYPE; }
|
||||
unsafe { dispatch(method_id, instance_id, args, args_len, result, result_len) }
|
||||
}
|
||||
|
||||
// ===== v2 TypeBox FFI =====
|
||||
#[allow(non_camel_case_types)]
|
||||
type InvokeFn = extern "C" fn(
|
||||
u32, /* instance_id */
|
||||
u32, /* method_id */
|
||||
*const u8,
|
||||
usize,
|
||||
*mut u8,
|
||||
*mut usize,
|
||||
) -> i32;
|
||||
|
||||
#[repr(C)]
|
||||
pub struct NyashTypeBoxFfi {
|
||||
pub abi_tag: u32,
|
||||
pub version: u16,
|
||||
pub struct_size: u16,
|
||||
pub name: *const std::os::raw::c_char,
|
||||
pub resolve: Option<extern "C" fn(*const std::os::raw::c_char) -> u32>,
|
||||
pub invoke_id: Option<InvokeFn>,
|
||||
pub capabilities: u64,
|
||||
}
|
||||
|
||||
unsafe impl Sync for NyashTypeBoxFfi {}
|
||||
|
||||
extern "C" fn fixture_resolve(name: *const std::os::raw::c_char) -> u32 {
|
||||
unsafe {
|
||||
if name.is_null() { return 0; }
|
||||
let s = std::ffi::CStr::from_ptr(name).to_string_lossy();
|
||||
match s.as_ref() {
|
||||
"birth" => METHOD_BIRTH,
|
||||
"echo" => METHOD_ECHO,
|
||||
"get" => METHOD_GET,
|
||||
"fini" => METHOD_FINI,
|
||||
_ => 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" fn fixture_invoke(
|
||||
instance_id: u32,
|
||||
method_id: u32,
|
||||
args: *const u8,
|
||||
args_len: usize,
|
||||
result: *mut u8,
|
||||
result_len: *mut usize,
|
||||
) -> i32 {
|
||||
unsafe { dispatch(method_id, instance_id, args, args_len, result, result_len) }
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
pub static nyash_typebox_FixtureBox: NyashTypeBoxFfi = NyashTypeBoxFfi {
|
||||
abi_tag: 0x5459_4258, // 'TYBX'
|
||||
version: 1,
|
||||
struct_size: std::mem::size_of::<NyashTypeBoxFfi>() as u16,
|
||||
name: b"FixtureBox\0".as_ptr() as *const std::os::raw::c_char,
|
||||
resolve: Some(fixture_resolve),
|
||||
invoke_id: Some(fixture_invoke),
|
||||
capabilities: 0,
|
||||
};
|
||||
|
||||
// ===== Shared dispatch and helpers =====
|
||||
unsafe fn dispatch(
|
||||
method_id: u32,
|
||||
instance_id: u32,
|
||||
args: *const u8,
|
||||
args_len: usize,
|
||||
result: *mut u8,
|
||||
result_len: *mut usize,
|
||||
) -> i32 {
|
||||
match method_id {
|
||||
METHOD_BIRTH => birth(result, result_len),
|
||||
METHOD_FINI => fini(instance_id),
|
||||
METHOD_ECHO => echo(args, args_len, result, result_len),
|
||||
METHOD_GET => write_tlv_str("ok", result, result_len),
|
||||
_ => NYB_E_INVALID_METHOD,
|
||||
}
|
||||
}
|
||||
|
||||
unsafe fn birth(result: *mut u8, result_len: *mut usize) -> i32 {
|
||||
if result_len.is_null() { return NYB_E_INVALID_ARGS; }
|
||||
if preflight(result, result_len, 4) { return NYB_E_SHORT_BUFFER; }
|
||||
let id = INSTANCE_COUNTER.fetch_add(1, Ordering::Relaxed);
|
||||
if let Ok(mut map) = INSTANCES.lock() {
|
||||
map.insert(id, FixtureInstance { alive: true });
|
||||
} else { return NYB_E_PLUGIN_ERROR; }
|
||||
let bytes = id.to_le_bytes();
|
||||
std::ptr::copy_nonoverlapping(bytes.as_ptr(), result, 4);
|
||||
*result_len = 4;
|
||||
NYB_SUCCESS
|
||||
}
|
||||
|
||||
unsafe fn fini(instance_id: u32) -> i32 {
|
||||
if let Ok(mut map) = INSTANCES.lock() {
|
||||
map.remove(&instance_id);
|
||||
NYB_SUCCESS
|
||||
} else { NYB_E_PLUGIN_ERROR }
|
||||
}
|
||||
|
||||
unsafe fn echo(
|
||||
args: *const u8,
|
||||
args_len: usize,
|
||||
result: *mut u8,
|
||||
result_len: *mut usize,
|
||||
) -> i32 {
|
||||
// Expect TLV with 1 argument: tag=6 (String)
|
||||
if args.is_null() || args_len < 4 { return NYB_E_INVALID_ARGS; }
|
||||
let slice = std::slice::from_raw_parts(args, args_len);
|
||||
// Minimal TLV parse: skip header (ver/argc) and verify first entry is String
|
||||
if slice.len() < 8 { return NYB_E_INVALID_ARGS; }
|
||||
if slice[0] != 1 || slice[1] != 0 { /* ver=1 little endian */ }
|
||||
// position 4.. is first entry; [tag, rsv, sz_lo, sz_hi, payload...]
|
||||
let tag = slice[4];
|
||||
if tag != 6 { return NYB_E_INVALID_ARGS; }
|
||||
let sz = u16::from_le_bytes([slice[6], slice[7]]) as usize;
|
||||
if 8 + sz > slice.len() { return NYB_E_INVALID_ARGS; }
|
||||
let payload = &slice[8..8 + sz];
|
||||
let s = match std::str::from_utf8(payload) { Ok(t) => t, Err(_) => return NYB_E_INVALID_ARGS };
|
||||
write_tlv_str(s, result, result_len)
|
||||
}
|
||||
|
||||
fn write_tlv_result(payloads: &[(u8, &[u8])], result: *mut u8, result_len: *mut usize) -> i32 {
|
||||
if result_len.is_null() { return NYB_E_INVALID_ARGS; }
|
||||
let needed = 4 + payloads.iter().map(|(_, p)| 4 + p.len()).sum::<usize>();
|
||||
let mut buf: Vec<u8> = Vec::with_capacity(needed);
|
||||
buf.extend_from_slice(&1u16.to_le_bytes()); // ver
|
||||
buf.extend_from_slice(&(payloads.len() as u16).to_le_bytes()); // argc
|
||||
for (tag, payload) in payloads {
|
||||
buf.push(*tag);
|
||||
buf.push(0);
|
||||
buf.extend_from_slice(&(payload.len() as u16).to_le_bytes());
|
||||
buf.extend_from_slice(payload);
|
||||
}
|
||||
unsafe {
|
||||
if result.is_null() || *result_len < needed {
|
||||
*result_len = needed;
|
||||
return NYB_E_SHORT_BUFFER;
|
||||
}
|
||||
std::ptr::copy_nonoverlapping(buf.as_ptr(), result, needed);
|
||||
*result_len = needed;
|
||||
}
|
||||
NYB_SUCCESS
|
||||
}
|
||||
|
||||
fn write_tlv_str(s: &str, result: *mut u8, result_len: *mut usize) -> i32 {
|
||||
write_tlv_result(&[(6u8, s.as_bytes())], result, result_len)
|
||||
}
|
||||
|
||||
fn preflight(result: *mut u8, result_len: *mut usize, needed: usize) -> bool {
|
||||
unsafe {
|
||||
if result_len.is_null() { return false; }
|
||||
if result.is_null() || *result_len < needed {
|
||||
*result_len = needed;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user