Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use wasi crate for Core API #63676

Merged
merged 23 commits into from
Sep 6, 2019
Merged

Use wasi crate for Core API #63676

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6896ed3
use wasi crate
newpavlov Aug 19, 2019
23cc850
return 0 from errno function
newpavlov Aug 19, 2019
cb52065
replace libc::nanosleep with wasi::poll_oneoff
newpavlov Aug 19, 2019
75a553f
remove to_string
newpavlov Aug 19, 2019
7a4f0ae
use wasi::get_args
newpavlov Aug 19, 2019
52d2871
use wasi::get_environ
newpavlov Aug 19, 2019
8394dbb
remove libc import
newpavlov Aug 19, 2019
338fc7d
use non-zero clock id
newpavlov Aug 19, 2019
7658a13
typo fix
newpavlov Aug 19, 2019
e5ba80a
use const
newpavlov Aug 19, 2019
c052376
fix
newpavlov Aug 19, 2019
744442d
fix C incompatibilities
newpavlov Aug 20, 2019
7daf890
Merge branch 'master' into wasi
newpavlov Aug 20, 2019
4dee102
use new get_args
newpavlov Aug 20, 2019
88fd945
update args
newpavlov Aug 21, 2019
a47e3c0
fixes
newpavlov Aug 21, 2019
926f364
move cvt
newpavlov Aug 21, 2019
3772146
Merge branch 'master' into wasi
newpavlov Aug 24, 2019
6374b84
update to wasi v0.7
newpavlov Aug 29, 2019
06acfb2
add wasi license to the licenses whitelist
newpavlov Aug 29, 2019
127311b
whitelist wasi crate
newpavlov Aug 29, 2019
9fd203a
simplify code
newpavlov Aug 30, 2019
0662fcf
make wasi a target-specific dependency
newpavlov Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
simplify code
  • Loading branch information
@newpavlov
newpavlov committed Aug 30, 2019
commit 9fd203a01e0fe6fb307809fdfdbfcd3bda350cfc
17 changes: 12 additions & 5 deletions src/libstd/sys/wasi/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,18 @@ impl Thread {
type_: wasi::EVENTTYPE_CLOCK,
u: wasi::raw::__wasi_subscription_u { clock: clock },
}];
let mut out: [wasi::Event; 1] = [unsafe { mem::zeroed() }];
let n = unsafe { wasi::poll_oneoff(&in_, &mut out).unwrap() };
let wasi::Event { userdata, error, type_, .. } = out[0];
match (n, userdata, error) {
(1, CLOCK_ID, 0) if type_ == wasi::EVENTTYPE_CLOCK => {}
let (res, event) = unsafe {
let mut out: [wasi::Event; 1] = mem::zeroed();
let res = wasi::poll_oneoff(&in_, &mut out);
(res, out[0])
};
match (res, event) {
(Ok(1), wasi::Event {
userdata: CLOCK_ID,
error: 0,
type_: wasi::EVENTTYPE_CLOCK,
..
}) => {}
_ => panic!("thread::sleep(): unexpected result of poll_oneoff"),
}
}
Expand Down