Move all local-only fields to LocalUser

[user/henk/code/inspircd.git] / include / dynamic.h

diff --git a/include/dynamic.h b/include/dynamic.h
index 19ff7bdaf67f56008258a926b2efa1c62e05b8bb..12f6ffbc9a2de6d47927665684f3ecee97c8a24f 100644 (file)
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -14,16 +14,17 @@
 #ifndef __DLL_H
 #define __DLL_H
 
+class Module;
+
 /** The DLLManager class is able to load a module file by filename,
  * and locate its init_module symbol.
  */
-class CoreExport DLLManager
+class CoreExport DLLManager : public classbase
 {
  protected:
-
-       /** The last error string, or NULL
+       /** The last error string
         */
-       const char *err;
+       std::string err;
 
  public:
        /** This constructor loads the module using dlopen()
@@ -33,125 +34,20 @@ class CoreExport DLLManager
        DLLManager(const char *fname);
        virtual ~DLLManager();
 
-       /** Get a symbol using dynamic linking.
-        * @param v A function pointer, pointing at an init_module function
-        * @param sym_name The symbol name to find, usually "init_module"
-        * @return true if the symbol can be found, also the symbol will be put into v.
-        */
-       bool GetSymbol(void **v, const char *sym_name);
-
        /** Get the last error from dlopen() or dlsym().
-        * @return The last error string, or NULL if no error has occured.
         */
-       const char* LastError()
+       const std::string& LastError()
        {
                 return err;
        }
 
-       /** The module handle.
-        * This is OS dependent, on POSIX platforms it is a pointer to a function
-        * pointer (yes, really!) and on windows it is a library handle.
+       /** The module library handle.
         */
        void *h;
-};
-
-class CoreExport LoadModuleException : public CoreException
-{
- public:
-       /** This constructor can be used to specify an error message before throwing.
-        */
-       LoadModuleException(const std::string &message)
-       : CoreException(message, "the core")
-       {
-       }
-
-       /** This destructor solves world hunger, cancels the world debt, and causes the world to end.
-        * Actually no, it does nothing. Never mind.
-        * @throws Nothing!
-        */
-       virtual ~LoadModuleException() throw() {};
-};
-
-class CoreExport FindSymbolException : public CoreException
-{
- public:
-       /** This constructor can be used to specify an error message before throwing.
-        */
-       FindSymbolException(const std::string &message)
-       : CoreException(message, "the core")
-       {
-       }
-
-       /** This destructor solves world hunger, cancels the world debt, and causes the world to end.
-        * Actually no, it does nothing. Never mind.
-        * @throws Nothing!
-        */
-       virtual ~FindSymbolException() throw() {};
-};
 
-/** This is the highest-level class of the DLLFactory system used to load InspIRCd modules and commands.
- * All the dirty mucking around with dl*() is done by DLLManager, all this does it put a pretty shell on
- * it and make it nice to use to load modules and core commands. This class is quite specialised for these
- * two uses and it may not be useful more generally -- use DLLManager directly for that.
- */
-template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
-{
- protected:
-       /** This typedef represents the init_* function within each module or command.
-        * The init_module function is the only exported extern "C" declaration
-        * in any module file. In a cmd_*.cpp file the equivilant is init_command
+       /** Return a module by calling the init function
         */
-       typedef ReturnType * (initfunctype) ();
-
-       /** Pointer to the init function.
-        */
-       initfunctype* init_func;
-
- public:
-       /** Default constructor.
-        * This constructor passes its paramerers down through DLLFactoryBase and then DLLManager
-        * to load the module, then calls the factory function to retrieve a pointer to a ModuleFactory
-        * class. It is then down to the core to call the ModuleFactory::CreateModule() method and
-        * receive a Module* which it can insert into its module lists.
-        */
-       DLLFactory(const char *fname, const char *func_name)
-       : DLLManager(fname), init_func(NULL)
-       {
-               const char* error = LastError();
-
-               if(!error)
-               {
-                       if(!GetSymbol((void **)&init_func, func_name))
-                       {
-                               throw FindSymbolException("Missing " + std::string(func_name) + "() entrypoint!");
-                       }
-               }
-               else
-               {
-                       throw LoadModuleException(error);
-               }
-       }
-
-       /** Calls the 'init_module' C exported function within a module, which
-        * returns a pointer to a Module derived object.
-        */
-       ReturnType* CallInit()
-       {
-               if(init_func)
-               {
-                       return init_func();
-               }
-               else
-               {
-                       return NULL;
-               }
-       }
-
-       /** The destructor deletes the ModuleFactory pointer.
-        */
-       ~DLLFactory()
-       {
-       }
+       Module* callInit();
 };
 
 #endif