Changeset 52a5e8 in git for Singular/polys-impl.cc

Timestamp:

Dec 2, 1998, 2:57:41 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

a92ff6f3188bbc12d2a3689101ca97f48f880850

Parents:

5811fbf32c7285e5b584702b134e80d61f40e342

Message:

* new memory management scheme


git-svn-id: file:///usr/local/Singular/svn/trunk@2703 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/polys-impl.cc (modified) (25 diffs)

Singular/polys-impl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.cc,v 1.20 1998-11-10 17:25:32 Singular Exp $ */
+/* $Id: polys-impl.cc,v 1.21 1998-12-02 13:57:39 obachman Exp $ */
 
 /***************************************************************
@@ -22 +22 @@
 #include "tok.h"
 #include "structs.h"
-#include "mmprivat.h"
+#include "mmprivate.h"
 #include "mmemory.h"
 #include "febase.h"
@@ -184 +184 @@
 // currRing and r have the same number of variables, i.e. that polys
 // from r can be "fetched" into currRing
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBFetchCopy(ring r, poly p,char *f,int l)
 #else
@@ -195 +195 @@
   if (r->VarOffset == pVarOffset)
   {
-#ifdef PDEBUG
+#ifdef MDEBUG
     res = a = pDBNew(f,l);
 #else
@@ -206 +206 @@
     while (p!=NULL)
     {
-#ifdef PDEBUG
+#ifdef MDEBUG
       a = pNext(a) = pDBNew(f,l);
 #else
@@ -220 +220 @@
   else
   {
-#ifdef PDEBUG
+#ifdef MDEBUG
     a = res = pDBInit(f,l);
 #else
@@ -234 +234 @@
       // convert betweeen a lex order and a revlex order -- to speed
       // up the sorting, we assemble new poly in inverse order
-#ifdef PDEBUG
+#ifdef MDEBUG
       res = pDBInit(f,l);
 #else
@@ -263 +263 @@
  ***************************************************************/
 
-#ifdef PDEBUG
-poly pDBNew(char *f, int l)
-{
-#ifdef MDEBUG
-  poly p = (poly) mmDBAllocSpecialized(f,l);
-#else
-  poly p = (poly) mmAllocSpecialized();
-#endif
-  memset(p,0,pMonomSize);
-  return p;
-}
-#endif
 
 /*2
 * create a new monomial and init
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBInit(char * f, int l)
 {
@@ -293 +281 @@
 * put the monomials in the freelist
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 void pDBDelete(poly * p, char * f, int l)
 {
@@ -307 +295 @@
     pIter(h);
 #ifdef MDEBUG
-    mmDBFreeSpecialized((ADDRESS)*p,f,l);
-#else
-    mmFreeSpecialized((ADDRESS)*p);
+    pDBFree1((ADDRESS)*p,f,l);
+#else
+    pFree1((ADDRESS)*p);
 #endif
     *p=h;
@@ -327 +315 @@
     pp=h;
     pIter(h);
-    mmFreeSpecialized((ADDRESS)pp);
+    pFree1((ADDRESS)pp);
   }
   *p = NULL;
@@ -336 +324 @@
 * remove first monom
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 void pDBDelete1(poly * p, char * f, int l)
 {
@@ -345 +333 @@
   *p = pNext(h);
 #ifdef MDEBUG
-  mmDBFreeSpecialized((ADDRESS)h,f,l);
-#else
-  mmFreeSpecialized((ADDRESS)h);
+  pDBFree1((ADDRESS)h,f,l);
+#else
+  pFree1((ADDRESS)h);
 #endif
 }
@@ -358 +346 @@
   nDelete(&(h->coef));
   *p = pNext(h);
-  mmFreeSpecialized((ADDRESS)h);
+  pFree1((ADDRESS)h);
 }
 #endif
@@ -371 +359 @@
 
 /*2
-* remove first monom
-*/
-#ifdef PDEBUG
-void pDBFree1(poly p, char * f, int l)
-{
-  if (p!=NULL)
-  {
-    p->coef=NULL;//nDelete(&(p->coef));
-#ifdef MDEBUG
-    mmDBFreeSpecialized((ADDRESS)p,f,l);
-#else
-    mmFreeSpecialized((ADDRESS)p);
-#endif
-  }
-}
-#endif
-
-/*2
 * creates a copy of p
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBCopy(poly p,char *f,int l)
 #else
@@ -401 +371 @@
   if (p==NULL) return NULL;
   pDBTest(p,f,l);
-#ifdef PDEBUG
+#ifdef MDEBUG
   w = a = pDBNew(f,l);
 #else
@@ -413 +383 @@
     do
     {
-#ifdef PDEBUG
+#ifdef MDEBUG
       a = pNext(a) = pDBNew(f,l);
 #else
@@ -433 +403 @@
 * sets the coeff of the copy to a defined value
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBCopy1(poly p,char *f,int l)
 #else
@@ -440 +410 @@
 {
   poly w;
-#ifdef PDEBUG
+#ifdef MDEBUG
   w = pDBNew(f,l);
 #else
@@ -454 +424 @@
 * returns (a copy of) the head term of a
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBHead(poly p,char *f, int l)
 #else
@@ -464 +434 @@
   if (p!=NULL)
   {
-#ifdef PDEBUG
+#ifdef MDEBUG
     w = pDBNew(f,l);
 #else
@@ -484 +454 @@
 * returns (a copy of) the head term of a without the coef
 */
