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

Timestamp:

May 31, 2011, 8:02:50 AM (15 years ago)

Author:

eugene

Message:

updates for ohana malloc

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

@@ -5 +5 @@
 # ifdef OHANA_MEMORY
 
-void *ohana_malloc (char *file, int line, int Nelem, size_t esize);
-void *ohana_realloc (char *file, int line, void *in, int Nelem, size_t esize);
-void  ohana_free (char *file, int line, void *in);
-void  ohana_memregister_func (char *file, int line, void *ptr);
+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_memdump_func (int mode);
 void  ohana_memcheck_func (int mode);
 
-# define ohana_memregister(X) ohana_memregister_func (__FILE__, __LINE__, (X));
 # 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__, (SIZE), sizeof(TYPE)) }
+  { PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, __func__, (SIZE), sizeof(TYPE)) }
 # define ALLOCATE_ZERO(PTR,TYPE,SIZE)                                   \
-  { PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, (SIZE), sizeof(TYPE)); memset (PTR, 0, (SIZE)*sizeof(TYPE)); }
+  { 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__, PTR, (SIZE), sizeof(TYPE)); }
+  { 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__, PTR, (SIZE), sizeof(TYPE)); } }
-# define FREE(PTR) { if (PTR != NULL) { ohana_free (__FILE__, __LINE__, PTR); } }
+    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); }}
 
-# else 
-# define ohana_memregister(X) /* NOP */
+# else  /* OHANA_MEMORY */
+
 # define ohana_memcheck(X) /* NOP */
 # define ohana_memdump(X) /* NOP */
-# endif /* OHANA_MEMORY */
+# define real_free(PTR) { if (PTR) { free(PTR); }}
 
 # ifndef ALLOCATE
@@ -64 +63 @@
 # define FREE(PTR) { if (PTR != NULL) { free (PTR); } }
 # endif /* ALLOCATE */
+# endif /* OHANA_MEMORY */
 
 # endif /* OHANA_ALLOCATE */