Changeset cba516 in git for omalloc

Timestamp:

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

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cb66fa0d8f3235673bb9477eb737a9069010b278

Parents:

b4e536263bb0aa911b1f252afe51fd37579eaaa1

Message:

* omPrintCurrentBackTraceMax
* omTestBinAddrSize


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

Location:

omalloc

Files:

• omAllocDecl.h (modified) (7 diffs)
• omDebug.c (modified) (4 diffs)
• omDebug.h (modified) (2 diffs)
• omDebugCheck.c (modified) (6 diffs)
• omDebugTrack.c (modified) (2 diffs)
• omError.h (modified) (2 diffs)
• omRet2Info.c (modified) (4 diffs)
• omRet2Info.h (modified) (3 diffs)
• omtTest.c (modified) (1 diff)
• omtTestError.c (modified) (3 diffs)

omalloc/omAllocDecl.h

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omAllocDecl.h,v 1.5 2000-08-18 09:05:50 obachman Exp $
+ *  Version: $Id: omAllocDecl.h,v 1.6 2000-09-14 12:59:51 obachman Exp $
  *******************************************************************/
 #ifndef OM_ALLOC_DECL_H
@@ -81 +81 @@
 #define omDebugBinAddr(addr)                 _omDebugAddr(addr,NULL,OM_FBINADDR,OM_CFL) 
 #define omDebugAddrBin(addr, bin)            _omDebugAddr(addr,bin,OM_FBIN,OM_CFL)
+#define omDebugBinAddrSize(addr, size)       _omDebugAddr(addr,(void*)(size),OM_FBINADDR|OM_FSIZE,OM_CFL)
 #define omDebugAddrSize(addr,size)           _omDebugAddr(addr,(void*)(size),OM_FSIZE,OM_CFL)
 #define omDebugAddr(addr)                    _omDebugAddr(addr,NULL, 0, OM_CFL)
@@ -91 +92 @@
 #if OM_CHECK > 0
 #define omCheckBinAddr      omDebugBinAddr
-#define omCheckAddrBin      omDebugAddrBin   
+#define omCheckAddrBin      omDebugAddrBin  
+#define omCheckBinAddrSize  omDebugBinAddrSize 
 #define omCheckAddrSize     omDebugAddrSize  
 #define omCheckAddr         omDebugAddr      
@@ -297 +299 @@
 #define omDebugBinAddr(addr)                     ((void) 0)
 #define omDebugAddrBin(addr,bin)                 ((void) 0)
+#define omDebugBinAddrSize(addr,size)            ((void) 0)                       
 #define omDebugAddrSize(addr,size)               ((void) 0)                       
 #define omDebugAddr(addr)                        ((void) 0)                               
@@ -310 +313 @@
 #define omCheckBinAddr(addr)                     ((void) 0)
 #define omCheckAddrBin(addr,bin)                 ((void) 0)
+#define omCheckBinAddrSize(addr,size)            ((void) 0)                       
 #define omCheckAddrSize(addr,size)               ((void) 0)                       
 #define omCheckAddr(addr)                        ((void) 0)                               
@@ -323 +327 @@
 omError_t omTestAddrBin(void* addr, omBin bin, int check_level);
 omError_t omTestBinAddr(void* addr, int check_level);
+omError_t omTestBinAddrSize(void* addr, size_t size, int check_level);
 omError_t omTestAddrSize(void* addr, size_t size, int check_level);
 omError_t omTestAddr(void* addr, int check_level);
@@ -341 +346 @@
 #define omTestAddrBin(addr,bin,l)                 ((void) 0)
 #define omTestBinAddr(addr,l)                     ((void) 0)                               
+#define omTestBinAddrSize(addr,size,l)            ((void) 0)                       
 #define omTestAddrSize(addr,size,l)               ((void) 0)                       
 #define omTestAddr(addr,l)                        ((void) 0)                               

