remember who has locked free, and only set unlock if no one else has

locked.


git-svn-id: https://dune.mathematik.uni-freiburg.de/svn/alugrid/trunk@943 0d966ed9-3843-0410-af09-ebfb50bd7c74

src/parallel/gitter_pll_mgb.cc

@@ -32,7 +32,7 @@ ParallelGridMover :: ParallelGridMover (BuilderIF & b, bool init) : MacroGridBui
 {
   // lock MyAlloc so that objects are not freed  
   // because we want to reuse them  
-  MyAlloc :: lockFree () ;
+  MyAlloc :: lockFree ((void *) this) ;
 
   if(init) initialize();
 }
@@ -74,7 +74,7 @@ inline ParallelGridMover :: ~ParallelGridMover () {
   assert(_initialized);
 
   // unlock MyAlloc so that objects can be freed again 
-  MyAlloc :: unlockFree () ;
+  MyAlloc :: unlockFree ((void *) this) ;
 
   return ;
 }

src/serial/myalloc.cc

@@ -65,15 +65,23 @@ struct AllocEntry {
 
 // map holding AllocEntries for sizes 
 static map < size_t, AllocEntry, less < size_t > > * freeStore = 0 ;
+static set < void * > myAllocFreeLockers;
 
-void MyAlloc :: lockFree () 
+void MyAlloc :: lockFree (void * addr) 
 {
+  // remember address of locker 
+  myAllocFreeLockers.insert( addr );
   _freeAllowed = false; 
 }
 
-void MyAlloc :: unlockFree () 
+void MyAlloc :: unlockFree (void * addr) 
 {
-  _freeAllowed = true; 
+  myAllocFreeLockers.erase( addr );
+  // only if no-one else has locked 
+  if( myAllocFreeLockers.empty () )
+  {
+    _freeAllowed = true; 
+  }
 }
 
 void * MyAlloc :: operator new (size_t s) throw (OutOfMemoryException) 

src/serial/myalloc.h

@@ -44,10 +44,10 @@ class MyAlloc {
     friend class Initializer;
 
     // if called, freeing objects is allowed again 
-    static void unlockFree();
+    static void unlockFree(void *);
 
     // if called free of objects is not allowed 
-    static void lockFree (); 
+    static void lockFree (void *); 
   protected :
     MyAlloc () {}
    ~MyAlloc () {}