Repository: mesos
Updated Branches:
  refs/heads/master 0bc57b89a -> 49dcd833e


Cleanup mesos due to the new io::read semantics.

Review: https://reviews.apache.org/r/24774


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/49dcd833
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/49dcd833
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/49dcd833

Branch: refs/heads/master
Commit: 49dcd833e635c2492413310395593bbd8dd90921
Parents: 44d0bae
Author: Jie Yu <yujie....@gmail.com>
Authored: Sat Aug 16 10:47:20 2014 -0700
Committer: Jie Yu <yujie....@gmail.com>
Committed: Sat Aug 16 11:46:24 2014 -0700

----------------------------------------------------------------------
 src/linux/perf.cpp | 16 ----------------
 1 file changed, 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/49dcd833/src/linux/perf.cpp
----------------------------------------------------------------------
diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
index c6dc120..1a851a1 100644
--- a/src/linux/perf.cpp
+++ b/src/linux/perf.cpp
@@ -170,22 +170,6 @@ private:
     }
     perf = _perf.get();
 
-    Try<Nothing> nonblock = os::nonblock(perf.get().out().get());
-    if (nonblock.isError()) {
-      promise.fail("Failed to set nonblock on stdout for perf process: " +
-                    nonblock.error());
-      terminate(self());
-      return;
-    }
-
-    nonblock = os::nonblock(perf.get().err().get());
-    if (nonblock.isError()) {
-      promise.fail("Failed to set nonblock on stderr for perf process: " +
-                    nonblock.error());
-      terminate(self());
-      return;
-    }
-
     // Start reading from stdout and stderr now. We don't use stderr
     // but must read from it to avoid the subprocess blocking on the
     // pipe.

Reply via email to