Changeset 25fe907 in git

Timestamp:

Jan 24, 2019, 1:07:07 PM (4 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a3f0feac28fd347ce5b5d091108f9128d7b13554

Parents:

d0c48800963359deb121c3d103d17df80ba21b8e

Message:

Necessary changes for multi-threading.

Files:

• Singular/blackbox.cc (modified) (2 diffs)
• Singular/iplib.cc (modified) (5 diffs)
• Singular/tesths.cc (modified) (2 diffs)
• libpolys/polys/mod_raw.cc (modified) (2 diffs)

Singular/blackbox.cc

@@ -10 +10 @@
 // #define BLACKBOX_DEVEL 1
 
-static blackbox* blackboxTable[MAX_BB_TYPES];
-static char *    blackboxName[MAX_BB_TYPES];
-static int blackboxTableCnt=0;
+GLOBAL_VAR static blackbox* blackboxTable[MAX_BB_TYPES];
+GLOBAL_VAR static char *    blackboxName[MAX_BB_TYPES];
+GLOBAL_VAR static int blackboxTableCnt=0;
 #define BLACKBOX_OFFSET (MAX_TOK+1)
 blackbox* getBlackboxStuff(const int t)
@@ -126 +126 @@
 int setBlackboxStuff(blackbox *bb, const char *n)
 {
-  int where=-1;
-  if (MAX_BB_TYPES<=blackboxTableCnt)
-  {
-    // second try, find empty slot from removed bb:
-    for (int i=0;i<MAX_BB_TYPES;i++)
-    {
-      if (blackboxTable[i]==NULL) { where=i; break; }
-    }
-  }
-  else
-  {
-    where=blackboxTableCnt;
-    blackboxTableCnt++;
+  int where = -1;   
+  for (int i=0;i<MAX_BB_TYPES;i++)      
+  {
+    if (blackboxTable[i]!=NULL && strcmp(blackboxName[i],n)==0) {
+      where = i;
+      break;
+    }
+  }
+  if (where < 0) {
+    if (MAX_BB_TYPES<=blackboxTableCnt)
+    {
+      // second try, find empty slot from removed bb:
+      for (int i=0;i<MAX_BB_TYPES;i++)
+      {
+        if (blackboxTable[i]==NULL) { where=i; break; }
+      }
+    }
+    else
+    {
+      where=blackboxTableCnt;
+      blackboxTableCnt++;
+    }
   }
   if (where==-1)

Singular/iplib.cc

@@ -60 +60 @@
 extern int yylp_errno;
 extern int yylplineno;
-extern char *yylp_errlist[];
+extern const char *yylp_errlist[];
 void print_init();
 libstackv library_stack;
@@ -1088 +1088 @@
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 #ifdef HAVE_DYNAMIC_LOADING
-BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport)
+#include <map>
+#include <string>
+#include <pthread.h>
+
+STATIC_VAR std::map<std::string, void *> *dyn_modules;
+
+bool registered_dyn_module(char *fullname) {
+  if (dyn_modules == NULL)
+    return false;
+  std::string fname = fullname;
+  return !(dyn_modules->count(fname));
+}
+
+void register_dyn_module(char *fullname, void * handle) {
+  std::string fname = fullname;
+  if (dyn_modules == NULL)
+    dyn_modules = new std::map<std::string, void *>();
+  dyn_modules->insert(std::pair<std::string, void *>(fname, handle));
+}
+
+void close_all_dyn_modules() {
+  for (std::map<std::string, void *>::iterator it = dyn_modules->begin();
+       it != dyn_modules->end();
+       it++)
+  {
+    dynl_close(it->second);
+  }
+  delete dyn_modules;
+  dyn_modules = NULL;
+}
+BOOLEAN load_modules_aux(const char *newlib, char *fullname, BOOLEAN autoexport)
 {
 #ifdef HAVE_STATIC
@@ -1143 +1173 @@
   }
   IDPACKAGE(pl)->language = LANG_C;
-  if (dynl_check_opened(FullName))
+  if (registered_dyn_module(FullName))
   {
     if (BVERBOSE(V_LOAD_LIB)) Warn( "%s already loaded as C library", fullname);
@@ -1178 +1208 @@
       currPack->loaded=1;
       currPack=s; /* reset currPack to previous */
+      register_dyn_module(fullname, IDPACKAGE(pl)->handle);
       RET=FALSE;
     }
@@ -1192 +1223 @@
   return RET;
 #endif /*STATIC */
+}
+
+BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport) {
+  GLOBAL_VAR static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+  pthread_mutex_lock(&mutex);
+  BOOLEAN r = load_modules_aux(newlib, fullname, autoexport);
+  pthread_mutex_unlock(&mutex);
+  return r;
 }
 #endif /* HAVE_DYNAMIC_LOADING */

Singular/tesths.cc

@@ -37 +37 @@
 
 extern int siInit(char *);
+#ifdef PSINGULAR
+GLOBAL_VAR char *global_argv0;
+#endif
 
 int mmInit( void )
@@ -63 +66 @@
   omInitGetBackTrace();
 
+#ifdef PSINGULAR
+  global_argv0 = argv[0];
+#endif
   siInit(argv[0]);
   init_signals();

libpolys/polys/mod_raw.cc

@@ -147 +147 @@
   )
 {
+  return dlopen(filename, RTLD_NOW|RTLD_GLOBAL);
+#if 0
 // glibc 2.2:
   if ((filename==NULL) || (dlopen(filename,RTLD_NOW|RTLD_NOLOAD)==NULL))
@@ -155 +157 @@
 // alternative
 //    return(dlopen(filename, RTLD_NOW|RTLD_GLOBAL));
+#endif
 }