Changeset 31593

Timestamp:

Jun 1, 2011, 12:00:17 PM (15 years ago)

Author:

eugene

Message:

option for OHANA_MEMORY must be passed via make option

Location:

branches/eam_branches/ipp-20110505/Ohana/src/libohana

Files:

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

branches/eam_branches/ipp-20110505/Ohana/src/libohana/include/ohana.h

@@ -20 +20 @@
 
 // comment this out to avoid the internal Ohana memory management code
-# define OHANA_MEMORY
+// # define OHANA_MEMORY
 
 // XXX I was including these before, but RHL claims they are not needed

branches/eam_branches/ipp-20110505/Ohana/src/libohana/include/ohana_allocate.h

@@ -15 +15 @@
 # ifdef OHANA_MEMORY
 
-void *ohana_malloc (const char *file, int line, const char *func, int Nelem, size_t esize);
-void *ohana_realloc (const char *file, int line, const char *func, void *in, int Nelem, size_t esize);
+void *ohana_malloc (const char *file, int line, const char *func, size_t Nelem, size_t esize);
+void *ohana_realloc (const char *file, int line, const char *func, void *in, size_t Nelem, size_t esize);
 void  ohana_free (const char *file, int line, const char *func, void *in);
 void  ohana_memdump_func (int mode);

branches/eam_branches/ipp-20110505/Ohana/src/libohana/src/ohana_allocate.c

@@ -4 +4 @@
 # include <stdint.h>
 # include <pthread.h>
+
+# undef OHANA_MEMORY
 # include "ohana_allocate.h"
 
@@ -276 +278 @@
     Nbytes += thisBlock->size;
 
-    if (good) {
-      fprintf (stderr, "  %zd  %zd  %zd  GOOD  %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
-    } else {
-      fprintf (stderr, "  %zd  %zd  %zd  BAD   %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
+    if (Ntotal < 100) {
+      if (good) {
+        fprintf (stderr, "  %zd  %zd  %zd  GOOD  %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
+      } else {
+        fprintf (stderr, "  %zd  %zd  %zd  BAD   %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
+      }
     }
 
     thisBlock = thisBlock->prevBlock;
   }
+  fprintf (stderr, "%zd memory blocks allocated (%zd bytes total)\n", Ntotal, Nbytes);
+
   return;
 }