Changeset 7174 in orxonox.OLD

Timestamp:

Feb 21, 2006, 10:48:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/dylib: now the dylibLoader should work

Location:

branches/shared_lib/src

Files:

• Makefile.am (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• util/Makefile.am (modified) (2 diffs)
• util/loading/dynamic_loader.cc (modified) (4 diffs)
• util/loading/dynamic_loader.h (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (4 diffs)
• util/loading/resource_manager.h (modified) (2 diffs)
• world_entities/Makefile.am (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (1 diff)

branches/shared_lib/src/Makefile.am

@@ -13 +13 @@
 
 orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_LDFLAGS =
+orxonox_LDFLAGS = -ldl -rdynamic
 
 orxonox_DEPENDENCIES = \

branches/shared_lib/src/orxonox.cc

@@ -333 +333 @@
   delete[] imageDir;
 
-//   void* handle;
-//   handle = dlopen("./src/world_entities/.libs/libORXground_turret.so", RTLD_NOW);
-//   if(handle == NULL)
-//   {
-//     PRINTF(1)("unable to load %s\n", dlerror());
-//
-//     return false;
-//   }
-  DynamicLoader::loadDyLib("src/world_entities/.libs/libORXground_turret.so");
+  DynamicLoader::addSearchDirRelative("./world_entities");
+  DynamicLoader::addSearchDirRelative("./src/world_entities");
+
+  DynamicLoader::loadDyLib("libORXground_turret");
 
   // start the collision detection engine

branches/shared_lib/src/util/Makefile.am

@@ -3 +3 @@
 
 noinst_LIBRARIES = libORXutils.a
+
 
 libORXutils_a_SOURCES = fast_factory.cc \
@@ -26 +27 @@
                         track/track_node.cc
 
+
 noinst_HEADERS =        fast_factory.h \
                         object_manager.h \

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

@@ -17 +17 @@
 
 #include "dynamic_loader.h"
-
+#include "resource_manager.h"
 
 using namespace std;
-
 
 /**
@@ -36 +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;
+}
 
 /**
@@ -50 +63 @@
 bool DynamicLoader::loadDynamicLib(const std::string& libName)
 {
-  if (lt_dlinit () != 0)
-  {
-    PRINTF(1)("Initializing LT_DL_LIB\n");
-  }
-  this->handle = lt_dlopen(&libName[0]);
+  DynamicLoader::initialize();
+
+  this->handle = lt_dlopenext(&libName[0]);
   if(this->handle == NULL)
   {
     return false;
   }
-  //void *mkr = dlsym( this->handle, "maker");
 }
 
 bool DynamicLoader::loadDyLib(const char* libName)
 {
-  if (lt_dlinit () != 0)
-  {
-    PRINTF(1)("Initializing LT_DL_LIB\n");
-  }
-
+  DynamicLoader::initialize();
   void* handle;
-  handle = lt_dlopen(libName);
+  handle = lt_dlopenext(libName);
   if(handle == NULL)
   {
@@ -77 +83 @@
     return false;
   }
-//  void *mkr = dlsym("maker");
 
 }
 
+void DynamicLoader::addSearchDir(const char* searchDir)
+{
+  DynamicLoader::initialize();
 
-BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
+  lt_dladdsearchdir(searchDir);
+}
+
+/**
+ * @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 char* relSearchDir)
 {
+  char* absSearchDir = ResourceManager::getAbsDir(relSearchDir);
+  if (ResourceManager::isDir(absSearchDir))
+  {
+    DynamicLoader::addSearchDir(absSearchDir);
+    delete[] absSearchDir;
+    return true;
+  }
+  else
+  {
+    delete[] absSearchDir;
+    return false;
+  }
 }
+
+
+const char* DynamicLoader::getSearchDir()
+{
+  return lt_dlgetsearchpath();
+}

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

@@ -23 +23 @@
 
   bool loadDynamicLib(const std::string& libName);
-  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const;
 
   static bool loadDyLib(const char* libName);
 
+  static void addSearchDir(const char* searchDir);
+  static bool addSearchDirRelative(const char* relSearchDir);
+  static const char* getSearchDir();
+
+  static void unload();
+private:
+  // will be done automatically when using the this Engine.
+  static bool initialize();
 
 private:

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

@@ -62 +62 @@
   strcpy(this->dataDir, "./");
   this->tryDataDir("./data");
+
+  this->_cwd = NULL;
 }
 
@@ -86 +88 @@
 
   delete[] this->dataDir;
-
+  if (this->_cwd)
+    delete[] this->_cwd;
   ResourceManager::singletonRef = NULL;
 }
@@ -984 +987 @@
 
 /**
+ * @param name the relative name of the File/Directory.
+ * @returns a new char* with the name in abs-dir-format
+ */
+char* ResourceManager::getAbsDir(const char* name)
+{
+  if (name == NULL)
+    return NULL;
+  char* retName;
+  if (strncmp(name, "/", 1))
+  {
+    if (*name == '.' && *(name+1) != '.')
+      name++;
+    const char* absDir = ResourceManager::cwd();
+    retName = new char[strlen(absDir)+strlen(name)+1];
+    sprintf(retName, "%s%s", absDir, name);
+  }
+  else
+  {
+    retName = new char[strlen(name)+1];
+    strcpy(retName, name);
+  }
+  return retName;
+}
+
+
+/**
  * @param fileName the Name of the File to check
  * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
@@ -1003 +1032 @@
     return NULL;
   }
+}
+
+#ifdef __unix__
+  #include <unistd.h>
+#elif __WIN32__ || _MS_DOS_
+  #include <dir.h>
+#else
+  #include <direct.h> /* Visual C++ */
+#endif
+/**
+ * @returns the Current Woring Directory
+ */
+const char* ResourceManager::cwd()
+{
+  if (ResourceManager::getInstance()->_cwd == NULL)
+  {
+    char cwd[1024];
+    char* errno = getcwd(cwd, 1024);
+    if (errno == 0)
+      return NULL;
+
+    ResourceManager::getInstance()->_cwd = new char[strlen(cwd)+1];
+    strcpy(ResourceManager::getInstance()->_cwd, cwd);
+  }
+  return ResourceManager::getInstance()->_cwd;
 }
 

branches/shared_lib/src/util/loading/resource_manager.h

@@ -137 +137 @@
   static char* getFullName(const char* fileName);
   static bool isInDataDir(const char* fileName);
+  static char* getAbsDir(const char* fileName);
+  static const char* cwd();
 
   static const char* ResourceTypeToChar(ResourceType type);
@@ -149 +151 @@
   static ResourceManager*  singletonRef;       //!< singleton Reference
 
+  char*                    _cwd;               //!< The currend Working directory.
   char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   std::vector<char*>       imageDirs;          //!< A list of directories in which images are stored.

branches/shared_lib/src/world_entities/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=..
 include $(MAINSRCDIR)/defs/include_paths.am
-include WorldEntities.am
+# include WorldEntities.am
 
 noinst_LIBRARIES = libORXwe.a
-lib_LTLIBRARIES = libORXground_turret.la
-libORXground_turret_la_SOURCES = npcs/ground_turret.cc
 
 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES

branches/shared_lib/src/world_entities/WorldEntities.am

@@ -1 +1 @@
 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
+
+pkglib_LTLIBRARIES = libORXground_turret.la
+libORXground_turret_la_SOURCES = world_entities/npcs/ground_turret.cc
+
+
 WorldEntities_SOURCES_ = \
                 world_entities/npcs/npc_test1.cc \