fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-05 02:20:19 +00:00
Code Issues Projects Releases Wiki Activity

prepare for publish

Browse Source
This commit is contained in:
vms 2020-07-28 20:07:16 +03:00
parent cdc9921023
commit 8fd05a9bdb
20 changed files with 374 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

580
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
Cargo.toml
View File

@ -30,8 +30,8 @@ structopt = "0.3"
wabt = { version = "0.9.1", optional = true }
wasmer = { path = "lib/api", default-features = false }
wasmer-middleware-common = { path = "lib/middleware-common" }
wasmer-runtime = { path = "lib/runtime", default-features = false }
wasmer-runtime-core = { path = "lib/runtime-core" }
wasmer-runtime = { path = "lib/runtime", package = "wasmer-runtime-fl", default-features = false }
wasmer-runtime-core = { path = "lib/runtime-core", package = "wasmer-runtime-core-fl" }
wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true }
# Backends
@ -41,7 +41,7 @@ wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true }
# Frontends
wasmer-emscripten = { path = "lib/emscripten" }
wasmer-wasi = { path = "lib/wasi", optional = true }
wasmer-wasi = { path = "lib/wasi", package = "wasmer-wasi-fl", optional = true }
wasmer-wasi-experimental-io-devices = { path = "lib/wasi-experimental-io-devices", optional = true }
[workspace]

4
examples/parallel/Cargo.toml
View File

@ -10,5 +10,5 @@ license = "MIT"
[dependencies]
rayon = "1.2"
time = "0.1"
wasmer-runtime = { path = "../../lib/runtime" }
wasmer-runtime-core = { path = "../../lib/runtime-core" }
wasmer-runtime = { path = "../../lib/runtime", package = "wasmer-runtime-fl" }
wasmer-runtime-core = { path = "../../lib/runtime-core", package = "wasmer-runtime-core-fl" }

4
fuzz/Cargo.toml
View File

@ -9,8 +9,8 @@ publish = false
cargo-fuzz = true
[dependencies]
wasmer-runtime = { path = "../lib/runtime" }
wasmer-runtime-core = { path = "../lib/runtime-core" }
wasmer-runtime-fl = { path = "../lib/runtime" }
wasmer-runtime-core = { path = "../lib/runtime-core", package = "wasmer-runtime-core-fl" }
wasmer = { path = "../" }
wasmer-llvm-backend = { path = "../lib/llvm-backend" }
wasmer-singlepass-backend = { path = "../lib/singlepass-backend" }

2
lib/api/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "MIT"
[dependencies]
serde = { version = "1", features = ["derive"] }
wasmer-runtime-core = { version = "0.17.0", path = "../runtime-core" }
wasmer-runtime-core = { version = "0.17.0", path = "../runtime-core", package = "wasmer-runtime-core-fl" }
[dependencies.wasmer-singlepass-backend]
path = "../singlepass-backend"

2
lib/clif-backend/Cargo.toml
View File

@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }
cranelift-native = "0.59.0"
cranelift-codegen = "0.59.0"
cranelift-entity = "0.59.0"

2
lib/emscripten/Cargo.toml
View File

@ -15,7 +15,7 @@ lazy_static = "1.4"
libc = "0.2.60"
log = "0.4"
time = "0.1"
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }
[target.'cfg(windows)'.dependencies]
getrandom = "0.1"

2
lib/kernel-loader/Cargo.toml
View File

@ -7,4 +7,4 @@ edition = "2018"
[dependencies]
libc = "0.2.60"
wasmer-runtime-core = { path = "../runtime-core" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl"}

2
lib/llvm-backend/Cargo.toml
View File

@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0", features = ["generate-debug-information-no-export-symbols"] }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["generate-debug-information-no-export-symbols"] }
wasmparser = "0.51.3"
smallvec = "1"
goblin = "0.1"

2
lib/middleware-common/Cargo.toml
View File

@ -10,4 +10,4 @@ categories = ["wasm"]
edition = "2018"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }

2
lib/runtime-c-api/Cargo.toml
View File

@ -26,12 +26,14 @@ version = "0.17.0"
default-features = false
path = "../runtime-core"
version = "0.17.0"
package = "wasmer-runtime-core-fl"
[dependencies.wasmer-wasi]
default-features = false
path = "../wasi"
version = "0.17.0"
optional = true
package = "wasmer-wasi-fl"
[dependencies.wasmer-emscripten]
path = "../emscripten"

2
lib/runtime-core/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "wasmer-runtime-core"
name = "wasmer-runtime-core-fl"
version = "0.17.0"
description = "Wasmer runtime core library"
license = "MIT"

