Changeset 9de60a in git

Timestamp:

Apr 4, 2017, 5:33:27 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4a0e4ea61e709d6664315404b52dd64b5469d1dd6c688bd32235d71dd4d5ed60cc4bc0c2aec6969d

Parents:

ae88f61bc549fc10cc2a54fe1aaf8e8c68190b9e

Message:

chg: allocation in kutil.cc, p2

File:

• kernel/GBEngine/kutil.cc (modified) (5 diffs)

kernel/GBEngine/kutil.cc

@@ -8539 +8539 @@
   if (Q!=NULL) i=((IDELEMS(Q)+(setmaxTinc-1))/setmaxTinc)*setmaxTinc;
   else i=setmaxT;
-  i=((i+IDELEMS(F)+IDELEMS(P)+15)/16)*16;
+  i=((i+IDELEMS(F)+IDELEMS(P)+setmax-1)/setmax)*setmax;
   strat->ecartS=initec(i);
   strat->sevS=initsevS(i);
@@ -8684 +8684 @@
   if (Q!=NULL) i=((IDELEMS(Q)+(setmaxTinc-1))/setmaxTinc)*setmaxTinc;
   else i=setmaxT;
-  i=((i+IDELEMS(F)+IDELEMS(P)+15)/16)*16;
+  i=((i+IDELEMS(F)+IDELEMS(P)+setmax-1)/setmax)*setmax;
   strat->sevS=initsevS(i);
   strat->sevSig=initsevS(i);
@@ -9337 +9337 @@
     strat->sevS = (unsigned long*) omRealloc0Size(strat->sevS,
                                     IDELEMS(strat->Shdl)*sizeof(unsigned long),
-                                    (IDELEMS(strat->Shdl)+setmaxTinc)
+                                    (IDELEMS(strat->Shdl)+setmax)
                                                   *sizeof(unsigned long));
     strat->sevSig = (unsigned long*) omRealloc0Size(strat->sevSig,
                                     IDELEMS(strat->Shdl)*sizeof(unsigned long),
-                                    (IDELEMS(strat->Shdl)+setmaxTinc)
+                                    (IDELEMS(strat->Shdl)+setmax)
                                                   *sizeof(unsigned long));
     strat->ecartS = (intset)omReallocSize(strat->ecartS,
                                           IDELEMS(strat->Shdl)*sizeof(int),
-                                          (IDELEMS(strat->Shdl)+setmaxTinc)
+                                          (IDELEMS(strat->Shdl)+setmax)
                                                   *sizeof(int));
     strat->S_2_R = (int*) omRealloc0Size(strat->S_2_R,
                                          IDELEMS(strat->Shdl)*sizeof(int),
-                                         (IDELEMS(strat->Shdl)+setmaxTinc)
+                                         (IDELEMS(strat->Shdl)+setmax)
                                                   *sizeof(int));
     if (strat->lenS!=NULL)
       strat->lenS=(int*)omRealloc0Size(strat->lenS,
                                        IDELEMS(strat->Shdl)*sizeof(int),
-                                       (IDELEMS(strat->Shdl)+setmaxTinc)
+                                       (IDELEMS(strat->Shdl)+setmax)
                                                  *sizeof(int));
     if (strat->lenSw!=NULL)
       strat->lenSw=(wlen_type*)omRealloc0Size(strat->lenSw,
                                        IDELEMS(strat->Shdl)*sizeof(wlen_type),
-                                       (IDELEMS(strat->Shdl)+setmaxTinc)
+                                       (IDELEMS(strat->Shdl)+setmax)
                                                  *sizeof(wlen_type));
     if (strat->fromQ!=NULL)
@@ -9365 +9365 @@
       strat->fromQ = (intset)omReallocSize(strat->fromQ,
                                     IDELEMS(strat->Shdl)*sizeof(int),
-                                    (IDELEMS(strat->Shdl)+setmaxTinc)*sizeof(int));
-    }
-    pEnlargeSet(&strat->S,IDELEMS(strat->Shdl),setmaxTinc);
-    pEnlargeSet(&strat->sig,IDELEMS(strat->Shdl),setmaxTinc);
-    IDELEMS(strat->Shdl)+=setmaxTinc;
+                                    (IDELEMS(strat->Shdl)+setmax)*sizeof(int));
+    }
+    pEnlargeSet(&strat->S,IDELEMS(strat->Shdl),setmax);
+    pEnlargeSet(&strat->sig,IDELEMS(strat->Shdl),setmax);
+    IDELEMS(strat->Shdl)+=setmax;
     strat->Shdl->m=strat->S;
   }
@@ -9673 +9673 @@
   if (strat->syzl == strat->syzmax-1)
   {
-    pEnlargeSet(&strat->syz,strat->syzmax,setmaxTinc);
+    pEnlargeSet(&strat->syz,strat->syzmax,setmax);
     strat->sevSyz = (unsigned long*) omRealloc0Size(strat->sevSyz,
                                     (strat->syzmax)*sizeof(unsigned long),
-                                    ((strat->syzmax)+setmaxTinc)
+                                    ((strat->syzmax)+setmax)
                                                   *sizeof(unsigned long));
-    strat->syzmax += setmaxTinc;
+    strat->syzmax += setmax;
   }
   if (atT < strat->syzl)