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`
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
#pragma once
|
|
|
|
#include "EventFlag.h"
|
|
#include "MessageQueue.h"
|
|
#include "PubSub.h"
|
|
#include "RtosCompatSemaphore.h"
|
|
#include "Thread.h"
|
|
#include "app/AppInstance.h"
|
|
#include "app/AppManifest.h"
|
|
#include "service/loader/Loader.h"
|
|
#include <DispatcherThread.h>
|
|
#include <stack>
|
|
#include <utility>
|
|
|
|
namespace tt::service::loader {
|
|
|
|
// region LoaderMessage
|
|
|
|
class LoaderMessageAppStart {
|
|
public:
|
|
std::string id;
|
|
std::shared_ptr<const Bundle> _Nullable parameters;
|
|
|
|
LoaderMessageAppStart() = default;
|
|
|
|
LoaderMessageAppStart(LoaderMessageAppStart& other) :
|
|
id(other.id),
|
|
parameters(other.parameters) {}
|
|
|
|
LoaderMessageAppStart(const std::string& id, std::shared_ptr<const Bundle> parameters) :
|
|
id(id),
|
|
parameters(std::move(parameters))
|
|
{}
|
|
|
|
~LoaderMessageAppStart() = default;
|
|
};
|
|
|
|
// endregion LoaderMessage
|
|
|
|
struct Loader {
|
|
std::shared_ptr<PubSub> pubsubExternal = std::make_shared<PubSub>();
|
|
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
|
std::stack<std::shared_ptr<app::AppInstance>> appStack;
|
|
/** The dispatcher thread needs a callstack large enough to accommodate all the dispatched methods.
|
|
* This includes full LVGL redraw via Gui::redraw()
|
|
*/
|
|
std::unique_ptr<DispatcherThread> dispatcherThread = std::make_unique<DispatcherThread>("loader_dispatcher", 6144); // Files app requires ~5k
|
|
};
|
|
|
|
} // namespace
|