mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove allocator silliness.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-11-14 18:42:07 +01:00
parent fe04cf0b35
commit 93f83fc50c
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
client/tracy_SPSCQueue.h
View File

@ -25,30 +25,18 @@ SOFTWARE.
#include <atomic> #include <atomic>
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <memory> // std::allocator
#include <new> // std::hardware_destructive_interference_size #include <new> // std::hardware_destructive_interference_size
#include <stdexcept> #include <stdexcept>
#include <type_traits> // std::enable_if, std::is_*_constructible #include <type_traits> // std::enable_if, std::is_*_constructible
#include "../common/TracyAlloc.hpp"
namespace tracy { namespace tracy {
template <typename T, typename Allocator = std::allocator<T>> class SPSCQueue { template <typename T> class SPSCQueue {
#if defined(__cpp_if_constexpr) && defined(__cpp_lib_void_t)
template <typename Alloc2, typename = void>
struct has_allocate_at_least : std::false_type {};
template <typename Alloc2>
struct has_allocate_at_least<
Alloc2, std::void_t<typename Alloc2::value_type,
decltype(std::declval<Alloc2 &>().allocate_at_least(
size_t{}))>> : std::true_type {};
#endif
public: public:
explicit SPSCQueue(const size_t capacity, explicit SPSCQueue(const size_t capacity)
const Allocator &allocator = Allocator()) : capacity_(capacity) {
: capacity_(capacity), allocator_(allocator) {
// The queue needs at least one element // The queue needs at least one element
if (capacity_ < 1) { if (capacity_ < 1) {
capacity_ = 1; capacity_ = 1;
@ -59,19 +47,7 @@ public:
capacity_ = SIZE_MAX - 2 * kPadding; capacity_ = SIZE_MAX - 2 * kPadding;
} }
#if defined(__cpp_if_constexpr) && defined(__cpp_lib_void_t) slots_ = (T*)tracy_malloc(sizeof(T) * (capacity_ + 2 * kPadding));
if constexpr (has_allocate_at_least<Allocator>::value) {
auto res = allocator_.allocate_at_least(capacity_ + 2 * kPadding);
slots_ = res.ptr;
capacity_ = res.count - 2 * kPadding;
} else {
slots_ = std::allocator_traits<Allocator>::allocate(
allocator_, capacity_ + 2 * kPadding);
}
#else
slots_ = std::allocator_traits<Allocator>::allocate(
allocator_, capacity_ + 2 * kPadding);
#endif
static_assert(alignof(SPSCQueue<T>) == kCacheLineSize, ""); static_assert(alignof(SPSCQueue<T>) == kCacheLineSize, "");
static_assert(sizeof(SPSCQueue<T>) >= 3 * kCacheLineSize, ""); static_assert(sizeof(SPSCQueue<T>) >= 3 * kCacheLineSize, "");
@ -84,8 +60,7 @@ public:
while (front()) { while (front()) {
pop(); pop();
} }
std::allocator_traits<Allocator>::deallocate(allocator_, slots_, tracy_free(slots_);
capacity_ + 2 * kPadding);
} }
// non-copyable and non-movable // non-copyable and non-movable
@ -206,11 +181,6 @@ private:
private: private:
size_t capacity_; size_t capacity_;
T *slots_; T *slots_;
#if defined(__has_cpp_attribute) && __has_cpp_attribute(no_unique_address)
Allocator allocator_ [[no_unique_address]];
#else
Allocator allocator_;
#endif
// Align to cache line size in order to avoid false sharing // Align to cache line size in order to avoid false sharing
// readIdxCache_ and writeIdxCache_ is used to reduce the amount of cache // readIdxCache_ and writeIdxCache_ is used to reduce the amount of cache