diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-01 14:13:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-01 14:13:01 -0800 |
| commit | fc89d14c639faec779956b4e3cd873c07bd4327b (patch) | |
| tree | 8a54aa5e63a6df7842d705613a5b4c6f88a99116 /thread-utils.h | |
| parent | grep: work around LSan threading race with barrier (diff) | |
| download | git-fc89d14c639faec779956b4e3cd873c07bd4327b.tar.gz git-fc89d14c639faec779956b4e3cd873c07bd4327b.zip | |
Revert barrier-based LSan threading race workaround
The extra "barrier" approach was too much code whose sole purpose
was to work around a race that is not even ours (i.e. in LSan's
teardown code).
In preparation for queuing a solution taking a much-less-invasive
approach, let's revert them.
Diffstat (limited to 'thread-utils.h')
| -rw-r--r-- | thread-utils.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/thread-utils.h b/thread-utils.h index 3df5be9916..4961487ed9 100644 --- a/thread-utils.h +++ b/thread-utils.h @@ -53,22 +53,5 @@ int dummy_pthread_init(void *); int online_cpus(void); int init_recursive_mutex(pthread_mutex_t*); -#ifdef THREAD_BARRIER_PTHREAD -#define maybe_thread_barrier_t pthread_barrier_t -#define maybe_thread_barrier_init pthread_barrier_init -#define maybe_thread_barrier_wait pthread_barrier_wait -#define maybe_thread_barrier_destroy pthread_barrier_destroy -#else -#define maybe_thread_barrier_t int -static inline int maybe_thread_barrier_init(maybe_thread_barrier_t *b UNUSED, - void *attr UNUSED, - unsigned nr UNUSED) -{ - errno = ENOSYS; - return -1; -} -#define maybe_thread_barrier_wait(barrier) -#define maybe_thread_barrier_destroy(barrier) -#endif #endif /* THREAD_COMPAT_H */ |