Skip to content

Remove dlsym() lookup for TSan functions from common path #36478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2021
Merged

Remove dlsym() lookup for TSan functions from common path #36478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20df19f
Move TSan function lookup out of the common path
Mar 17, 2021
35065bb
Remove Windows code
Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions stdlib/public/Concurrency/ThreadSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,54 +10,39 @@
//
//===----------------------------------------------------------------------===//
//
// Thread Sanitizer support for the Swift Task runtime
// Thread Sanitizer support for the Swift Task runtime.
//
//===----------------------------------------------------------------------===//

#include "TaskPrivate.h"

// Thread Sanitizer is not supported on Windows.
#if defined(_WIN32)
#define NOMINMAX
#include <windows.h>
void swift::_swift_tsan_acquire(void *addr) {}
void swift::_swift_tsan_release(void *addr) {}
#else
#include <dlfcn.h>
#endif

namespace {
using TSanFunc = void(void *);
TSanFunc *tsan_acquire, *tsan_release;

TSanFunc *loadSymbol(const char *name) {
#if defined(_WIN32)
return (TSanFunc *)GetProcAddress(GetModuleHandle(NULL), name);
#else
return (TSanFunc *)dlsym(RTLD_DEFAULT, name);
#endif
}

swift::swift_once_t initOnceToken;
void initializeThreadSanitizer(void *unused) {
tsan_acquire = loadSymbol("__tsan_acquire");
tsan_release = loadSymbol("__tsan_release");
}
} // anonymous namespace

void swift::_swift_tsan_acquire(void *addr) {
swift_once(&initOnceToken, initializeThreadSanitizer, nullptr);
if (tsan_acquire) {
tsan_acquire(addr);
}
}

void swift::_swift_tsan_release(void *addr) {
swift_once(&initOnceToken, initializeThreadSanitizer, nullptr);
if (tsan_release) {
tsan_release(addr);
}
}

SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(c)
void swift_task_set_tsan_hooks(TSanFunc *acquire, TSanFunc *release) {
tsan_acquire = acquire;
tsan_release = release;
void __tsan_on_initialize() {
tsan_acquire = (TSanFunc *)dlsym(RTLD_DEFAULT, "__tsan_acquire");
tsan_release = (TSanFunc *)dlsym(RTLD_DEFAULT, "__tsan_release");
}
#endif