omalloc/omDebug.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 7/00
- *  Version: $Id: omDebug.c,v 1.8 2000-09-12 16:02:18 obachman Exp $
+ *  Version: $Id: omDebug.c,v 1.9 2000-09-14 12:59:52 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -39 +39 @@
 {
   return _omDebugAddr(addr,bin,OM_FBIN,OM_CLFL);
+}
+omError_t omTestBinAddrSize(void* addr, size_t size, int check_level)
+{
+  return _omDebugAddr(addr,(void*)(size),OM_FSIZE|OM_FBINADDR,OM_CLFL);
 }
 omError_t omTestAddrSize(void* addr, size_t size, int check_level)
@@ -237 +241 @@
   }
   while (addr[i] != '\0' && i < size) i++;
+// there seems to be no way to check if it is really a string
+#if 0
   if (i == size)
   {
@@ -242 +248 @@
     i = size-1;
   }
+#endif 
   ret = __omDebugAlloc((void*)i+1, OM_FSIZE, track, OM_FLR_VAL);
   memcpy(ret, addr, i);

omalloc/omDebug.h

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 7/00
- *  Version: $Id: omDebug.h,v 1.8 2000-09-12 16:02:18 obachman Exp $
+ *  Version: $Id: omDebug.h,v 1.9 2000-09-14 12:59:52 obachman Exp $
  *******************************************************************/
 #ifndef OM_DEBUG_H
@@ -179 +179 @@
   if (_status && _status != omError_MaxError)                                 \
   {                                                                           \
-    omPrintAddrInfo(stderr, _status, addr, bin_size, flags, "  occured for"); \
+    _omPrintAddrInfo(stderr, _status, addr, bin_size, flags, "  occured for"); \
     return _status;                                                           \
   }                                                                           \

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");
   }

omalloc/omDebugTrack.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebugTrack.c,v 1.6 2000-09-12 16:02:18 obachman Exp $
+ *  Version: $Id: omDebugTrack.c,v 1.7 2000-09-14 12:59:53 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -453 +453 @@
   omAddrCheckReturnError((d_addr->flags & OM_FUSED) ^ (flags & OM_FUSED), omError_FreedAddrOrMemoryCorrupted);
 
+  if (flags & OM_FBINADDR && flags & OM_FSIZE)
+    omAddrCheckReturnError(omTrackAddr_2_OutSize(d_addr) != (size_t) bin_size, omError_WrongSize);
+  
   if (d_addr->track > 2)
   {

omalloc/omError.h

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omError.h,v 1.4 2000-08-18 09:05:53 obachman Exp $
+ *  Version: $Id: omError.h,v 1.5 2000-09-14 12:59:53 obachman Exp $
  *******************************************************************/
 #ifndef OM_ERROR_H
 #define OM_ERROR_H
 
+#include <stdio.h>
 /*******************************************************************
  *  
@@ -54 +55 @@
                                const char* fmt, ...);
 
+#ifndef OM_NDEBUG
+extern void omPrintAddrInfo(FILE* fd, void* addr, char* s);
+#else
+#define omPrintAddrInfo(fd, addr, s) fprintf(fd, "OM_NDEBUG: no addr info available\n")
+#endif
+
 /*BEGINPRIVATE*/
 /*******************************************************************

omalloc/omRet2Info.c

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omRet2Info.c,v 1.5 2000-09-12 16:02:19 obachman Exp $
+ *  Version: $Id: omRet2Info.c,v 1.6 2000-09-14 12:59:53 obachman Exp $
  *******************************************************************/
 #include <stdio.h>
@@ -25 +25 @@
 #endif
 
+/* define to also print return addresses in (default)
+   output of omPrintInfo */
+/* #define OM_PRINT_RETURN_ADDRESS */
 static char om_this_prog[MAXPATHLEN] = "";
 
@@ -139 +142 @@
   
   i = omBackTrace_2_RetInfo(bt, info, max);
-  return omPrintRetInfo(info, i, fd, "  #%i %L in %F\n");
-}
-
-int omPrintCurrentBackTrace(FILE* fd)
+#ifdef OM_PRINT_RETURN_ADDRESS
+  return omPrintRetInfo(info, i, fd, "  #%i at %L in %F ra=%p\n");
+#else
+  return omPrintRetInfo(info, i, fd, "  #%i at %L in %F\n");
+#endif  
+}
+
+int omPrintCurrentBackTraceMax(FILE* fd, int max)
 {
   int i;
   void* bt[OM_MAX_BACKTRACE_DEPTH];
-  
-  i = omGetBackTrace(bt, 1, OM_MAX_BACKTRACE_DEPTH);
+  if (max > OM_MAX_BACKTRACE_DEPTH)
+    max = OM_MAX_BACKTRACE_DEPTH;
+  if (max <= 0) return 0;
+  i = omGetBackTrace(bt, 1, max);
   return omPrintBackTrace(bt, i, fd);
 }
