Changeset 172d852 in git for kernel/GBEngine/f5gb.cc

Timestamp:

Jan 24, 2019, 2:32:29 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

08394f319ba420091cccad7e025c3f7cac04c373

Parents:

5abb79fd2458b47b21d297f2c8b26f285ac9546f756676ef1fcf4cff300fb1607a6d21293b253245

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-01-24 14:32:29+01:00

git-committer:

GitHub <noreply@github.com>2019-01-24 14:32:29+01:00

Message:

Merge pull request #906 from rbehrends/prelim-thread-rewrite

Singular changes for multi-threading support.

File:

• kernel/GBEngine/f5gb.cc (modified) (2 diffs)

kernel/GBEngine/f5gb.cc

@@ -29 +29 @@
 #define pDeg(A) p_Deg(A,currRing)
 
-int notInG              =   0;
-int numberOfRules       =   0;
-int reductionsToZero    =   0;
-int reductionTime       =   0;
-int spolsTime           =   0;
-int highestDegree       =   0;
-int degreeBound         =   0;
-int numberUsefulPairs   =   0;
-int numberUselessPairs  =   0;
-int numberUsefulPairsMinDeg = 0;
-int highestDegreeGBCriticalPair = 0;
-int numberRejectedF5CriticalPairs = 0;
-int numberOfReductions  = 0;
-int numberOfSpolys  = 0;
+VAR int notInG              =   0;
+VAR int numberOfRules       =   0;
+VAR int reductionsToZero    =   0;
+VAR int reductionTime       =   0;
+VAR int spolsTime           =   0;
+VAR int highestDegree       =   0;
+VAR int degreeBound         =   0;
+VAR int numberUsefulPairs   =   0;
+VAR int numberUselessPairs  =   0;
+VAR int numberUsefulPairsMinDeg = 0;
+VAR int highestDegreeGBCriticalPair = 0;
+VAR int numberRejectedF5CriticalPairs = 0;
+VAR int numberOfReductions  = 0;
+VAR int numberOfSpolys  = 0;
 /*
 ====================================================================
@@ -152 +152 @@
     // in the list critPairs
     criticalPair(gPrev, critPairs, lTag, rTag, rules, rejectedGBList, plus);
-    static LList* sPolyList        =   new LList();
+    STATIC_VAR LList* sPolyList        =   new LList();
     //sPolyList->print();
     // labeled polynomials which have passed reduction() and have to be added to list gPrev
-    static LList* completed        =   new LList();
+    STATIC_VAR LList* completed        =   new LList();
     // the reduced labeled polynomials which are returned from subalgorithm reduction()
-    static LList* reducedLPolys     =   new LList();
+    STATIC_VAR LList* reducedLPolys     =   new LList();
     // while there are critical pairs to be further checked and deleted/computed
     while(NULL != critPairs->getFirst()) {