зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
3e8b06d09c
Коммит
df85757244
|
@ -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");
|
||||
|
|
Загрузка…
Ссылка в новой задаче