This is an archive of the discontinued LLVM Phabricator instance.

Differential D110157

tsan: uninline Enable/DisableIgnores
ClosedPublic

Authored by dvyukov on Sep 21 2021, 5:15 AM.

Details

Reviewers
melver
vitalybuka
Commits
rG82e593cf900d: tsan: uninline Enable/DisableIgnores
Summary

ScopedInterceptor::Enable/DisableIgnores is only used for some special cases.
Unline them from the common interceptor handling.

Diff Detail

Event Timeline

dvyukov requested review of this revision.Sep 21 2021, 5:15 AM
dvyukov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptSep 21 2021, 5:15 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B124871: Diff 373868.Sep 21 2021, 5:39 AM
vitalybuka accepted this revision.Sep 21 2021, 1:19 PM
This revision is now accepted and ready to land.Sep 21 2021, 1:19 PM
Closed by commit rG82e593cf900d: tsan: uninline Enable/DisableIgnores (authored by dvyukov). · Explain WhySep 21 2021, 10:25 PM
This revision was automatically updated to reflect the committed changes.
dvyukov added a commit: rG82e593cf900d: tsan: uninline Enable/DisableIgnores.

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
rtl/
14 lines
32 lines

Diff 374120

compiler-rt/lib/tsan/rtl/tsan_interceptors.h

#ifndef TSAN_INTERCEPTORS_H #ifndef TSAN_INTERCEPTORS_H
#define TSAN_INTERCEPTORS_H #define TSAN_INTERCEPTORS_H
#include "sanitizer_common/sanitizer_stacktrace.h" #include "sanitizer_common/sanitizer_stacktrace.h"
#include "tsan_rtl.h" #include "tsan_rtl.h"
namespace __tsan { namespace __tsan {
class ScopedInterceptor { class ScopedInterceptor {
public: public:
ScopedInterceptor(ThreadState *thr, const char *fname, uptr pc); ScopedInterceptor(ThreadState *thr, const char *fname, uptr pc);
~ScopedInterceptor(); ~ScopedInterceptor();
void DisableIgnores(); void DisableIgnores() {
void EnableIgnores(); if (UNLIKELY(ignoring_))
DisableIgnoresImpl();
}
void EnableIgnores() {
if (UNLIKELY(ignoring_))
EnableIgnoresImpl();
}
private: private:
ThreadState *const thr_; ThreadState *const thr_;
bool in_ignored_lib_; bool in_ignored_lib_;
bool ignoring_; bool ignoring_;
void DisableIgnoresImpl();
void EnableIgnoresImpl();
}; };
LibIgnore *libignore(); LibIgnore *libignore();
#if !SANITIZER_GO #if !SANITIZER_GO
inline bool in_symbolizer() { inline bool in_symbolizer() {
cur_thread_init(); cur_thread_init();
return UNLIKELY(cur_thread()->in_symbolizer); return UNLIKELY(cur_thread()->in_symbolizer);
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines

compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp

Show First 20 Lines • Show All 258 Lines • ▼ Show 20 LinesScopedInterceptor::~ScopedInterceptor() {
DisableIgnores(); DisableIgnores();
if (!thr_->ignore_interceptors) { if (!thr_->ignore_interceptors) {
ProcessPendingSignals(thr_); ProcessPendingSignals(thr_);
FuncExit(thr_); FuncExit(thr_);
CheckedMutex::CheckNoLocks(); CheckedMutex::CheckNoLocks();
} }
} }
void ScopedInterceptor::EnableIgnores() { NOINLINE
if (ignoring_) { void ScopedInterceptor::EnableIgnoresImpl() {
ThreadIgnoreBegin(thr_, 0); ThreadIgnoreBegin(thr_, 0);
if (flags()->ignore_noninstrumented_modules) thr_->suppress_reports++; if (flags()->ignore_noninstrumented_modules)
thr_->suppress_reports++;
if (in_ignored_lib_) { if (in_ignored_lib_) {
DCHECK(!thr_->in_ignored_lib); DCHECK(!thr_->in_ignored_lib);
thr_->in_ignored_lib = true; thr_->in_ignored_lib = true;
} }
} }
}
void ScopedInterceptor::DisableIgnores() { NOINLINE
if (ignoring_) { void ScopedInterceptor::DisableIgnoresImpl() {
ThreadIgnoreEnd(thr_); ThreadIgnoreEnd(thr_);
if (flags()->ignore_noninstrumented_modules) thr_->suppress_reports--; if (flags()->ignore_noninstrumented_modules)
thr_->suppress_reports--;
if (in_ignored_lib_) { if (in_ignored_lib_) {
DCHECK(thr_->in_ignored_lib); DCHECK(thr_->in_ignored_lib);
thr_->in_ignored_lib = false; thr_->in_ignored_lib = false;
} }
} }
}
#define TSAN_INTERCEPT(func) INTERCEPT_FUNCTION(func) #define TSAN_INTERCEPT(func) INTERCEPT_FUNCTION(func)
#if SANITIZER_FREEBSD #if SANITIZER_FREEBSD
# define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func) # define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func)
# define TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(func) # define TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS(func)
# define TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(func) # define TSAN_MAYBE_INTERCEPT_NETBSD_ALIAS_THR(func)
#elif SANITIZER_NETBSD #elif SANITIZER_NETBSD
# define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func) # define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func)
▲ Show 20 Lines • Show All 2,663 Lines • Show Last 20 Lines