Changeset 39415

Timestamp:

Feb 28, 2016, 5:44:25 AM (10 years ago)

Author:

eugene

Message:

add a realloc counter to the memblock (in dummy slot); test realloc did not mess up endblocks

Location:

branches/eam_branches/ohana.20160226/src/libohana

Files:

• include/ohana_allocate.h (modified) (1 diff)
• src/ohana_allocate.c (modified) (7 diffs)

branches/eam_branches/ohana.20160226/src/libohana/include/ohana_allocate.h

@@ -13 +13 @@
   int line;                   // line (re)allocated
   int freed;                  // memory has been freed
-  int dummy;                  // need to put endblock on the endpost
+  int Nalloc;                 // need to put endblock on the endpost
   uint32_t endblock;          // endpost marker
 } OhanaMemblock;

branches/eam_branches/ohana.20160226/src/libohana/src/ohana_allocate.c

@@ -55 +55 @@
   Nelem = MAX (1, Nelem);
   size = Nelem * esize;
+  // if (size % 8) size += (8 - size % 8); // do NOT round to 8-byte boundary (did not fix corruption)
 
   // total size is : memblock + data + endpost
@@ -75 +76 @@
   new->func = func;
   new->freed = FALSE;
+  new->Nalloc = 1;
 
   // poison the whole memory: we should not rely of 0'ed memory
@@ -129 +131 @@
   Nelem = MAX (1, Nelem);
   size = Nelem * esize;
+  // if (size % 8) size += (8 - size % 8); // do NOT round to 8-byte boundary (did not fix corruption)
 
   // requested same size as current allocation
@@ -134 +137 @@
     return in;
   }
+  size_t oldsize = old->size;
 
   pthread_mutex_lock(&memBlockListMutex);
@@ -156 +160 @@
   new->nextBlock = old->nextBlock;
   new->prevBlock = old->prevBlock;
+  new->startblock = OHANA_MEMMAGIC;
+  new->endblock = OHANA_MEMMAGIC;
+  new->freed = FALSE;
 # else
   // ask for new memory
@@ -164 +171 @@
 # endif
   
-  // set the end-post values
-  new->startblock = OHANA_MEMMAGIC;
-  new->endblock = OHANA_MEMMAGIC;
-  *(uint32_t *)(ptr_new + size) = OHANA_MEMMAGIC;
+  if (new->startblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
+  if (new->endblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
 
   // set the memory metadata
@@ -174 +179 @@
   new->line = line;
   new->func = func;
-  new->freed = FALSE;
-
-  // update the endpost (the others were set originally
+  new->Nalloc++;
+
+  // update the endpost (the others were set originally and maintained through the realloc)
   *(uint32_t *)(ptr_new + size) = OHANA_MEMMAGIC;
+
+  // poison the new memory: we should not rely of 0'ed memory
+  if (new->size > oldsize) {
+    memset (&ptr_new[oldsize], 0x7f, new->size - oldsize);
+  }
 
   // need to reset lastBlock in case we moved