diff options
author | Dean Michael Berris <dberris@google.com> | 2017-10-24 01:39:59 +0000 |
---|---|---|
committer | Dean Michael Berris <dberris@google.com> | 2017-10-24 01:39:59 +0000 |
commit | 6c9ee8c61a70980db9abd1cc481473b11eb206ef (patch) | |
tree | 2d109f189309467e9a573836fd65df68828ab8ec /lib/xray/xray_buffer_queue.cc | |
parent | ed5545d851416c54828787c615f8f87334ce855c (diff) |
[XRay][compiler-rt] Remove C++ STL from the buffer queue implementation
Summary:
This change removes the dependency on C++ standard library
types/functions in the implementation of the buffer queue. This is an
incremental step in resolving llvm.org/PR32274.
Reviewers: dblaikie, pelikan
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D39175
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@316406 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray/xray_buffer_queue.cc')
-rw-r--r-- | lib/xray/xray_buffer_queue.cc | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/lib/xray/xray_buffer_queue.cc b/lib/xray/xray_buffer_queue.cc index 61a0add0e..c42bba322 100644 --- a/lib/xray/xray_buffer_queue.cc +++ b/lib/xray/xray_buffer_queue.cc @@ -13,29 +13,30 @@ // //===----------------------------------------------------------------------===// #include "xray_buffer_queue.h" +#include "sanitizer_common/sanitizer_allocator_internal.h" #include "sanitizer_common/sanitizer_common.h" #include "sanitizer_common/sanitizer_libc.h" -#include <algorithm> -#include <cstdlib> -#include <tuple> - using namespace __xray; using namespace __sanitizer; -BufferQueue::BufferQueue(std::size_t B, std::size_t N, bool &Success) - : BufferSize(B), Buffers(new std::tuple<Buffer, bool>[N]()), - BufferCount(N), Finalizing{0}, OwnedBuffers(new void *[N]()), - Next(Buffers.get()), First(Buffers.get()), LiveBuffers(0) { +BufferQueue::BufferQueue(size_t B, size_t N, bool &Success) + : BufferSize(B), + Buffers(new BufferRep[N]()), + BufferCount(N), + Finalizing{0}, + OwnedBuffers(new void *[N]()), + Next(Buffers), + First(Buffers), + LiveBuffers(0) { for (size_t i = 0; i < N; ++i) { auto &T = Buffers[i]; - void *Tmp = malloc(BufferSize); + void *Tmp = InternalAlloc(BufferSize); if (Tmp == nullptr) { Success = false; return; } - auto &Buf = std::get<0>(T); - std::get<1>(T) = false; + auto &Buf = T.Buffer; Buf.Buffer = Tmp; Buf.Size = B; OwnedBuffers[i] = Tmp; @@ -47,39 +48,42 @@ BufferQueue::ErrorCode BufferQueue::getBuffer(Buffer &Buf) { if (__sanitizer::atomic_load(&Finalizing, __sanitizer::memory_order_acquire)) return ErrorCode::QueueFinalizing; __sanitizer::SpinMutexLock Guard(&Mutex); - if (LiveBuffers == BufferCount) - return ErrorCode::NotEnoughMemory; + if (LiveBuffers == BufferCount) return ErrorCode::NotEnoughMemory; auto &T = *Next; - auto &B = std::get<0>(T); + auto &B = T.Buffer; Buf = B; ++LiveBuffers; - if (++Next == (Buffers.get() + BufferCount)) - Next = Buffers.get(); + if (++Next == (Buffers + BufferCount)) Next = Buffers; return ErrorCode::Ok; } BufferQueue::ErrorCode BufferQueue::releaseBuffer(Buffer &Buf) { // Blitz through the buffers array to find the buffer. - if (std::none_of(OwnedBuffers.get(), OwnedBuffers.get() + BufferCount, - [&Buf](void *P) { return P == Buf.Buffer; })) - return ErrorCode::UnrecognizedBuffer; + bool Found = false; + for (auto I = OwnedBuffers, E = OwnedBuffers + BufferCount; I != E; ++I) { + if (*I == Buf.Buffer) { + Found = true; + break; + } + } + if (!Found) return ErrorCode::UnrecognizedBuffer; + __sanitizer::SpinMutexLock Guard(&Mutex); // This points to a semantic bug, we really ought to not be releasing more // buffers than we actually get. - if (LiveBuffers == 0) - return ErrorCode::NotEnoughMemory; + if (LiveBuffers == 0) return ErrorCode::NotEnoughMemory; // Now that the buffer has been released, we mark it as "used". - *First = std::make_tuple(Buf, true); + First->Buffer = Buf; + First->Used = true; Buf.Buffer = nullptr; Buf.Size = 0; --LiveBuffers; - if (++First == (Buffers.get() + BufferCount)) - First = Buffers.get(); + if (++First == (Buffers + BufferCount)) First = Buffers; return ErrorCode::Ok; } @@ -92,9 +96,11 @@ BufferQueue::ErrorCode BufferQueue::finalize() { } BufferQueue::~BufferQueue() { - for (auto I = Buffers.get(), E = Buffers.get() + BufferCount; I != E; ++I) { + for (auto I = Buffers, E = Buffers + BufferCount; I != E; ++I) { auto &T = *I; - auto &Buf = std::get<0>(T); - free(Buf.Buffer); + auto &Buf = T.Buffer; + InternalFree(Buf.Buffer); } + delete[] Buffers; + delete[] OwnedBuffers; } |