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`
53 lines
1.0 KiB
C++
53 lines
1.0 KiB
C++
#include <Mutex.h>
|
|
#include "LvglSync.h"
|
|
|
|
namespace tt::lvgl {
|
|
|
|
static Mutex lockMutex;
|
|
|
|
static bool defaultLock(uint32_t timeoutMillis) {
|
|
return lockMutex.lock(timeoutMillis);
|
|
}
|
|
|
|
static void defaultUnlock() {
|
|
lockMutex.unlock();
|
|
}
|
|
|
|
static LvglLock lock_singleton = defaultLock;
|
|
static LvglUnlock unlock_singleton = defaultUnlock;
|
|
|
|
void syncSet(LvglLock lock, LvglUnlock unlock) {
|
|
lock_singleton = lock;
|
|
unlock_singleton = unlock;
|
|
}
|
|
|
|
bool lock(TickType_t timeout) {
|
|
return lock_singleton(pdMS_TO_TICKS(timeout == 0 ? portMAX_DELAY : timeout));
|
|
}
|
|
|
|
void unlock() {
|
|
unlock_singleton();
|
|
}
|
|
|
|
class LvglSync : public Lockable {
|
|
public:
|
|
~LvglSync() override = default;
|
|
|
|
bool lock(TickType_t timeoutTicks) const override {
|
|
return tt::lvgl::lock(timeoutTicks);
|
|
}
|
|
|
|
bool unlock() const override {
|
|
tt::lvgl::unlock();
|
|
return true;
|
|
}
|
|
};
|
|
|
|
static std::shared_ptr<Lockable> lvglSync = std::make_shared<LvglSync>();
|
|
|
|
std::shared_ptr<Lockable> getLvglSyncLockable() {
|
|
return lvglSync;
|
|
}
|
|
|
|
} // namespace
|