mirror of
https://github.com/fluencelabs/wasmer
synced 2024-12-05 02:20:19 +00:00
Move kwasmd into wasmer
This commit is contained in:
Syrus
parent
f7c84c8a26
commit
08061f51cb
@ -1,180 +0,0 @@
|
||||
#![deny(
|
||||
dead_code,
|
||||
nonstandard_style,
|
||||
unused_imports,
|
||||
unused_mut,
|
||||
unused_variables,
|
||||
unused_unsafe,
|
||||
unreachable_patterns
|
||||
)]
|
||||
extern crate byteorder;
|
||||
extern crate structopt;
|
||||
|
||||
use structopt::StructOpt;
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
use wasmer_singlepass_backend::SinglePassCompiler;
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
use wasmer_runtime_core::loader::Instance;
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
use std::os::unix::net::{UnixListener, UnixStream};
|
||||
|
||||
#[derive(Debug, StructOpt)]
|
||||
#[structopt(name = "kwasmd", about = "Kernel-mode WebAssembly service.")]
|
||||
enum CLIOptions {
|
||||
#[structopt(name = "listen")]
|
||||
Listen(Listen),
|
||||
}
|
||||
|
||||
#[derive(Debug, StructOpt)]
|
||||
struct Listen {
|
||||
#[structopt(long = "socket")]
|
||||
socket: String,
|
||||
}
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
const CMD_RUN_CODE: u32 = 0x901;
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
const CMD_READ_MEMORY: u32 = 0x902;
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
const CMD_WRITE_MEMORY: u32 = 0x903;
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
fn handle_client(mut stream: UnixStream) {
|
||||
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
|
||||
use std::io::{Read, Write};
|
||||
let binary_size = stream.read_u32::<LittleEndian>().unwrap();
|
||||
if binary_size > 1048576 * 16 {
|
||||
println!("binary too large");
|
||||
return;
|
||||
}
|
||||
let mut wasm_binary: Vec<u8> = Vec::with_capacity(binary_size as usize);
|
||||
unsafe { wasm_binary.set_len(binary_size as usize) };
|
||||
stream.read_exact(&mut wasm_binary).unwrap();
|
||||
use wasmer_runtime_core::backend::{CompilerConfig, MemoryBoundCheckMode};
|
||||
let module = wasmer_runtime::compile_with_config_with(
|
||||
&wasm_binary[..],
|
||||
CompilerConfig {
|
||||
symbol_map: None,
|
||||
memory_bound_check_mode: MemoryBoundCheckMode::Disable,
|
||||
enforce_stack_check: true,
|
||||
track_state: false,
|
||||
features: Default::default(),
|
||||
..Default::default()
|
||||
},
|
||||
&SinglePassCompiler::new(),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let mut import_object = wasmer_runtime_core::import::ImportObject::new();
|
||||
import_object.allow_missing_functions = true; // Import initialization might be left to the loader.
|
||||
let instance = module.instantiate(&import_object).unwrap();
|
||||
let mut ins = instance.load(::wasmer_kernel_loader::KernelLoader).unwrap();
|
||||
|
||||
loop {
|
||||
let cmd = stream.read_u32::<LittleEndian>().unwrap();
|
||||
match cmd {
|
||||
CMD_RUN_CODE => {
|
||||
let func_name_len = stream.read_u32::<LittleEndian>().unwrap();
|
||||
if func_name_len > 32 {
|
||||
println!("function name too long");
|
||||
return;
|
||||
}
|
||||
let mut func_name: Vec<u8> = Vec::with_capacity(func_name_len as usize);
|
||||
unsafe { func_name.set_len(func_name_len as usize) };
|
||||
stream.read_exact(&mut func_name).unwrap();
|
||||
let func_name = ::std::str::from_utf8(&func_name).unwrap();
|
||||
let arg_count = stream.read_u32::<LittleEndian>().unwrap();
|
||||
if arg_count > 0 {
|
||||
println!("Too many arguments");
|
||||
return;
|
||||
}
|
||||
use wasmer_runtime::Value;
|
||||
let mut args: Vec<Value> = Vec::with_capacity(arg_count as usize);
|
||||
for _ in 0..arg_count {
|
||||
args.push(Value::I64(stream.read_u64::<LittleEndian>().unwrap() as _));
|
||||
}
|
||||
|
||||
let index = instance.resolve_func(func_name).unwrap();
|
||||
let ret = ins.call(index, &args);
|
||||
match ret {
|
||||
Ok(x) => {
|
||||
stream.write_u32::<LittleEndian>(1).unwrap();
|
||||
stream.write_u128::<LittleEndian>(x).unwrap();
|
||||
}
|
||||
Err(e) => {
|
||||
println!("Execution error: {:?}", e);
|
||||
stream.write_u32::<LittleEndian>(0).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
CMD_READ_MEMORY => {
|
||||
let offset = stream.read_u32::<LittleEndian>().unwrap();
|
||||
let len = stream.read_u32::<LittleEndian>().unwrap();
|
||||
if len > 1048576 * 16 {
|
||||
println!("memory size too large");
|
||||
return;
|
||||
}
|
||||
let buf = ins.read_memory(offset, len).unwrap();
|
||||
stream.write_all(&buf).unwrap();
|
||||
}
|
||||
CMD_WRITE_MEMORY => {
|
||||
let offset = stream.read_u32::<LittleEndian>().unwrap();
|
||||
let len = stream.read_u32::<LittleEndian>().unwrap();
|
||||
if len > 1048576 * 16 {
|
||||
println!("memory size too large");
|
||||
return;
|
||||
}
|
||||
let mut buf: Vec<u8> = Vec::with_capacity(len as usize);
|
||||
unsafe { buf.set_len(len as usize) };
|
||||
stream.read_exact(&mut buf).unwrap();
|
||||
ins.write_memory(offset, len, &buf).unwrap();
|
||||
}
|
||||
_ => {
|
||||
println!("Unknown command");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
fn run_listen(opts: Listen) {
|
||||
let listener = UnixListener::bind(&opts.socket).unwrap();
|
||||
use std::thread;
|
||||
for stream in listener.incoming() {
|
||||
match stream {
|
||||
Ok(stream) => {
|
||||
thread::spawn(|| {
|
||||
match ::std::panic::catch_unwind(::std::panic::AssertUnwindSafe(|| {
|
||||
handle_client(stream);
|
||||
})) {
|
||||
Ok(()) => {}
|
||||
Err(_) => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
Err(err) => {
|
||||
panic!("{:?}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "loader-kernel")]
|
||||
fn main() {
|
||||
panic!("Kwasm not updated for 128-bit support, yet. Sorry!");
|
||||
// let options = CLIOptions::from_args();
|
||||
// match options {
|
||||
// CLIOptions::Listen(listen) => {
|
||||
// run_listen(listen);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "loader-kernel"))]
|
||||
fn main() {
|
||||
panic!("Kwasm loader is not enabled during compilation.");
|
||||
}
|
||||
@ -8,6 +8,8 @@
|
||||
unreachable_patterns
|
||||
)]
|
||||
use std::env;
|
||||
#[cfg(all(target_os = "linux", feature = "loader-kernel"))]
|
||||
use wasmer_bin::commands::Kernel;
|
||||
use wasmer_bin::commands::{Cache, Run, SelfUpdate, Validate};
|
||||
|
||||
use structopt::{clap, StructOpt};
|
||||
@ -31,6 +33,11 @@ enum CLIOptions {
|
||||
/// Update wasmer to the latest version
|
||||
#[structopt(name = "self-update")]
|
||||
SelfUpdate,
|
||||
|
||||
/// The Wasm kernel loader
|
||||
#[cfg(all(target_os = "linux", feature = "loader-kernel"))]
|
||||
#[structopt(name = "self-update")]
|
||||
Kernel(Kernel),
|
||||
}
|
||||
|
||||
fn main() {
|
||||
@ -54,5 +61,7 @@ fn main() {
|
||||
CLIOptions::SelfUpdate => SelfUpdate::execute(),
|
||||
CLIOptions::Cache(cache) => cache.execute(),
|
||||
CLIOptions::Validate(validate) => validate.execute(),
|
||||
#[cfg(all(target_os = "linux", feature = "loader-kernel"))]
|
||||
CLIOptions::Kernel(kernel) => kernel.execute(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
mod cache;
|
||||
#[cfg(all(target_os = "linux", feature = "loader-kernel"))]
|
||||
mod kernel;
|
||||
mod run;
|
||||
mod selfupdate;
|
||||
mod validate;
|
||||
|
||||
#[cfg(all(target_os = "linux", feature = "loader-kernel"))]
|
||||
pub use kernel::*;
|
||||
pub use {cache::*, run::*, selfupdate::*, validate::*};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user