T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[wiggle] Don't make generated structs and unions Copy.

Browse Source 
Some structs and unions are large enough that making them `Copy` isn't
ideal. wasi-common only needed `Copy` in a few places that were easy to
fix. `SubscriptionClock` is 32 bytes, so it's not a bad a idea to pass
it by reference anyway.
This commit is contained in:
Dan Gohman
2020-03-20 11:08:38 -07:00
committed by Jakub Konka
parent 66460f2139
commit 2fdc7f1a8e
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wasi-common/src/clock.rs
View File

@@ -5,7 +5,7 @@ use std::time::SystemTime;
pub(crate) use sys::clock::*; pub(crate) use sys::clock::*;
pub(crate) fn to_relative_ns_delay(clock: SubscriptionClock) -> Result<u128> { pub(crate) fn to_relative_ns_delay(clock: &SubscriptionClock) -> Result<u128> {
if clock.flags != Subclockflags::SUBSCRIPTION_CLOCK_ABSTIME { if clock.flags != Subclockflags::SUBSCRIPTION_CLOCK_ABSTIME {
return Ok(u128::from(clock.timeout)); return Ok(u128::from(clock.timeout));
} }

2
crates/wasi-common/src/snapshots/wasi_snapshot_preview1.rs
View File

@@ -1185,7 +1185,7 @@ impl<'a> WasiSnapshotPreview1 for WasiCtx {
for subscription in subscriptions { for subscription in subscriptions {
match subscription.u { match subscription.u {
types::SubscriptionU::Clock(clock) => { types::SubscriptionU::Clock(clock) => {
let delay = clock::to_relative_ns_delay(clock)?; let delay = clock::to_relative_ns_delay(&clock)?;
log::debug!("poll_oneoff event.u.clock = {:?}", clock); log::debug!("poll_oneoff event.u.clock = {:?}", clock);
log::debug!("poll_oneoff delay = {:?}ns", delay); log::debug!("poll_oneoff delay = {:?}ns", delay);
let current = poll::ClockEventData { let current = poll::ClockEventData {

2
crates/wasi-common/src/wasi.rs
View File

@@ -95,7 +95,7 @@ impl AsBytes for types::Dirent {
let mut bytes: Vec<u8> = Vec::with_capacity(offset); let mut bytes: Vec<u8> = Vec::with_capacity(offset);
bytes.resize(offset, 0); bytes.resize(offset, 0);
let ptr = bytes.as_mut_ptr() as *mut Self; let ptr = bytes.as_mut_ptr() as *mut Self;
unsafe { ptr.write_unaligned(*self) }; unsafe { ptr.write_unaligned(self.clone()) };
Ok(bytes) Ok(bytes)
} }
} }

2
crates/wiggle/crates/generate/src/types/struct.rs
View File

@@ -74,7 +74,7 @@ pub(super) fn define_struct(
let (struct_lifetime, extra_derive) = if s.needs_lifetime() { let (struct_lifetime, extra_derive) = if s.needs_lifetime() {
(quote!(<'a>), quote!()) (quote!(<'a>), quote!())
} else { } else {
(quote!(), quote!(, Copy, PartialEq)) (quote!(), quote!(, PartialEq))
}; };
let transparent = if s.is_transparent() { let transparent = if s.is_transparent() {

2
crates/wiggle/crates/generate/src/types/union.rs
View File

@@ -68,7 +68,7 @@ pub(super) fn define_union(names: &Names, name: &witx::Id, u: &witx::UnionDataty
let (enum_lifetime, extra_derive) = if u.needs_lifetime() { let (enum_lifetime, extra_derive) = if u.needs_lifetime() {
(quote!(<'a>), quote!()) (quote!(<'a>), quote!())
} else { } else {
(quote!(), quote!(, Copy, PartialEq)) (quote!(), quote!(, PartialEq))
}; };
quote! { quote! {