-#ifdef PDEBUG
+#ifdef MDEBUG
 poly pDBHead0(poly p,char *f, int l)
 #else
@@ -735 +705 @@
 #endif // PDEBUG != 0
 
-
 BOOLEAN pDBTest(poly p, char *f, int l)
+{
+  return pDBTest(p, mm_specHeap, f,l);
+}
+
+BOOLEAN pDBTest(poly p, memHeap tail_heap, memHeap lm_heap, char *f, int l)
+{
+  if (tail_heap != lm_heap && lm_heap != NULL)
+  {
+    poly pn = pNext(p);
+    BOOLEAN ret;
+    pNext(p) = NULL;
+    ret = pDBTest(pn, tail_heap, f, l) && pDBTest(p, lm_heap, f, l);
+    pNext(p) = pn;
+    return ret;
+  }
+  else
+  {
+    return pDBTest(p, tail_heap, f, l);
+  }
+}
+
+BOOLEAN pDBTest(poly p, memHeap heap, char *f, int l)
 {
   poly old=NULL;
@@ -743 +734 @@
   {
 #ifdef MDEBUG
-    if (!mmDBTestBlock(p,mm_specSize,f,l))
+    if (!mmDBTestHeapBlock(p, heap, f,l))
       return FALSE;
+#elif defined(HEAP_DEBUG)
+      if (! mmDebugCheckHeapAddr(p, heap, MM_HEAP_ADDR_USED_FLAG, f, l))
+        return FALSE;
 #endif
 #ifdef LDEBUG
@@ -818 +812 @@
 #endif // PDEBUG
 
+#define BIT_SIZEOF_LONG 8*SIZEOF_LONG
+unsigned long GetBitFields(Exponent_t e, 
+                           unsigned int s, unsigned int n)
+{
+  unsigned int i = 0, ev = 0;
+  assume(n > 0 && s < BIT_SIZEOF_LONG);
+  do
+  {
+    assume(s+i < BIT_SIZEOF_LONG);
+    if (e > (Exponent_t) i) ev |= Sy_bit(s+i);
+    else break;
+    i++;
+  }
+  while (i < n);
+  return ev;
+}
+
+unsigned long pGetShortExpVector(poly p)
+{
+  unsigned long ev = 0; // short exponent vector
+  unsigned int n = BIT_SIZEOF_LONG / pVariables; // number of bits per exp
+  unsigned int m1; // highest bit which is filled with (n+1)
+  unsigned int i = 0, j=0;
+  
+  if (n == 0) 
+  {
+    n = 1;
+    m1 = 0;
+  }
+  else
+  {
+    m1 = (n+1)*(BIT_SIZEOF_LONG - n*pVariables);
+  }
+  
+  n++;
+  while (i<m1)
+  {
+    ev |= GetBitFields(p->exp[pVarLowIndex + j], i, n);
+    i += n;
+    j++;
+  }
+
+  return ev;
+}
 
 #endif // POLYS_IMPL_CC