Changeset 4300 for trunk/Ohana/src/libohana/include/ohana_allocate.h

Timestamp:

Jun 17, 2005, 12:16:29 PM (21 years ago)

Author:

eugene

Message:

added corruption tests to ohana_allocate

File:

• trunk/Ohana/src/libohana/include/ohana_allocate.h (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana_allocate.h

@@ -5 +5 @@
 # ifdef OHANA_MEMORY
 
-void *ohana_malloc (char *file, int line, size_t size);
-void *ohana_realloc (char *file, int line, void *in, size_t size);
+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_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(X,T,S)  \
-  X = (T *) ohana_malloc (__FILE__, __LINE__, (unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
-    fprintf(stderr,"failed malloc at %d in %s\n", __LINE__, __FILE__);\
-    exit (10); } 
+# define ALLOCATE(X,T,S) \
+  X = (T *) ohana_malloc (__FILE__, __LINE__, (S), sizeof(T))
 # define REALLOCATE(X,T,S) \
-  X = (T *) ohana_realloc(__FILE__, __LINE__, X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
-    fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
-    exit (10); }
+  X = (T *) ohana_realloc(__FILE__, __LINE__, X, (S), sizeof(T));
 # define CHECK_REALLOCATE(X,T,S,N,D) \
-  if ((N) >= (S)) { \
-    S += D; \
-    X = (T *) ohana_realloc(__FILE__, __LINE__, X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-    if (X == NULL) { \
-      fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
-      exit (10); } }
+  if ((N) >= (S)) { S += D; \
+  X = (T *) ohana_realloc(__FILE__, __LINE__, X, (S), sizeof(T)); }
 # define free(X) ohana_free(__FILE__, __LINE__, X)
 
 # else 
 # define ohana_memregister(X) /* NOP */
+# define ohana_memcheck(X) /* NOP */
 # define ohana_memdump(X) /* NOP */
 # endif /* OHANA_MEMORY */