Changeset d5d6e31 in tol

Timestamp:

Nov 4, 2011, 2:08:47 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

08e78b9

Parents:

b3eeebe

Message:

refs #1323, make sure InitTolKernel is invoked only if TOL has not being initialized

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

Location:

toltcl/generic

Files:

• tolaccess.cpp (modified) (1 diff)
• toltcl.c (modified) (1 diff)
• toltclInt.h (modified) (1 diff)

toltcl/generic/tolaccess.cpp

@@ -142 +142 @@
   }
   return TCL_OK;
+}
+
+int Tol_IsInitialized( )
+{
+  return BGrammar::Exists( "Real" );
 }
 

toltcl/generic/toltcl.c

@@ -217 +217 @@
   lang = (objc == 1 || !strcasecmp("es", Tcl_GetString(objv[1])));
   vmode = objc == 3 ? Tcl_GetString(objv[2]) :  NULL;
-  /*
-   * Initialize kernel
-   */
-
-  InitTolKernel(Tcl_GetNameOfExecutable(), lang, vmode&&vmode[0]?vmode:NULL);
-
-  /*
-   * this should only be called to find out where the GSL errors are generated
-   */
-
-  Tol_gsl_set_error_handler(&TT_gsl_error_handler);
-
+
+  if ( !Tol_IsInitialized( ) ) {
+    //printf( "TOL no esta inicializado\n" );
+    /*
+     * Initialize kernel
+     */
+    
+    InitTolKernel(Tcl_GetNameOfExecutable(), lang, vmode&&vmode[0]?vmode:NULL);
+    
+    /*
+     * this should only be called to find out where the GSL errors are generated
+     */
+    
+    Tol_gsl_set_error_handler(&TT_gsl_error_handler);
+  } else {
+    //printf( "TOL esta inicializado\n" );
+  }
+  
   /*
    * Install tol::* commands

toltcl/generic/toltclInt.h

@@ -39 +39 @@
 #endif
 
-
 BEGIN_C_DECLS
 
-
 extern Tcl_Interp * TT_interp;
+
+/*! Check if TOL kernel has being initialized
+ */
+extern int Tol_IsInitialized ();
 
 /*! Fill in obj_result the version info corresponding to tol