Changeset 7264 in orxonox.OLD for branches/shared_lib/src/lib/util

Timestamp:

Apr 2, 2006, 4:51:19 PM (19 years ago)

Author:

bensch

Message:

shared_lib: compile again

Location:

branches/shared_lib/src/lib/util/loading

Files:

• dynamic_loader.cc (modified) (5 diffs)
• dynamic_loader.h (modified) (2 diffs)
• resource_manager.cc (modified) (2 diffs)

branches/shared_lib/src/lib/util/loading/dynamic_loader.cc

@@ -17 +17 @@
 
 #include "dynamic_loader.h"
-
-
-#include <dlfcn.h>
-
+#include "resource_manager.h"
 
 using namespace std;
-
 
 /**
@@ -30 +26 @@
 */
 DynamicLoader::DynamicLoader (const std::string& libName)
-    : Factory(NULL, CL_NULL)
 {
   this->setClassID(CL_DYNAMIC_LOADER, "DynamicLoader");
@@ -40 +35 @@
 }
 
+/**
+ * @brief initializes the Dynamic Library loader
+ * @returns true on succes, false otherwise
+ */
+bool DynamicLoader::initialize()
+{
+  if (lt_dlinit () != 0)
+  {
+    PRINTF(1)("Initializing LT_DL_LIB: %s\n", lt_dlerror());
+    return false;
+  }
+  else
+    return true;
+}
 
 /**
@@ -48 +57 @@
   // delete what has to be deleted here
   if (this->handle != NULL)
-    dlclose(this->handle);
+    lt_dlclose(this->handle);
 }
 
@@ -54 +63 @@
 bool DynamicLoader::loadDynamicLib(const std::string& libName)
 {
-  this->handle = dlopen(&libName[0], RTLD_NOW);
+  DynamicLoader::initialize();
+
+  this->handle = lt_dlopen(&libName[0]);
   if(this->handle == NULL)
   {
     return false;
   }
-  void *mkr = dlsym( this->handle, "maker");
 }
 
 bool DynamicLoader::loadDyLib(const std::string& libName)
 {
+  DynamicLoader::initialize();
+
   void* handle;
-  handle = dlopen(&libName[0], RTLD_NOW);
+  handle = lt_dlopen(libName.c_str());
   if(handle == NULL)
   {
-    PRINTF(0)("unable to load %s\n", &libName[0]);
+    PRINTF(1)("unable to load %s: %s\n", libName.c_str(), lt_dlerror());
+
     return false;
   }
-//  void *mkr = dlsym("maker");
+
+}
+
+void DynamicLoader::addSearchDir(const std::string& searchDir)
+{
+  DynamicLoader::initialize();
+
+  lt_dladdsearchdir(searchDir.c_str());
+}
+
+/**
+ * @param relSearchDir: the Relative directory to add to searchPath of lt_dl
+ * @returns true if the Path was Valid, false otherwise
+ */
+bool DynamicLoader::addSearchDirRelative(const std::string& relSearchDir)
+{
+  std::string absSearchDir = ResourceManager::getAbsDir(relSearchDir);
+  if (ResourceManager::isDir(absSearchDir))
+  {
+    DynamicLoader::addSearchDir(absSearchDir);
+    return true;
+  }
+  else
+  {
+    return false;
+  }
+}
+
+bool DynamicLoader::addSearchDirInLibDir(const std::string& relSearchDir)
+{
 
 }
 
 
-BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
+const char* DynamicLoader::getSearchDir()
 {
+  return lt_dlgetsearchpath();
 }

branches/shared_lib/src/lib/util/loading/dynamic_loader.h

@@ -8 +8 @@
 
 #include "util/loading/factory.h"
+#include <ltdl.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
+class DynamicLoader : public BaseObject
 {
 
@@ -25 +23 @@
 
   bool loadDynamicLib(const std::string& libName);
-  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const;
 
   static bool loadDyLib(const std::string& libName);
 
+  static void addSearchDir(const std::string& searchDir);
+  static bool addSearchDirRelative(const std::string& relSearchDir);
+  static bool addSearchDirInLibDir(const std::string& relSearchDir);
+  static const char* getSearchDir();
+
+  static void unload();
+private:
+  // will be done automatically when using the this Engine.
+  static bool initialize();
 
 private:
-  void*      handle;
+  lt_dlhandle      handle;
 };
 

branches/shared_lib/src/lib/util/loading/resource_manager.cc

@@ -881 +881 @@
 
 
+
+
 /**
  * @param fileName the Name of the File to check
@@ -921 +923 @@
   return ResourceManager::getInstance()->_cwd;
 }
-
 
 /**