Skip to content

Expr/ramfs #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anti-entropy123 merged 6 commits into from
Jan 22, 2025
Merged

Expr/ramfs #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5c56ef
can build without ramdisk
anti-entropy123 Jan 17, 2025
cad8710
test sorter performance
anti-entropy123 Jan 19, 2025
95fbcde
ps_ramfs has bugs
anti-entropy123 Jan 20, 2025
19892cd
finish ramfs expr
anti-entropy123 Jan 21, 2025
5ec2f77
fix ci error.
anti-entropy123 Jan 21, 2025
09f7fa9
fix ci
anti-entropy123 Jan 22, 2025
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
3 changes: 1 addition & 2 deletions bins/msvisor/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,10 @@ fn msvisor_start(isol: &Arc<Isolation>) {
let isol = get_isol(isol.id).expect("isol don't exist?");

if let Err(e) = isol.run() {
log::error!("isol{} run failed. err={e:?}", isol.id);
// if in debug mod, error will lead to exit.
#[cfg(debug_assertions)]
panic!("isol{} run failed. err={e:?}", isol.id);
#[cfg(not(debug_assertions))]
log::error!("isol{} run failed. err={e:?}", isol.id)
}
}

Expand Down
6 changes: 5 additions & 1 deletion common_service/mm/src/faas_buffer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ lazy_static! {

#[no_mangle]
pub fn buffer_alloc(slot: &str, l: Layout, fingerprint: u64) -> MMResult<usize> {
let addr = BUFFER_ALLOCATOR.lock().allocate_first_fit(l).unwrap();
let addr = BUFFER_ALLOCATOR
.lock()
.allocate_first_fit(l)
.expect("alloc mem failed");

let addr = addr.as_ptr() as usize;

BUFFER_REGISTER
Expand Down
54 changes: 27 additions & 27 deletions common_service/ruxfdtab/Cargo.lock
View file
Open in desktop

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

26 changes: 12 additions & 14 deletions common_service/ruxfdtab/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ edition = "2021"
[lib]
crate-type = ["dylib"]

[features]
mpk = ["ms_std/mpk"]
log = []

default = []

[dependencies]
ms_std = { path = "../../ms_std" }
Expand All @@ -25,18 +20,21 @@ axio = { git = "https://github.com/anti-entropy123/ruxos/" }
ruxfdtable = { git = "https://github.com/anti-entropy123/ruxos/" }
# ruxfdtable = { path = "/home/yjn/rust_project/ruxos/modules/ruxfdtable" }

ruxfs = { git = "https://github.com/anti-entropy123/ruxos/", features = [
"use-ramdisk",
] }
# ruxfs = { path = "/home/yjn/rust_project/ruxos/modules/ruxfs", features = [
# "use-ramdisk",
# ] }
ruxfs = { git = "https://github.com/anti-entropy123/ruxos/", features = [] }
# ruxfs = { path = "/home/yjn/rust_project/ruxos/modules/ruxfs", features = [] }
ruxdriver = { git = "https://github.com/anti-entropy123/ruxos/", features = [
"ramdisk",
] }
], optional = true }
# ruxdriver = { path = "/home/yjn/rust_project/ruxos/modules/ruxdriver", features = [
# "ramdisk",
# ] }
# ], optional = true }

spin = "0.9.8"
lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
lazy_static = { version = "1.5.0", features = ["spin_no_std"] }

[features]
mpk = ["ms_std/mpk"]
use-ramdisk = ["ruxfs/use-ramdisk", "ruxfs/full", "ruxdriver"]
log = []

default = ["use-ramdisk"]
Loading
Loading