Changeset 25fe907 in git for Singular/blackbox.cc

Timestamp:

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

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a3f0feac28fd347ce5b5d091108f9128d7b13554

Parents:

d0c48800963359deb121c3d103d17df80ba21b8e

Message:

Necessary changes for multi-threading.

File:

• Singular/blackbox.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)