Merge #2666 #2668

2666: fix(windows) Fix slow memory grow handling (fix #2260) r=ptitSeb a=ptitSeb # Description Fix slowiness on Windows plateforms with "memory grow". Will fix #2260 and should speedup Windows use in general. 2668: Fix time format spec in debug output r=ptitSeb a=Amanieu `%Z` is not a valid specifier for the `time` crate, it should be `%z` instead. This was causing panics in debug builds. Co-authored-by: ptitSeb <[email protected]> Co-authored-by: Amanieu d'Antras <[email protected]>
wasmerio · Nov 8, 2021 · e275bd4 · e275bd4
3 parents 4529b03 + 50dc212 + a314675
commit e275bd4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
 CHANGELOG.md merge=union
 *.wast linguist-vendored
 *.wat linguist-vendored
-* -text
+scene*.txt -text
diff --git a/lib/api/src/sys/tunables.rs b/lib/api/src/sys/tunables.rs
@@ -1,9 +1,8 @@
 use crate::sys::{MemoryType, Pages, TableType};
 use loupe::MemoryUsage;
-use std::cmp::min;
 use std::ptr::NonNull;
 use std::sync::Arc;
-use target_lexicon::{OperatingSystem, PointerWidth};
+use target_lexicon::PointerWidth;
 use wasmer_compiler::Target;
 use wasmer_engine::Tunables;
 use wasmer_vm::MemoryError;
@@ -37,7 +36,7 @@ impl BaseTunables {
     pub fn for_target(target: &Target) -> Self {
         let triple = target.triple();
         let pointer_width: PointerWidth = triple.pointer_width().unwrap();
-        let (mut static_memory_bound, mut static_memory_offset_guard_size): (Pages, u64) =
+        let (static_memory_bound, static_memory_offset_guard_size): (Pages, u64) =
             match pointer_width {
                 PointerWidth::U16 => (0x400.into(), 0x1000),
                 PointerWidth::U32 => (0x4000.into(), 0x1_0000),
@@ -60,13 +59,6 @@ impl BaseTunables {
         #[cfg(not(target_os = "windows"))]
         let dynamic_memory_offset_guard_size: u64 = 0x1_0000;
 
-        if let OperatingSystem::Windows = triple.operating_system {
-            // For now, use a smaller footprint on Windows so that we don't
-            // outstrip the paging file.
-            static_memory_bound = min(static_memory_bound, 0x100.into());
-            static_memory_offset_guard_size = min(static_memory_offset_guard_size, 0x20000);
-        }
-
         Self {
             static_memory_bound,
             static_memory_offset_guard_size,

diff --git a/lib/wasi-types/src/file.rs b/lib/wasi-types/src/file.rs
@@ -127,7 +127,7 @@ impl fmt::Debug for __wasi_filestat_t {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let convert_ts_into_time_string = |ts| {
             let tspec = ::time::OffsetDateTime::from_unix_timestamp_nanos(ts);
-            format!("{} ({})", tspec.format("%a, %d %b %Y %T %Z"), ts)
+            format!("{} ({})", tspec.format("%a, %d %b %Y %T %z"), ts)
         };
         f.debug_struct("__wasi_filestat_t")
             .field("st_dev", &self.st_dev)

diff --git a/lib/wasi-types/src/versions/snapshot0.rs b/lib/wasi-types/src/versions/snapshot0.rs
@@ -58,7 +58,7 @@ impl fmt::Debug for __wasi_filestat_t {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let convert_ts_into_time_string = |ts| {
             let tspec = ::time::OffsetDateTime::from_unix_timestamp_nanos(ts);
-            format!("{} ({})", tspec.format("%a, %d %b %Y %T %Z"), ts)
+            format!("{} ({})", tspec.format("%a, %d %b %Y %T %z"), ts)
         };
         f.debug_struct("__wasi_filestat_t")
             .field("st_dev", &self.st_dev)