diff options
author | Dean Michael Berris <dberris@google.com> | 2017-10-03 11:40:54 +0000 |
---|---|---|
committer | Dean Michael Berris <dberris@google.com> | 2017-10-03 11:40:54 +0000 |
commit | 8f30a9c5f0810060699ae500140af885e3378b92 (patch) | |
tree | 9c1a9d22d3d44f918da99621716f9085026b27e6 /lib/xray/xray_buffer_queue.h | |
parent | ebffae6c671e3c5c914395212eea2ce3b5269312 (diff) |
Revert "[XRay][compiler-rt] Use a hand-written circular buffer in BufferQueue"
This reverts r314766 (rL314766). Unit tests fail in multiple bots.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@314786 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray/xray_buffer_queue.h')
-rw-r--r-- | lib/xray/xray_buffer_queue.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lib/xray/xray_buffer_queue.h b/lib/xray/xray_buffer_queue.h index 1115b4722..bd382a26c 100644 --- a/lib/xray/xray_buffer_queue.h +++ b/lib/xray/xray_buffer_queue.h @@ -17,8 +17,8 @@ #include "sanitizer_common/sanitizer_atomic.h" #include "sanitizer_common/sanitizer_mutex.h" -#include <cstdint> -#include <memory> +#include <deque> +#include <unordered_set> #include <utility> namespace __xray { @@ -36,23 +36,15 @@ public: }; private: - // Size of each individual Buffer. size_t BufferSize; // We use a bool to indicate whether the Buffer has been used in this // freelist implementation. - std::unique_ptr<std::tuple<Buffer, bool>[]> Buffers; - size_t BufferCount; - - __sanitizer::SpinMutex Mutex; + std::deque<std::tuple<Buffer, bool>> Buffers; + __sanitizer::BlockingMutex Mutex; + std::unordered_set<void *> OwnedBuffers; __sanitizer::atomic_uint8_t Finalizing; - // Sorted buffer pointers, making it quick to find buffers that we own. - std::unique_ptr<void *[]> OwnedBuffers; - - std::tuple<Buffer, bool> *Next; - std::tuple<Buffer, bool> *First; - public: enum class ErrorCode : unsigned { Ok, @@ -125,9 +117,8 @@ public: /// Buffer is marked 'used' (i.e. has been the result of getBuffer(...) and a /// releaseBuffer(...) operation). template <class F> void apply(F Fn) { - __sanitizer::SpinMutexLock G(&Mutex); - for (auto I = Buffers.get(), E = Buffers.get() + BufferCount; I != E; ++I) { - const auto &T = *I; + __sanitizer::BlockingMutexLock G(&Mutex); + for (const auto &T : Buffers) { if (std::get<1>(T)) Fn(std::get<0>(T)); } |