Changeset f4399e in git

Timestamp:

Dec 14, 2012, 10:55:38 AM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

1d6ec35f323c22dad6c849d92fd276b63460f494

Parents:

c1e7a64cbf29c8f08287152a94545e06e8608a9a

git-author:

Alexander Dreyer <adreyer@gmx.de>2012-12-14 10:55:38+01:00

git-committer:

Alexander Dreyer <adreyer@gmx.de>2012-12-14 15:08:38+01:00

Message:

fix: reloading of modules (multiply calling LIB("file.so")) is ignored
add: dynl_check_opened newly introduced

Files:

• Singular/iplib.cc (modified) (2 diffs)
• libpolys/polys/mod_raw.cc (modified) (4 diffs)
• libpolys/polys/mod_raw.h (modified) (4 diffs)

Singular/iplib.cc

@@ -1079 +1079 @@
     }
   }
+  if (dynl_check_opened(FullName)) {
+    if (BVERBOSE(V_LOAD_LIB)) Warn( "%s already loaded", fullname);
+    return FALSE;
+  }
   if((IDPACKAGE(pl)->handle=dynl_open(FullName))==(void *)NULL)
   {
@@ -1125 +1129 @@
 
   pl = IDROOT->get(plib,0);
-  if (pl==NULL)
-  {
-    pl = enterid( plib,0, PACKAGE_CMD, &IDROOT,
-                  TRUE );
-    IDPACKAGE(pl)->language = LANG_C;
-    IDPACKAGE(pl)->libname=omStrDup(newlib);
-  }
+  if (pl!=NULL)
+  {
+    if (BVERBOSE(V_LOAD_LIB)) Warn( "(builtin) %s already loaded", newlib);
+    omFree(plib);
+    return FALSE;
+  }
+
+  pl = enterid( plib,0, PACKAGE_CMD, &IDROOT,
+                TRUE );
+  IDPACKAGE(pl)->language = LANG_C;
+  IDPACKAGE(pl)->libname=omStrDup(newlib);
+
   IDPACKAGE(pl)->handle=(void *)NULL;
   SModulFunctions sModulFunctions;

libpolys/polys/mod_raw.cc

@@ -5 +5 @@
  * ABSTRACT: machine depend code for dynamic modules
  *
- * Provides: dynl_open()
+ * Provides: dynl_check_opened()
+ *           dynl_open()
  *           dynl_sym()
  *           dynl_error()
@@ -241 +242 @@
 
 static void* kernel_handle = NULL;
+int dynl_check_opened(
+  char *filename    /* I: filename to check */
+  )
+{
+  return dlopen(filename,RTLD_NOW|RTLD_NOLOAD) != NULL;
+}
+
 void *dynl_open(
   char *filename    /* I: filename to load */
@@ -286 +294 @@
 typedef char *((*func_ptr) ());
 
+int dynl_check_opened(    /* NOTE: untested */
+  char *filename    /* I: filename to check */
+  )
+{
+  struct shl_descriptor *desc;
+  for (int idx = 0; shl_get(idx, &desc) != -1; ++idx)
+  {
+    if (strcmp(filename, desc->filename) == 0) return TRUE;
+  }
+  return FALSE;
+}
+
 void *dynl_open(char *filename)
 {
@@ -329 +349 @@
 #ifndef DL_IMPLEMENTED
 
+int dynl_check_opened(char *filename)
+{
+  return FALSE;
+}
+
 void *dynl_open(char *filename)
 {

libpolys/polys/mod_raw.h

@@ +1 @@
+
 #ifndef MOD_RAW_H
 #define MOD_RAW_H
@@ -7 +8 @@
  * ABSTRACT: machine depend code for dynamic modules
  *
- * Provides: dynl_open()
+ * Provides: dynl_check_opened()
+ *           dynl_open()
  *           dynl_sym()
  *           dynl_error()
@@ -26 +28 @@
 extern "C" {
 #endif
+int          dynl_check_opened(char* filename);
 void *       dynl_open(char *filename);
 // if handle == DYNL_KERNEL_HANDLE, then symbol is searched for
@@ -47 +50 @@
 #endif
 
-/// Use @c add(name) to add built-in library to macro
+/// Data for @c type_of_LIB to determine built-in modules,
+/// use @c add(name) to add built-in library to macro
 #define SI_FOREACH_BUILTIN(add)\
   add(huhu)\