remove debug prints
This commit is contained in:
@@ -107,36 +107,7 @@ namespace Archimedes {
|
||||
|
||||
virtual void startModule(std::variant<std::string, Module*> m) { toOpen.push_back(m); }
|
||||
|
||||
virtual bool onEvent(const Event& event) {
|
||||
|
||||
unsigned int type = getEventType(event);
|
||||
|
||||
if(type == getEventType(Archimedes::DoLoadModuleEvent())) {
|
||||
|
||||
Archimedes::DoLoadModuleEvent& e = (Archimedes::DoLoadModuleEvent&) event;
|
||||
|
||||
startModule(e.module);
|
||||
|
||||
return true;
|
||||
|
||||
} else if(type == getEventType(Archimedes::DoUnloadModuleEvent())) {
|
||||
|
||||
Archimedes::DoUnloadModuleEvent& e = (Archimedes::DoUnloadModuleEvent&) event;
|
||||
|
||||
stopModule(e.module);
|
||||
|
||||
return true;
|
||||
|
||||
} else if(type == getEventType(Archimedes::LoadModuleEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == getEventType(Archimedes::UnloadModuleEvent())) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
virtual bool onEvent(const Event& event) = 0;
|
||||
|
||||
void handleEvents() {
|
||||
static bool handled;
|
||||
@@ -213,8 +184,6 @@ namespace Archimedes {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "1\n";
|
||||
|
||||
void* h = m->getHandle();
|
||||
for(auto it = runOrder.begin(); it != runOrder.end(); it++) {
|
||||
if(*it == static_cast<std::string>(*m)) {
|
||||
@@ -227,13 +196,9 @@ namespace Archimedes {
|
||||
}
|
||||
}
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "2\n";
|
||||
|
||||
if(modules.find(*m) == modules.end())
|
||||
modules[*m] = m;
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "3\n";
|
||||
|
||||
for(auto it = runOrder.begin(); it != runOrder.end(); it++) {
|
||||
|
||||
if(m->deps.find(*it) != m->deps.end()) {
|
||||
@@ -245,8 +210,6 @@ namespace Archimedes {
|
||||
}
|
||||
}
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "4\n";
|
||||
|
||||
//insert temporarily to avoid circular dependencies
|
||||
runOrder.insert(roInsert, *m);
|
||||
|
||||
@@ -268,21 +231,13 @@ namespace Archimedes {
|
||||
m->moduleInstances[it.first] = load(std::get<Module*>(it.second));
|
||||
}
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "5\n";
|
||||
|
||||
//reinsert once final order has been reached
|
||||
runOrder.remove(*m);
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "6\n";
|
||||
|
||||
runOrder.insert(roInsert, *m);
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "7\n";
|
||||
|
||||
emitEvent(new LoadModuleEvent(*m));
|
||||
|
||||
std::cout << "Load: " << (std::string) *m << "8\n";
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user