Changeset b22a1e2 in tol

Timestamp:

Dec 22, 2015, 12:36:23 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

89cc521

Parents:

d5e4e94

Message:

refs #1904, fixes #1905, DynLoad + incremento de versión

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7139 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• CMakeLists.txt (modified) (1 diff)
• LoadDynLib/LoadDynLib.cpp (modified) (2 diffs)
• tol_version_def.h (modified) (1 diff)

tol/CMakeLists.txt

@@ -238 +238 @@
 if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
   add_definitions( -DUNIX )
+  #set( CMAKE_SHARED_LINKER_FLAGS "-rdynamic ${CMAKE_SHARED_LINKER_FLAGS}" )
 endif( )
 

tol/LoadDynLib/LoadDynLib.cpp

@@ -34 +34 @@
 #include <tol/tol_btxtgra.h>
 #include <tol/tol_bdatgra.h>
+#include <tol/tol_bsetgra.h>
 #include <tol/tol_bdir.h>
 
@@ -123 +124 @@
   }
 }
+
+//--------------------------------------------------------------------
+DeclareContensClass(BDat, BDatTemporary, BDatDynLoad);
+DefExtOpr(1, BDatDynLoad, "DynLoad", 1, 2, "Text Set",
+          "(Text libraryPath [, Set options])",
+          I2("Load a dynamic library without TOL built-in functions.",
+             "Carga una librería dinámica sin funciones TOL nativas."),
+          BOperClassify::Statistic_);
+void BDatDynLoad::CalcContens()
+//--------------------------------------------------------------------
+{
+  if(CheckNonDeclarativeAction("LoadDynLib")) { return; }
+  BText& libraryPath = Text(Arg(1));
+  lt_dladvise advise;
+  if( Arg( 2 ) )
+    {
+    BSet& options = Set( Arg( 2 ) );
+    bool hasAdvise = false;
+    bool global = false;
+    BSyntaxObject *obj = options["global"];
+    if ( obj && obj->Grammar() == GraReal( ) )
+      {
+      BDat &dGlobal = Dat( obj );
+      global = dGlobal.Value() != 0;
+      hasAdvise = true;
+      }
+    else
+      {
+      Warning( "DynLoad: global option provided but with wrong type, must be Real" );
+      }
+    if ( hasAdvise )
+      {
+      if ( !lt_dladvise_init( &advise ) )
+        {
+        if ( global )
+          {
+          lt_dladvise_global( &advise );
+          }
+        }
+      else
+        {
+        advise = NULL;
+        Warning( "DynLoad: not using advise, lt_dladvise_init failed" );
+        }
+      }
+    else
+      {
+      advise = NULL;
+      }
+    }
+  else
+    {
+    advise = NULL;
+    }
+//Std(BText("\nTRACE BLoadDynLib::Evaluator 1 libraryPath=")+libraryPath);
+//Std(BText("\nTRACE BLoadDynLib::Evaluator 2 libraryName=")+libraryName);
+  BUserNameBlock* unb ATTR_UNUSED = NULL;
+
+  // se cambia el directorio de trabajo (cwd) inicial
+  BText currentDir = BDir::GetCurrent();
+  BDir::ChangeCurrent(GetFilePath(libraryPath));
+
+  lt_dlhandle handleLib;
+
+  // abro la DynLib
+  handleLib = lt_dlopenadvise( libraryPath, advise );
+  
+  // se retorna al directorio de trabajo (cwd) inicial
+  BDir::ChangeCurrent(currentDir);
+
+  if ( !handleLib ) 
+  {
+  //Std(BText("\nTRACE BLoadDynLib::Evaluator 3 lt_dlerror='")+lt_dlerror()+"'");
+    BText reason( lt_dlerror( ) );
+    Error(BText("[LoadDynLib(\"")+libraryPath+"\")]"+" \n"
+    "  lt_dlopen error:'"+reason+"'");
+    contens_ = false;
+  } 
+  else
+  {
+    contens_ = true;
+  }
+  if ( advise )
+    {
+    lt_dladvise_destroy( &advise );
+    }
+}
+
 
 //--------------------------------------------------------------------

tol/tol_version_def.h

@@ -23 +23 @@
 ////////////////////////////////////////////////////////////////////////////////////
 #define VERSION_MAJOR   3
-#define VERSION_MINOR   2
-#define VERSION_BUILD   "b021"
+#define VERSION_MINOR   5
+#define VERSION_BUILD   "b000"
 
 #if defined(_MSC_VER)