From 79a45a258023698eda12a6407e7875189db183f0 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Mon, 10 Jul 2017 11:15:45 -0700 Subject: [PATCH] Revert "pipe: make read() return when write end is closed" This reverts commit 09a67641c65c8bdaa1d86dd6ce8ec8310ff7a697. --- src/scheme/pipe.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/scheme/pipe.rs b/src/scheme/pipe.rs index d5dda17..802b748 100644 --- a/src/scheme/pipe.rs +++ b/src/scheme/pipe.rs @@ -172,8 +172,6 @@ impl PipeRead { } fn read(&self, buf: &mut [u8]) -> Result { - let mut resumed = false; - loop { { let mut vec = self.vec.lock(); @@ -188,7 +186,7 @@ impl PipeRead { } } - if i > 0 || resumed { + if i > 0 { return Ok(i); } } @@ -199,7 +197,6 @@ impl PipeRead { return Err(Error::new(EAGAIN)); } else { self.condition.wait(); - resumed = true; } } } @@ -249,9 +246,7 @@ impl PipeWrite { vec.push_back(b); } - if buf.len() > 0 { - self.condition.notify(); - } + self.condition.notify(); Ok(buf.len()) } else {