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`
58 lines
1.3 KiB
C++
58 lines
1.3 KiB
C++
#pragma once
|
|
|
|
#include "Check.h"
|
|
#include "RtosCompat.h"
|
|
#include <memory>
|
|
#include <functional>
|
|
#include <algorithm>
|
|
|
|
namespace tt {
|
|
|
|
class ScopedLockableUsage;
|
|
|
|
/** Represents a lock/mutex */
|
|
class Lockable {
|
|
public:
|
|
virtual ~Lockable() = default;
|
|
|
|
virtual bool lock(TickType_t timeoutTicks) const = 0;
|
|
|
|
virtual bool lock() const { return lock(portMAX_DELAY); }
|
|
|
|
virtual bool unlock() const = 0;
|
|
|
|
std::unique_ptr<ScopedLockableUsage> scoped() const;
|
|
};
|
|
|
|
/**
|
|
* Represents a lockable instance that is scoped to a specific lifecycle.
|
|
* Once the ScopedLockableUsage is destroyed, unlock() is called automatically.
|
|
*
|
|
* In other words:
|
|
* You have to lock() this object manually, but unlock() happens automatically on destruction.
|
|
*/
|
|
class ScopedLockableUsage final : public Lockable {
|
|
|
|
const Lockable& lockable;
|
|
|
|
public:
|
|
|
|
explicit ScopedLockableUsage(const Lockable& lockable) : lockable(lockable) {}
|
|
|
|
~ScopedLockableUsage() final {
|
|
lockable.unlock(); // We don't care whether it succeeded or not
|
|
}
|
|
|
|
bool lock(TickType_t timeout) const override {
|
|
return lockable.lock(timeout);
|
|
}
|
|
|
|
bool lock() const override { return lock(portMAX_DELAY); }
|
|
|
|
bool unlock() const override {
|
|
return lockable.unlock();
|
|
}
|
|
};
|
|
|
|
}
|