user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #65617 - newpavlov:patch-2, r=alexcrichton

Browse source 
Fix WASI sleep impl

Closes #65607

@sunfishcode
Is it fine to use 0 for the `identifier` field? What is this field used for?
This commit is contained in:
Yuki Okushi 2019-10-23 17:14:36 +09:00 • committed by GitHub
commit ff2442ff36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/sys/wasi/thread.rs
View file

@ -31,10 +31,10 @@ impl Thread {
let nanos = dur.as_nanos();
assert!(nanos <= u64::max_value() as u128);
const CLOCK_ID: wasi::Userdata = 0x0123_45678;
const USERDATA: wasi::Userdata = 0x0123_45678;
let clock = wasi::raw::__wasi_subscription_u_clock_t {
identifier: CLOCK_ID,
identifier: 0,
clock_id: wasi::CLOCK_MONOTONIC,
timeout: nanos as u64,
precision: 0,
@ -42,7 +42,7 @@ impl Thread {
};
let in_ = [wasi::Subscription {
userdata: 0,
userdata: USERDATA,
type_: wasi::EVENTTYPE_CLOCK,
u: wasi::raw::__wasi_subscription_u { clock: clock },
}];
@ -53,7 +53,7 @@ impl Thread {
};
match (res, event) {
(Ok(1), wasi::Event {
userdata: CLOCK_ID,
userdata: USERDATA,
error: 0,
type_: wasi::EVENTTYPE_CLOCK,
..