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++
#include "app/AppInstance.h"
|
|
#include "app/AppInstancePaths.h"
|
|
|
|
namespace tt::app {
|
|
|
|
#define TAG "app"
|
|
|
|
void AppInstance::setState(State newState) {
|
|
mutex.lock();
|
|
state = newState;
|
|
mutex.unlock();
|
|
}
|
|
|
|
State AppInstance::getState() const {
|
|
mutex.lock();
|
|
auto result = state;
|
|
mutex.unlock();
|
|
return result;
|
|
}
|
|
|
|
/** TODO: Make this thread-safe.
|
|
* In practice, the bundle is writeable, so someone could be writing to it
|
|
* while it is being accessed from another thread.
|
|
* Consider creating MutableBundle vs Bundle.
|
|
* Consider not exposing bundle, but expose `app_get_bundle_int(key)` methods with locking in it.
|
|
*/
|
|
const AppManifest& AppInstance::getManifest() const {
|
|
assert(manifest != nullptr);
|
|
return *manifest;
|
|
}
|
|
|
|
Flags AppInstance::getFlags() const {
|
|
mutex.lock();
|
|
auto result = flags;
|
|
mutex.unlock();
|
|
return result;
|
|
}
|
|
|
|
void AppInstance::setFlags(Flags newFlags) {
|
|
mutex.lock();
|
|
flags = newFlags;
|
|
mutex.unlock();
|
|
}
|
|
|
|
std::shared_ptr<const Bundle> AppInstance::getParameters() const {
|
|
mutex.lock();
|
|
std::shared_ptr<const Bundle> result = parameters;
|
|
mutex.unlock();
|
|
return result;
|
|
}
|
|
|
|
std::unique_ptr<Paths> AppInstance::getPaths() const {
|
|
assert(manifest != nullptr);
|
|
return std::make_unique<AppInstancePaths>(*manifest);
|
|
}
|
|
|
|
} // namespace
|