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

Timestamp:

May 31, 2011, 3:50:46 PM (15 years ago)

Author:

eugene

Message:

added test for ohana_memory functions; updated CommandOps to fix interaction between ohana and readline; ohana memory seems to work

File:

• branches/eam_branches/ipp-20110505/Ohana/src/libohana/include/ohana_allocate.h (modified) (2 diffs)

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

@@ -1 +1 @@
 # ifndef OHANA_ALLOCATE
 # define OHANA_ALLOCATE
+
+typedef struct {
+  int    exists; // has the memory management system been created?
+  size_t Ntotal; // number of blocks currently allocated
+  size_t Nbytes; // number of bytes currently allocated
+  size_t Ngood;  // number of good blocks
+  size_t Nbad;   // number of bad blocks
+} OhanaMemstats;
+
+OhanaMemstats ohana_memstats (int mode);
 
 /* default is to use basic system memory functions */
 # ifdef OHANA_MEMORY
 
-void *ohana_malloc (char *file, int line, char *func, int Nelem, size_t esize);
-void *ohana_realloc (char *file, int line, char *func, void *in, int Nelem, size_t esize);
-void  ohana_free (char *file, int line, char *func, void *in);
+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_free (const char *file, int line, const char *func, void *in);
 void  ohana_memdump_func (int mode);
 void  ohana_memcheck_func (int mode);
+void  real_free (void *in);
 
 # define ohana_memcheck(X) ohana_memcheck_func (X);
 # define ohana_memdump(X) ohana_memdump_func (X);
 
-# define ALLOCATE(PTR,TYPE,SIZE) \
-  { PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, __func__, (SIZE), sizeof(TYPE)) }
-# define ALLOCATE_ZERO(PTR,TYPE,SIZE)                                   \
-  { PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, __func__, (SIZE), sizeof(TYPE)); memset (PTR, 0, (SIZE)*sizeof(TYPE)); }
-# define REALLOCATE(PTR,TYPE,SIZE) \
-  { PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, __func__, PTR, (SIZE), sizeof(TYPE)); }
-# define CHECK_REALLOCATE(PTR,TYPE,SIZE,NCURR,DELTA) {                  \
-  if ((NCURR) >= (SIZE)) { SIZE += DELTA;                               \
-    PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, __func__, PTR, (SIZE), sizeof(TYPE)); } }
+# define ALLOCATE(PTR,TYPE,SIZE) { \
+    PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, __func__, (SIZE), sizeof(TYPE)); \
+  }
+
+# define ALLOCATE_ZERO(PTR,TYPE,SIZE) { \
+    PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, __func__, (SIZE), sizeof(TYPE)); \
+    memset (PTR, 0, (SIZE)*sizeof(TYPE)); \
+  }
+
+# define REALLOCATE(PTR,TYPE,SIZE) { \
+    PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, __func__, PTR, (SIZE), sizeof(TYPE)); \
+  }
+
+# define CHECK_REALLOCATE(PTR,TYPE,SIZE,NCURR,DELTA) { \
+  if ((NCURR) >= (SIZE)) { \
+    SIZE += DELTA; \
+    PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, __func__, PTR, (SIZE), sizeof(TYPE)); \
+  } }
+
 # define FREE(PTR) { if (PTR != NULL) { ohana_free (__FILE__, __LINE__, __func__, PTR); } }
-# define free(PTR) { ohana_free(__FILE__, __LINE__, PTR); }
-# define real_free(PTR) { if (PTR) { free(PTR); }}
+# define free(PTR) { ohana_free(__FILE__, __LINE__, __func__, PTR); }
 
-# else  /* OHANA_MEMORY */
+# else  /* below: not OHANA_MEMORY */
 
 # define ohana_memcheck(X) /* NOP */
 # define ohana_memdump(X) /* NOP */
-# define real_free(PTR) { if (PTR) { free(PTR); }}
+void  real_free (void *in);
 
-# ifndef ALLOCATE
 # define ALLOCATE(PTR,TYPE,SIZE) {                                      \
   PTR = (TYPE *) malloc ((size_t)(MAX(((SIZE)*((int)sizeof(TYPE))),1))); \
@@ -62 +81 @@
 
 # define FREE(PTR) { if (PTR != NULL) { free (PTR); } }
-# endif /* ALLOCATE */
 # endif /* OHANA_MEMORY */