ALL: use ConcurrentQueue instead of ConcurrentPriorityQueue

master
Martin Gerhardy 2021-01-21 19:15:51 +01:00
parent c3b2a4ff43
commit 87ebb4ab7a
3 changed files with 6 additions and 10 deletions

View File

@ -11,7 +11,7 @@
#include "core/Log.h"
#include "core/Common.h"
#include "core/concurrent/ReadWriteLock.h"
#include "core/collection/ConcurrentPriorityQueue.h"
#include "core/collection/ConcurrentQueue.h"
namespace core {
@ -136,7 +136,7 @@ private:
typedef std::unordered_map<ClassTypeId, EventBusHandlerReferences> EventBusHandlerReferenceMap;
core::ReadWriteLock _lock;
core::ConcurrentPriorityQueue<IEventBusEventPtr, std::less<IEventBusEventPtr> > _queue;
core::ConcurrentQueue<IEventBusEventPtr> _queue;
class EventBusHandlerReference {
private:

View File

@ -7,7 +7,7 @@
#include "Connection.h"
#include "core/Var.h"
#include "core/Trace.h"
#include "core/collection/ConcurrentPriorityQueue.h"
#include "core/collection/ConcurrentQueue.h"
#include "core/IComponent.h"
#include "core/concurrent/Atomic.h"
@ -31,7 +31,7 @@ protected:
core::VarPtr _minConnections;
core::VarPtr _maxConnections;
core::ConcurrentPriorityQueue<Connection*> _connections;
core::ConcurrentQueue<Connection*> _connections;
public:
ConnectionPool();

View File

@ -12,7 +12,7 @@
#include "core/IComponent.h"
#include "core/collection/DynamicArray.h"
#include "math/Rect.h"
#include "core/collection/ConcurrentPriorityQueue.h"
#include "core/collection/ConcurrentQueue.h"
#include <thread>
namespace util {
@ -85,12 +85,8 @@ protected:
message = SDL_strdup(o.message);
return *this;
}
inline bool operator<(const LogLine& logLine) const {
return category < logLine.category && priority < logLine.priority && message < logLine.message;
}
};
core::ConcurrentPriorityQueue<LogLine> _messageQueue;
core::ConcurrentQueue<LogLine> _messageQueue;
Messages _history;
uint32_t _historyPos = 0;
const std::thread::id _mainThread;