fix macOS build using conditional compilation (#6355)

Depends on neondatabase/tokio-epoll-uring#32
neondatabase · Jan 16, 2024 · 75ebc39 · 75ebc39
1 parent 7218c32
commit 75ebc39
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pageserver/src/virtual_file/io_engine.rs b/pageserver/src/virtual_file/io_engine.rs
@@ -22,6 +22,7 @@
 #[strum(serialize_all = "kebab-case")]
 pub enum IoEngineKind {
     StdFs,
+    #[cfg(target_os = "linux")]
     TokioEpollUring,
 }
 
@@ -91,6 +92,7 @@ impl IoEngineKind {
                 drop(dst);
                 ((file_guard, buf), res)
             }
+            #[cfg(target_os = "linux")]
             IoEngineKind::TokioEpollUring => {
                 let system = tokio_epoll_uring::thread_local_system().await;
                 let (resources, res) = system.read(file_guard, offset, buf).await;

diff --git a/pageserver/src/virtual_file/open_options.rs b/pageserver/src/virtual_file/open_options.rs
@@ -6,13 +6,15 @@ use std::{os::fd::OwnedFd, path::Path};
 #[derive(Debug, Clone)]
 pub enum OpenOptions {
     StdFs(std::fs::OpenOptions),
+    #[cfg(target_os = "linux")]
     TokioEpollUring(tokio_epoll_uring::ops::open_at::OpenOptions),
 }
 
 impl Default for OpenOptions {
     fn default() -> Self {
         match super::io_engine::get() {
             IoEngineKind::StdFs => Self::StdFs(std::fs::OpenOptions::new()),
+            #[cfg(target_os = "linux")]
             IoEngineKind::TokioEpollUring => {
                 Self::TokioEpollUring(tokio_epoll_uring::ops::open_at::OpenOptions::new())
             }
@@ -30,6 +32,7 @@ impl OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.read(read);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.read(read);
             }
@@ -42,6 +45,7 @@ impl OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.write(write);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.write(write);
             }
@@ -54,6 +58,7 @@ impl OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.create(create);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.create(create);
             }
@@ -66,6 +71,7 @@ impl OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.create_new(create_new);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.create_new(create_new);
             }
@@ -78,6 +84,7 @@ impl OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.truncate(truncate);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.truncate(truncate);
             }
@@ -88,6 +95,7 @@ impl OpenOptions {
     pub(in crate::virtual_file) async fn open(&self, path: &Path) -> std::io::Result<OwnedFd> {
         match self {
             OpenOptions::StdFs(x) => x.open(path).map(|file| file.into()),
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let system = tokio_epoll_uring::thread_local_system().await;
                 system.open(path, x).await.map_err(|e| match e {
@@ -107,6 +115,7 @@ impl std::os::unix::prelude::OpenOptionsExt for OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.mode(mode);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.mode(mode);
             }
@@ -119,6 +128,7 @@ impl std::os::unix::prelude::OpenOptionsExt for OpenOptions {
             OpenOptions::StdFs(x) => {
                 let _ = x.custom_flags(flags);
             }
+            #[cfg(target_os = "linux")]
             OpenOptions::TokioEpollUring(x) => {
                 let _ = x.custom_flags(flags);
             }