mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-11-03 09:48:39 +01:00
committed by Junio C Hamano
parent 10bc232d0f
commit c0e40a2d66
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
run-command.c
View File

@ -1246,6 +1246,15 @@ int finish_async(struct async *async)
#endif #endif
} }
int async_with_fork(void)
{
#ifdef NO_PTHREADS
return 1;
#else
return 0;
#endif
}
const char *find_hook(const char *name) const char *find_hook(const char *name)
{ {
static struct strbuf path = STRBUF_INIT; static struct strbuf path = STRBUF_INIT;

1
run-command.h
View File

@ -141,6 +141,7 @@ struct async {
int start_async(struct async *async); int start_async(struct async *async);
int finish_async(struct async *async); int finish_async(struct async *async);
int in_async(void); int in_async(void);
int async_with_fork(void);
void check_pipe(int err); void check_pipe(int err);
/** /**

5
send-pack.c
View File

@ -203,9 +203,8 @@ static int receive_status(int in, struct ref *refs)
static int sideband_demux(int in, int out, void *data) static int sideband_demux(int in, int out, void *data)
{ {
int *fd = data, ret; int *fd = data, ret;
#ifdef NO_PTHREADS if (async_with_fork())
close(fd[1]); close(fd[1]);
#endif
ret = recv_sideband("send-pack", fd[0], out); ret = recv_sideband("send-pack", fd[0], out);
close(out); close(out);
return ret; return ret;