parent
317fe1e528
commit
a6ad68190f
|
@ -46,36 +46,22 @@ Manager* g_manager = nullptr; ///< Service manager
|
|||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Service Manager class
|
||||
|
||||
Manager::Manager() {
|
||||
}
|
||||
|
||||
Manager::~Manager() {
|
||||
for(Interface* service : m_services) {
|
||||
DeleteService(service->GetPortName());
|
||||
}
|
||||
}
|
||||
|
||||
/// Add a service to the manager (does not create it though)
|
||||
void Manager::AddService(Interface* service) {
|
||||
// TOOD(yuriks): Fix error reporting
|
||||
m_port_map[service->GetPortName()] = Kernel::g_handle_table.Create(service).ValueOr(INVALID_HANDLE);
|
||||
m_services.push_back(service);
|
||||
}
|
||||
|
||||
/// Removes a service from the manager, also frees memory
|
||||
void Manager::DeleteService(const std::string& port_name) {
|
||||
Interface* service = FetchFromPortName(port_name);
|
||||
m_services.erase(std::remove(m_services.begin(), m_services.end(), service), m_services.end());
|
||||
m_port_map.erase(port_name);
|
||||
delete service;
|
||||
}
|
||||
|
||||
/// Get a Service Interface from its Handle
|
||||
Interface* Manager::FetchFromHandle(Handle handle) {
|
||||
return Kernel::g_handle_table.Get<Interface>(handle);
|
||||
}
|
||||
|
||||
/// Get a Service Interface from its port
|
||||
Interface* Manager::FetchFromPortName(const std::string& port_name) {
|
||||
auto itr = m_port_map.find(port_name);
|
||||
if (itr == m_port_map.end()) {
|
||||
|
|
|
@ -114,29 +114,22 @@ private:
|
|||
|
||||
/// Simple class to manage accessing services from ports and UID handles
|
||||
class Manager {
|
||||
|
||||
public:
|
||||
Manager();
|
||||
|
||||
~Manager();
|
||||
|
||||
/// Add a service to the manager (does not create it though)
|
||||
/// Add a service to the manager
|
||||
void AddService(Interface* service);
|
||||
|
||||
/// Removes a service from the manager (does not delete it though)
|
||||
/// Removes a service from the manager
|
||||
void DeleteService(const std::string& port_name);
|
||||
|
||||
/// Get a Service Interface from its UID
|
||||
Interface* FetchFromHandle(u32 uid);
|
||||
/// Get a Service Interface from its Handle
|
||||
Interface* FetchFromHandle(Handle handle);
|
||||
|
||||
/// Get a Service Interface from its port
|
||||
Interface* FetchFromPortName(const std::string& port_name);
|
||||
|
||||
private:
|
||||
|
||||
std::vector<Interface*> m_services;
|
||||
std::map<std::string, u32> m_port_map;
|
||||
|
||||
};
|
||||
|
||||
/// Initialize ServiceManager
|
||||
|
|
Reference in New Issue