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.2 KiB
C++
51 lines
1.2 KiB
C++
#include "ManifestRegistry.h"
|
|
#include "Mutex.h"
|
|
#include "AppManifest.h"
|
|
#include <unordered_map>
|
|
|
|
#define TAG "app"
|
|
|
|
namespace tt::app {
|
|
|
|
typedef std::unordered_map<std::string, std::shared_ptr<AppManifest>> AppManifestMap;
|
|
|
|
static AppManifestMap app_manifest_map;
|
|
static Mutex hash_mutex(Mutex::Type::Normal);
|
|
|
|
void addApp(const AppManifest& manifest) {
|
|
TT_LOG_I(TAG, "Registering manifest %s", manifest.id.c_str());
|
|
|
|
hash_mutex.lock();
|
|
|
|
if (!app_manifest_map.contains(manifest.id)) {
|
|
app_manifest_map[manifest.id] = std::make_shared<AppManifest>(manifest);
|
|
} else {
|
|
TT_LOG_E(TAG, "App id in use: %s", manifest.id.c_str());
|
|
}
|
|
|
|
hash_mutex.unlock();
|
|
}
|
|
|
|
_Nullable std::shared_ptr<AppManifest> findAppById(const std::string& id) {
|
|
hash_mutex.lock();
|
|
auto result = app_manifest_map.find(id);
|
|
hash_mutex.unlock();
|
|
if (result != app_manifest_map.end()) {
|
|
return result->second;
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
std::vector<std::shared_ptr<AppManifest>> getApps() {
|
|
std::vector<std::shared_ptr<AppManifest>> manifests;
|
|
hash_mutex.lock();
|
|
for (const auto& item: app_manifest_map) {
|
|
manifests.push_back(item.second);
|
|
}
|
|
hash_mutex.unlock();
|
|
return manifests;
|
|
}
|
|
|
|
} // namespace
|