[PATCH 1/2] run-command: Remove set_nonblocking
- From
Stefan Beller <sbeller@google.com>
- Date
- Nov 5, 2015, 18:17 UTC
- Message-ID
- <1446747439-30349-2-git-send-email-sbeller@google.com>
- In-Reply-To
- <1446747439-30349-1-git-send-email-sbeller@google.com>
strbuf_read_once can also operate on blocking file descriptors if we are sure they are ready. The poll (2) command however makes sure this is the case.
Reading the manual for poll (2), there may be spurious returns indicating readiness but that is for network sockets only. Pipes should be unaffected. By having this patch, we rely on the correctness of poll to return only pipes ready to read.
This fixes compilation in Windows.
Signed-off-by: Stefan Beller <sbeller@google.com> --- run-command.c | 13 ------------- 1 file changed, 13 deletions(-)
diff --git a/run-command.c b/run-command.c index 0a3c24e..51d078c 100644 --- a/run-command.c +++ b/run-command.c @@ -1006,17 +1006,6 @@ static void pp_cleanup(struct parallel_processes *pp) sigchain_pop_common(); } -static void set_nonblocking(int fd) -{ - int flags = fcntl(fd, F_GETFL); - if (flags < 0) - warning("Could not get file status flags, " - "output will be degraded"); - else if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) - warning("Could not set file status flags, " - "output will be degraded"); -} - /* returns * 0 if a new task was started. * 1 if no new jobs was started (get_next_task ran out of work, non critical @@ -1052,8 +1041,6 @@ static int pp_start_one(struct parallel_processes *pp) return code ? -1 : 1; } - set_nonblocking(pp->children[i].process.err); - pp->nr_processes++; pp->children[i].in_use = 1; pp->pfd[i].fd = pp->children[i].process.err;
-- 2.6.1.247.ge8f2a41.dirty