TactilityCore improvements (#187)
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`
This commit is contained in:
committed by
GitHub
parent
c2edbad0fb
commit
686f7cce83
@@ -42,7 +42,7 @@ public:
|
||||
bool setEntriesForPath(const std::string& path);
|
||||
|
||||
const std::vector<dirent>& lockEntries() const {
|
||||
mutex.lock(TtWaitForever);
|
||||
mutex.lock();
|
||||
return dir_entries;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ private:
|
||||
.onConnectSsidContext = nullptr
|
||||
};
|
||||
View view = View(&bindings, &state);
|
||||
PubSubSubscription* wifiSubscription;
|
||||
PubSub::SubscriptionHandle wifiSubscription;
|
||||
bool view_enabled = false;
|
||||
|
||||
public:
|
||||
|
||||
@@ -12,7 +12,7 @@ class WifiManage : public App {
|
||||
|
||||
private:
|
||||
|
||||
PubSubSubscription* wifiSubscription = nullptr;
|
||||
PubSub::SubscriptionHandle wifiSubscription = nullptr;
|
||||
Mutex mutex;
|
||||
Bindings bindings = { };
|
||||
State state;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "MessageQueue.h"
|
||||
#include "Mutex.h"
|
||||
#include "Pubsub.h"
|
||||
#include "PubSub.h"
|
||||
#include "service/gui/Gui.h"
|
||||
#include <cstdio>
|
||||
#include <lvgl.h>
|
||||
@@ -19,7 +19,7 @@ struct Gui {
|
||||
// Thread and lock
|
||||
Thread* thread = nullptr;
|
||||
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
||||
PubSubSubscription* loader_pubsub_subscription = nullptr;
|
||||
PubSub::SubscriptionHandle loader_pubsub_subscription = nullptr;
|
||||
|
||||
// Layers and Canvas
|
||||
lv_obj_t* appRootWidget = nullptr;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include "app/AppManifest.h"
|
||||
#include "app/AppInstance.h"
|
||||
#include "EventFlag.h"
|
||||
#include "MessageQueue.h"
|
||||
#include "Pubsub.h"
|
||||
#include "Thread.h"
|
||||
#include "service/loader/Loader.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>
|
||||
#include <DispatcherThread.h>
|
||||
|
||||
namespace tt::service::loader {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user