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

More unique force inline macro name.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-03 14:51:58 +02:00
parent ba037e5798
commit fe41185dc0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/concurrentqueue.h
View File

@ -31,11 +31,11 @@
#pragma once #pragma once
#if defined(__GNUC__) #if defined(__GNUC__)
# define force_inline __attribute__((always_inline)) # define tracy_force_inline __attribute__((always_inline))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define force_inline __forceinline # define tracy_force_inline __forceinline
#else #else
# define force_inline inline # define tracy_force_inline inline
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
@ -951,12 +951,12 @@ public:
return inner_enqueue<CanAlloc>(token, std::move(item)); return inner_enqueue<CanAlloc>(token, std::move(item));
} }
force_inline T* enqueue_begin(producer_token_t const& token, index_t& currentTailIndex) tracy_force_inline T* enqueue_begin(producer_token_t const& token, index_t& currentTailIndex)
{ {
return inner_enqueue_begin<CanAlloc>(token, currentTailIndex); return inner_enqueue_begin<CanAlloc>(token, currentTailIndex);
} }
force_inline void enqueue_finish(producer_token_t const& token, index_t currentTailIndex) tracy_force_inline void enqueue_finish(producer_token_t const& token, index_t currentTailIndex)
{ {
inner_enqueue_finish(token, currentTailIndex); inner_enqueue_finish(token, currentTailIndex);
} }
@ -1301,12 +1301,12 @@ private:
} }
template<AllocationMode canAlloc> template<AllocationMode canAlloc>
force_inline T* inner_enqueue_begin(producer_token_t const& token, index_t& currentTailIndex) tracy_force_inline T* inner_enqueue_begin(producer_token_t const& token, index_t& currentTailIndex)
{ {
return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue_begin<canAlloc>(currentTailIndex); return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue_begin<canAlloc>(currentTailIndex);
} }
force_inline void inner_enqueue_finish(producer_token_t const& token, index_t currentTailIndex) tracy_force_inline void inner_enqueue_finish(producer_token_t const& token, index_t currentTailIndex)
{ {
return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue_finish(currentTailIndex); return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue_finish(currentTailIndex);
} }
@ -1976,7 +1976,7 @@ private:
} }
template<AllocationMode allocMode> template<AllocationMode allocMode>
force_inline T* enqueue_begin(index_t& currentTailIndex) tracy_force_inline T* enqueue_begin(index_t& currentTailIndex)
{ {
currentTailIndex = this->tailIndex.load(std::memory_order_relaxed); currentTailIndex = this->tailIndex.load(std::memory_order_relaxed);
if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0) { if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0) {
@ -1988,7 +1988,7 @@ private:
} }
} }
force_inline void enqueue_finish(index_t currentTailIndex) tracy_force_inline void enqueue_finish(index_t currentTailIndex)
{ {
this->tailIndex.store(currentTailIndex + 1, std::memory_order_release); this->tailIndex.store(currentTailIndex + 1, std::memory_order_release);
} }