Changeset f85b93 in git

Timestamp:

Mar 14, 2019, 2:27:37 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d4c9b0f42fb49550f32f4494efb073a56c80da5c

Parents:

1d494e626d4d7d4f0cf65e3804d9b04c7e808edda6895f08280ec39a7714dbc7016f1a922a036609

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

Location:

Singular

Files:

• LIB/systhreads.lib (modified) (1 diff)
• dyn_modules/systhreads/lintree.cc (modified) (1 diff)
• dyn_modules/systhreads/shared.cc (modified) (4 diffs)
• dyn_modules/systhreads/thread.cc (modified) (1 diff)
• links/ssiLink.cc (modified) (2 diffs)

Singular/LIB/systhreads.lib

@@ -14 +14 @@
 
 static proc mod_init() {
-  LIB "systhreads.so";
+  load("systhreads.so");
 }
 

Singular/dyn_modules/systhreads/lintree.cc

@@ -1 +1 @@
 #include "threadconf.h"
-#ifdef ENABLE_THREADS
-#include <factory/prelude.h>
-#endif
 #include "lintree.h"
 #include <iostream>

Singular/dyn_modules/systhreads/shared.cc

@@ -1 +1 @@
 #include "threadconf.h"
-#ifdef ENABLE_THREADS
-#include <factory/prelude.h>
-#else
-#define SIMPLE_THREAD_VAR
-#endif
 #include <iostream>
 #include "kernel/mod2.h"
@@ -231 +226 @@
 Lock master_lock(true);
 Lock name_lock(true);
-SIMPLE_THREAD_VAR long thread_id;
+VAR long thread_id;
 long thread_counter;
 
@@ -1379 +1374 @@
   master_lock.unlock();
 #ifdef ENABLE_THREADS
-  onThreadInit();
+  extern void pSingular_initialize_thread();
+  pSingular_initialize_thread();
   siInit(global_argv0);
 #endif
@@ -1630 +1626 @@
 };
 
-static SIMPLE_THREAD_VAR ThreadPool *currentThreadPoolRef;
-static SIMPLE_THREAD_VAR Job *currentJobRef;
+STATIC_VAR ThreadPool *currentThreadPoolRef;
+STATIC_VAR Job *currentJobRef;
 
 class ThreadPool : public SharedObject {

Singular/dyn_modules/systhreads/thread.cc

@@ -1 +1 @@
 #include "threadconf.h"
-#ifdef ENABLE_THREADS
-#include <factory/prelude.h>
-#endif
 #include <list>
 #include <vector>

Singular/links/ssiLink.cc

@@ -1505 +1505 @@
     void *dd=data->Data();
     attr *aa=data->Attribute();
-    BOOLEAN with_attr=FALSE;
-    if ((aa!=NULL) && ((*aa)!=NULL))
+    if ((aa!=NULL) && ((*aa)!=NULL)) // n user attributes
     {
       attr a=*aa;
@@ -1513 +1512 @@
       fprintf(d->f_write,"21 %d %d ",data->flag,n);
     }
-    else if (data->flag!=0)
+    else if (data->flag!=0) // only "flag" attributes
     {
       fprintf(d->f_write,"21 %d 0 ",data->flag);