kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

trace2: fix tracing when NO_PTHREADS is defined 

Teach trace2 TLS code to not rely on pthread_getspecific() when NO_PTHREADS
is defined.  Instead, always assume the context data of the main thread.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff Hostetler 2019-05-21 12:33:59 -07:00 committed by Junio C Hamano
parent c173542c84
commit 5fdae9d3be
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trace2/tr2_tls.c
View File

@ -47,7 +47,12 @@ struct tr2tls_thread_ctx *tr2tls_create_self(const char *thread_name)


struct tr2tls_thread_ctx *tr2tls_get_self(void) struct tr2tls_thread_ctx *tr2tls_get_self(void)
{ {
struct tr2tls_thread_ctx *ctx = pthread_getspecific(tr2tls_key); struct tr2tls_thread_ctx *ctx;

if (!HAVE_THREADS)
return tr2tls_thread_main;

ctx = pthread_getspecific(tr2tls_key);


/* /*
* If the thread-proc did not call trace2_thread_start(), we won't * If the thread-proc did not call trace2_thread_start(), we won't
@ -62,9 +67,10 @@ struct tr2tls_thread_ctx *tr2tls_get_self(void)


int tr2tls_is_main_thread(void) int tr2tls_is_main_thread(void)
{ {
struct tr2tls_thread_ctx *ctx = pthread_getspecific(tr2tls_key); if (!HAVE_THREADS)
return 1;


return ctx == tr2tls_thread_main; return pthread_getspecific(tr2tls_key) == tr2tls_thread_main;
} }


void tr2tls_unset_self(void) void tr2tls_unset_self(void)