From 8b0b857eaaa50c6ec217a46c0577395c78ec04c7 Mon Sep 17 00:00:00 2001 From: sapier Date: Mon, 6 Jan 2014 12:45:42 +0100 Subject: Make MutexQueue use jsemaphore for signaling --- src/util/container.h | 151 ++++++++++++++++++++++++++++++++++++--------------- src/util/thread.h | 62 ++++++++++++--------- 2 files changed, 141 insertions(+), 72 deletions(-) (limited to 'src/util') diff --git a/src/util/container.h b/src/util/container.h index e83c3cd37..6d836a4d5 100644 --- a/src/util/container.h +++ b/src/util/container.h @@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../exceptions.h" #include "../jthread/jmutex.h" #include "../jthread/jmutexautolock.h" -#include "../porting.h" // For sleep_ms +#include "../jthread/jsemaphore.h" #include #include #include @@ -201,6 +201,12 @@ public: ++m_list_size; } + void push_front(T t) + { + m_list.push_front(t); + ++m_list_size; + } + T pop_front() { if(m_list.empty()) @@ -247,86 +253,141 @@ template class MutexedQueue { public: + template + friend class RequestQueue; + MutexedQueue() { } bool empty() { JMutexAutoLock lock(m_mutex); - return m_list.empty(); + return (m_size.GetValue() == 0); } void push_back(T t) { JMutexAutoLock lock(m_mutex); m_list.push_back(t); + m_size.Post(); } - T pop_front(u32 wait_time_max_ms=0) + + /* this version of pop_front returns a empty element of T on timeout. + * Make sure default constructor of T creates a recognizable "empty" element + */ + T pop_frontNoEx(u32 wait_time_max_ms) { - u32 wait_time_ms = 0; + if (m_size.Wait(wait_time_max_ms)) + { + JMutexAutoLock lock(m_mutex); - for(;;) + typename std::list::iterator begin = m_list.begin(); + T t = *begin; + m_list.erase(begin); + return t; + } + else { - { - JMutexAutoLock lock(m_mutex); - - if(!m_list.empty()) - { - typename std::list::iterator begin = m_list.begin(); - T t = *begin; - m_list.erase(begin); - return t; - } - - if(wait_time_ms >= wait_time_max_ms) - throw ItemNotFoundException("MutexedQueue: queue is empty"); - } - - // Wait a while before trying again - sleep_ms(10); - wait_time_ms += 10; + return T(); } } + + T pop_front(u32 wait_time_max_ms) + { + if (m_size.Wait(wait_time_max_ms)) + { + JMutexAutoLock lock(m_mutex); + + typename std::list::iterator begin = m_list.begin(); + T t = *begin; + m_list.erase(begin); + return t; + } + else + { + throw ItemNotFoundException("MutexedQueue: queue is empty"); + } + } + + T pop_frontNoEx() + { + m_size.Wait(); + + JMutexAutoLock lock(m_mutex); + + typename std::list::iterator begin = m_list.begin(); + T t = *begin; + m_list.erase(begin); + return t; + } + T pop_back(u32 wait_time_max_ms=0) { - u32 wait_time_ms = 0; + if (m_size.Wait(wait_time_max_ms)) + { + JMutexAutoLock lock(m_mutex); + + typename std::list::iterator last = m_list.end(); + last--; + T t = *last; + m_list.erase(last); + return t; + } + else + { + throw ItemNotFoundException("MutexedQueue: queue is empty"); + } + } + + /* this version of pop_back returns a empty element of T on timeout. + * Make sure default constructor of T creates a recognizable "empty" element + */ + T pop_backNoEx(u32 wait_time_max_ms=0) + { + if (m_size.Wait(wait_time_max_ms)) + { + JMutexAutoLock lock(m_mutex); - for(;;) + typename std::list::iterator last = m_list.end(); + last--; + T t = *last; + m_list.erase(last); + return t; + } + else { - { - JMutexAutoLock lock(m_mutex); - - if(!m_list.empty()) - { - typename std::list::iterator last = m_list.end(); - last--; - T t = *last; - m_list.erase(last); - return t; - } - - if(wait_time_ms >= wait_time_max_ms) - throw ItemNotFoundException("MutexedQueue: queue is empty"); - } - - // Wait a while before trying again - sleep_ms(10); - wait_time_ms += 10; + return T(); } } + T pop_backNoEx() + { + m_size.Wait(); + + JMutexAutoLock lock(m_mutex); + + typename std::list::iterator last = m_list.end(); + last--; + T t = *last; + m_list.erase(last); + return t; + } + +protected: JMutex & getMutex() { return m_mutex; } + // NEVER EVER modify the >>list<< you got by using this function! + // You may only modify it's content std::list & getList() { return m_list; } -protected: JMutex m_mutex; std::list m_list; + JSemaphore m_size; }; #endif diff --git a/src/util/thread.h b/src/util/thread.h index bb8e03317..8b3c33621 100644 --- a/src/util/thread.h +++ b/src/util/thread.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../jthread/jthread.h" #include "../jthread/jmutex.h" #include "../jthread/jmutexautolock.h" +#include "porting.h" template class MutexedVariable @@ -123,36 +124,38 @@ public: void add(Key key, Caller caller, CallerData callerdata, ResultQueue *dest) { - JMutexAutoLock lock(m_queue.getMutex()); - - /* - If the caller is already on the list, only update CallerData - */ - for(typename std::list< GetRequest >::iterator - i = m_queue.getList().begin(); - i != m_queue.getList().end(); ++i) { - GetRequest &request = *i; - - if(request.key == key) + JMutexAutoLock lock(m_queue.getMutex()); + + /* + If the caller is already on the list, only update CallerData + */ + for(typename std::list< GetRequest >::iterator + i = m_queue.getList().begin(); + i != m_queue.getList().end(); ++i) { - for(typename std::list< CallerInfo >::iterator - i = request.callers.begin(); - i != request.callers.end(); ++i) + GetRequest &request = *i; + + if(request.key == key) { - CallerInfo &ca = *i; - if(ca.caller == caller) + for(typename std::list< CallerInfo >::iterator + i = request.callers.begin(); + i != request.callers.end(); ++i) { - ca.data = callerdata; - return; + CallerInfo &ca = *i; + if(ca.caller == caller) + { + ca.data = callerdata; + return; + } } + CallerInfo ca; + ca.caller = caller; + ca.data = callerdata; + ca.dest = dest; + request.callers.push_back(ca); + return; } - CallerInfo ca; - ca.caller = caller; - ca.data = callerdata; - ca.dest = dest; - request.callers.push_back(ca); - return; } } @@ -168,12 +171,17 @@ public: ca.dest = dest; request.callers.push_back(ca); - m_queue.getList().push_back(request); + m_queue.push_back(request); + } + + GetRequest pop(unsigned int timeout_ms) + { + return m_queue.pop_front(timeout_ms); } - GetRequest pop(bool wait_if_empty=false) + GetRequest pop() { - return m_queue.pop_front(wait_if_empty); + return m_queue.pop_frontNoEx(); } void pushResult(GetRequest req, -- cgit v1.2.3