Skip to content

Commit

Permalink
extend Metadata to determine last access and modification time
Browse files Browse the repository at this point in the history
  • Loading branch information
@stlankes
stlankes committed Jan 8, 2024
1 parent 53e09bf commit c91f514
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 108 deletions.
14 changes: 7 additions & 7 deletions src/fs/fuse.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,15 @@ impl From<fuse_attr> for FileAttr {
st_uid: attr.uid,
st_gid: attr.gid,
st_rdev: attr.rdev as u64,
st_size: attr.size.try_into().unwrap(),
st_size: attr.size,
st_blksize: attr.blksize as i64,
st_blocks: attr.blocks.try_into().unwrap(),
st_atime: attr.atime.try_into().unwrap(),
st_atime_nsec: attr.atimensec as i64,
st_mtime: attr.mtime.try_into().unwrap(),
st_mtime_nsec: attr.atimensec as i64,
st_ctime: attr.ctime.try_into().unwrap(),
st_ctime_nsec: attr.ctimensec as i64,
st_atime: attr.atime,
st_atime_nsec: attr.atimensec as u64,
st_mtime: attr.mtime,
st_mtime_nsec: attr.atimensec as u64,
st_ctime: attr.ctime,
st_ctime_nsec: attr.ctimensec as u64,
..Default::default()
}
}
Expand Down
162 changes: 113 additions & 49 deletions src/fs/mem.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,47 @@ use alloc::collections::BTreeMap;
use alloc::string::{String, ToString};
use alloc::sync::Arc;
use alloc::vec::Vec;
use core::ops::{Deref, DerefMut};
use core::slice;

use hermit_sync::{RwSpinLock, SpinMutex};

use crate::arch;
use crate::fd::{AccessPermission, IoError, ObjectInterface, OpenOption};
use crate::fs::{DirectoryEntry, FileAttr, NodeKind, VfsNode};

#[derive(Debug, Clone)]
pub(crate) struct RomFileInner {
pub data: &'static [u8],
pub attr: FileAttr,
}

impl RomFileInner {
pub unsafe fn new(ptr: *const u8, length: usize, attr: FileAttr) -> Self {
Self {
data: unsafe { slice::from_raw_parts(ptr, length) },
attr,
}
}
}

#[derive(Debug)]
struct RomFileInterface {
/// Position within the file
pos: SpinMutex<usize>,
/// File content
data: Arc<RwSpinLock<&'static [u8]>>,
inner: Arc<RwSpinLock<RomFileInner>>,
}

