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

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

File:

• trunk/Ohana/src/libohana/include/ohana_allocate.h (modified) (3 diffs)

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

@@ -1 +1 @@
 # ifndef OHANA_ALLOCATE
 # define OHANA_ALLOCATE
+
+# define OHANA_MEMMAGIC (uint32_t) 0xdeadbeef
+
+typedef struct OhanaMemblock {
+  uint32_t startblock;        // endpost marker
+  struct OhanaMemblock *prevBlock; // previously allocated memory
+  struct OhanaMemblock *nextBlock; // next allocated memory
+  size_t size;                // size of memory
+  const char *file;           // file (re)allocated 
+  const char *func;           // func (re)allocated 
+  int line;                   // line (re)allocated
+  int freed;                  // memory has been freed
+  int dummy;                  // need to put endblock on the endpost
+  uint32_t endblock;          // endpost marker
+} OhanaMemblock;
 
 typedef struct {
@@ -29 +44 @@
 void  real_free (void *in);
 
-# define ohana_memcheck(X) ohana_memcheck_func (X);
+# define ohana_memcheck(X) ohana_memcheck_func (X)
 # define ohana_memdump(X) ohana_memdump_func (X);
 
@@ -56 +71 @@
 # else  /* below: not OHANA_MEMORY */
 
-# define ohana_memcheck(X) TRUE
+int   ohana_memcheck_noop (int mode);
+
+# define ohana_memcheck(X) ohana_memcheck_noop (X)
 # define ohana_memdump(X) /* NOP */
 void  real_free (void *in);