fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

debug log error in windows clock, conditionally pull in winapi

Browse Source
This commit is contained in:
Mark McCaskey 2019-05-21 10:35:51 -07:00
parent 08b4b639f4
commit 736bddfe17
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wasi/src/lib.rs
View File

@ -2,6 +2,8 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[cfg(target = windows)]
extern crate winapi;
#[macro_use] #[macro_use]
mod macros; mod macros;

9
lib/wasi/src/syscalls/windows.rs
View File

@ -5,7 +5,7 @@ pub fn platform_clock_res_get(
clock_id: __wasi_clockid_t, clock_id: __wasi_clockid_t,
resolution: &Cell<__wasi_timestamp_t>, resolution: &Cell<__wasi_timestamp_t>,
) -> __wasi_errno_t { ) -> __wasi_errno_t {
let resolution = match clock_id { let resolution_val = match clock_id {
// resolution of monotonic clock at 10ms, from: // resolution of monotonic clock at 10ms, from:
// https://docs.microsoft.com/en-us/windows/desktop/api/sysinfoapi/nf-sysinfoapi-gettickcount64 // https://docs.microsoft.com/en-us/windows/desktop/api/sysinfoapi/nf-sysinfoapi-gettickcount64
__WASI_CLOCK_MONOTONIC => 10_000_000, __WASI_CLOCK_MONOTONIC => 10_000_000,
@ -18,7 +18,7 @@ pub fn platform_clock_res_get(
return __WASI_EINVAL; return __WASI_EINVAL;
} }
}; };
resolution.set(resolution); resolution.set(resolution_val);
__WASI_ESUCCESS __WASI_ESUCCESS
} }
@ -35,7 +35,10 @@ pub fn platform_clock_time_get(
__WASI_CLOCK_REALTIME => { __WASI_CLOCK_REALTIME => {
let duration = wasi_try!(std::time::SystemTime::now() let duration = wasi_try!(std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH) .duration_since(std::time::UNIX_EPOCH)
.ok_or(__WASI_EIO)); .map_err(|e| {
debug!("Error in wasi::platform_clock_time_get: {:?}", e);
__WASI_EIO
}));
duration.as_nanos() as u64 duration.as_nanos() as u64
} }
__WASI_CLOCK_PROCESS_CPUTIME_ID => { __WASI_CLOCK_PROCESS_CPUTIME_ID => {