impl ObjectInterface for RomFileInterface {
fn read(&self, buf: &mut [u8]) -> Result<usize, IoError> {
let vec = self.data.read();
{
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();
let mut guard = self.inner.write();
guard.attr.st_atime = microseconds / 1_000_000;
guard.attr.st_atime_nsec = (microseconds % 1_000_000) * 1000;
}

let vec = self.inner.read().data;
let mut pos_guard = self.pos.lock();
let pos = *pos_guard;

Expand All @@ -54,24 +76,38 @@ impl ObjectInterface for RomFileInterface {
}

impl RomFileInterface {
pub fn new(data: Arc<RwSpinLock<&'static [u8]>>) -> Self {
pub fn new(inner: Arc<RwSpinLock<RomFileInner>>) -> Self {
Self {
pos: SpinMutex::new(0),
data,
inner,
}
}

pub fn len(&self) -> usize {
let guard = self.data.read();
guard.len()
self.inner.read().data.len()
}
}

impl Clone for RomFileInterface {
fn clone(&self) -> Self {
Self {
pos: SpinMutex::new(*self.pos.lock()),
data: self.data.clone(),
inner: self.inner.clone(),
}
}
}

#[derive(Debug, Clone)]
pub(crate) struct RamFileInner {
pub data: Vec<u8>,
pub attr: FileAttr,
}

impl RamFileInner {
pub fn new(attr: FileAttr) -> Self {
Self {
data: Vec::new(),
attr,
}
}
}
Expand All @@ -81,77 +117,87 @@ pub struct RamFileInterface {
/// Position within the file
pos: SpinMutex<usize>,
/// File content
data: Arc<RwSpinLock<Vec<u8>>>,
inner: Arc<RwSpinLock<RamFileInner>>,
}

impl ObjectInterface for RamFileInterface {
fn read(&self, buf: &mut [u8]) -> Result<usize, IoError> {
let guard = self.data.read();
let vec = guard.deref();
{
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();
let mut guard = self.inner.write();
guard.attr.st_atime = microseconds / 1_000_000;
guard.attr.st_atime_nsec = (microseconds % 1_000_000) * 1000;
}

let guard = self.inner.read();
let mut pos_guard = self.pos.lock();
let pos = *pos_guard;

if pos >= vec.len() {
if pos >= guard.data.len() {
return Ok(0);
}

let len = if vec.len() - pos < buf.len() {
vec.len() - pos
let len = if guard.data.len() - pos < buf.len() {
guard.data.len() - pos
} else {
buf.len()
};

buf[0..len].clone_from_slice(&vec[pos..pos + len]);
buf[0..len].clone_from_slice(&guard.data[pos..pos + len]);
*pos_guard = pos + len;

Ok(len)
}

fn write(&self, buf: &[u8]) -> Result<usize, IoError> {
let mut guard = self.data.write();
let vec = guard.deref_mut();
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();
let mut guard = self.inner.write();
let mut pos_guard = self.pos.lock();
let pos = *pos_guard;

if pos + buf.len() > vec.len() {
vec.resize(pos + buf.len(), 0);
if pos + buf.len() > guard.data.len() {
guard.data.resize(pos + buf.len(), 0);
guard.attr.st_size = guard.data.len().try_into().unwrap();
}

vec[pos..pos + buf.len()].clone_from_slice(buf);
guard.attr.st_atime = microseconds / 1_000_000;
guard.attr.st_atime_nsec = (microseconds % 1_000_000) * 1000;
guard.attr.st_mtime = guard.attr.st_atime;
guard.attr.st_mtime_nsec = guard.attr.st_atime_nsec;
guard.attr.st_ctime = guard.attr.st_atime;
guard.attr.st_ctime_nsec = guard.attr.st_atime_nsec;

guard.data[pos..pos + buf.len()].clone_from_slice(buf);
*pos_guard = pos + buf.len();

Ok(buf.len())
}
}

impl RamFileInterface {
pub fn new(data: Arc<RwSpinLock<Vec<u8>>>) -> Self {
pub fn new(inner: Arc<RwSpinLock<RamFileInner>>) -> Self {
Self {
pos: SpinMutex::new(0),
data,
inner,
}
}

pub fn len(&self) -> usize {
let guard = self.data.read();
let vec: &Vec<u8> = guard.deref();
vec.len()
self.inner.read().data.len()
}
}

impl Clone for RamFileInterface {
fn clone(&self) -> Self {
Self {
pos: SpinMutex::new(*self.pos.lock()),
data: self.data.clone(),
inner: self.inner.clone(),
}
}
}

#[derive(Debug)]
pub(crate) struct RomFile {
data: Arc<RwSpinLock<&'static [u8]>>,
attr: FileAttr,
data: Arc<RwSpinLock<RomFileInner>>,
}

impl VfsNode for RomFile {
Expand All @@ -164,9 +210,7 @@ impl VfsNode for RomFile {
}

fn get_file_attributes(&self) -> Result<FileAttr, IoError> {
let mut attr = self.attr;
attr.st_size = self.data.read().len().try_into().unwrap();
Ok(attr)
Ok(self.data.read().attr)
}

fn traverse_lstat(&self, components: &mut Vec<&str>) -> Result<FileAttr, IoError> {
Expand All @@ -188,22 +232,28 @@ impl VfsNode for RomFile {

impl RomFile {
pub unsafe fn new(ptr: *const u8, length: usize, mode: AccessPermission) -> Self {
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();
let attr = FileAttr {
st_size: length.try_into().unwrap(),
st_mode: mode | AccessPermission::S_IFREG,
st_atime: microseconds / 1_000_000,
st_atime_nsec: (microseconds % 1_000_000) * 1000,
st_mtime: microseconds / 1_000_000,
st_mtime_nsec: (microseconds % 1_000_000) * 1000,
st_ctime: microseconds / 1_000_000,
st_ctime_nsec: (microseconds % 1_000_000) * 1000,
..Default::default()
};

Self {
data: Arc::new(RwSpinLock::new(unsafe {
slice::from_raw_parts(ptr, length)
})),
attr: FileAttr {
st_mode: mode | AccessPermission::S_IFREG,
..Default::default()
},
data: unsafe { Arc::new(RwSpinLock::new(RomFileInner::new(ptr, length, attr))) },
}
}
}

#[derive(Debug, Clone)]
pub(crate) struct RamFile {
data: Arc<RwSpinLock<Vec<u8>>>,
attr: FileAttr,
data: Arc<RwSpinLock<RamFileInner>>,
}

impl VfsNode for RamFile {
Expand All @@ -216,9 +266,7 @@ impl VfsNode for RamFile {
}

fn get_file_attributes(&self) -> Result<FileAttr, IoError> {
let mut attr = self.attr;
attr.st_size = self.data.read().len().try_into().unwrap();
Ok(attr)
Ok(self.data.read().attr)
}

fn traverse_lstat(&self, components: &mut Vec<&str>) -> Result<FileAttr, IoError> {
Expand All @@ -240,12 +288,20 @@ impl VfsNode for RamFile {

impl RamFile {
pub fn new(mode: AccessPermission) -> Self {
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();
let attr = FileAttr {
st_mode: mode | AccessPermission::S_IFREG,
st_atime: microseconds / 1_000_000,
st_atime_nsec: (microseconds % 1_000_000) * 1000,
st_mtime: microseconds / 1_000_000,
st_mtime_nsec: (microseconds % 1_000_000) * 1000,
st_ctime: microseconds / 1_000_000,
st_ctime_nsec: (microseconds % 1_000_000) * 1000,
..Default::default()
};

Self {
data: Arc::new(RwSpinLock::new(Vec::new())),
attr: FileAttr {
st_mode: mode | AccessPermission::S_IFREG,
..Default::default()
},
data: Arc::new(RwSpinLock::new(RamFileInner::new(attr))),
}
}
}
Expand All @@ -260,10 +316,18 @@ pub(crate) struct MemDirectory {

impl MemDirectory {
pub fn new(mode: AccessPermission) -> Self {
let microseconds = arch::processor::get_timer_ticks() + arch::get_boot_time();

Self {
inner: Arc::new(RwSpinLock::new(BTreeMap::new())),
attr: FileAttr {
st_mode: mode | AccessPermission::S_IFDIR,
st_atime: microseconds / 1_000_000,
st_atime_nsec: (microseconds % 1_000_000) * 1000,
st_mtime: microseconds / 1_000_000,
st_mtime_nsec: (microseconds % 1_000_000) * 1000,
st_ctime: microseconds / 1_000_000,
st_ctime_nsec: (microseconds % 1_000_000) * 1000,
..Default::default()
},
}
Expand Down
29 changes: 22 additions & 7 deletions src/fs/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::fd::{
insert_object, AccessPermission, IoError, ObjectInterface, OpenOption, FD_COUNTER,
};
use crate::io::Write;
use crate::time::{timespec, SystemTime};

pub(crate) static FILESYSTEM: OnceCell<Filesystem> = OnceCell::new();

Expand Down Expand Up @@ -316,20 +317,20 @@ pub struct FileAttr {
/// device id
pub st_rdev: u64,
/// size in bytes
pub st_size: i64,
pub st_size: u64,
/// block size
pub st_blksize: i64,
/// size in blocks
pub st_blocks: i64,
/// time of last access
pub st_atime: i64,
pub st_atime_nsec: i64,
pub st_atime: u64,
pub st_atime_nsec: u64,
/// time of last modification
pub st_mtime: i64,
pub st_mtime_nsec: i64,
pub st_mtime: u64,
pub st_mtime_nsec: u64,
/// time of last status change
pub st_ctime: i64,
pub st_ctime_nsec: i64,
pub st_ctime: u64,
pub st_ctime_nsec: u64,
}

#[derive(Debug, FromPrimitive, ToPrimitive)]
Expand Down Expand Up @@ -439,6 +440,20 @@ impl Metadata {
pub fn is_dir(&self) -> bool {
self.0.st_mode.contains(AccessPermission::S_IFDIR)
}

/// Returns the last modification time listed in this metadata.
pub fn modified(&self) -> Result<SystemTime, IoError> {
Ok(SystemTime::from(timespec::from_usec(
self.0.st_mtime * 1_000_000 + self.0.st_mtime_nsec / 1000,
)))
}

/// Returns the last modification time listed in this metadata.
pub fn accessed(&self) -> Result<SystemTime, IoError> {
Ok(SystemTime::from(timespec::from_usec(
self.0.st_atime * 1_000_000 + self.0.st_atime_nsec / 1000,
)))
}
}

/// Given a path, query the file system to get information about a file, directory, etc.
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ mod mm;
mod scheduler;
mod synch;
pub mod syscalls;
pub mod time;

#[cfg(target_os = "none")]
hermit_entry::define_entry_version!();
Expand Down
Loading

0 comments on commit c91f514

Please sign in to comment.