Changeset cba516 in git for omalloc/omDebugCheck.c

Timestamp:

Sep 14, 2000, 2:59:54 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

cb66fa0d8f3235673bb9477eb737a9069010b278

Parents:

b4e536263bb0aa911b1f252afe51fd37579eaaa1

Message:

* omPrintCurrentBackTraceMax
* omTestBinAddrSize


git-svn-id: file:///usr/local/Singular/svn/trunk@4594 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

omalloc/omDebugCheck.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebugCheck.c,v 1.4 2000-08-18 09:05:52 obachman Exp $
+ *  Version: $Id: omDebugCheck.c,v 1.5 2000-09-14 12:59:52 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -26 +26 @@
 static omError_t omDoCheckBinPage(omBinPage page, int normal_page, int level, 
                                   omError_t report, OM_FLR_DECL);
-static void omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, char* s);
+static void _omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, char* s);
 
 
@@ -199 +199 @@
   omAddrCheckReturnCorrupted(! omIsKnownTopBin(bin, ! omIsBinAddrTrackAddr(addr)));
 
+  if (flags & OM_FBINADDR && flags & OM_FSIZE)
+    omAddrCheckReturnError(bin->sizeW*SIZEOF_LONG != (size_t) bin_size, omError_WrongSize);
+    
   if (level > 1)
   {
@@ -423 +426 @@
   omReportError(error, report_error, OM_FLR_VAL, fmt, ap);
   
-  omPrintAddrInfo(stderr, error, addr, bin_size, flags, " occured for");
+  _omPrintAddrInfo(stderr, error, addr, bin_size, flags, " occured for");
   return om_ErrorStatus;
 }
 
-void omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, char* s)
+void _omPrintAddrInfo(FILE* fd, omError_t error, void* addr, void* bin_size, omTrackFlags_t flags, char* s)
 {
   if (! omCheckPtr(addr, omError_MaxError, OM_FLR))
@@ -448 +451 @@
     fprintf(fd, "%s (invalid) addr: %p\n", s, addr);
   }
+}
+
+void omPrintAddrInfo(FILE* fd, void *addr, char* s)
+{
+  _omPrintAddrInfo(fd, omError_NoError, addr, NULL, 0, s);
 }
 
@@ -537 +545 @@
     om_total_used_blocks++;
     om_total_used_size += omSizeOfAddr(addr);
-    omPrintAddrInfo(om_print_used_addr_fd, omError_NoError, addr, NULL, 0, "");
+    _omPrintAddrInfo(om_print_used_addr_fd, omError_NoError, addr, NULL, 0, "");
     fprintf(om_print_used_addr_fd, "\n");
   }