std: Expose SystemTime accessors on fs::Metadata

These accessors are used to get at the last modification, last access, and
creation time of the underlying file. Currently not all platforms provide the
creation time, so that currently returns `Option`.
This commit is contained in:
Alex Crichton
2016-01-12 17:24:16 -08:00
parent d0ef740266
commit d1681bbde5
7 changed files with 183 additions and 8 deletions

View File

@@ -22,6 +22,7 @@ use ptr;
use sync::Arc;
use sys::fd::FileDesc;
use sys::platform::raw;
use sys::time::SystemTime;
use sys::{cvt, cvt_r};
use sys_common::{AsInner, FromInner};
@@ -86,6 +87,67 @@ impl FileAttr {
}
}
#[cfg(any(target_os = "ios", target_os = "macos"))]
// FIXME: update SystemTime to store a timespec and don't lose precision
impl FileAttr {
pub fn modified(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timeval {
tv_sec: self.stat.st_mtime,
tv_usec: (self.stat.st_mtime_nsec / 1000) as libc::suseconds_t,
}))
}
pub fn accessed(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timeval {
tv_sec: self.stat.st_atime,
tv_usec: (self.stat.st_atime_nsec / 1000) as libc::suseconds_t,
}))
}
pub fn created(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timeval {
tv_sec: self.stat.st_birthtime,
tv_usec: (self.stat.st_birthtime_nsec / 1000) as libc::suseconds_t,
}))
}
}
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
impl FileAttr {
pub fn modified(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timespec {
tv_sec: self.stat.st_mtime,
tv_nsec: self.stat.st_mtime_nsec as libc::c_long,
}))
}
pub fn accessed(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timespec {
tv_sec: self.stat.st_atime,
tv_nsec: self.stat.st_atime_nsec as libc::c_long,
}))
}
#[cfg(any(target_os = "bitrig",
target_os = "freebsd",
target_os = "openbsd"))]
pub fn created(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(libc::timespec {
tv_sec: self.stat.st_birthtime,
tv_nsec: self.stat.st_birthtime_nsec as libc::c_long,
}))
}
#[cfg(not(any(target_os = "bitrig",
target_os = "freebsd",
target_os = "openbsd")))]
pub fn created(&self) -> io::Result<SystemTime> {
Err(io::Error::new(io::ErrorKind::Other,
"creation time is not available on this platform \
currently"))
}
}
impl AsInner<raw::stat> for FileAttr {
fn as_inner(&self) -> &raw::stat { &self.stat }
}

View File

@@ -146,6 +146,12 @@ mod inner {
}
}
impl From<libc::timeval> for SystemTime {
fn from(t: libc::timeval) -> SystemTime {
SystemTime { t: t }
}
}
impl PartialEq for SystemTime {
fn eq(&self, other: &SystemTime) -> bool {
self.t.tv_sec == other.t.tv_sec && self.t.tv_usec == other.t.tv_usec
@@ -282,6 +288,12 @@ mod inner {
}
}
impl From<libc::timespec> for SystemTime {
fn from(t: libc::timespec) -> SystemTime {
SystemTime { t: Timespec { t: t } }
}
}
impl fmt::Debug for SystemTime {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("SystemTime")

View File

@@ -196,9 +196,9 @@ pub trait MetadataExt {
#[stable(feature = "metadata_ext", since = "1.1.0")]
impl MetadataExt for Metadata {
fn file_attributes(&self) -> u32 { self.as_inner().attrs() }
fn creation_time(&self) -> u64 { self.as_inner().created() }
fn last_access_time(&self) -> u64 { self.as_inner().accessed() }
fn last_write_time(&self) -> u64 { self.as_inner().modified() }
fn creation_time(&self) -> u64 { self.as_inner().created_u64() }
fn last_access_time(&self) -> u64 { self.as_inner().accessed_u64() }
fn last_write_time(&self) -> u64 { self.as_inner().modified_u64() }
fn file_size(&self) -> u64 { self.as_inner().size() }
}

View File

@@ -20,6 +20,7 @@ use ptr;
use slice;
use sync::Arc;
use sys::handle::Handle;
use sys::time::SystemTime;
use sys::{c, cvt};
use sys_common::FromInner;
@@ -421,12 +422,28 @@ impl FileAttr {
FileType::new(self.data.dwFileAttributes, self.reparse_tag)
}
pub fn created(&self) -> u64 { self.to_u64(&self.data.ftCreationTime) }
pub fn accessed(&self) -> u64 { self.to_u64(&self.data.ftLastAccessTime) }
pub fn modified(&self) -> u64 { self.to_u64(&self.data.ftLastWriteTime) }
pub fn modified(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(self.data.ftLastWriteTime))
}
fn to_u64(&self, ft: &c::FILETIME) -> u64 {
(ft.dwLowDateTime as u64) | ((ft.dwHighDateTime as u64) << 32)
pub fn accessed(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(self.data.ftLastAccessTime))
}
pub fn created(&self) -> io::Result<SystemTime> {
Ok(SystemTime::from(self.data.ftCreationTime))
}
pub fn modified_u64(&self) -> u64 {
to_u64(&self.data.ftLastWriteTime)
}
pub fn accessed_u64(&self) -> u64 {
to_u64(&self.data.ftLastAccessTime)
}
pub fn created_u64(&self) -> u64 {
to_u64(&self.data.ftCreationTime)
}
fn is_reparse_point(&self) -> bool {
@@ -434,6 +451,10 @@ impl FileAttr {
}
}
fn to_u64(ft: &c::FILETIME) -> u64 {
(ft.dwLowDateTime as u64) | ((ft.dwHighDateTime as u64) << 32)
}
impl FilePermissions {
pub fn readonly(&self) -> bool {
self.attrs & c::FILE_ATTRIBUTE_READONLY != 0

View File

@@ -166,6 +166,12 @@ impl fmt::Debug for SystemTime {
}
}
impl From<c::FILETIME> for SystemTime {
fn from(t: c::FILETIME) -> SystemTime {
SystemTime { t: t }
}
}
fn dur2intervals(d: &Duration) -> i64 {
d.as_secs().checked_mul(INTERVALS_PER_SEC).and_then(|i| {
i.checked_add(d.subsec_nanos() as u64 / 100)