From b087ac2f72702a2b8148b5e2356797982a96076e Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Wed, 28 Jan 2009 21:32:30 +0000
Subject: [PATCH] 'memory usage' bug fix

---
 libsrc/general/dynamicmem.cpp  |  10 +-
 libsrc/general/moveablemem.cpp | 451 ++++++++++++++++-----------------
 2 files changed, 227 insertions(+), 234 deletions(-)

diff --git a/libsrc/general/dynamicmem.cpp b/libsrc/general/dynamicmem.cpp
index 051aa8e9..bda91e27 100644
--- a/libsrc/general/dynamicmem.cpp
+++ b/libsrc/general/dynamicmem.cpp
@@ -1,11 +1,5 @@
-#include <iostream>
-#include <iomanip>
-
-#ifdef SSE
-#include <emmintrin.h>
-#endif
-
 #include <myadt.hpp>
+
 using namespace std;
 
 namespace netgen
@@ -176,7 +170,7 @@ namespace netgen
     BaseMoveableMem * pm = BaseMoveableMem::first;
     while (pm)
       {
-        long unsigned hptr = (long unsigned) p->ptr;
+        long unsigned hptr = (long unsigned) pm->ptr;
         // uintptr_t hptr = reinterpret_cast<uintptr_t>(pm->ptr);
 
 	hptr /= (1024*1024);
diff --git a/libsrc/general/moveablemem.cpp b/libsrc/general/moveablemem.cpp
index e7f3c1da..8129dfeb 100644
--- a/libsrc/general/moveablemem.cpp
+++ b/libsrc/general/moveablemem.cpp
@@ -12,260 +12,259 @@ namespace netgen
   size_t BaseMoveableMem::used = 0;
   char * BaseMoveableMem::largeblock = 0;
   
-  BaseMoveableMem * BaseMoveableMem::first = 0;
-  BaseMoveableMem * BaseMoveableMem::last = 0;
+  BaseMoveableMem * BaseMoveableMem::first = NULL;
+  BaseMoveableMem * BaseMoveableMem::last = NULL;
   
 
   BaseMoveableMem :: BaseMoveableMem (size_t s)
   {
-    // cout << "Construct object begin" << endl;
     //   Print ();
 
-  prev = last;
-  next = 0;
+    prev = last;
+    next = 0;
 
-  if (last) last->next = this;
-  last = this;
-  if (!first) first = this;
+    if (last) last->next = this;
+    last = this;
+    if (!first) first = this;
 
-  size = 0;
+    size = 0;
 
-  if (prev)
-    pos = prev->pos + prev->size;
-  else
-    pos = 0;
+    if (prev)
+      pos = prev->pos + prev->size;
+    else
+      pos = 0;
 
-  ptr = 0;
-  name = NULL;
-
-  if (s) Alloc(s);
-}
- 
-BaseMoveableMem :: ~BaseMoveableMem () throw()
-{
-  Free();
-
-  if (next) next->prev = prev;
-  else last = prev;
-  if (prev) prev->next = next;
-  else first = next;
-
-  if(name != NULL)
-    {
-      delete [] name;
-      name = NULL;
-    }
-}
-
-void BaseMoveableMem :: SetName (const char * aname)
-{
-  if(name != NULL)
-    {
-      delete [] name;
-      name = NULL;
-    }
-  if (aname)
-    {
-      name = new char[strlen(aname)+1];
-      strcpy (name, aname);
-    }
-}
-
-
-void BaseMoveableMem :: Alloc (size_t s)
-{
-  if (totalsize == 0)
-    {
-      size = s;
-      //ptr = (char*) malloc(s);
-      ptr = new char[s];
-
-      if (!ptr)
-	{
-	  cerr << "BaseynamicMem, cannot allocate " << s << " bytes" << endl;
-	  Print ();
-	  throw ("BaseDynamicMem::Alloc: out of memory");
-	}
-
-      return;
-    }
-
-
-  used += s - size;
-
-  size_t r = s % 8;
-  if (r) s += 8-r;
-  if (prev)
-    pos = prev->pos + prev->size;
-  else
-    pos = 0;
-  size = s;
-  
-  if (next)
-    {
-      NgLock lock(mem_mutex);
-      lock.Lock();
-      try
-	{
-	  next->MoveTo (pos+size);
-	}
-      catch (NgException e)
-      {
-	lock.UnLock();
-	throw NgException ("MoveableMem overflow");
-      }
-      lock.UnLock();
-    }
-
-  if (size)
-    {
-      if (!largeblock)
-	{
-	  cout << "moveable memory: allocate large block of "
-	       << totalsize / 1048576  << " MB" << endl; 
-	  // largeblock = new char[totalsize];
-	  // largeblock = (char*)malloc (totalsize);
-	  largeblock = new char[totalsize];
-	}
-      ptr = largeblock+pos;
-
-      if (pos + size > totalsize)
-	throw NgException ("MoveableMem overflow");
-    }
-  else
     ptr = 0;
-}
+    name = NULL;
 
-void BaseMoveableMem :: ReAlloc (size_t s)
-{
-  if (totalsize == 0)
-    {
-      if (size == s) return;
-      
-      char * old = ptr;
-      ptr = new char[s];
+    if (s) Alloc(s);
+  }
+ 
+  BaseMoveableMem :: ~BaseMoveableMem () throw()
+  {
+    Free();
 
-      if (!ptr)
-	{
-	  cerr << "BaseynamicMem, cannot Reallocate " << s << " bytes" << endl;
-	  Print ();
-	  throw ("BaseDynamicMem::Alloc: out of memory");
-	}
-      
+    if (next) next->prev = prev;
+    else last = prev;
+    if (prev) prev->next = next;
+    else first = next;
+
+    if(name != NULL)
+      {
+        delete [] name;
+        name = NULL;
+      }
+  }
+
+  void BaseMoveableMem :: SetName (const char * aname)
+  {
+    if(name != NULL)
+      {
+        delete [] name;
+        name = NULL;
+      }
+    if (aname)
+      {
+        name = new char[strlen(aname)+1];
+        strcpy (name, aname);
+      }
+  }
 
 
-      memmove (ptr, old, (s < size) ? s : size);
-      //free (old);
-      delete [] old;
-      size = s;
-      return;
-    }
+  void BaseMoveableMem :: Alloc (size_t s)
+  {
+    if (totalsize == 0)
+      {
+        size = s;
+        //ptr = (char*) malloc(s);
+        ptr = new char[s];
 
-  Alloc (s);
-}
+        if (!ptr)
+          {
+            cerr << "BaseynamicMem, cannot allocate " << s << " bytes" << endl;
+            Print ();
+            throw ("BaseDynamicMem::Alloc: out of memory");
+          }
 
-void BaseMoveableMem :: MoveTo (size_t newpos)
-{
-  //  cout << "move block, oldpos = " << pos << "; newpos = " << newpos
-  // << ", size = " << size << endl;
-  static size_t move = 0;
+        return;
+      }
 
-  if (newpos + size > totalsize)
-    throw NgException ("MoveableMem overflow");
-  if (newpos > pos)
-    {
-      if (next) next->MoveTo (newpos+size);
-      memmove (largeblock+newpos, largeblock+pos, size);
-      move += size;
-    }
-  else if (newpos < pos)
-    {
-      // cout << "move down: " << size << endl;
-      memmove (largeblock+newpos, largeblock+pos, size);
-      if (next) next->MoveTo (newpos+size);
-      move += size;
-    }
-  pos = newpos;
-  ptr = largeblock+pos;
-  //  cout << "total move: " << move << endl;
-}
 
-void BaseMoveableMem :: Free () throw()
-{
-  if (totalsize == 0)
-    {
-      //free (ptr);
-      delete [] ptr;
+    used += s - size;
+
+    size_t r = s % 8;
+    if (r) s += 8-r;
+    if (prev)
+      pos = prev->pos + prev->size;
+    else
+      pos = 0;
+    size = s;
+  
+    if (next)
+      {
+        NgLock lock(mem_mutex);
+        lock.Lock();
+        try
+          {
+            next->MoveTo (pos+size);
+          }
+        catch (NgException e)
+          {
+            lock.UnLock();
+            throw NgException ("MoveableMem overflow");
+          }
+        lock.UnLock();
+      }
+
+    if (size)
+      {
+        if (!largeblock)
+          {
+            cout << "moveable memory: allocate large block of "
+                 << totalsize / 1048576  << " MB" << endl; 
+            // largeblock = new char[totalsize];
+            // largeblock = (char*)malloc (totalsize);
+            largeblock = new char[totalsize];
+          }
+        ptr = largeblock+pos;
+
+        if (pos + size > totalsize)
+          throw NgException ("MoveableMem overflow");
+      }
+    else
       ptr = 0;
-      return;
-    }
+  }
 
-  /*
-    cout << "free block, pos = " << pos << "size = " << size << endl;
-    cout << "before: " << endl;
-    Print();
-  */
-  used -= size;
-  if (next) 
-    {
-      NgLock lock(mem_mutex);
-      lock.Lock();
-      next->MoveTo (pos);
-      lock.UnLock();
-    }
+  void BaseMoveableMem :: ReAlloc (size_t s)
+  {
+    if (totalsize == 0)
+      {
+        if (size == s) return;
+      
+        char * old = ptr;
+        ptr = new char[s];
+
+        if (!ptr)
+          {
+            cerr << "BaseynamicMem, cannot Reallocate " << s << " bytes" << endl;
+            Print ();
+            throw ("BaseDynamicMem::Alloc: out of memory");
+          }
+      
+
+
+        memmove (ptr, old, (s < size) ? s : size);
+        //free (old);
+        delete [] old;
+        size = s;
+        return;
+      }
+
+    Alloc (s);
+  }
+
+  void BaseMoveableMem :: MoveTo (size_t newpos)
+  {
+    //  cout << "move block, oldpos = " << pos << "; newpos = " << newpos
+    // << ", size = " << size << endl;
+    static size_t move = 0;
+
+    if (newpos + size > totalsize)
+      throw NgException ("MoveableMem overflow");
+    if (newpos > pos)
+      {
+        if (next) next->MoveTo (newpos+size);
+        memmove (largeblock+newpos, largeblock+pos, size);
+        move += size;
+      }
+    else if (newpos < pos)
+      {
+        // cout << "move down: " << size << endl;
+        memmove (largeblock+newpos, largeblock+pos, size);
+        if (next) next->MoveTo (newpos+size);
+        move += size;
+      }
+    pos = newpos;
+    ptr = largeblock+pos;
+    //  cout << "total move: " << move << endl;
+  }
+
+  void BaseMoveableMem :: Free () throw()
+  {
+    if (totalsize == 0)
+      {
+        //free (ptr);
+        delete [] ptr;
+        ptr = 0;
+        return;
+      }
+
+    /*
+      cout << "free block, pos = " << pos << "size = " << size << endl;
+      cout << "before: " << endl;
+      Print();
+    */
+    used -= size;
+    if (next) 
+      {
+        NgLock lock(mem_mutex);
+        lock.Lock();
+        next->MoveTo (pos);
+        lock.UnLock();
+      }
   
-  size = 0;
-  ptr = 0;
-  // pos = 0;
-}
+    size = 0;
+    ptr = 0;
+    // pos = 0;
+  }
 
