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`
117 lines
3.6 KiB
C++
117 lines
3.6 KiB
C++
#include "ServiceRegistry.h"
|
|
|
|
#include "Mutex.h"
|
|
#include "service/ServiceInstance.h"
|
|
#include "service/ServiceManifest.h"
|
|
#include <string>
|
|
#include <unordered_map>
|
|
|
|
namespace tt::service {
|
|
|
|
#define TAG "service_registry"
|
|
|
|
typedef std::unordered_map<std::string, std::shared_ptr<const ServiceManifest>> ManifestMap;
|
|
typedef std::unordered_map<std::string, std::shared_ptr<ServiceInstance>> ServiceInstanceMap;
|
|
|
|
static ManifestMap service_manifest_map;
|
|
static ServiceInstanceMap service_instance_map;
|
|
|
|
static Mutex manifest_mutex(Mutex::Type::Normal);
|
|
static Mutex instance_mutex(Mutex::Type::Normal);
|
|
|
|
void addService(std::shared_ptr<const ServiceManifest> manifest, bool autoStart) {
|
|
// We'll move the manifest pointer, but we'll need to id later
|
|
std::string id = manifest->id;
|
|
|
|
TT_LOG_I(TAG, "Adding %s", id.c_str());
|
|
|
|
manifest_mutex.lock();
|
|
if (service_manifest_map[id] == nullptr) {
|
|
service_manifest_map[id] = std::move(manifest);
|
|
} else {
|
|
TT_LOG_E(TAG, "Service id in use: %s", id.c_str());
|
|
}
|
|
manifest_mutex.unlock();
|
|
|
|
if (autoStart) {
|
|
startService(id);
|
|
}
|
|
}
|
|
|
|
void addService(const ServiceManifest& manifest, bool autoStart) {
|
|
addService(std::make_shared<const ServiceManifest>(manifest), autoStart);
|
|
}
|
|
|
|
std::shared_ptr<const ServiceManifest> _Nullable findManifestId(const std::string& id) {
|
|
manifest_mutex.lock();
|
|
auto iterator = service_manifest_map.find(id);
|
|
auto manifest = iterator != service_manifest_map.end() ? iterator->second : nullptr;
|
|
manifest_mutex.unlock();
|
|
return manifest;
|
|
}
|
|
|
|
static std::shared_ptr<ServiceInstance> _Nullable findServiceInstanceById(const std::string& id) {
|
|
manifest_mutex.lock();
|
|
auto iterator = service_instance_map.find(id);
|
|
auto service = iterator != service_instance_map.end() ? iterator->second : nullptr;
|
|
manifest_mutex.unlock();
|
|
return service;
|
|
}
|
|
|
|
// TODO: Return proper error/status instead of BOOL?
|
|
bool startService(const std::string& id) {
|
|
TT_LOG_I(TAG, "Starting %s", id.c_str());
|
|
auto manifest = findManifestId(id);
|
|
if (manifest == nullptr) {
|
|
TT_LOG_E(TAG, "manifest not found for service %s", id.c_str());
|
|
return false;
|
|
}
|
|
|
|
auto service_instance = std::make_shared<ServiceInstance>(manifest);
|
|
|
|
// Register first, so that a service can retrieve itself during onStart()
|
|
instance_mutex.lock();
|
|
service_instance_map[manifest->id] = service_instance;
|
|
instance_mutex.unlock();
|
|
|
|
service_instance->getService()->onStart(*service_instance);
|
|
|
|
TT_LOG_I(TAG, "Started %s", id.c_str());
|
|
|
|
return true;
|
|
}
|
|
|
|
std::shared_ptr<ServiceContext> _Nullable findServiceContextById(const std::string& id) {
|
|
return findServiceInstanceById(id);
|
|
}
|
|
|
|
std::shared_ptr<Service> _Nullable findServiceById(const std::string& id) {
|
|
auto instance = findServiceInstanceById(id);
|
|
return instance != nullptr ? instance->getService() : nullptr;
|
|
}
|
|
|
|
bool stopService(const std::string& id) {
|
|
TT_LOG_I(TAG, "Stopping %s", id.c_str());
|
|
auto service_instance = findServiceInstanceById(id);
|
|
if (service_instance == nullptr) {
|
|
TT_LOG_W(TAG, "service not running: %s", id.c_str());
|
|
return false;
|
|
}
|
|
|
|
service_instance->getService()->onStop(*service_instance);
|
|
|
|
instance_mutex.lock();
|
|
service_instance_map.erase(id);
|
|
instance_mutex.unlock();
|
|
|
|
if (service_instance.use_count() > 1) {
|
|
TT_LOG_W(TAG, "Possible memory leak: service %s still has %ld references", service_instance->getManifest().id.c_str(), service_instance.use_count() - 1);
|
|
}
|
|
|
|
TT_LOG_I(TAG, "Stopped %s", id.c_str());
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace
|