Changeset 6e5833 in git

Timestamp:

Mar 19, 1999, 6:42:33 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2efb0e4a1f16840557ae3ada88076edccb960534

Parents:

105efeceef55c91a7f3c55acd25aac54cf6ae7ba

Message:

* some improvements to mmbt


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

Location:

Singular

Files:

• mmalloc.c (modified) (2 diffs)
• mmbt.c (modified) (4 diffs)
• mmbt.h (modified) (2 diffs)
• mmcheck.c (modified) (4 diffs)
• mmemory.h (modified) (3 diffs)
• mmisc.c (modified) (3 diffs)
• mmprivate.h (modified) (3 diffs)
• mod2.h.in (modified) (2 diffs)
• scanner.l (modified) (2 diffs)
• tesths.cc (modified) (2 diffs)

Singular/mmalloc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmalloc.c,v 1.13 1999-03-19 16:00:04 Singular Exp $ */
+/* $Id: mmalloc.c,v 1.14 1999-03-19 17:42:27 obachman Exp $ */
 
 /*
@@ -227 +227 @@
   mmFillDBMCB(what, SizeFromRealSize(mmGetHeapBlockSize(heap)),
               heap, MM_FREEFLAG, fname, lineno);
+
+#ifdef MTRACK
+  mmTrack(what->bt_stack);
+#endif  
 }
 

Singular/mmbt.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmbt.c,v 1.7 1999-03-19 16:00:05 Singular Exp $ */
+/* $Id: mmbt.c,v 1.8 1999-03-19 17:42:28 obachman Exp $ */
 /*
 * ABSTRACT: backtrace: part of memory subsystem (for linux/elf)
@@ -101 +101 @@
     j=fscanf(f,"%d %s\n",(int *)&p2n[i].p,n);
     if (j!=2) break;
-    p2n[i].name=strdup(n);
-    i++;
+    if (strcmp(n, "___crt_dummy__") != 0 && strcmp(n, "_start") != 0)
+    {
+      p2n[i].name=strdup(n);
+      i++;
+    }
   }
   fclose(f);
@@ -112 +115 @@
 char * mmP2cName(unsigned long p)
 {
+  int i, e;
   int a=0;
-  int e=mm_p2n_max;
-  int i;
   if (mm_p2n_max == -1)
     mmP2cNameInit();
+  e=mm_p2n_max;
   loop
   {
@@ -148 +151 @@
 }
 
-void mmPrintStack(unsigned long *bt_stack) /* print stack */
+void mmPrintStack(unsigned long *stack, int all)
 {
-  int i=0;
+  mmPrintStackFrames(stack, 0, BT_MAXSTACK, all);
+}
+
+void mmDBPrintStack(void* memblock, int all)
+{
+  mmPrintStackFrames(((DBMCB*) memblock)->bt_stack, 0, BT_MAXSTACK, all);
+}
+
+void mmDBPrintStackFrames(void* memblock, int start, int end)
+{
+  mmPrintStackFrames(((DBMCB*) memblock)->bt_stack, start, end, 
+                     MM_PRINT_ALL_STACK);
+}
+
+/* print stack */
+void mmPrintStackFrames(unsigned long *bt_stack, int start, int end, int mm) 
+{
+  int i=start;
   PrintS(" ");
   do
   {
     char *s;
-    fprintf( stderr,":%x",bt_stack[i]);
     s=mmP2cName(bt_stack[i]); 
     if (s!=NULL)
-      fprintf( stderr,"/%s",s);
+    {
+      if ((mm & MM_PRINT_ALL_STACK) || strncmp(s, "mm", 2) !=0)
+        fprintf( stderr,":%s",s);
+      if (strcmp(s, "main") == 0) break;
+    }
+    else
+      fprintf( stderr,":%x",bt_stack[i]);
     i++;
-  } while ((i<BT_MAXSTACK) && (bt_stack[i]!=0));
+  } while ((i<end) && (bt_stack[i]!=0));
   fprintf( stderr,"\n");
 }

Singular/mmbt.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmbt.h,v 1.2 1999-03-19 16:00:05 Singular Exp $ */
+/* $Id: mmbt.h,v 1.3 1999-03-19 17:42:29 obachman Exp $ */
 /*
 * ABSTRACT: backtrace: part of memory subsystem (for linux/elf)
@@ -26 +26 @@
 void mmP2cNameInit(); /* init. of PC -> Name resolution */
 char * mmP2cName(unsigned long p); /* PC -> Name resolution */
-void mmPrintStack(unsigned long *bt_stack); /* print stack */
+void mmPrintStack(unsigned long *stack, int mm);
+void mmDBPrintStack(void* memblock, int mm);
+void mmDBPrintStackFrames(void* memblock, int start, int end);
+void mmPrintStackFrames(unsigned long *bt_stack, int start, int end, int mm); 
 
 #endif /* linux, i386 */

