Changeset 7167 in orxonox.OLD

Timestamp:

Feb 19, 2006, 3:18:08 PM (18 years ago)

Author:

bensch

Message:

trunk: dynamic library loading test

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)
• util/Makefile.am (modified) (3 diffs)
• util/loading/dynamic_loader.cc (copied) (copied from trunk/src/proto/proto_class.cc) (3 diffs)
• util/loading/dynamic_loader.h (copied) (copied from trunk/src/proto/proto_class.h) (1 diff)
• util/loading/factory.h (modified) (2 diffs)
• world_entities/WorldEntities.am (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -335 +335 @@
   CL_QUICK_ANIMATION            =    0x00000e02,
 
-  CL_FACTORY                    =    0x00000e03,
-  CL_FAST_FACTORY               =    0x00000e01,
-  CL_LOAD_PARAM                 =    0x00000e07,
+  CL_FACTORY                    =    0x00e01000,
+  CL_FAST_FACTORY               =    0x00000ea2,
+  CL_LOAD_PARAM                 =    0x00000ea3,
+  CL_DYNAMIC_LOADER             =    0x00000ea8,
 
   CL_INI_PARSER                 =    0x00000e04,
-
-  CL_TRACK_ELEMENT              =    0x00000e0b,
-  CL_LIST                       =    0x00000e05,
-  CL_SUBSTRING                  =    0x00000e06,
-  CL_CURVE                      =    0x00000e08,
-  CL_CHARACTER_ATTRIBUTES       =    0x00000e0a,
-  CL_NUMBER                     =    0x00000e0c,
-  CL_EXECUTOR                   =    0x00000e0d,
 
   CL_SHELL                      =    0x00000e10,
@@ -356 +349 @@
   CL_SHELL_COMMAND_ALIAS        =    0x00000e15,
 
+  CL_TRACK_ELEMENT              =    0x00000e2b,
+  CL_LIST                       =    0x00000e25,
+  CL_SUBSTRING                  =    0x00000e26,
+  CL_CURVE                      =    0x00000e28,
+  CL_CHARACTER_ATTRIBUTES       =    0x00000e2a,
+  CL_NUMBER                     =    0x00000e2c,
+  CL_EXECUTOR                   =    0x00000e2d,
+
   // Spatial Data Separation
   CL_SPATIAL_SEPARATION         =    0x00000e0d,

trunk/src/orxonox.cc

@@ -289 +289 @@
 }
 
+#include "dynamic_loader.h"
 
 /**
@@ -330 +331 @@
   ResourceManager::getInstance()->addImageDir(imageDir);
   delete[] imageDir;
+
+  DynamicLoader::loadDyLib("libtest.so");
 
   // start the collision detection engine

trunk/src/util/Makefile.am

@@ -6 +6 @@
 libORXutils_a_SOURCES = fast_factory.cc \
                         object_manager.cc \
-                        loading/factory.cc \
                         state.cc \
                         hud.cc \
@@ -20 +19 @@
                         loading/load_param.cc \
                         loading/load_param_description.cc \
+                        loading/factory.cc \
+                        loading/dynamic_loader.cc \
                         \
                         track/pilot_node.cc \
@@ -38 +39 @@
                         \
                         loading/resource_manager.h \
-                        loading/factory.h \
                         loading/game_loader.h \
                         loading/load_param.h \
                         loading/load_param_description.h \
+                        loading/factory.h \
+                        loading/dynamic_loader.h \
                         \
                         track/pilot_node.h \

trunk/src/util/loading/dynamic_loader.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
-#include "proto_class.h"
+#include "dynamic_loader.h"
+
+
+#include <dlfcn.h>
+
 
 using namespace std;
@@ -25 +29 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+DynamicLoader::DynamicLoader (const std::string& libName)
+    : Factory(NULL, CL_NULL)
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+  this->setClassID(CL_DYNAMIC_LOADER, "DynamicLoader");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
+  this->handle = NULL;
 
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+  if (loadDynamicLib(libName));
+  this->setName(&libName[0]);
 }
 
@@ -45 +44 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+DynamicLoader::~DynamicLoader ()
 {
   // delete what has to be deleted here
+  if (this->handle != NULL)
+    dlclose(this->handle);
 }
+
+
+bool DynamicLoader::loadDynamicLib(const std::string& libName)
+{
+  this->handle = dlopen(&libName[0], RTLD_NOW);
+  if(this->handle == NULL)
+  {
+    return false;
+  }
+  void *mkr = dlsym( this->handle, "maker");
+}
+
+bool DynamicLoader::loadDyLib(const std::string& libName)
+{
+  void* handle;
+  handle = dlopen(&libName[0], RTLD_NOW);
+  if(handle == NULL)
+  {
+    PRINTF(0)("unable to load %s\n", &libName[0]);
+    return false;
+  }
+//  void *mkr = dlsym("maker");
+
+}
+
+
+BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
+{
+}

trunk/src/util/loading/dynamic_loader.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
- * @brief Definition of ...
+ * @file dynamic_loader.h
+ * @brief Definition of The Dynamic Loader Factory.
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _DYNAMIC_LOADER_H
+#define _DYNAMIC_LOADER_H
 
-#include "base_object.h"
+#include "factory.h"
+
+#include <string>
+
+#define DYNAMIC_LINKAGE_FACTORY(CLASS_NAME, CLASS_ID) \
+          void* DynamicCreator(const TiXmlElement* root) { return new CLASS_NAME(root); };
 
 // FORWARD DECLARATION
 
+//! A class for ...
+class DynamicLoader : public Factory
+{
+
+public:
+  DynamicLoader(const std::string& libName);
+  virtual ~DynamicLoader();
+
+  bool loadDynamicLib(const std::string& libName);
+  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const;
+
+  static bool loadDyLib(const std::string& libName);
 
 
-//! A class for ...
-class ProtoClass : public BaseObject {
-
- public:
-  ProtoClass();
-  virtual ~ProtoClass();
-
-
- private:
-
+private:
+  void*      handle;
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _DYNAMIC_LOADER_H */

trunk/src/util/loading/factory.h

@@ -38 +38 @@
     tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
 
+// #define CREATE_DYNAMIC_FACTORY(CLASS_NAME, CLASS_ID) \
+//     tFactory<CLASS_NAME>* global_##CLASS_NAME##_Dynamic_Factory = new DynamicLoader<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
+
 //! The Factory is a loadable object handler
 class Factory : public BaseObject {
 
  public:
-  Factory (const char* factoryName, ClassID classID);
   virtual ~Factory ();
 
@@ -56 +58 @@
 
   protected:
+    Factory (const char* factoryName, ClassID classID);
     virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 

trunk/src/world_entities/WorldEntities.am

@@ -4 +4 @@
                 world_entities/npcs/npc_test.cc \
                 world_entities/npcs/ground_turret.cc \
+                \
                 world_entities/environment.cc \
                 world_entities/skysphere.cc \