Blunkall-Technologies/Archimedes
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

heavy refactoring

Browse Source
This commit is contained in:
Nathan
2025-04-02 11:50:32 -05:00
parent c3685d2b30
commit 44ef73395c
18 changed files with 132 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/utils/App/App.h
View File

@@ -49,7 +49,9 @@ namespace Archimedes {
bool done = false;
std::list<Module*> modules;
std::unordered_map<std::string, Module*> modules;
std::list<std::string> runOrder;
std::list<Module*> toClose;
std::list<std::string> toOpen;
@@ -73,53 +75,47 @@ namespace Archimedes {
return create(h, Get());
}
virtual std::list<Module*>::iterator load(std::string modulePath, std::list<std::string> blacklist = {}) {
virtual Module* load(std::string modulePath, std::list<std::string>::iterator ins) {
Module* m = dynamicLoad(modulePath);
return load(m, blacklist);
return load(m, ins);
}
virtual std::list<Module*>::iterator load(Module* m, std::list<std::string> blacklist = {}) {
virtual Module* load(Module* m, std::list<std::string>::iterator ins) {
if(!m) {
return modules.end();
return nullptr;
}
void* h = m->getHandle();
for(auto it = blacklist.begin(); it != blacklist.end(); it++) {
for(auto it = runOrder.begin(); it != runOrder.end(); it++) {
if(*it == m->getName()) {
std::cout << "Module \"" << *it << "\" is already loaded!\n";
delete m;
if(h)
dlclose(h);
return modules.end();
return nullptr;
}
}
blacklist.push_back(m->getName());
bool skip = false;
for(auto it = m->deps.begin(); it != m->deps.end(); it++) {
for(std::string s : blacklist) {
if(it->first == s)
skip = true;
for(auto it = runOrder.begin(); it != runOrder.end(); it++) {
if(m->deps.find(*it) != m->deps.end()) {
skip = true;
m->depsInstances[*it] = modules[*it];
}
if(skip) {
skip = false;
continue;
} else {
if(std::holds_alternative<std::string>(it->second))
m->depsInstances[it->first] = load(std::get<std::string>(it->second), blacklist);
if(std::holds_alternative<std::string>(m->deps[*it]))
m->depsInstances[*it] = load(std::get<std::string>(m->deps[*it]), ins);
else
m->depsInstances[it->first] = load(std::get<Module*>(it->second), blacklist);
m->depsInstances[*it] = load(std::get<Module*>(m->deps[*it]), ins);
}
}
modules.push_back(m);
m->setSelf(--modules.end());
modules.end()++;
return m->self;
return m;
}
virtual void unload(std::list<Module*>::iterator it) {
@@ -135,13 +131,6 @@ namespace Archimedes {
virtual void printHelp() = 0;
std::list<std::string> getBlacklist() {
std::list<std::string> l;
for(Module* m : modules)
l.push_back(m->getName());
return l;
}
};
}