franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

threadsafe_queue: Remove NeedSize template parameter

Browse Source 
The necessity of this parameter is dubious at best, and in 2019 probably
offers completely negligible savings as opposed to just leaving this
enabled. This removes it and simplifies the overall interface.
This commit is contained in:
Lioncash 2019-02-12 22:03:48 -05:00
parent c425a1a857
commit f0bfb24c61
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/threadsafe_queue.h
View File

@ -14,10 +14,10 @@
#include "common/common_types.h" #include "common/common_types.h"
namespace Common { namespace Common {
template <typename T, bool NeedSize = true> template <typename T>
class SPSCQueue { class SPSCQueue {
public: public:
SPSCQueue() : size(0) { SPSCQueue() {
write_ptr = read_ptr = new ElementPtr(); write_ptr = read_ptr = new ElementPtr();
} }
~SPSCQueue() { ~SPSCQueue() {
@ -26,12 +26,11 @@ public:
} }
u32 Size() const { u32 Size() const {
static_assert(NeedSize, "using Size() on FifoQueue without NeedSize");
return size.load(); return size.load();
} }
bool Empty() const { bool Empty() const {
return !read_ptr->next.load(); return Size() == 0;
} }
T& Front() const { T& Front() const {
@ -47,13 +46,13 @@ public:
ElementPtr* new_ptr = new ElementPtr(); ElementPtr* new_ptr = new ElementPtr();
write_ptr->next.store(new_ptr, std::memory_order_release); write_ptr->next.store(new_ptr, std::memory_order_release);
write_ptr = new_ptr; write_ptr = new_ptr;
if (NeedSize)
size++; ++size;
} }
void Pop() { void Pop() {
if (NeedSize) --size;
size--;
ElementPtr* tmpptr = read_ptr; ElementPtr* tmpptr = read_ptr;
// advance the read pointer // advance the read pointer
read_ptr = tmpptr->next.load(); read_ptr = tmpptr->next.load();
@ -66,8 +65,7 @@ public:
if (Empty()) if (Empty())
return false; return false;
if (NeedSize) --size;
size--;
ElementPtr* tmpptr = read_ptr; ElementPtr* tmpptr = read_ptr;
read_ptr = tmpptr->next.load(std::memory_order_acquire); read_ptr = tmpptr->next.load(std::memory_order_acquire);
@ -103,13 +101,13 @@ private:
ElementPtr* write_ptr; ElementPtr* write_ptr;
ElementPtr* read_ptr; ElementPtr* read_ptr;
std::atomic<u32> size; std::atomic<u32> size{0};
}; };
// a simple thread-safe, // a simple thread-safe,
// single reader, multiple writer queue // single reader, multiple writer queue
template <typename T, bool NeedSize = true> template <typename T>
class MPSCQueue { class MPSCQueue {
public: public:
u32 Size() const { u32 Size() const {
@ -144,7 +142,7 @@ public:
} }
private: private:
SPSCQueue<T, NeedSize> spsc_queue; SPSCQueue<T> spsc_queue;
std::mutex write_lock; std::mutex write_lock;
}; };
} // namespace Common } // namespace Common

4
src/core/core_timing.cpp
View File

@ -54,10 +54,10 @@ static std::vector<Event> event_queue;
static u64 event_fifo_id; static u64 event_fifo_id;
// the queue for storing the events from other threads threadsafe until they will be added // the queue for storing the events from other threads threadsafe until they will be added
// to the event_queue by the emu thread // to the event_queue by the emu thread
static Common::MPSCQueue<Event, false> ts_queue; static Common::MPSCQueue<Event> ts_queue;
// the queue for unscheduling the events from other threads threadsafe // the queue for unscheduling the events from other threads threadsafe
static Common::MPSCQueue<std::pair<const EventType*, u64>, false> unschedule_queue; static Common::MPSCQueue<std::pair<const EventType*, u64>> unschedule_queue;
constexpr int MAX_SLICE_LENGTH = 20000; constexpr int MAX_SLICE_LENGTH = 20000;