aboutsummaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-19 13:45:04 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-19 13:45:05 -0700
commit9526aa461f6c6900cb892a6fe248150ad436c0d5 (patch)
tree1c190fc47d136a5d32f8bf3362a2224f9b2bc81b /run-command.c
parent6ae5d9863ba13b5d138851d8e622c9ed05313966 (diff)
parent1ece66bc9e5433dff008786daba9918f3e2a6525 (diff)
downloadgit-9526aa461f6c6900cb892a6fe248150ad436c0d5.tar.gz
git-9526aa461f6c6900cb892a6fe248150ad436c0d5.tar.xz
Merge branch 'jk/a-thread-only-dies-once'
A regression fix for the logic to detect die() handler triggering itself recursively. * jk/a-thread-only-dies-once: run-command: use thread-aware die_is_recursing routine usage: allow pluggable die-recursion checks
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c
index 765c2ce05..1b32a12a2 100644
--- a/run-command.c
+++ b/run-command.c
@@ -588,6 +588,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
static pthread_t main_thread;
static int main_thread_set;
static pthread_key_t async_key;
+static pthread_key_t async_die_counter;
static void *run_thread(void *data)
{
@@ -614,6 +615,14 @@ static NORETURN void die_async(const char *err, va_list params)
exit(128);
}
+
+static int async_die_is_recursing(void)
+{
+ void *ret = pthread_getspecific(async_die_counter);
+ pthread_setspecific(async_die_counter, (void *)1);
+ return ret != NULL;
+}
+
#endif
int start_async(struct async *async)
@@ -695,7 +704,9 @@ int start_async(struct async *async)
main_thread_set = 1;
main_thread = pthread_self();
pthread_key_create(&async_key, NULL);
+ pthread_key_create(&async_die_counter, NULL);
set_die_routine(die_async);
+ set_die_is_recursing_routine(async_die_is_recursing);
}
if (proc_in >= 0)