diff options
| -rw-r--r-- | run-command.c | 29 | ||||
| -rw-r--r-- | run-command.h | 5 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index dd8b7751c..63238e412 100644 --- a/run-command.c +++ b/run-command.c @@ -288,13 +288,23 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const return run_command(&cmd); } +#ifdef __MINGW32__ +static __stdcall unsigned run_thread(void *data) +{ + struct async *async = data; + return async->proc(async->fd_for_proc, async->data); +} +#endif + int start_async(struct async *async) { int pipe_out[2]; if (pipe(pipe_out) < 0) return error("cannot create pipe: %s", strerror(errno)); + async->out = pipe_out[0]; +#ifndef __MINGW32__ async->pid = fork(); if (async->pid < 0) { error("fork (async) failed: %s", strerror(errno)); @@ -305,16 +315,33 @@ int start_async(struct async *async) close(pipe_out[0]); exit(!!async->proc(pipe_out[1], async->data)); } - async->out = pipe_out[0]; close(pipe_out[1]); +#else + async->fd_for_proc = pipe_out[1]; + async->tid = (HANDLE) _beginthreadex(NULL, 0, run_thread, async, 0, NULL); + if (!async->tid) { + error("cannot create thread: %s", strerror(errno)); + close_pair(pipe_out); + return -1; + } +#endif return 0; } int finish_async(struct async *async) { +#ifndef __MINGW32__ int ret = 0; if (wait_or_whine(async->pid)) ret = error("waitpid (async) failed"); +#else + DWORD ret = 0; + if (WaitForSingleObject(async->tid, INFINITE) != WAIT_OBJECT_0) + ret = error("waiting for thread failed: %lu", GetLastError()); + else if (!GetExitCodeThread(async->tid, &ret)) + ret = error("cannot get thread exit code: %lu", GetLastError()); + CloseHandle(async->tid); +#endif return ret; } diff --git a/run-command.h b/run-command.h index debe3074b..5203a9ebb 100644 --- a/run-command.h +++ b/run-command.h @@ -76,7 +76,12 @@ struct async { int (*proc)(int fd, void *data); void *data; int out; /* caller reads from here and closes it */ +#ifndef __MINGW32__ pid_t pid; +#else + HANDLE tid; + int fd_for_proc; +#endif }; int start_async(struct async *async); diff --git a/upload-pack.c b/upload-pack.c index b46dd365e..9f82941f8 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -135,6 +135,8 @@ static int do_rev_list(int fd, void *create_full_pack) die("revision walk setup failed"); mark_edges_uninteresting(revs.commits, &revs, show_edge); traverse_commit_list(&revs, show_commit, show_object); + fflush(pack_pipe); + fclose(pack_pipe); return 0; } |