kobako 0.30.0 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.release-please-manifest.json +1 -1
- data/CHANGELOG.md +335 -0
- data/Cargo.lock +469 -11
- data/README.md +43 -3
- data/ROADMAP.md +1 -1
- data/crates/kobako-runtime/CHANGELOG.md +219 -0
- data/crates/kobako-runtime/Cargo.toml +51 -3
- data/crates/kobako-runtime/README.md +7 -4
- data/crates/kobako-runtime/src/cred.rs +124 -0
- data/crates/kobako-runtime/src/dispatch.rs +4 -5
- data/crates/kobako-runtime/src/endpoint/buffer.rs +153 -44
- data/crates/kobako-runtime/src/endpoint/dispatch.rs +80 -41
- data/crates/kobako-runtime/src/endpoint/invoke.rs +23 -36
- data/crates/kobako-runtime/src/endpoint.rs +137 -36
- data/crates/kobako-runtime/src/errno.rs +391 -0
- data/crates/kobako-runtime/src/error.rs +31 -10
- data/crates/kobako-runtime/src/filesystem/anon_inodes.rs +52 -0
- data/crates/kobako-runtime/src/filesystem/bind/lookup.rs +52 -14
- data/crates/kobako-runtime/src/filesystem/bind/walk.rs +19 -20
- data/crates/kobako-runtime/src/filesystem/bind.rs +437 -245
- data/crates/kobako-runtime/src/filesystem/overlay/file.rs +6 -6
- data/crates/kobako-runtime/src/filesystem/overlay/path.rs +43 -65
- data/crates/kobako-runtime/src/filesystem/overlay/stack/copy_up.rs +9 -16
- data/crates/kobako-runtime/src/filesystem/overlay/stack/dir.rs +47 -72
- data/crates/kobako-runtime/src/filesystem/overlay/stack/namei.rs +12 -12
- data/crates/kobako-runtime/src/filesystem/overlay/stack/readdir.rs +4 -7
- data/crates/kobako-runtime/src/filesystem/overlay/stack.rs +121 -37
- data/crates/kobako-runtime/src/filesystem/overlay.rs +302 -343
- data/crates/kobako-runtime/src/filesystem/pipe.rs +12 -9
- data/crates/kobako-runtime/src/filesystem/rdir.rs +15 -32
- data/crates/kobako-runtime/src/filesystem/tmpfs/seed.rs +32 -0
- data/crates/kobako-runtime/src/filesystem/tmpfs/tmpfile.rs +3 -3
- data/crates/kobako-runtime/src/filesystem/tmpfs/whiteout.rs +57 -35
- data/crates/kobako-runtime/src/filesystem/tmpfs/xattr.rs +2 -2
- data/crates/kobako-runtime/src/filesystem/tmpfs.rs +172 -160
- data/crates/kobako-runtime/src/filesystem/wrap.rs +36 -52
- data/crates/kobako-runtime/src/filesystem.rs +6 -3
- data/crates/kobako-runtime/src/fork.rs +96 -0
- data/crates/kobako-runtime/src/grant.rs +3 -0
- data/crates/kobako-runtime/src/hashtable.rs +4 -2
- data/crates/kobako-runtime/src/lib.rs +18 -7
- data/crates/kobako-runtime/src/limits.rs +195 -0
- data/crates/kobako-runtime/src/locking.rs +10 -0
- data/crates/kobako-runtime/src/memcg.rs +383 -0
- data/crates/kobako-runtime/src/mount.rs +67 -9
- data/crates/kobako-runtime/src/net/backends.rs +43 -0
- data/crates/kobako-runtime/src/net/connections.rs +179 -0
- data/crates/kobako-runtime/src/net/credential.rs +125 -0
- data/crates/kobako-runtime/src/net/egress.rs +160 -0
- data/crates/kobako-runtime/src/net/family.rs +181 -0
- data/crates/kobako-runtime/src/net/http.rs +2733 -0
- data/crates/kobako-runtime/src/net/lookup.rs +285 -0
- data/crates/kobako-runtime/src/net/mock.rs +251 -0
- data/crates/kobako-runtime/src/net/namespace.rs +1366 -0
- data/crates/kobako-runtime/src/net/reactor.rs +531 -0
- data/crates/kobako-runtime/src/net/resolv/darwin.rs +275 -0
- data/crates/kobako-runtime/src/net/resolv/stub/tests.rs +469 -0
- data/crates/kobako-runtime/src/net/resolv/stub.rs +536 -0
- data/crates/kobako-runtime/src/net/resolv/windows.rs +248 -0
- data/crates/kobako-runtime/src/net/resolv.rs +227 -0
- data/crates/kobako-runtime/src/net/socket.rs +870 -0
- data/crates/kobako-runtime/src/net/tcp.rs +1588 -0
- data/crates/kobako-runtime/src/net/tls.rs +58 -0
- data/crates/kobako-runtime/src/net/transport.rs +279 -0
- data/crates/kobako-runtime/src/net/udp.rs +1003 -0
- data/crates/kobako-runtime/src/net.rs +42 -0
- data/crates/kobako-runtime/src/network/builder.rs +177 -0
- data/crates/kobako-runtime/src/network/ruleset.rs +777 -0
- data/crates/kobako-runtime/src/network.rs +551 -0
- data/crates/kobako-runtime/src/policy.rs +16 -0
- data/crates/kobako-runtime/src/profile.rs +29 -144
- data/crates/kobako-runtime/src/runtime.rs +3 -5
- data/crates/kobako-runtime/src/sched.rs +130 -29
- data/crates/kobako-runtime/src/security/entry_policy.rs +22 -0
- data/crates/kobako-runtime/src/{vfs/cred.rs → security/hooks.rs} +52 -144
- data/crates/kobako-runtime/src/security/mount_policy.rs +158 -0
- data/crates/kobako-runtime/src/security.rs +101 -196
- data/crates/kobako-runtime/src/snapshot.rs +121 -2
- data/crates/kobako-runtime/src/vfs/attr.rs +5 -5
- data/crates/kobako-runtime/src/vfs/dentry.rs +143 -89
- data/crates/kobako-runtime/src/vfs/file.rs +199 -203
- data/crates/kobako-runtime/src/vfs/inode.rs +41 -45
- data/crates/kobako-runtime/src/vfs/kern_path.rs +38 -42
- data/crates/kobako-runtime/src/vfs/mount.rs +10 -9
- data/crates/kobako-runtime/src/vfs/namei.rs +829 -700
- data/crates/kobako-runtime/src/vfs/namespace.rs +162 -0
- data/crates/kobako-runtime/src/vfs/open_files.rs +69 -0
- data/crates/kobako-runtime/src/vfs/openat2.rs +3 -3
- data/crates/kobako-runtime/src/vfs/path.rs +6 -6
- data/crates/kobako-runtime/src/vfs/readdir.rs +6 -6
- data/crates/kobako-runtime/src/vfs/stat.rs +159 -23
- data/crates/kobako-runtime/src/vfs/super_block.rs +18 -14
- data/crates/kobako-runtime/src/vfs/utimes.rs +37 -27
- data/crates/kobako-runtime/src/vfs.rs +9 -6
- data/crates/kobako-runtime/src/wait.rs +356 -0
- data/crates/kobako-transport/CHANGELOG.md +31 -0
- data/crates/kobako-transport/Cargo.toml +1 -1
- data/crates/kobako-transport/README.md +3 -4
- data/crates/kobako-transport/src/abi.rs +78 -72
- data/crates/kobako-transport/src/envelope/bytes.rs +17 -6
- data/crates/kobako-transport/src/envelope/call.rs +32 -4
- data/crates/kobako-transport/src/envelope/error_record.rs +21 -0
- data/crates/kobako-transport/src/envelope/name.rs +99 -0
- data/crates/kobako-transport/src/envelope/outcome.rs +9 -9
- data/crates/kobako-transport/src/envelope/preamble.rs +24 -21
- data/crates/kobako-transport/src/envelope/reply.rs +27 -27
- data/crates/kobako-transport/src/envelope/unsupported.rs +10 -10
- data/crates/kobako-transport/src/envelope.rs +13 -8
- data/crates/kobako-wasmtime/CHANGELOG.md +161 -0
- data/crates/kobako-wasmtime/Cargo.toml +26 -7
- data/crates/kobako-wasmtime/README.md +3 -2
- data/crates/kobako-wasmtime/build/preview2.rs +1339 -0
- data/crates/kobako-wasmtime/build.rs +16 -0
- data/crates/kobako-wasmtime/src/abi.rs +17 -37
- data/crates/kobako-wasmtime/src/ambient.rs +33 -18
- data/crates/kobako-wasmtime/src/cache.rs +23 -15
- data/crates/kobako-wasmtime/src/config.rs +52 -68
- data/crates/kobako-wasmtime/src/driver.rs +48 -63
- data/crates/kobako-wasmtime/src/exports.rs +143 -17
- data/crates/kobako-wasmtime/src/guest.rs +12 -6
- data/crates/kobako-wasmtime/src/guest_binary.rs +14 -0
- data/crates/kobako-wasmtime/src/imports.rs +42 -18
- data/crates/kobako-wasmtime/src/instance_pre.rs +4 -4
- data/crates/kobako-wasmtime/src/invocation.rs +74 -12
- data/crates/kobako-wasmtime/src/lib.rs +5 -3
- data/crates/kobako-wasmtime/src/limiter.rs +70 -5
- data/crates/kobako-wasmtime/src/preview1/descriptors.rs +309 -0
- data/crates/kobako-wasmtime/src/preview1/differential/mount.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1/differential.rs +27 -31
- data/crates/kobako-wasmtime/src/preview1/errno.rs +55 -66
- data/crates/kobako-wasmtime/src/preview1/fd.rs +327 -296
- data/crates/kobako-wasmtime/src/preview1/memory.rs +21 -12
- data/crates/kobako-wasmtime/src/preview1/mount_view/wrap.rs +34 -53
- data/crates/kobako-wasmtime/src/preview1/mount_view.rs +231 -217
- data/crates/kobako-wasmtime/src/preview1/path.rs +56 -121
- data/crates/kobako-wasmtime/src/preview1/poll.rs +244 -120
- data/crates/kobako-wasmtime/src/preview1/sock.rs +10 -8
- data/crates/kobako-wasmtime/src/preview1/testsuite.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1.rs +46 -42
- data/crates/kobako-wasmtime/src/preview2/abi.rs +227 -0
- data/crates/kobako-wasmtime/src/preview2/error.rs +118 -0
- data/crates/kobako-wasmtime/src/preview2/filesystem.rs +122 -0
- data/crates/kobako-wasmtime/src/preview2/host.rs +3959 -0
- data/crates/kobako-wasmtime/src/preview2/http.rs +1503 -0
- data/crates/kobako-wasmtime/src/preview2/io.rs +315 -0
- data/crates/kobako-wasmtime/src/preview2/sockets.rs +379 -0
- data/crates/kobako-wasmtime/src/preview2/table.rs +305 -0
- data/crates/kobako-wasmtime/src/preview2.rs +57 -0
- data/crates/kobako-wasmtime/src/trap.rs +24 -9
- data/crates/kobako-wasmtime/src/wasi.rs +210 -81
- data/crates/kobako-wasmtime/wit/deps/cli.wit +233 -0
- data/crates/kobako-wasmtime/wit/deps/clocks.wit +162 -0
- data/crates/kobako-wasmtime/wit/deps/filesystem.wit +589 -0
- data/crates/kobako-wasmtime/wit/deps/http.wit +733 -0
- data/crates/kobako-wasmtime/wit/deps/io.wit +299 -0
- data/crates/kobako-wasmtime/wit/deps/random.wit +92 -0
- data/crates/kobako-wasmtime/wit/deps/sockets.wit +949 -0
- data/data/kobako.wasm +0 -0
- data/ext/kobako/Cargo.toml +1 -1
- data/ext/kobako/src/{runtime/errors.rs → errors.rs} +34 -26
- data/ext/kobako/src/{runtime/escape.rs → escape.rs} +42 -11
- data/ext/kobako/src/{runtime/filesystem → filesystem}/grants.rs +30 -26
- data/ext/kobako/src/{runtime/filesystem → filesystem}/ruby.rs +149 -168
- data/ext/kobako/src/{runtime/filesystem.rs → filesystem.rs} +24 -15
- data/ext/kobako/src/gvl.rs +306 -0
- data/ext/kobako/src/lib.rs +64 -3
- data/ext/kobako/src/network/mock.rs +187 -0
- data/ext/kobako/src/network.rs +591 -0
- data/ext/kobako/src/runtime/bridge.rs +30 -29
- data/ext/kobako/src/runtime/snapshot.rs +4 -4
- data/ext/kobako/src/runtime.rs +221 -143
- data/ext/kobako/src/wire.rs +42 -0
- data/lib/kobako/catalog/extensions.rb +14 -2
- data/lib/kobako/catalog/flags.rb +3 -5
- data/lib/kobako/catalog/grants.rb +5 -4
- data/lib/kobako/catalog/handles.rb +5 -27
- data/lib/kobako/catalog/mount.rb +11 -3
- data/lib/kobako/catalog/network.rb +35 -0
- data/lib/kobako/catalog/replacements.rb +28 -0
- data/lib/kobako/catalog/services.rb +5 -19
- data/lib/kobako/catalog/snippets.rb +3 -18
- data/lib/kobako/catalog.rb +3 -0
- data/lib/kobako/codec/{utils.rb → boundary.rb} +4 -2
- data/lib/kobako/codec/decoder.rb +4 -4
- data/lib/kobako/codec/ext_types.rb +3 -3
- data/lib/kobako/codec/handle_walk.rb +3 -43
- data/lib/kobako/codec/value_budget.rb +132 -40
- data/lib/kobako/codec.rb +1 -1
- data/lib/kobako/context.rb +24 -11
- data/lib/kobako/errors.rb +15 -12
- data/lib/kobako/extension.rb +3 -2
- data/lib/kobako/filesystem.rb +9 -2
- data/lib/kobako/handle.rb +2 -2
- data/lib/kobako/names.rb +28 -0
- data/lib/kobako/network.rb +210 -0
- data/lib/kobako/outcome.rb +7 -7
- data/lib/kobako/pool.rb +45 -23
- data/lib/kobako/runtime.rb +3 -2
- data/lib/kobako/sandbox.rb +92 -35
- data/lib/kobako/sandbox_options.rb +41 -106
- data/lib/kobako/transport/argument_wrap.rb +64 -0
- data/lib/kobako/transport/block_failure.rb +1 -1
- data/lib/kobako/transport/dispatcher.rb +6 -6
- data/lib/kobako/transport/exposure.rb +26 -15
- data/lib/kobako/transport/reflection.rb +21 -4
- data/lib/kobako/transport/run.rb +8 -23
- data/lib/kobako/transport/yielder.rb +2 -9
- data/lib/kobako/transport.rb +1 -0
- data/lib/kobako/version.rb +1 -1
- data/lib/kobako.rb +6 -2
- data/release-please-config.json +15 -0
- data/sig/core/thread.rbs +6 -0
- data/sig/kobako/catalog/extensions.rbs +2 -0
- data/sig/kobako/catalog/grants.rbs +7 -4
- data/sig/kobako/catalog/handles.rbs +0 -2
- data/sig/kobako/catalog/mount.rbs +3 -1
- data/sig/kobako/catalog/network.rbs +20 -0
- data/sig/kobako/catalog/replacements.rbs +14 -0
- data/sig/kobako/catalog/services.rbs +0 -4
- data/sig/kobako/catalog/snippets.rbs +0 -2
- data/sig/kobako/codec/{utils.rbs → boundary.rbs} +2 -2
- data/sig/kobako/codec/handle_walk.rbs +0 -6
- data/sig/kobako/codec/value_budget.rbs +47 -4
- data/sig/kobako/context.rbs +3 -1
- data/sig/kobako/errors.rbs +4 -4
- data/sig/kobako/filesystem.rbs +21 -3
- data/sig/kobako/network.rbs +115 -0
- data/sig/kobako/outcome.rbs +1 -1
- data/sig/kobako/pool.rbs +7 -3
- data/sig/kobako/runtime.rbs +32 -3
- data/sig/kobako/sandbox.rbs +19 -2
- data/sig/kobako/sandbox_options.rbs +29 -38
- data/sig/kobako/transport/argument_wrap.rbs +15 -0
- data/sig/kobako/transport/error.rbs +1 -1
- data/sig/kobako/transport/exposure.rbs +2 -4
- data/sig/kobako/transport/reflection.rbs +10 -0
- data/sig/kobako/transport/run.rbs +0 -2
- data/sig/kobako/transport/yielder.rbs +0 -3
- data/sig/kobako/transport.rbs +1 -1
- data/sig/kobako.rbs +13 -0
- metadata +84 -35
- data/crates/kobako-runtime/src/endpoint/capture.rs +0 -115
- data/crates/kobako-runtime/src/endpoint/memory_cap.rs +0 -238
- data/crates/kobako-runtime/src/filesystem/path.rs +0 -21
- data/crates/kobako-runtime/src/vfs/errno.rs +0 -153
- data/crates/kobako-runtime/tests/linux_baseline/calls.rs +0 -171
- data/crates/kobako-runtime/tests/linux_baseline/concurrent.rs +0 -276
- data/crates/kobako-runtime/tests/linux_baseline/kobako.rs +0 -323
- data/crates/kobako-runtime/tests/linux_baseline/linux-baseline-expected.txt +0 -16
- data/crates/kobako-runtime/tests/linux_baseline/linux.rs +0 -449
- data/crates/kobako-runtime/tests/linux_baseline/main.rs +0 -611
- data/crates/kobako-runtime/tests/linux_baseline/permissions.rs +0 -236
- data/crates/kobako-wasmtime/src/descriptors.rs +0 -200
- data/crates/kobako-wasmtime/tests/integration/compile_posture.rs +0 -43
- data/crates/kobako-wasmtime/tests/integration/guest_file.rs +0 -1085
- data/crates/kobako-wasmtime/tests/integration/main.rs +0 -29
- data/crates/kobako-wasmtime/tests/integration/preamble_flags.rs +0 -70
- data/crates/kobako-wasmtime/tests/integration/snippet_compile.rs +0 -95
- data/crates/kobako-wasmtime/tests/integration/support/mod.rs +0 -30
- data/crates/kobako-wasmtime/tests/integration/unanswered_call.rs +0 -86
- data/crates/kobako-wasmtime/tests/integration/unsupported_call.rs +0 -51
- data/ext/kobako/src/runtime/gvl.rs +0 -147
- data/lib/kobako/constant_name.rb +0 -8
- data/sig/kobako/constant_name.rbs +0 -3
- /data/ext/kobako/src/{runtime/pinned_value.rs → pinned_value.rs} +0 -0
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
//!
|
|
3
3
|
//! The Ruby-Proc `DispatchHandler` and the frame-scoped `GuestYielder`
|
|
4
4
|
//! handle the Proc re-enters the guest through — the one place the
|
|
5
|
-
//! dispatch seam touches `magnus`. The
|
|
6
|
-
//!
|
|
5
|
+
//! dispatch seam touches `magnus`. The Wasm Driver's dispatch path sees
|
|
6
|
+
//! only the contract traits.
|
|
7
7
|
|
|
8
8
|
use core::cell::{Cell, RefCell};
|
|
9
9
|
use core::ptr::NonNull;
|
|
@@ -17,7 +17,7 @@ use magnus::{
|
|
|
17
17
|
|
|
18
18
|
use kobako_runtime::dispatch::DispatchHandler;
|
|
19
19
|
use kobako_runtime::yielder::Yielder;
|
|
20
|
-
use kobako_transport::envelope::{Call, Fault, FaultKind,
|
|
20
|
+
use kobako_transport::envelope::{Call, CallReply, Fault, FaultKind, Target, YieldReply};
|
|
21
21
|
|
|
22
22
|
/// The names each side of this seam branches on — one per Reply and
|
|
23
23
|
/// Yield Reply arm. Neutral Symbols rather than the envelope's tag bytes,
|
|
@@ -51,9 +51,10 @@ pub(super) fn register(kobako: RModule) -> Result<(), MagnusError> {
|
|
|
51
51
|
#[derive(Default)]
|
|
52
52
|
struct OpenFrames(RefCell<Vec<NonNull<dyn Yielder>>>);
|
|
53
53
|
|
|
54
|
-
// SAFETY:
|
|
55
|
-
//
|
|
56
|
-
//
|
|
54
|
+
// SAFETY: every push, pop, and read of the stack runs on a thread holding
|
|
55
|
+
// Ruby's GVL: the dispatch frames push and pop it on the fiber driving the
|
|
56
|
+
// invocation, and a `GuestYielder` reads it before refusing any other fiber,
|
|
57
|
+
// so no two threads reach it at once.
|
|
57
58
|
unsafe impl Send for OpenFrames {}
|
|
58
59
|
unsafe impl Sync for OpenFrames {}
|
|
59
60
|
|
|
@@ -85,17 +86,16 @@ impl OpenFrames {
|
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
/// Frame-scoped Ruby handle that lets the dispatch `Proc` run the block
|
|
88
|
-
/// one Call carried. The bridge builds one per `
|
|
89
|
+
/// one Call carried. The bridge builds one per `upcall` frame,
|
|
89
90
|
/// hands it to the `Proc` as the last argument, and `invalidate`s it the
|
|
90
91
|
/// instant the `Proc` returns. A guest block stashed and called after that
|
|
91
|
-
/// frame
|
|
92
|
-
/// `
|
|
93
|
-
///
|
|
94
|
-
/// the backstop behind that outer net, so neither net is redundant.
|
|
92
|
+
/// frame raises `LocalJumpError`, as a Ruby block called past the frame it
|
|
93
|
+
/// belongs to does, before `call` reaches a frame pointer no longer on the
|
|
94
|
+
/// stack.
|
|
95
95
|
///
|
|
96
96
|
/// The guest's Store is entered from the fiber that drives the
|
|
97
97
|
/// invocation, and only from it: another fiber runs on its own native
|
|
98
|
-
/// stack, which
|
|
98
|
+
/// stack, which the Engine's stack limit and the value budget never saw. A
|
|
99
99
|
/// block run from any other fiber, including one on another thread, is
|
|
100
100
|
/// refused before it reaches the guest.
|
|
101
101
|
///
|
|
@@ -110,9 +110,10 @@ struct GuestYielder {
|
|
|
110
110
|
fiber: rb_sys::VALUE,
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
// SAFETY: magnus requires `Send + Sync` on wrapped types. `call`
|
|
114
|
-
//
|
|
115
|
-
//
|
|
113
|
+
// SAFETY: magnus requires `Send + Sync` on wrapped types. `call` runs only
|
|
114
|
+
// on a thread holding Ruby's GVL, as `OpenFrames` reads require, and refuses
|
|
115
|
+
// every fiber but the one driving the invocation before it re-enters the
|
|
116
|
+
// guest.
|
|
116
117
|
unsafe impl Send for GuestYielder {}
|
|
117
118
|
unsafe impl Sync for GuestYielder {}
|
|
118
119
|
|
|
@@ -138,9 +139,9 @@ impl GuestYielder {
|
|
|
138
139
|
let ruby = Ruby::get().expect("Ruby handle unavailable in the block bridge");
|
|
139
140
|
let innermost = self.open.innermost().filter(|_| self.live.get());
|
|
140
141
|
let Some(mut ptr) = innermost else {
|
|
141
|
-
return Err(
|
|
142
|
-
|
|
143
|
-
"guest block invoked after
|
|
142
|
+
return Err(MagnusError::new(
|
|
143
|
+
ruby.exception_local_jump_error(),
|
|
144
|
+
"guest block invoked after host dispatch frame returned",
|
|
144
145
|
));
|
|
145
146
|
};
|
|
146
147
|
if ruby.fiber_current().as_raw() != self.fiber {
|
|
@@ -149,7 +150,7 @@ impl GuestYielder {
|
|
|
149
150
|
"guest block called from a thread or fiber other than its invocation's",
|
|
150
151
|
));
|
|
151
152
|
}
|
|
152
|
-
let bytes =
|
|
153
|
+
let bytes = crate::to_bytes(args);
|
|
153
154
|
// SAFETY: this frame is live, so the innermost frame — this one or
|
|
154
155
|
// a later Call — is still on the Rust stack with its Yielder lent.
|
|
155
156
|
// Only the innermost frame's Ruby code runs, so no other borrow of
|
|
@@ -157,7 +158,7 @@ impl GuestYielder {
|
|
|
157
158
|
let yielder: &mut dyn Yielder = unsafe { ptr.as_mut() };
|
|
158
159
|
let reply = yielder
|
|
159
160
|
.yield_to_block(self.frame, &bytes)
|
|
160
|
-
.map_err(|t|
|
|
161
|
+
.map_err(|t| crate::errors::from_trap(&ruby, t))?;
|
|
161
162
|
Ok(match reply {
|
|
162
163
|
YieldReply::Ok(body) => (ruby.to_symbol(ARM_OK), ruby.str_from_slice(&body), None),
|
|
163
164
|
YieldReply::Break => (ruby.to_symbol(ARM_BREAK), ruby.str_from_slice(&[]), None),
|
|
@@ -203,17 +204,17 @@ impl DispatchHandler for RubyDispatchHandler {
|
|
|
203
204
|
/// than copied. The Proc folds every `StandardError` into the Reply's
|
|
204
205
|
/// fault arm, so one escaping is a contract violation surfaced as
|
|
205
206
|
/// `None`.
|
|
206
|
-
fn dispatch(&self, call: Call<'_>, yielder: &mut dyn Yielder) -> Option<
|
|
207
|
+
fn dispatch(&self, call: Call<'_>, yielder: &mut dyn Yielder) -> Option<CallReply> {
|
|
207
208
|
// The guest may be running GVL-free (`gvl: :release`); re-acquire the
|
|
208
209
|
// GVL for the whole callback before touching any Ruby VALUE. In hold
|
|
209
210
|
// mode `reenter` runs the body inline — the GVL is already held.
|
|
210
|
-
|
|
211
|
-
// The
|
|
211
|
+
crate::gvl::reenter(|| {
|
|
212
|
+
// The Driver's callback runs on the same Ruby thread that called
|
|
212
213
|
// the active Sandbox invocation (#eval or #run), so `Ruby::get()`
|
|
213
214
|
// is available here once the GVL is held.
|
|
214
215
|
// Panicking with `expect` localises the violation rather than
|
|
215
216
|
// letting a nonsense error propagate.
|
|
216
|
-
let ruby = Ruby::get().expect("Ruby handle unavailable in
|
|
217
|
+
let ruby = Ruby::get().expect("Ruby handle unavailable in the upcall");
|
|
217
218
|
let proc_value: Value = ruby.get_inner(self.on_dispatch);
|
|
218
219
|
// The target crosses in one slot, already discriminated: a
|
|
219
220
|
// String for a bound constant's path, an Integer for a Handle
|
|
@@ -248,7 +249,7 @@ impl DispatchHandler for RubyDispatchHandler {
|
|
|
248
249
|
let (arm, body, kind) = match answer {
|
|
249
250
|
Ok(answer) => answer,
|
|
250
251
|
Err(error) => {
|
|
251
|
-
let _ =
|
|
252
|
+
let _ = crate::escape::hold(&ruby, error);
|
|
252
253
|
return None;
|
|
253
254
|
}
|
|
254
255
|
};
|
|
@@ -260,9 +261,9 @@ impl DispatchHandler for RubyDispatchHandler {
|
|
|
260
261
|
// the public API, so it fails the dispatch rather than
|
|
261
262
|
// degrading.
|
|
262
263
|
match arm.name().ok()?.as_ref() {
|
|
263
|
-
ARM_OK => Some(
|
|
264
|
-
ARM_BREAK => Some(
|
|
265
|
-
ARM_FAULT => Some(
|
|
264
|
+
ARM_OK => Some(CallReply::Ok(crate::to_bytes(body))),
|
|
265
|
+
ARM_BREAK => Some(CallReply::Break),
|
|
266
|
+
ARM_FAULT => Some(CallReply::Fault(Fault::new(
|
|
266
267
|
FaultKind::from_name(&kind?.to_string().ok()?)?,
|
|
267
268
|
body.to_string().ok()?,
|
|
268
269
|
))),
|
|
@@ -272,6 +273,6 @@ impl DispatchHandler for RubyDispatchHandler {
|
|
|
272
273
|
}
|
|
273
274
|
|
|
274
275
|
fn abandoned(&self) -> bool {
|
|
275
|
-
|
|
276
|
+
crate::escape::pending()
|
|
276
277
|
}
|
|
277
278
|
}
|
|
@@ -6,9 +6,9 @@ use magnus::{
|
|
|
6
6
|
};
|
|
7
7
|
|
|
8
8
|
use kobako_runtime::snapshot::{Completion, Snapshot as RuntimeSnapshot};
|
|
9
|
-
use kobako_transport::envelope::Outcome;
|
|
9
|
+
use kobako_transport::envelope::{Origin, Outcome, SANDBOX_ERROR};
|
|
10
10
|
|
|
11
|
-
use
|
|
11
|
+
use crate::errors;
|
|
12
12
|
|
|
13
13
|
/// A Panic's fields as they cross to Ruby: origin, class, message,
|
|
14
14
|
/// backtrace, and the names the invocation could have used in place of the
|
|
@@ -69,8 +69,8 @@ impl Snapshot {
|
|
|
69
69
|
Completion::Outcome(Outcome::Unsupported(_)) => Ok((
|
|
70
70
|
ruby.str_from_slice(&[]),
|
|
71
71
|
Some((
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
Origin::Sandbox.name().to_owned(),
|
|
73
|
+
SANDBOX_ERROR.to_owned(),
|
|
74
74
|
format!(
|
|
75
75
|
"the Sandbox runtime does not support #{}; \
|
|
76
76
|
rebuild it against the kobako version in use",
|