@@ -231 +240 @@
   else
 #endif /* ! OM_INTERNAL_DEBUG */
+#ifdef OM_PRINT_RETURN_ADDRESS
     return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %F ra=%p");
+#else
+    return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %F");
+#endif
 }
 

omalloc/omRet2Info.h

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omRet2Info.h,v 1.4 2000-08-16 12:06:11 obachman Exp $
+ *  Version: $Id: omRet2Info.h,v 1.5 2000-09-14 12:59:53 obachman Exp $
  *******************************************************************/
 #ifndef OM_RET_2_INFO_H
@@ -37 +37 @@
 
 int omPrintBackTrace(void** bt, int max, FILE* fd);
-int omPrintCurrentBackTrace(FILE* fd);
+#define omPrintCurrentBackTrace(fd) omPrintCurrentBackTraceMax(fd, 1000)
+int omPrintCurrentBackTraceMax(FILE* fd, int max);
 
 int omFilterRetInfo_i(omRetInfo info, int max, int i);
@@ -72 +73 @@
 #define omPrintBackTrace(bt,max,fd)     ((void)0)
 #define omPrintCurrentBackTrace(fd)     ((void)0)
+#define omPrintCurrentBackTraceMax(fd,max) ((void)0)
 #define omFilterRetInfo_i(info,max,i)   ((void)0)
 #define omFilterRetInfo(info, max, cond)((void)0)

omalloc/omtTest.c

@@ -259 +259 @@
 void my_exit()
 {
-  printf("\notTest Summary: ");
+  printf("\nomtTest Summary: ");
   if (errors || missed_errors || used_regions)
   {   

omalloc/omtTestError.c

@@ -118 +118 @@
           {
             omDebugAddrSize(cell->addr, OM_MAX_BLOCK_SIZE + 1);
-            spec.MaxSize = 0;
-            spec.MinTrack = 3;
-            spec.NotIsBin = 1;
-            cell = omFindCell(spec);
-            if (cell != NULL)
-            {   
-              omDebugAddrSize(cell->addr, GET_SIZE(cell->spec) + SIZEOF_OM_ALIGNMENT);
-            } else printf("cell not found\n");
+            if (om_ErrorStatus != omError_NoError)
+            {
+              om_ErrorStatus = omError_NoError;
+              spec.MaxSize = 0;
+              spec.MinTrack = 3;
+              spec.NotIsBin = 1;
+              cell = omFindCell(spec);
+              if (cell != NULL)
+              {   
+                omDebugAddrSize(cell->addr, GET_SIZE(cell->spec) + SIZEOF_OM_ALIGNMENT);
+                if (om_ErrorStatus != omError_NoError)
+                {
+                  om_ErrorStatus = omError_NoError;
+                  spec.MaxSize = OM_MAX_BLOCK_SIZE;
+                  spec.MinTrack = 0;
+                  spec.NotIsBin = 0;
+                  cell = omFindCell(spec);
+                  if (cell != NULL)
+                    omDebugBinAddrSize(cell->addr, GET_SIZE(cell->spec) - 1);
+                  else printf("cell not found");
+                } 
+              }
+              else printf("cell not found\n");
+            }
           }
           else printf("cell not found\n");
@@ -319 +335 @@
         case omError_NotString:
         {
+/* can only test for NULL string */
+#if 0 
           spec.MaxSize = OM_MAX_BLOCK_SIZE;
           cell = omFindCell(spec);
@@ -333 +351 @@
           else printf("cell not found\n");
           break;
+#endif
+          omStrDup(NULL);
         }
         default: