Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 17:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Mutex and RwLock in jinux-frame for jinux-std

Browse Source
This commit is contained in:
Chuandong Li
2023-08-19 17:26:02 +00:00
committed by Tate, Hongliang Tian
parent df7bd65e70
commit 6d101c5b6d
26 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/libs/jinux-std/src/fs/ramfs/fs.rs
View File

@ -3,9 +3,9 @@ use alloc::str;
use alloc::string::String;
use core::sync::atomic::{AtomicUsize, Ordering};
use core::time::Duration;
use jinux_frame::sync::{RwLock, RwLockWriteGuard};
use jinux_frame::vm::VmFrame;
use jinux_util::slot_vec::SlotVec;
use spin::{RwLock, RwLockWriteGuard};
use super::*;
use crate::fs::device::Device;

5
services/libs/jinux-std/src/prelude.rs
View File

@ -18,14 +18,11 @@ pub(crate) use core::ffi::CStr;
pub(crate) use core::fmt::Debug;
pub(crate) use int_to_c_enum::TryFromInt;
pub(crate) use jinux_frame::config::PAGE_SIZE;
// pub(crate) use jinux_frame::sync::{Mutex, MutexGuard};
pub(crate) use jinux_frame::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
pub(crate) use jinux_frame::sync::{SpinLock, SpinLockGuard};
pub(crate) use jinux_frame::sync::{Mutex, MutexGuard, RwLock, SpinLock, SpinLockGuard};
pub(crate) use jinux_frame::vm::Vaddr;
pub(crate) use jinux_frame::{print, println};
pub(crate) use log::{debug, error, info, trace, warn};
pub(crate) use pod::Pod;
pub(crate) use spin::{Mutex, MutexGuard};
/// return current process
#[macro_export]

2
services/libs/jinux-std/src/vm/vmar/vm_mapping.rs
View File

@ -1,7 +1,7 @@
use crate::prelude::*;
use core::ops::Range;
use jinux_frame::sync::Mutex;
use jinux_frame::vm::{VmFrame, VmFrameVec, VmIo, VmMapOptions, VmPerm, VmSpace};
use spin::Mutex;
use crate::vm::{
vmo::get_page_idx_range,