This is an archive of the discontinued LLVM Phabricator instance.

Differential D53863

Handle NetBSD alias for pthread_sigmask
ClosedPublic

Authored by krytarowski on Oct 30 2018, 1:31 AM.

Details

Reviewers
vitalybuka
joerg
Commits
rGdf8802da7a2d: Handle NetBSD alias for pthread_sigmask
rL345627: Handle NetBSD alias for pthread_sigmask
rCRT345627: Handle NetBSD alias for pthread_sigmask
Summary

Add a new helper macro TSAN_INTERCEPTOR_NETBSD_ALIAS_THR2
that handles pthread(3)/libc aliases in scenarios when a name in both
libraries differs not just in prefix namespace.

Handle TSan pthread_sigmask mangling accordingly into __libc_thr_sigsetmask.

Diff Detail

Repository
rL LLVM

Event Timeline

krytarowski created this revision.Oct 30 2018, 1:31 AM
Herald added subscribers: llvm-commits, jfb, kubamracek. · View Herald TranscriptOct 30 2018, 1:31 AM
vitalybuka accepted this revision.Oct 30 2018, 11:43 AM

is this covered with existing test?

This revision is now accepted and ready to land.Oct 30 2018, 11:43 AM
krytarowski added a comment.Oct 30 2018, 11:49 AM
In D53863#1280795, @vitalybuka wrote:

is this covered with existing test?

Yes, test/tsan/signal_block.cc.

Closed by commit rCRT345627: Handle NetBSD alias for pthread_sigmask (authored by kamil). · Explain WhyOct 30 2018, 11:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
tsan/
rtl/
4 lines
3 lines

Diff 171645

lib/tsan/rtl/tsan_interceptors.h

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
# define TSAN_INTERCEPTOR_NETBSD_ALIAS(ret, func, ...) \ # define TSAN_INTERCEPTOR_NETBSD_ALIAS(ret, func, ...) \
TSAN_INTERCEPTOR(ret, __libc_##func, __VA_ARGS__) \ TSAN_INTERCEPTOR(ret, __libc_##func, __VA_ARGS__) \
ALIAS(WRAPPER_NAME(pthread_##func)); ALIAS(WRAPPER_NAME(pthread_##func));
# define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(ret, func, ...) \ # define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(ret, func, ...) \
TSAN_INTERCEPTOR(ret, __libc_thr_##func, __VA_ARGS__) \ TSAN_INTERCEPTOR(ret, __libc_thr_##func, __VA_ARGS__) \
ALIAS(WRAPPER_NAME(pthread_##func)); ALIAS(WRAPPER_NAME(pthread_##func));
# define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR2(ret, func, func2, ...) \
TSAN_INTERCEPTOR(ret, __libc_thr_##func, __VA_ARGS__) \
ALIAS(WRAPPER_NAME(pthread_##func2));
#else #else
# define TSAN_INTERCEPTOR_NETBSD_ALIAS(ret, func, ...) # define TSAN_INTERCEPTOR_NETBSD_ALIAS(ret, func, ...)
# define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(ret, func, ...) # define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(ret, func, ...)
# define TSAN_INTERCEPTOR_NETBSD_ALIAS_THR2(ret, func, func2, ...)
#endif #endif
#endif // TSAN_INTERCEPTORS_H #endif // TSAN_INTERCEPTORS_H

lib/tsan/rtl/tsan_interceptors.cc

Show First 20 Lines • Show All 2,554 Lines • ▼ Show 20 Lines
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_init, void *m, void *a) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_init, void *m, void *a)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_destroy, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_destroy, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_rdlock, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_rdlock, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_tryrdlock, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_tryrdlock, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_wrlock, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_wrlock, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_trywrlock, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_trywrlock, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_unlock, void *m) TSAN_INTERCEPTOR_NETBSD_ALIAS(int, rwlock_unlock, void *m)
TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(int, once, void *o, void (*f)()) TSAN_INTERCEPTOR_NETBSD_ALIAS_THR(int, once, void *o, void (*f)())
TSAN_INTERCEPTOR_NETBSD_ALIAS_THR2(int, sigsetmask, sigmask, int a, void *b,
void *c)
namespace __tsan { namespace __tsan {
static void finalize(void *arg) { static void finalize(void *arg) {
ThreadState *thr = cur_thread(); ThreadState *thr = cur_thread();
int status = Finalize(thr); int status = Finalize(thr);
// Make sure the output is not lost. // Make sure the output is not lost.
FlushStreams(); FlushStreams();
▲ Show 20 Lines • Show All 193 Lines • ▼ Show 20 Lines#endif
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_init); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_init);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_destroy); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_destroy);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_rdlock); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_rdlock);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_tryrdlock); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_tryrdlock);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_wrlock); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_wrlock);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_trywrlock); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_trywrlock);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_unlock); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(rwlock_unlock);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(once); TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(once);
TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(sigsetmask);
FdInit(); FdInit();
} }
} // namespace __tsan } // namespace __tsan
// Invisible barrier for tests. // Invisible barrier for tests.
// There were several unsuccessful iterations for this functionality: // There were several unsuccessful iterations for this functionality:
Show All 33 Lines