Changeset f3d535 in git

Timestamp:

Apr 24, 1997, 8:01:30 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

40edb034ca387eb23ce7e5316dae62e764557712

Parents:

56f7c59395cec760c41b7311172e225a5cc099eb

Message:

* hannes: simplified initalisation: now only needed for gmp-alloc routines


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

Location:

Singular

Files:

• febase.cc (modified) (3 diffs)
• mminit.cc (modified) (5 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.6 1997-04-02 15:06:58 Singular Exp $ */
+/* $Id: febase.cc,v 1.7 1997-04-24 18:01:30 Singular Exp $ */
 /*
 * ABSTRACT: i/o system, handling of 'voices'
@@ -67 +67 @@
 #define INITIAL_PRINT_BUFFER 24*1024
 static int feBufferLength=INITIAL_PRINT_BUFFER;
-static char * feBuffer;
+static char * feBuffer=(char *)Alloc(INITIAL_PRINT_BUFFER);
 
 #define START_LEVMAX 32
@@ -584 +584 @@
   yylineno = 1;
   currentVoice = &FileAttribs[0];
-  feBuffer = (char *)Alloc(INITIAL_PRINT_BUFFER);
-}
-
-char * feBufferStart;
+}
+
+static char * feBufferStart;
   /* only used in StringSet(S)/StringAppend(S)*/
 char * StringAppend(char *fmt, ...)

Singular/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.4 1997-04-08 16:49:24 Singular Exp $ */
+/* $Id: mminit.cc,v 1.5 1997-04-24 18:01:30 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -38 +38 @@
   NULL,NULL,NULL,NULL,
   NULL,NULL};
-;
+#ifdef MM_STAT
+int mm_active[MAXLIST+1]=
+{ 0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0};
+int mm_max[MAXLIST+2]=
+{ 0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0};
+#endif
 #else
 mcb mm_normList[MAXLIST]=
@@ -54 +67 @@
   NULL,NULL,NULL,NULL,
   NULL,NULL};
+#ifdef MM_STAT
+int mm_active[MAXLIST+1]=
+{ 0,0,0,0,
+  0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0};
+int mm_max[MAXLIST+2]=
+{ 0,0,0,0,
+  0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0,
+  0,0,0,0};
 #endif
+#endif
+
 
 mcb *mm_theList=mm_normList;
@@ -67 +97 @@
 #ifdef MDEBUG
 
-DBMCB mm_theDBused;
-DBMCB mm_theDBfree;
-DBMCB mm_tmpDBused;
-DBMCB mm_tmpDBfree;
-DBMCB mm_normDBused;
-DBMCB mm_normDBfree;
+DBMCB mm_theDBused={NULL,NULL,0,0,NULL,0,0,NULL};
+DBMCB mm_theDBfree={NULL,NULL,0,0,NULL,0,0,NULL};
+DBMCB mm_tmpDBused={NULL,NULL,0,0,NULL,0,0,NULL};
+DBMCB mm_tmpDBfree={NULL,NULL,0,0,NULL,0,0,NULL};
+DBMCB mm_normDBused={NULL,NULL,0,0,NULL,0,0,NULL};
+DBMCB mm_normDBfree={NULL,NULL,0,0,NULL,0,0,NULL};
 void * mm_maxAddr=NULL;
 void * mm_minAddr=NULL;
@@ -134 +164 @@
 int mmInit( void )
 {
-  int ii;
-#ifdef MM_STAT
-  for(ii=0; ii<=MAXLIST; ii++)
+#ifdef HAVE_GMP
+  if(mmIsInitialized==0)
   {
-    mm_active[ii]=0; mm_max[ii]=0;
+#ifndef MDEBUG
+    mp_set_memory_functions(mmAllocBlock,mmReallocBlock,mmFreeBlock);
+#else
+    mp_set_memory_functions(mgAllocBlock,mgReallocBlock,mgFreeBlock);
+#endif
   }
-  mm_max[MAXLIST+1]=0;
-#endif
-#ifdef MDEBUG
-  if ( ! mmIsInitialized ) {
-    memset(&mm_theDBused,0,sizeof(mm_theDBused));
-    memset(&mm_theDBfree,0,sizeof(mm_theDBfree));
-    memset(&mm_tmpDBused,0,sizeof(mm_tmpDBused));
-    memset(&mm_tmpDBfree,0,sizeof(mm_tmpDBfree));
-    memset(&mm_normDBused,0,sizeof(mm_normDBused));
-    memset(&mm_normDBfree,0,sizeof(mm_normDBfree));
-    mmIsInitialized=1;
-  }
-#endif /* MDEBUG */
-#ifdef HAVE_GMP
-#ifndef MDEBUG
-  mp_set_memory_functions(mmAllocBlock,mmReallocBlock,mmFreeBlock);
-#else
-  mp_set_memory_functions(mgAllocBlock,mgReallocBlock,mgFreeBlock);
-#endif
 #endif
   return 1;