-void BaseMoveableMem :: Swap (BaseMoveableMem & m2) throw()
-{
-  size_t hi;
-  // BaseMoveableMem * hp;
-  char * cp;
-  hi = size; size  = m2.size; m2.size = hi;
-  hi = pos; pos = m2.pos; m2.pos = hi;
-  /*
-  hp = prev; prev = m2.prev; m2.prev = hp;
-  hp = next; next = m2.next; m2.next = hp;
-  */
-  cp = ptr; ptr = m2.ptr; m2.ptr = cp;
-  cp = name; name = m2.name; m2.name = cp;
-}
+  void BaseMoveableMem :: Swap (BaseMoveableMem & m2) throw()
+  {
+    size_t hi;
+    // BaseMoveableMem * hp;
+    char * cp;
+    hi = size; size  = m2.size; m2.size = hi;
+    hi = pos; pos = m2.pos; m2.pos = hi;
+    /*
+      hp = prev; prev = m2.prev; m2.prev = hp;
+      hp = next; next = m2.next; m2.next = hp;
+    */
+    cp = ptr; ptr = m2.ptr; m2.ptr = cp;
+    cp = name; name = m2.name; m2.name = cp;
+  }
 
 
-void BaseMoveableMem :: Print ()
-{
-  cout << "****************** Moveable Mem Report ****************" << endl;
-  BaseMoveableMem * p = first;
-  long int mem = 0;
-  int cnt = 0;
-  while (p)
-    {
-      mem += long(p->size);
-      cnt++;
+  void BaseMoveableMem :: Print ()
+  {
+    cout << "****************** Moveable Mem Report ****************" << endl;
+    BaseMoveableMem * p = first;
+    long int mem = 0;
+    int cnt = 0;
+    while (p)
+      {
+        mem += long(p->size);
+        cnt++;
 
-      cout << setw(10) << p->size << " Bytes";
-      cout << ", pos = " << p->pos;
-      cout << ", addr = " << (void*)p->ptr;
-      if (p->name)
-	cout << " in block " << p->name;
-      cout << endl;
+        cout << setw(10) << p->size << " Bytes";
+        cout << ", pos = " << p->pos;
+        cout << ", addr = " << (void*)p->ptr;
+        if (p->name)
+          cout << " in block " << p->name;
+        cout << endl;
 
-      p = p->next;
-    }
+        p = p->next;
+      }
 
-  if (mem > 100000000)
-    cout << "memory in moveable arena: " << mem/1048576 << " MB" << endl;
-  else if (mem > 100000)
-    cout << "memory in moveable arena: " << mem/1024 << " kB" << endl;
-  else
-    cout << "memory in moveable arena: " << mem << " Bytes" << endl;
-  cout << "number of blocks:         " << cnt << endl;
+    if (mem > 100000000)
+      cout << "memory in moveable arena: " << mem/1048576 << " MB" << endl;
+    else if (mem > 100000)
+      cout << "memory in moveable arena: " << mem/1024 << " kB" << endl;
+    else
+      cout << "memory in moveable arena: " << mem << " Bytes" << endl;
+    cout << "number of blocks:         " << cnt << endl;
   
-  cout << " used  = " << used << endl;
-  //  cout << "******************************************************" << endl;
-}
+    cout << " used  = " << used << endl;
+    //  cout << "******************************************************" << endl;
+  }
 
 }