From cb8be48a05a92868052532313eb055c2edbbff72 Mon Sep 17 00:00:00 2001 From: David Cook Date: Sun, 26 Jan 2020 00:17:45 -0600 Subject: [PATCH] Disable use of pwrite/pread under miri --- src/pagecache/mod.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pagecache/mod.rs b/src/pagecache/mod.rs index 8aa7d54fd..3d6b385d5 100644 --- a/src/pagecache/mod.rs +++ b/src/pagecache/mod.rs @@ -11,11 +11,11 @@ mod io_uring; mod iobuf; mod iterator; mod pagetable; -#[cfg(all(not(unix), not(windows)))] +#[cfg(any(all(not(unix), not(windows)), miri))] mod parallel_io_polyfill; -#[cfg(unix)] +#[cfg(all(unix, not(miri)))] mod parallel_io_unix; -#[cfg(windows)] +#[cfg(all(windows, not(miri)))] mod parallel_io_windows; mod reservation; mod segment; @@ -24,13 +24,13 @@ mod snapshot; use crate::*; use std::{collections::BinaryHeap, ops::Deref}; -#[cfg(all(not(unix), not(windows)))] +#[cfg(any(all(not(unix), not(windows)), miri))] use parallel_io_polyfill::{pread_exact, pwrite_all}; -#[cfg(unix)] +#[cfg(all(unix, not(miri)))] use parallel_io_unix::{pread_exact, pwrite_all}; -#[cfg(windows)] +#[cfg(all(windows, not(miri)))] use parallel_io_windows::{pread_exact, pwrite_all}; use self::{