more work on testMenu

modules/testMenu/src/testMenu.cpp

@@ -4,14 +4,17 @@ TestMenu::TestMenu(void* h) {
     handle = h;
 }
 
-TestMenu::~TestMenu() {}
+TestMenu::~TestMenu() {
+    std::cout << "TestMenu Destroyed!\n";
+}
 
 void TestMenu::run() {
     
     std::cout << "Your number is: " << num << "\n"
               << "1. Add 1\n"
               << "2. Subtract 1\n"
-              << "3. Quit\n\n";
+              << "3. Unload Module\n\n"
+              << "4. Quit\n\n";
 
     std::cin >> choice;
 
@@ -23,6 +26,9 @@ void TestMenu::run() {
             num--;
             break;
         case 3:
+            App::Get().unload(self);
+            break;
+        case 4:
             App::Get().end();
             break;
         default:

modules/testMenu/src/testMenu.h

@@ -16,8 +16,4 @@ extern "C" {
     Module* create(void* handle) {
         return new TestMenu(handle);
     }
-
-    void destroy(Module* m) {
-        delete m;
-    }
 }

src/App.cpp

@@ -20,15 +20,19 @@ App::App(const int& argc, char* argv[]) {
 App::~App() {
 
     std::cout << "\nExiting...";
+    for(auto it = modules.begin(); it != modules.end(); it++) {
+        void* handle = (*it)->getHandle();
+        delete *it;
+        dlclose(handle);
+        modules.erase(it);
+    }
 }
 
 void App::run() {
     std::cout << "\nTesting...\n";
 
-    done = modules.empty();
-
     // Main loop
-    while (!done) {
+    while (!done && !modules.empty()) {
 
         for(auto it = modules.begin(); it != modules.end(); it++)
             (*it)->run();
@@ -65,10 +69,22 @@ void App::load(std::string lib) {
     }
 }
         
+void App::unload(std::list<Module*>::iterator it) {
+    void* handle = (*it)->getHandle();
+    delete *it;
+    dlclose(handle);
+    modules.erase(it);
+}
+
 void App::handleArgs(const int& argc, char* argv[]) {
 
     int i = 0;
 
+    if(argc == 0) {
+        printHelp();
+        end();
+    }
+    
     while(i < argc) {
         if(strcmp(argv[i], "-h") == 0) {
             printHelp();

src/App.h

@@ -12,9 +12,7 @@ class App {
 
         bool done;
 
-        std::vector<Module*> modules;
-        std::vector<Module::create_t> mCreators;
-        std::vector<Module::destroy_t> mDestroyers;
+        std::list<Module*> modules;
 
     public:
         App(const int&, char*[]);
@@ -26,11 +24,13 @@ class App {
 
         void load(std::string);
 
+        void unload(std::list<Module*>::iterator);
+
         void handleArgs(const int&, char*[]);
 
         void printHelp();
 
-        void end() { done = true; };
+        void end() { done = true; }
 };
 
 #endif

src/Module.h

@@ -7,16 +7,18 @@ class Module {
 
     public:
         typedef Module* create_t(void*);
-        typedef void destroy_t(Module*);
+        typedef void* destroy_t(Module*);
 
 
         virtual ~Module() {}
         virtual void run() = 0;
         std::string getName() const { return name; }
+        void* getHandle() { return handle; }
     
     protected:
         std::string name;
         void* handle;
+        std::list<Module*>::iterator self;
 };
 
 #endif

src/pch.hpp

@@ -3,7 +3,7 @@
 
 #include <iostream>
 #include <cstring>
-#include <vector>
+#include <list>
 
 #include <dlfcn.h>