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
142 changes: 71 additions & 71 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
[workspace]
members = [
"bins/*",
"libmsvisor",
"ms_hostcall",
"ms_std_proc_macro",
"ms_std",
"libasvisor",
"as_hostcall",
"as_std_proc_macro",
"as_std",
"wasmtime_wasi_api",
]

# The reason for excluding "user/" is obvious. This workspace can be regarded as
# a toolchain of libos. But "user/" are users' function.
#
# The reason for excluding "common_service/" is relate to feature gates of ms_std.
# In current implementation, ms_std has conflict features (e.g. `panic_def` and
# The reason for excluding "common_service/" is relate to feature gates of as_std.
# In current implementation, as_std has conflict features (e.g. `panic_def` and
# `unwinding`). Of course, if add "user/" to members, will also have problem of
# feature gate.
exclude = ["user/", "common_service/", "baseline/"]
default-members = ["bins/msvisor"]
default-members = ["bins/asvisor"]
resolver = "2"

[workspace.dependencies]
libmsvisor = { path = "libmsvisor", default-features = false, features = [
libasvisor = { path = "libasvisor", default-features = false, features = [
# "enable_mpk",
] }

ms_hostcall = { path = "ms_hostcall" }
ms_std = { path = "ms_std" }
as_hostcall = { path = "as_hostcall" }
as_std = { path = "as_std" }
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MSlibOS
# AlloyStack

[![CI](https://github.com/anti-entropy123/mslibos/actions/workflows/main.yml/badge.svg)](https://github.com/anti-entropy123/mslibos/actions/workflows/main.yml)
<!-- [![CI](https://github.com/anti-entropy123/mslibos/actions/workflows/main.yml/badge.svg)](https://github.com/anti-entropy123/mslibos/actions/workflows/main.yml) -->

## 构建

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ms_hostcall/Cargo.toml → as_hostcall/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "ms_hostcall"
name = "as_hostcall"
version = "0.1.0"
edition = "2021"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions ms_std/Cargo.toml → as_std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "ms_std"
name = "as_std"
version = "0.1.0"
edition = "2021"

Expand All @@ -9,13 +9,13 @@ crate-type = ["rlib"]


[dependencies]
ms_hostcall = { workspace = true, features = [
as_hostcall = { workspace = true, features = [
"socket",
"fdtab",
"fatfs",
"mm",
] }
ms_std_proc_macro = { path = "../ms_std_proc_macro" }
as_std_proc_macro = { path = "../as_std_proc_macro" }

# buddy_system_allocator = "0.9"
unwinding = { version = "=0.2.0", features = [
Expand All @@ -38,7 +38,7 @@ serde_json = { version = "1.0.135", default-features = false, features = [
[features]
panic_def = []
alloc_def = []
mpk = ["ms_hostcall/enable_mpk"]
mpk = ["as_hostcall/enable_mpk"]
file-based = []

default = []
4 changes: 2 additions & 2 deletions ms_std/src/agent.rs → as_std/src/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ mod refer_based_impl {
use core::{alloc::Layout, borrow::Borrow, mem::ManuallyDrop};

use alloc::{boxed::Box, string::String};
use ms_hostcall::Verify;
use as_hostcall::Verify;

use crate::{libos::libos, println};

Expand Down Expand Up @@ -163,7 +163,7 @@ mod refer_based_impl {
mod file_based_impl {
use alloc::{format, string::String};
use core::{borrow::Borrow, fmt::Write};
use ms_hostcall::Verify;
use as_hostcall::Verify;
use serde::{Deserialize, Serialize};

use crate::fs::File;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion ms_std/src/fs.rs → as_std/src/fs.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use ms_hostcall::{
use as_hostcall::{
fdtab::{FdtabError, FdtabResult},
types::{Fd, OpenFlags, OpenMode, Stat},
};
Expand Down
2 changes: 1 addition & 1 deletion ms_std/src/heap_alloc.rs → as_std/src/heap_alloc.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use linked_list_allocator::LockedHeap;
use ms_hostcall::SERVICE_HEAP_SIZE;
use as_hostcall::SERVICE_HEAP_SIZE;

#[global_allocator]
pub static HEAP_ALLOCATOR: LockedHeap = LockedHeap::empty();
Expand Down
4 changes: 2 additions & 2 deletions ms_std/src/init_context.rs → as_std/src/init_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! and `get_handler_addr`. These two symbols will be lookup when
//! initialize service.
//! To some service that depent `std`, they would use this crate directly
//! rather than `ms_std`.
//! rather than `as_std`.

use ms_hostcall::{types::HostCallResult as HCResult, IsolationContext};
use as_hostcall::{types::HostCallResult as HCResult, IsolationContext};

use spin::Mutex;

Expand Down
2 changes: 1 addition & 1 deletion ms_std/src/io.rs → as_std/src/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use alloc::{
string::{String, ToString},
vec::Vec,
};
use ms_hostcall::fdtab::FdtabError;
use as_hostcall::fdtab::FdtabError;

pub trait Read {
fn read(&mut self, buf: &mut [u8]) -> Result<usize, FdtabError>;
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions ms_std/src/libos/mod.rs → as_std/src/libos/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use core::mem::MaybeUninit;
use spin::Mutex;

use crate::init_context::isolation_ctx;
pub use ms_hostcall::types::MetricEvent;
use ms_hostcall::{
pub use as_hostcall::types::MetricEvent;
use as_hostcall::{
types::{FindHostCallFunc, PanicHandlerFunc, Transmutor},
CommonHostCall, HostCallID,
};
Expand Down
Loading
Loading