diff options
| author | Jeff King <peff@peff.net> | 2016-04-19 18:50:29 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-20 13:33:56 -0700 |
| commit | df85757244c47394d42de2a45bd39522ee0c3b1d (patch) | |
| tree | 86c3e1426d11590246a5d4932da19ff9bfd2703c | |
| parent | 3e8b06d09c48a46ad7fee761a58040a7b006a642 (diff) | |
| download | git-df85757244c47394d42de2a45bd39522ee0c3b1d.tar.gz git-df85757244c47394d42de2a45bd39522ee0c3b1d.tar.xz | |
fetch-pack: isolate sigpipe in demuxer thread
In commit 9ff18fa (fetch-pack: ignore SIGPIPE in sideband
demuxer, 2016-02-24), we started using sigchain_push() to
ignore SIGPIPE in the async demuxer thread. However, this is
rather clumsy, as it ignores SIGPIPE for the entire process,
including the main thread. At the time we didn't have any
per-thread signal support, but we now we do. Let's use it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | fetch-pack.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index f96f6dfb3..b501d5c32 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -15,7 +15,6 @@ #include "version.h" #include "prio-queue.h" #include "sha1-array.h" -#include "sigchain.h" static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; @@ -674,10 +673,8 @@ static int sideband_demux(int in, int out, void *data) int *xd = data; int ret; - sigchain_push(SIGPIPE, SIG_IGN); ret = recv_sideband("fetch-pack", xd[0], out); close(out); - sigchain_pop(SIGPIPE); return ret; } @@ -701,6 +698,7 @@ static int get_pack(struct fetch_pack_args *args, demux.proc = sideband_demux; demux.data = xd; demux.out = -1; + demux.isolate_sigpipe = 1; if (start_async(&demux)) die("fetch-pack: unable to fork off sideband" " demultiplexer"); |