From 3663fb08ff9a2521126d82dc0786d1fb9471ead1 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 7 Jan 2015 18:02:39 +0000 Subject: [PATCH] Reenable dlclose() for InternalUnloadDll on TSan. Upstream TSan bug has been fixed and dlclose() no longer needs to be excluded. R=henrika@webrtc.org BUG=3895 Review URL: https://webrtc-codereview.appspot.com/30099004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8016 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_device/linux/latebindingsymboltable_linux.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc index 658d55a6f3..6e1b9761d9 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc @@ -54,15 +54,12 @@ void InternalUnloadDll(DllHandle handle) { // stack trace gets displayed as instead of the actual library // -> it can not be suppressed. // https://code.google.com/p/address-sanitizer/issues/detail?id=89 -// -// Skip dlclose() on ThreadSanitizer since it's hitting an assert. -// https://code.google.com/p/webrtc/issues/detail?id=3895 -#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) +#if !defined(ADDRESS_SANITIZER) if (dlclose(handle) != 0) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, "%s", GetDllError()); } -#endif // !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) +#endif // !defined(ADDRESS_SANITIZER) #else #error Not implemented #endif