Changeset 38686

Timestamp:

Aug 28, 2015, 9:10:35 AM (11 years ago)

Author:

eugene

Message:

split memdump_func into memdump_file and _func (calling _file)

Location:

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

Files:

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

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

@@ -110 +110 @@
 # endif /* OHANA_MEMORY */
 
+void  ohana_memdump_file (FILE *f, int mode);
+
 # endif /* OHANA_ALLOCATE */

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

@@ -424 +424 @@
 }
 
-void ohana_memdump_func (int VERBOSE) {
+void ohana_memdump_file (FILE *f, int VERBOSE) {
 
   if (!lastBlock) {
-    if (VERBOSE) fprintf (stderr, "no memory allocated\n");
+    if (VERBOSE) fprintf (f, "no memory allocated\n");
     return;
   }
@@ -436 +436 @@
   size_t Nbytes = 0;
 
-  fprintf (stderr, " entry | bytes | cumulative | STATUS | file | line | function\n");
+  fprintf (f, " entry | bytes | cumulative | STATUS | file | line | function\n");
 
   while (thisBlock) {
@@ -456 +456 @@
     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);
+        fprintf (f, "  %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);
+        fprintf (f, "  %zd  %zd  %zd  BAD   %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
       }
     }
@@ -466 +466 @@
 
   if (Ntotal || VERBOSE) {
-    fprintf (stderr, "%zd memory blocks allocated (%zd bytes total)\n", Ntotal, Nbytes);
-  }
-
+    fprintf (f, "%zd memory blocks allocated (%zd bytes total)\n", Ntotal, Nbytes);
+  }
+
+  return;
+}
+
+void ohana_memdump_func (int VERBOSE) {
+  ohana_memdump_file (stderr, VERBOSE);
   return;
 }