tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-07 00:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: allow pipe::OpenOptions::read_write on Android (#7426)

Browse Source
This commit is contained in:
Marshall Pierce
2025-06-27 09:39:55 +02:00
committed by GitHub
parent 3636fd018a
commit 6b705b3053
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/src/net/unix/pipe.rs
+5 -5
View File
@@ -120,7 +120,7 @@ pub fn pipe() -> io::Result<(Sender, Receiver)> {
/// ``` /// ```
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct OpenOptions { pub struct OpenOptions {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
read_write: bool, read_write: bool,
unchecked: bool, unchecked: bool,
} }
@@ -131,7 +131,7 @@ impl OpenOptions {
/// All options are initially set to `false`. /// All options are initially set to `false`.
pub fn new() -> OpenOptions { pub fn new() -> OpenOptions {
OpenOptions { OpenOptions {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
read_write: false, read_write: false,
unchecked: false, unchecked: false,
} }
@@ -168,8 +168,8 @@ impl OpenOptions {
/// .read_write(true) /// .read_write(true)
/// .open_receiver("path/to/a/fifo"); /// .open_receiver("path/to/a/fifo");
/// ``` /// ```
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
#[cfg_attr(docsrs, doc(cfg(target_os = "linux")))] #[cfg_attr(docsrs, doc(cfg(any(target_os = "linux", target_os = "android"))))]
pub fn read_write(&mut self, value: bool) -> &mut Self { pub fn read_write(&mut self, value: bool) -> &mut Self {
self.read_write = value; self.read_write = value;
self self
@@ -264,7 +264,7 @@ impl OpenOptions {
.write(pipe_end == PipeEnd::Sender) .write(pipe_end == PipeEnd::Sender)
.custom_flags(libc::O_NONBLOCK); .custom_flags(libc::O_NONBLOCK);
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
if self.read_write { if self.read_write {
options.read(true).write(true); options.read(true).write(true);
} }
tokio/tests/net_unix_pipe.rs
+2 -2
View File
@@ -68,7 +68,7 @@ async fn fifo_simple_send() -> io::Result<()> {
} }
#[tokio::test] #[tokio::test]
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
#[cfg_attr(miri, ignore)] // No `mkfifo` in miri. #[cfg_attr(miri, ignore)] // No `mkfifo` in miri.
async fn fifo_simple_send_sender_first() -> io::Result<()> { async fn fifo_simple_send_sender_first() -> io::Result<()> {
const DATA: &[u8] = b"this is some data to write to the fifo"; const DATA: &[u8] = b"this is some data to write to the fifo";
@@ -134,7 +134,7 @@ async fn fifo_multiple_writes() -> io::Result<()> {
/// Checks behavior of a resilient reader (Receiver in O_RDWR access mode) /// Checks behavior of a resilient reader (Receiver in O_RDWR access mode)
/// with writers sequentially opening and closing a FIFO. /// with writers sequentially opening and closing a FIFO.
#[tokio::test] #[tokio::test]
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
#[cfg_attr(miri, ignore)] // No `socket` in miri. #[cfg_attr(miri, ignore)] // No `socket` in miri.
async fn fifo_resilient_reader() -> io::Result<()> { async fn fifo_resilient_reader() -> io::Result<()> {
const DATA: &[u8] = b"this is some data to write to the fifo"; const DATA: &[u8] = b"this is some data to write to the fifo";