Changeset fa2232 in git

Timestamp:

May 22, 2017, 12:14:39 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5701b2dba7b0ab2bead00e561ab312559359da8a

Parents:

adcd73732d5c4dec5a94ae3c2bef423fb742b455

Message:

omalloc: better debug messages

File:

• omalloc/omDebugCheck.c (modified) (2 diffs)

omalloc/omDebugCheck.c

@@ -418 +418 @@
 }
 
-void _omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, int frames, const char* s)
+static void _omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, int frames, const char* s)
 {
   int x;
-  if (! (x=omCheckPtr(addr, omError_MaxError, OM_FLR)))
+  if ((! (x=omCheckPtr(addr, omError_MaxError, OM_FLR)))
+  ||(x==omError_UnalignedAddr))
   {
     fprintf(fd, "%s addr:%p size:%ld", s, addr, (long)omSizeOfAddr(addr));
 
-  if (error == omError_WrongSize && (flags & OM_FSIZE))
-    fprintf(fd, " specified size:%ld", (long) bin_size);
-
-  if (error == omError_WrongBin && (flags & OM_FBIN))
-    fprintf(fd, " specified bin is of size:%ld",
+    if (error == omError_UnalignedAddr)
+      fputs(" unaligned",fd);
+
+    if (error == omError_WrongSize && (flags & OM_FSIZE))
+      fprintf(fd, " specified size:%ld", (long) bin_size);
+
+    if (error == omError_WrongBin && (flags & OM_FBIN))
+      fprintf(fd, " specified bin is of size:%ld",
                  (long)((omBin) bin_size)->sizeW << LOG_SIZEOF_LONG);
 
-  if (omIsTrackAddr(addr))
-    omPrintTrackAddrInfo(fd, addr, frames);
-  else
-    fprintf(fd, "\n");
+    if (omIsTrackAddr(addr))
+      omPrintTrackAddrInfo(fd, addr, frames);
+    else
+    {
+      fputs(" !omIsTrackAddr\n",fd);
+      omPrintTrackAddrInfo(fd, addr, frames);
+    }
   }
   else
@@ -550 +557 @@
     {
       _omPrintAddrInfo(om_print_used_addr_fd, omError_NoError, addr, NULL, 0, om_print_frames, "");
-      fprintf(om_print_used_addr_fd, "\n");
+      fputc('\n',om_print_used_addr_fd);
     }
   }