6
lib/runtime/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "wasmer-runtime"
name = "wasmer-runtime-fl"
version = "0.17.0"
description = "Wasmer runtime library"
license = "MIT"
@ -15,7 +15,7 @@ wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.17.0"
lazy_static = "1.4"
memmap = "0.7"
[dependencies.wasmer-runtime-core]
[dependencies.wasmer-runtime-core-fl]
path = "../runtime-core"
version = "0.17.0"
@ -55,7 +55,7 @@ singlepass = ["wasmer-singlepass-backend"]
default-backend-singlepass = ["singlepass"]
default-backend-llvm = ["llvm"]
default-backend-cranelift = ["cranelift"]
deterministic-execution = ["wasmer-singlepass-backend/deterministic-execution", "wasmer-runtime-core/deterministic-execution"]
deterministic-execution = ["wasmer-singlepass-backend/deterministic-execution", "wasmer-runtime-core-fl/deterministic-execution"]
[[bench]]
name = "nginx"

2
lib/runtime/benches/many_instances.rs
View File

@ -6,7 +6,7 @@ use wasmer_runtime::{
cache::{Cache, FileSystemCache, WasmHash},
compile, func, imports, instantiate, validate, Func,
};
use wasmer_runtime_core::vm::Ctx;
use wasmer_runtime_core_fl::vm::Ctx;
fn it_works(_ctx: &mut Ctx) -> i32 {
5

6
lib/runtime/src/cache.rs
View File

@ -12,8 +12,8 @@ use std::{
};
pub use super::Backend;
use wasmer_runtime_core::cache::Error as CacheError;
pub use wasmer_runtime_core::cache::{Artifact, WasmHash};
use wasmer_runtime_core_fl::cache::Error as CacheError;
pub use wasmer_runtime_core_fl::cache::{Artifact, WasmHash};
/// A generic cache for storing and loading compiled wasm modules.
///
@ -119,7 +119,7 @@ impl Cache for FileSystemCache {
let serialized_cache = Artifact::deserialize(&mmap[..])?;
unsafe {
wasmer_runtime_core::load_cache_with(
wasmer_runtime_core_fl::load_cache_with(
serialized_cache,
crate::compiler_for_backend(backend)
.ok_or_else(|| CacheError::UnsupportedBackend(backend.to_string().to_owned()))?

56
lib/runtime/src/lib.rs
View File

@ -94,25 +94,25 @@
#[macro_use]
extern crate serde_derive;
pub use wasmer_runtime_core::backend::{ExceptionCode, Features};
pub use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
pub use wasmer_runtime_core::export::Export;
pub use wasmer_runtime_core::global::Global;
pub use wasmer_runtime_core::import::{ImportObject, LikeNamespace};
pub use wasmer_runtime_core::instance::{DynFunc, Instance};
pub use wasmer_runtime_core::memory::ptr::{Array, Item, WasmPtr};
pub use wasmer_runtime_core::memory::Memory;
pub use wasmer_runtime_core::module::Module;
pub use wasmer_runtime_core::table::Table;
pub use wasmer_runtime_core::types::Value;
pub use wasmer_runtime_core::vm::Ctx;
pub use wasmer_runtime_core_fl::backend::{ExceptionCode, Features};
pub use wasmer_runtime_core_fl::codegen::{MiddlewareChain, StreamingCompiler};
pub use wasmer_runtime_core_fl::export::Export;
pub use wasmer_runtime_core_fl::global::Global;
pub use wasmer_runtime_core_fl::import::{ImportObject, LikeNamespace};
pub use wasmer_runtime_core_fl::instance::{DynFunc, Instance};
pub use wasmer_runtime_core_fl::memory::ptr::{Array, Item, WasmPtr};
pub use wasmer_runtime_core_fl::memory::Memory;
pub use wasmer_runtime_core_fl::module::Module;
pub use wasmer_runtime_core_fl::table::Table;
pub use wasmer_runtime_core_fl::types::Value;
pub use wasmer_runtime_core_fl::vm::Ctx;
pub use wasmer_runtime_core::Func;
pub use wasmer_runtime_core::{compile_with, validate};
pub use wasmer_runtime_core::{func, imports};
pub use wasmer_runtime_core_fl::Func;
pub use wasmer_runtime_core_fl::{compile_with, validate};
pub use wasmer_runtime_core_fl::{func, imports};
#[cfg(unix)]
pub use wasmer_runtime_core::{
pub use wasmer_runtime_core_fl::{
fault::{pop_code_version, push_code_version},
state::CodeVersion,
};
@ -120,14 +120,14 @@ pub use wasmer_runtime_core::{
pub mod memory {
//! The memory module contains the implementation data structures and helper functions used to
//! manipulate and access wasm memory.
pub use wasmer_runtime_core::memory::{Atomically, Memory, MemoryView};
pub use wasmer_runtime_core_fl::memory::{Atomically, Memory, MemoryView};
}
pub mod wasm {
//! Various types exposed by the Wasmer Runtime.
pub use wasmer_runtime_core::global::Global;
pub use wasmer_runtime_core::table::Table;
pub use wasmer_runtime_core::types::{
pub use wasmer_runtime_core_fl::global::Global;
pub use wasmer_runtime_core_fl::table::Table;
pub use wasmer_runtime_core_fl::types::{
FuncSig, GlobalDescriptor, MemoryDescriptor, TableDescriptor, Type, Value,
};
}
@ -135,23 +135,23 @@ pub mod wasm {
pub mod error {
//! The error module contains the data structures and helper functions used to implement errors that
//! are produced and returned from the wasmer runtime.
pub use wasmer_runtime_core::cache::Error as CacheError;
pub use wasmer_runtime_core::error::*;
pub use wasmer_runtime_core_fl::cache::Error as CacheError;
pub use wasmer_runtime_core_fl::error::*;
}
pub mod units {
//! Various unit types.
pub use wasmer_runtime_core::units::{Bytes, Pages};
pub use wasmer_runtime_core_fl::units::{Bytes, Pages};
}
pub mod types {
//! Types used in the Wasm runtime and conversion functions.
pub use wasmer_runtime_core::types::*;
pub use wasmer_runtime_core_fl::types::*;
}
pub mod cache;
pub use wasmer_runtime_core::backend::{Compiler, CompilerConfig};
pub use wasmer_runtime_core_fl::backend::{Compiler, CompilerConfig};
/// Enum used to select which compiler should be used to generate code.
#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq)]
@ -256,7 +256,7 @@ impl std::str::FromStr for Backend {
feature = "default-backend-llvm",
))]
pub fn compile(wasm: &[u8]) -> error::CompileResult<Module> {
wasmer_runtime_core::compile_with(&wasm[..], &default_compiler())
wasmer_runtime_core_fl::compile_with(&wasm[..], &default_compiler())
}
/// The same as `compile` but takes a `CompilerConfig` for the purpose of
@ -273,7 +273,7 @@ pub fn compile_with_config(
wasm: &[u8],
compiler_config: CompilerConfig,
) -> error::CompileResult<Module> {
wasmer_runtime_core::compile_with_config(&wasm[..], &default_compiler(), compiler_config)
wasmer_runtime_core_fl::compile_with_config(&wasm[..], &default_compiler(), compiler_config)
}
/// The same as `compile_with_config` but takes a `Compiler` for the purpose of
@ -283,7 +283,7 @@ pub fn compile_with_config_with(
compiler_config: CompilerConfig,
compiler: &dyn Compiler,
) -> error::CompileResult<Module> {
wasmer_runtime_core::compile_with_config(&wasm[..], compiler, compiler_config)
wasmer_runtime_core_fl::compile_with_config(&wasm[..], compiler, compiler_config)
}
/// Compile and instantiate WebAssembly code without

2
lib/singlepass-backend/Cargo.toml
View File

@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }
dynasm = "0.5"
dynasmrt = "0.5"
lazy_static = "1.4"

4
lib/wasi-experimental-io-devices/Cargo.toml
View File

@ -14,8 +14,8 @@ maintenance = { status = "experimental" }
[dependencies]
log = "0.4"
minifb = "0.13"
wasmer-wasi = { version = "0.17.0", path = "../wasi" }
wasmer-runtime-core = { version = "0.17.0", path = "../runtime-core" }
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.0", path = "../wasi" }
wasmer-runtime-core = { version = "0.17.0", package = "wasmer-runtime-core-fl", path = "../runtime-core" }
ref_thread_local = "0.0"
serde = "1"
typetag = "0.1"

4
lib/wasi/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "wasmer-wasi"
name = "wasmer-wasi-fl"
version = "0.17.0"
description = "Wasmer runtime WASI implementation library"
license = "MIT"
@ -20,7 +20,7 @@ getrandom = "0.1"
time = "0.1"
typetag = "0.1"
serde = { version = "1", features = ["derive"] }
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }
[target.'cfg(windows)'.dependencies]
winapi = "0.3"

2
lib/win-exception-handler/Cargo.toml
View File

@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018"
[target.'cfg(windows)'.dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.17.0" }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" }
winapi = { version = "0.3.8", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
libc = "0.2.60"