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

Merge branch 'jh/trace2' 

* jh/trace2:
  trace2: fix tracing when NO_PTHREADS is defined
maint
Junio C Hamano 2019-05-30 10:50:44 -07:00
parent 20aa7c594f 5fdae9d3be
commit 90f2d88e61
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

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

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
@ -76,9 +81,10 @@ struct tr2tls_thread_ctx *tr2tls_get_self(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)