diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-03 09:48:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-05 13:42:11 +0900 |
| commit | c0e40a2d66e3b95d13bbc2e6e58d7b5c029d94ab (patch) | |
| tree | e4ca6706ab8cd78073a11287d8d9e9b3e260aa91 /send-pack.c | |
| parent | 10bc232d0f93957c42b2167f00fc3437b30b08b3 (diff) | |
| download | git-c0e40a2d66e3b95d13bbc2e6e58d7b5c029d94ab.tar.gz git-c0e40a2d66e3b95d13bbc2e6e58d7b5c029d94ab.tar.xz | |
send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c
On systems that do not support multithread, start_async() is
implemented with fork(). This implementation details unfortunately
leak out at least in send-pack.c [1].
To keep the code base clean of NO_PTHREADS, move the this #ifdef back
to run-command.c. The new wrapper function async_with_fork() at least
helps suggest that this special "close()" is related to async in fork
mode.
[1] 09c9957cf7 (send-pack: avoid deadlock when pack-object dies early
- 2011-04-25)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/send-pack.c b/send-pack.c index e920ca57d..f69268677 100644 --- a/send-pack.c +++ b/send-pack.c @@ -203,9 +203,8 @@ static int receive_status(int in, struct ref *refs) static int sideband_demux(int in, int out, void *data) { int *fd = data, ret; -#ifdef NO_PTHREADS - close(fd[1]); -#endif + if (async_with_fork()) + close(fd[1]); ret = recv_sideband("send-pack", fd[0], out); close(out); return ret; |