686f7cce83
FreeRTOS handles were stored plainly and they were deleted in the destructor of classes. This meant that if a class were to be copied, the destructor would be called twice on the same handles and lead to double-free. Seha on Discord suggested to fix this by using `std::unique_ptr` with a custom deletion function. The changes affect: - Thread - Semaphore - Mutex - StreamBuffer - Timer - MessageQueue - EventFlag Thread changes: - Removal of the hack with the `Data` struct - Thread's main body is now just a private static function inside the class. - The C functions were relocated to static class members PubSub changes: - Refactored pubsub into class - Renamed files to `PubSub` instead of `Pubsub` - `PubSubSubscription` is now a private inner struct and `PubSub` only exposes `SubscriptionHandle` Lockable, ScopedLockable, Mutex: - Added `lock()` method that locks indefinitely - Remove deprecated `acquire()` and `release()` methods - Removed `TtWaitForever` in favour of `portMAX_DELAY`
80 lines
2.1 KiB
C++
80 lines
2.1 KiB
C++
#include "Semaphore.h"
|
|
#include "Check.h"
|
|
#include "CoreDefines.h"
|
|
|
|
namespace tt {
|
|
|
|
static inline struct QueueDefinition* createHandle(uint32_t maxCount, uint32_t initialCount) {
|
|
assert((maxCount > 0U) && (initialCount <= maxCount));
|
|
|
|
if (maxCount == 1U) {
|
|
auto handle = xSemaphoreCreateBinary();
|
|
if ((handle != nullptr) && (initialCount != 0U)) {
|
|
if (xSemaphoreGive(handle) != pdPASS) {
|
|
vSemaphoreDelete(handle);
|
|
handle = nullptr;
|
|
}
|
|
}
|
|
return handle;
|
|
} else {
|
|
return xSemaphoreCreateCounting(maxCount, initialCount);
|
|
}
|
|
}
|
|
|
|
Semaphore::Semaphore(uint32_t maxCount, uint32_t initialCount) : handle(createHandle(maxCount, initialCount)){
|
|
assert(!TT_IS_IRQ_MODE());
|
|
tt_check(handle != nullptr);
|
|
}
|
|
|
|
Semaphore::~Semaphore() {
|
|
assert(!TT_IS_IRQ_MODE());
|
|
}
|
|
|
|
bool Semaphore::acquire(uint32_t timeout) const {
|
|
if (TT_IS_IRQ_MODE()) {
|
|
if (timeout != 0U) {
|
|
return false;
|
|
} else {
|
|
BaseType_t yield = pdFALSE;
|
|
|
|
if (xSemaphoreTakeFromISR(handle.get(), &yield) != pdPASS) {
|
|
return false;
|
|
} else {
|
|
portYIELD_FROM_ISR(yield);
|
|
return true;
|
|
}
|
|
}
|
|
} else {
|
|
return xSemaphoreTake(handle.get(), (TickType_t)timeout) == pdPASS;
|
|
}
|
|
}
|
|
|
|
bool Semaphore::release() const {
|
|
if (TT_IS_IRQ_MODE()) {
|
|
BaseType_t yield = pdFALSE;
|
|
if (xSemaphoreGiveFromISR(handle.get(), &yield) != pdTRUE) {
|
|
return false;
|
|
} else {
|
|
portYIELD_FROM_ISR(yield);
|
|
return true;
|
|
}
|
|
} else {
|
|
return xSemaphoreGive(handle.get()) == pdPASS;
|
|
}
|
|
}
|
|
|
|
uint32_t Semaphore::getCount() const {
|
|
if (TT_IS_IRQ_MODE()) {
|
|
// TODO: uxSemaphoreGetCountFromISR is not supported on esp-idf 5.1.2 - perhaps later on?
|
|
#ifdef uxSemaphoreGetCountFromISR
|
|
return uxSemaphoreGetCountFromISR(handle.get());
|
|
#else
|
|
return uxQueueMessagesWaitingFromISR((QueueHandle_t)hSemaphore);
|
|
#endif
|
|
} else {
|
|
return uxSemaphoreGetCount(handle.get());
|
|
}
|
|
}
|
|
|
|
} // namespace
|