summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2010-03-06 15:40:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-07 08:37:36 (GMT)
commit0ea1c89ba616397ef7e5f6f601ef7a24d2c27b8e (patch)
treebe4b99aacc57c03083c5e199dd8a59457c068ed1 /run-command.c
parent200a76b74db5c2c75bcf73773cb85c5603ec038e (diff)
downloadgit-0ea1c89ba616397ef7e5f6f601ef7a24d2c27b8e.zip
git-0ea1c89ba616397ef7e5f6f601ef7a24d2c27b8e.tar.gz
git-0ea1c89ba616397ef7e5f6f601ef7a24d2c27b8e.tar.bz2
Dying in an async procedure should only exit the thread, not the process.
Async procedures are intended as helpers that perform a very restricted task, and the caller usually has to manage them in a larger context. Conceptually, the async procedure is not concerned with the "bigger picture" in whose context it is run. When it dies, it is not supposed to destroy this "bigger picture", but rather only its own limit view of the world. On POSIX, the async procedure is run in its own process, and exiting this process naturally had only these limited effects. On Windows (or when ASYNC_AS_THREAD is set), calling die() exited the whole process, destroying the caller (the "big picture") as well. This fixes it to exit only the thread. Without ASYNC_AS_THREAD, one particular effect of exiting the async procedure process is that it automatically closes file descriptors, most notably the writable end of the pipe that the async procedure writes to. The async API already requires that the async procedure closes the pipe ends when it exits normally. But for calls to die() no requirements are imposed. In the non-threaded case the pipe ends are closed implicitly by the exiting process, but in the threaded case, the die routine must take care of closing them. Now t5530-upload-pack-error.sh passes on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c
index 77aefff..66cc4bf 100644
--- a/run-command.c
+++ b/run-command.c
@@ -448,12 +448,35 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
}
#ifdef ASYNC_AS_THREAD
+static pthread_t main_thread;
+static int main_thread_set;
+static pthread_key_t async_key;
+
static void *run_thread(void *data)
{
struct async *async = data;
+
+ pthread_setspecific(async_key, async);
+
intptr_t ret = async->proc(async->proc_in, async->proc_out, async->data);
return (void *)ret;
}
+
+static NORETURN void die_async(const char *err, va_list params)
+{
+ vreportf("fatal: ", err, params);
+
+ if (!pthread_equal(main_thread, pthread_self())) {
+ struct async *async = pthread_getspecific(async_key);
+ if (async->proc_in >= 0)
+ close(async->proc_in);
+ if (async->proc_out >= 0)
+ close(async->proc_out);
+ pthread_exit((void *)128);
+ }
+
+ exit(128);
+}
#endif
int start_async(struct async *async)
@@ -525,6 +548,17 @@ int start_async(struct async *async)
else if (async->out)
close(async->out);
#else
+ if (!main_thread_set) {
+ /*
+ * We assume that the first time that start_async is called
+ * it is from the main thread.
+ */
+ main_thread_set = 1;
+ main_thread = pthread_self();
+ pthread_key_create(&async_key, NULL);
+ set_die_routine(die_async);
+ }
+
if (proc_in >= 0)
set_cloexec(proc_in);
if (proc_out >= 0)