Singular/mmcheck.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmcheck.c,v 1.5 1999-03-19 16:00:06 Singular Exp $ */
+/* $Id: mmcheck.c,v 1.6 1999-03-19 17:42:29 obachman Exp $ */
 
 /*
@@ -116 +116 @@
 {
   (void)fprintf( stderr, "warning: %s\n", msg );
-  (void)fprintf( stderr, "block %x allocated in: %s:%d\n",
-     (int)&(what->data), what->fname, what->lineno );
+  (void)fprintf( stderr, "block %x %s in: %s:%d",
+                 (int)&(what->data), 
+                 (what->flags & MM_FREEFLAG ? "freed" : "allocated" ),
+                 what->fname, what->lineno );
+#ifdef MTRACK
+  mmDBPrintStack(what, MM_PRINT_ALL_STACK);
+#else
+  fprintf( stderr,"\n");
+#endif  
   if (strcmp(msg,"size")==0)
     (void)fprintf( stderr, "size is: %d, but check said %d \n",
@@ -165 +172 @@
   what->lineno = lineno;
   what->flags = flags;
+  what->init = 0;
   
   if (flags & MM_FREEFLAG)
@@ -171 +179 @@
   memset(what->front_pattern, MM_FRONT_PATTERN, MM_NUMBER_OF_FRONT_PATTERNS);
   memset((char*) addr + size, MM_BACK_PATTERN, DebugOffsetBack);
+}
+
+void mmMarkInitDBMCB()
+{
+  DBMCB * what=mm_theDBused.next;
+  while (what != NULL)
+  {
+    what->init = 1;
+    what = what->next;
+  }
 }
 

Singular/mmemory.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmemory.h,v 1.16 1999-03-19 14:18:01 obachman Exp $ */
+/* $Id: mmemory.h,v 1.17 1999-03-19 17:42:30 obachman Exp $ */
 /*
 * ABSTRACT
@@ -117 +117 @@
 
 void mmPrintUsedList();
+void mmMarkInitDBMCB();
+void mmTestList (int all);
 
 #else
@@ -128 +130 @@
 #define mmTestMemory 1
 #define mmTestHeaps 1
+#define mmMarkInitDBMCB()
+#define mmTestList(a) 
 
 #endif /* MDEBUG */

Singular/mmisc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmisc.c,v 1.4 1999-03-19 16:00:07 Singular Exp $ */
+/* $Id: mmisc.c,v 1.5 1999-03-19 17:42:31 obachman Exp $ */
 
 /*
@@ -140 +140 @@
 
 #ifdef MLIST
-void mmTestList ( )
+void mmTestList (int all)
 {
   DBMCB * what=mm_theDBused.next;
@@ -146 +146 @@
   while (what!=NULL)
   {
-    fprintf( stderr, "%d bytes at %p in: %s:%d",
-      (int)what->size, what, what->fname, what->lineno);
+    if ((all & MM_PRINT_ALL_ADDR) || what->init == 0)
+    {
+      fprintf( stderr, "%d bytes at %p in: %s:%d",
+               (int)what->size, what, what->fname, what->lineno);
 #ifdef MTRACK
-    mmPrintStack(what->bt_stack);
+      mmDBPrintStack(what, all);
 #else
-    fprintf( stderr, "\n");
-#endif
+      fprintf( stderr, "\n");
+#endif
+    }
     what=what->next;
   }

Singular/mmprivate.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmprivate.h,v 1.7 1999-03-19 16:00:07 Singular Exp $ */
+/* $Id: mmprivate.h,v 1.8 1999-03-19 17:42:31 obachman Exp $ */
 /*
 * ABSTRACT
@@ -36 +36 @@
   char * fname;
   unsigned long bt_stack[BT_MAXSTACK];
+  int init;
   size_t size;
   int lineno;
@@ -81 +82 @@
 void mmCheckPrint( void );
 
+#define MM_PRINT_ALL_ADDR 1
+#define MM_PRINT_ALL_STACK 2
+
+
 #endif /* MEMPRIVATE_H */
 

Singular/mod2.h.in

@@ -333 +333 @@
 #endif
 
-/* define MTRACK for allowing to keep track of Alloc/Free with a backtrace */
-/* #define MTRACK */
 
 
@@ -350 +348 @@
 /* define MLIST for printing block of used memory on exit */
 #define MLIST 1
+/* define MTRACK for allowing to keep track of Alloc/Free with a backtrace */
+/* #define MTRACK */
 
 /* #define PAGE_TEST */

Singular/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.14 1998-12-14 14:27:43 Singular Exp $ */
+/* $Id: scanner.l,v 1.15 1999-03-19 17:42:33 obachman Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -281 +281 @@
                            #ifdef MDEBUG
                              #ifdef MLIST
-                             mmTestList();
+                             mmTestList(0);
                              #endif
                            #endif

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.57 1998-10-30 17:13:32 Singular Exp $ */
+/* $Id: tesths.cc,v 1.58 1999-03-19 17:42:33 obachman Exp $ */
 
 /*
@@ -531 +531 @@
   }
   errorreported = 0;
+  mmMarkInitDBMCB();
 #ifndef macintosh
 #if defined(HAVE_READLINE)