From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Brandon Casey <drafnel@gmail.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] run-command: use thread-aware die_is_recursing routine
Date: Tue, 16 Apr 2013 15:09:12 -0700 [thread overview]
Message-ID: <7v4nf6jfg7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130416195006.GB11185@sigill.intra.peff.net> (Jeff King's message of "Tue, 16 Apr 2013 15:50:07 -0400")
Jeff King <peff@peff.net> writes:
> diff --git a/run-command.c b/run-command.c
> index 765c2ce..1b32a12 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -588,6 +588,7 @@ static pthread_key_t async_key;
> 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)
Will queue; thanks.
next prev parent reply other threads:[~2013-04-16 22:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-15 23:06 [PATCH 0/3] avoid bogus "recursion detected in die handler" message Jeff King
2013-04-15 23:08 ` [PATCH 1/3] usage: refactor die-recursion checks Jeff King
2013-04-15 23:45 ` Eric Sunshine
2013-04-15 23:47 ` Jeff King
2013-04-16 0:11 ` Brandon Casey
2013-04-16 0:42 ` Jeff King
2013-04-16 1:41 ` Jonathan Nieder
2013-04-16 2:34 ` Brandon Casey
2013-04-16 2:50 ` Jeff King
2013-04-16 7:18 ` Johannes Sixt
2013-04-16 13:01 ` Jeff King
2013-04-16 14:13 ` Johannes Sixt
2013-04-16 19:44 ` [PATCH v2 0/2] avoid bogus "recursion detected in die handler" message Jeff King
2013-04-16 19:46 ` [PATCH v2 1/2] usage: allow pluggable die-recursion checks Jeff King
2013-04-16 19:50 ` [PATCH v2 2/2] run-command: use thread-aware die_is_recursing routine Jeff King
2013-04-16 22:09 ` Junio C Hamano [this message]
2013-04-17 0:49 ` [PATCH v2 0/2] avoid bogus "recursion detected in die handler" message Jonathan Nieder
2013-04-17 1:37 ` Jeff King
2013-04-23 21:27 ` Erik Faye-Lund
2013-04-15 23:08 ` [PATCH 2/3] run-command: factor out running_main_thread function Jeff King
2013-04-16 1:45 ` Jonathan Nieder
2013-04-16 2:53 ` Jeff King
2013-04-15 23:09 ` [PATCH 3/3] usage: do not check die recursion outside main thread Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4nf6jfg7.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).