feedc0de/espcpputils
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Lock helpers improvements

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-05-04 04:43:29 +02:00
parent 1cc4285a6b
commit 60286e30ee
3 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/lockhelper.h
View File

@ -13,40 +13,44 @@ class LockHelper
CPP_DISABLE_COPY_MOVE(LockHelper) CPP_DISABLE_COPY_MOVE(LockHelper)
public: public:
LockHelper(QueueHandle_t _xMutex, TickType_t xTicksToWait=portMAX_DELAY) : LockHelper(SemaphoreHandle_t xMutex, TickType_t xTicksToWait = portMAX_DELAY) :
xMutex{_xMutex} m_xMutex{xMutex},
{ m_locked{xSemaphoreTake(m_xMutex, xTicksToWait) == pdPASS}
locked = xSemaphoreTakeRecursive(xMutex, xTicksToWait); {}
}
~LockHelper() ~LockHelper()
{ {
if (locked) if (m_locked)
xSemaphoreGiveRecursive(xMutex); xSemaphoreGive(m_xMutex);
} }
bool lock(TickType_t xTicksToWait=portMAX_DELAY) bool lock(TickType_t xTicksToWait = portMAX_DELAY)
{ {
if (locked) if (m_locked)
return false; return false;
locked = xSemaphoreTakeRecursive(xMutex, xTicksToWait); m_locked = xSemaphoreTake(m_xMutex, xTicksToWait);
return locked; return m_locked;
} }
bool unlock() bool unlock()
{ {
if (!locked) if (!m_locked)
return false; return false;
locked = !xSemaphoreGiveRecursive(xMutex); m_locked = !xSemaphoreGive(m_xMutex);
return locked; return m_locked;
}
bool locked() const
{
return m_locked;
} }
private: private:
const QueueHandle_t xMutex; const SemaphoreHandle_t m_xMutex;
bool locked; bool m_locked;
}; };
} // namespace espcpputils } // namespace espcpputils

14
src/lockingqueue.h
View File

@ -10,8 +10,8 @@
// local includes // local includes
#include "delayedconstruction.h" #include "delayedconstruction.h"
#include "wrappers/recursive_mutex_semaphore.h" #include "wrappers/mutex_semaphore.h"
#include "recursivelockhelper.h" #include "lockhelper.h"
namespace espcpputils { namespace espcpputils {
template<typename T> template<typename T>
@ -28,7 +28,7 @@ public:
std::size_t size() const { return m_size; } std::size_t size() const { return m_size; }
private: private:
espcpputils::recursive_mutex_semaphore m_lock; espcpputils::mutex_semaphore m_lock;
std::queue<T> m_queue; std::queue<T> m_queue;
std::size_t m_size{}; // double-buffered to allow for reading without taking a lock std::size_t m_size{}; // double-buffered to allow for reading without taking a lock
}; };
@ -36,7 +36,7 @@ private:
template<typename T> template<typename T>
void LockingQueue<T>::push(const T &val) void LockingQueue<T>::push(const T &val)
{ {
RecursiveLockHelper helper{m_lock.handle}; LockHelper helper{m_lock.handle};
m_queue.push(val); m_queue.push(val);
m_size = m_queue.size(); m_size = m_queue.size();
} }
@ -44,7 +44,7 @@ void LockingQueue<T>::push(const T &val)
template<typename T> template<typename T>
void LockingQueue<T>::push(T &&val) void LockingQueue<T>::push(T &&val)
{ {
RecursiveLockHelper helper{m_lock.handle}; LockHelper helper{m_lock.handle};
m_queue.emplace(std::move(val)); m_queue.emplace(std::move(val));
m_size = m_queue.size(); m_size = m_queue.size();
} }
@ -52,7 +52,7 @@ void LockingQueue<T>::push(T &&val)
template<typename T> template<typename T>
std::optional<T> LockingQueue<T>::tryPop() std::optional<T> LockingQueue<T>::tryPop()
{ {
RecursiveLockHelper helper{m_lock.handle}; LockHelper helper{m_lock.handle};
if (m_queue.empty()) if (m_queue.empty())
return std::nullopt; return std::nullopt;
@ -65,7 +65,7 @@ std::optional<T> LockingQueue<T>::tryPop()
template<typename T> template<typename T>
void LockingQueue<T>::clear() void LockingQueue<T>::clear()
{ {
RecursiveLockHelper helper{m_lock.handle}; LockHelper helper{m_lock.handle};
m_queue = {}; m_queue = {};
} }
} // namespace espcpputils } // namespace espcpputils

36
src/recursivelockhelper.h
View File

@ -13,40 +13,44 @@ class RecursiveLockHelper
CPP_DISABLE_COPY_MOVE(RecursiveLockHelper) CPP_DISABLE_COPY_MOVE(RecursiveLockHelper)
public: public:
RecursiveLockHelper(QueueHandle_t _xMutex, TickType_t xTicksToWait=portMAX_DELAY) : RecursiveLockHelper(SemaphoreHandle_t _xMutex, TickType_t xTicksToWait = portMAX_DELAY) :
xMutex{_xMutex} m_xMutex{xMutex},
{ m_locked{xSemaphoreTakeRecursive(xMutex, xTicksToWait) == pdPASS}
locked = xSemaphoreTakeRecursive(xMutex, xTicksToWait); {}
}
~RecursiveLockHelper() ~RecursiveLockHelper()
{ {
if (locked) if (m_locked)
xSemaphoreGiveRecursive(xMutex); xSemaphoreGiveRecursive(m_xMutex);
} }
bool lock(TickType_t xTicksToWait=portMAX_DELAY) bool lock(TickType_t xTicksToWait = portMAX_DELAY)
{ {
if (locked) if (m_locked)
return false; return false;
locked = xSemaphoreTakeRecursive(xMutex, xTicksToWait); m_locked = xSemaphoreTakeRecursive(m_xMutex, xTicksToWait);
return locked; return m_locked;
} }
bool unlock() bool unlock()
{ {
if (!locked) if (!m_locked)
return false; return false;
locked = !xSemaphoreGiveRecursive(xMutex); m_locked = !xSemaphoreGiveRecursive(m_xMutex);
return locked; return m_locked;
}
bool locked() const
{
return m_locked;
} }
private: private:
const QueueHandle_t xMutex; const SemaphoreHandle_t m_xMutex;
bool locked; bool m_locked;
}; };
} // namespace espcpputils } // namespace espcpputils