Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions crates/server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ enum Runtime {
HyperlightDummy,
#[value(name = "hyperlight-wasm-jco")]
HyperlightWASMJco,
HyperlightWASMPulley,
#[value(name = "hyperlight-wasm-pulley-jco")]
HyperlightWASMPulleyJco,
HyperlightWASMPulleyQjs,
HyperlightWASMPulleyDummy,
HyperlightWASMQjs,
Expand Down Expand Up @@ -379,7 +380,7 @@ impl Runtime {
Self::HyperlightWASMJco => hyperlight_wasm(JCO_AOT, JCO_MEMORY),
Self::HyperlightWASMQjs => hyperlight_wasm(QJS_AOT, QJS_MEMORY),
Self::HyperlightWASMDummy => hyperlight_wasm(RUST_AOT, RUST_MEMORY),
Self::HyperlightWASMPulley => hyperlight_wasm(JCO_PULLEY, JCO_PULLEY_MEMORY),
Self::HyperlightWASMPulleyJco => hyperlight_wasm(JCO_PULLEY, JCO_PULLEY_MEMORY),
Self::HyperlightWASMPulleyQjs => hyperlight_wasm(QJS_PULLEY, QJS_MEMORY),
Self::HyperlightWASMPulleyDummy => hyperlight_wasm(RUST_PULLEY, RUST_MEMORY),
Self::HyperlightJS => {
Expand Down Expand Up @@ -451,7 +452,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let pool_size = args.pool_size;
let sandbox_mode = args.strategy;
let runtime = args.runtime;
let is_pulley = matches!(runtime, Runtime::HyperlightWASMPulley | Runtime::HyperlightWASMPulleyQjs | Runtime::HyperlightWASMPulleyDummy);
let is_pulley = matches!(runtime, Runtime::HyperlightWASMPulleyJco | Runtime::HyperlightWASMPulleyQjs | Runtime::HyperlightWASMPulleyDummy);
let is_native_wasm = matches!(runtime, Runtime::HyperlightWASMJco | Runtime::HyperlightWASMQjs | Runtime::HyperlightWASMDummy);
if (is_pulley && !cfg!(feature = "pulley")) || (is_native_wasm && cfg!(feature = "pulley")) {
return Err("Hyperlight Wasm runtime does not match this binary's pulley feature".into());
Expand Down
2 changes: 1 addition & 1 deletion shared/catalog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const definitions = [
{ id: 'hyperlight-dummy', engine: 'Native', description: 'Minimal native Hyperlight guest.' },
{ id: 'hyperlight-js', engine: 'QuickJS', description: 'Native QuickJS inside Hyperlight.' },
{ id: 'hyperlight-wasm-jco', engine: 'StarlingMonkey', description: 'jco component, native AOT, inside Hyperlight.' },
{ id: 'hyperlight-wasm-pulley', engine: 'StarlingMonkey', description: 'jco component, Pulley interpreter, inside Hyperlight.' },
{ id: 'hyperlight-wasm-pulley-jco', engine: 'StarlingMonkey', description: 'jco component, Pulley interpreter, inside Hyperlight.' },
{ id: 'hyperlight-wasm-qjs', engine: 'QuickJS', description: 'QuickJS component, native AOT, inside Hyperlight.' },
{ id: 'hyperlight-wasm-dummy', engine: 'Rust', description: 'Rust Wasm component, native AOT, inside Hyperlight.' },
{ id: 'wasmtime-jco', engine: 'StarlingMonkey', description: 'jco component compiled at context creation.' },
Expand Down
Loading