Changeset f4d581 in git for kernel/GBEngine/kutil.cc

Timestamp:

Apr 4, 2017, 2:40:54 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e3f7c1a69f73a3bc29e74ade0d078686074677e5

Parents:

c72b3a88cfcb83e29a3daacda3672978a6146759

Message:

chg: allocation in kutil.cc

File:

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

kernel/GBEngine/kutil.cc

@@ -3208 +3208 @@
   if (j>strat->Lmax)
   {
-    j=((j+setmaxLinc-1)/setmaxLinc)*setmaxLinc;
-    strat->L = (LSet)omReallocSize(strat->L,strat->Lmax*sizeof(LObject),
-                                 j*sizeof(LObject));
-    strat->Lmax=j;
+    j=((j+setmaxLinc-1)/setmaxLinc)*setmaxLinc-strat->Lmax;
+    enlargeL(&(strat->L),&(strat->Lmax),j);
   }
   j = strat->Ll;
@@ -3231 +3229 @@
   if (j>strat->Lmax)
   {
-    j=((j+setmaxLinc-1)/setmaxLinc)*setmaxLinc;
-    strat->L = (LSet)omReallocSize(strat->L,strat->Lmax*sizeof(LObject),
-                                 j*sizeof(LObject));
-    strat->Lmax=j;
+    j=((j+setmaxLinc-1)/setmaxLinc)*setmaxLinc-strat->Lmax;
+    enlargeL(&(strat->L),&(strat->Lmax),j);
   }
   j = strat->Ll;
@@ -10108 +10104 @@
   strat->Lmax = ((IDELEMS(F)+setmaxLinc-1)/setmaxLinc)*setmaxLinc;
   strat->Ll = -1;
-  strat->L = initL(((IDELEMS(F)+setmaxLinc-1)/setmaxLinc)*setmaxLinc);
+  strat->L = initL(strat->Lmax);
   /*- set B -*/
   strat->Bmax = setmaxL;
@@ -10306 +10302 @@
   strat->Lmax = ((IDELEMS(F)+setmaxLinc-1)/setmaxLinc)*setmaxLinc;
   strat->Ll = -1;
-  strat->L = initL(((IDELEMS(F)+setmaxLinc-1)/setmaxLinc)*setmaxLinc);
+  strat->L = initL(strat->Lmax);
   /*- set B -*/
   strat->Bmax = setmaxL;