work on main app

src/App.cpp

@@ -28,31 +28,15 @@ App::~App() {
     }
 }
 
-void App::run() {
-    std::cout << "\nTesting...\n";
 
-    // Main loop
-    while (!done && !modules.empty()) {
+bool App::load(std::string lib, std::list<std::string> blacklist = {}) {
 
-        for(auto it = modules.begin(); it != modules.end(); it++) {
-            (*it)->run();
-        }
-        
-        for(auto it = toClose.begin(); it != toClose.end(); it++) {
-            unload(it);
-        }
-        toClose.clear();
-    }
-    
-}
-
-void App::load(std::string lib) {
 
     void* h = dlopen(lib.c_str(), RTLD_NOW);
 
     if(!h) {
-        std::cout << "could not open lib: \"" << lib.c_str() << "\"\nError: " << dlerror() << std::endl;
-        return;
+        std::cout << "could not open lib at: \"" << lib.c_str() << "\"\nError: " << dlerror() << std::endl;
+        return false;
     }
 
     Module::create_t* create = (Module::create_t*) dlsym(h, "create");
@@ -63,33 +47,60 @@ void App::load(std::string lib) {
 
     Module* m = create(h, App::Get());
 
-    for(auto it = modules.begin(); it != modules.end(); it++) {
-        
-        if((*it)->getName() == m->getName()) {
-            std::cout << "Module \"" << m->getName() << "\" is already loaded!\n";
-            return;
+    for(std::string s : blacklist) {
+        if(s == m->getName()) {
+            std::cout << "Module \"" << s << "\" is already loaded!\n";
+            delete m;
+            dlclose(h);
+            return false;
         }
     }
 
+    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;
+        }
+        if(skip) {
+            skip = false;
+            continue;
+        } else {
+            load(it->second, blacklist);
+        }
+    }
+
+
     modules.push_back(m);
     m->setSelf(--modules.end());
     modules.end()++;
+
+    return true;
 }
         
 void App::unload(std::list<Module*>::iterator it) {
-    void* h = (*it)->getHandle();
-    
-    delete *it;
+
+    Module* m = *it;
+    void* h = m->getHandle();
+
+    modules.erase(m->self);
+    delete m;
     
     dlclose(h);
     
-    modules.erase((*it)->self);
 }
 
 void App::stopModule(std::list<Module*>::iterator it) {
     toClose.push_back(*it);
 }
 
+void App::startModule(std::string lib) {
+    toOpen.push_back(lib);
+}
+
 void App::handleArgs(const int& argc, char* argv[]) {
 
     int i = 1;
@@ -120,3 +131,30 @@ void App::handleArgs(const int& argc, char* argv[]) {
 void App::printHelp() {
     std::cout << "archimedes [ -h | --help ] /path/to/some/library.so\n";
 }
+
+
+void App::run() {
+    std::cout << "\nTesting...\n";
+    
+    for(auto* m : modules)
+        m->onLoad();
+
+    // Main loop
+    while (!done && !modules.empty()) {
+
+        for(auto* m : modules) {
+            m->run();
+        }
+        
+        for(auto it = toClose.begin(); it != toClose.end(); it++) {
+            unload(it);
+        }
+        toClose.clear();
+
+        for(std::string s : toOpen) {
+            load(s, getBlacklist());
+        }
+        toOpen.clear();
+    }
+    
+}