Changeset 43568c in git

Timestamp:

Sep 12, 2011, 2:49:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

6a4ba5f0fcf1059eaa59fa2244712afede164f3c

Parents:

d6039dfbb647e2775d91661b9541f7600bf05058

git-author:

Martin Lee <martinlee84@web.de>2011-09-12 14:49:35+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:43+01:00

Message:

deleted memory manager of factory

Location:

factory

Files:

• NTLconvert.cc (modified) (1 diff)
• canonicalform.cc (modified) (2 diffs)
• configure.ac (modified) (7 diffs)
• initgmp.cc (modified) (1 diff)
• memman.h (deleted)
• memutil.c (deleted)
• memutil.h (deleted)
• mmalloc.c (deleted)
• mmallocb.c (deleted)
• mmallocs.c (deleted)
• mmblock.c (deleted)
• mmheap.c (deleted)
• mminit.c (deleted)
• mmprivate.h (deleted)
• mmspec.c (deleted)
• mmutil.c (deleted)
• newdelete.cc (modified) (3 diffs)

factory/NTLconvert.cc

@@ -41 +41 @@
 #define Alloc(L) omAlloc(L)
 #define Free(A,L) omFreeSize(A,L)
-#elif defined(USE_MEMUTIL)
-#include "memutil.h"
-#define Alloc(L) getBlock(L)
-#define Free(A,L) freeBlock(A,L)
 #else
 #define Alloc(L) malloc(L)

factory/canonicalform.cc

@@ -17 +17 @@
 #include "cf_binom.h"
 
-#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
-#include "memman.h"
-#endif
-
 #include "cf_gmp.h"
 
@@ -41 +37 @@
     static bool initialized = false;
     if ( ! initialized ) {
-#if (defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)) || defined (SINGULAR)
+#if defined (SINGULAR)
         (void)mmInit();
 #endif

factory/configure.ac

@@ -43 +43 @@
 
 
-AC_ARG_WITH(
-  memman,
-  [  --with-memman(=<memman>) specify Factory memory manager.
-                          <memman> is either \`old' (default), \`new', or \`no'.],
-  ,
-  [ if test "x$with_Singular" = xyes; then
-      with_memman=no
-    else
-      with_memman=old
-    fi ])
-
 # font-lock-trick: '
 
@@ -72 +61 @@
   ,
   [enable_streamio=no])
-
-AC_ARG_ENABLE(
-  memdebug,
-  [  --enable-memdebug=<level> switch on memory management debugging.  Meaningful
-                          with \`--with-memman=new' only.  <level> may be either
-                          \`no' (default), \`normal', or \`full'.],
-  ,
-  enable_memdebug=no)
 
 AC_ARG_ENABLE(
@@ -279 +260 @@
   factorysrc='$(basefactorysrc) $(singfactorysrc)'
   factoryincl='$(basefactoryincl) $(singfactoryincl)'
-  memmansrc=
-  memmanincl=
 
   alltargets=cf
@@ -290 +269 @@
   factorysrc='$(basefactorysrc)'
   factoryincl='$(basefactoryincl)'
-  memmansrc='$(basememmansrc)'
-  memmanincl=
 
   alltargets=cf
@@ -383 +360 @@
 if test "$with_omalloc" = yes; then
   AC_DEFINE([HAVE_OMALLOC],[1],[HAVE_OMALLOC])
-  with_memman=no 
 fi
 AC_MSG_RESULT($with_omalloc)
@@ -390 +366 @@
 fi
 
-    
-# memory manager
-if test "x$with_memman" = xyes; then
-  alltargets="$alltargets mem"
-  installtargets="$installtargets installmem"
-  uninstalltargets="$uninstalltargets uninstallmem"
-  AC_DEFINE([USE_MEMUTIL],[1],[USE_MEMUTIL])
-
-  if test "x$with_memman" != xnew; then
-    memmansrc="$memmansrc \$(oldmemmansrc)"
-    memmanincl='$(oldmemmanincl)'
-    AC_DEFINE([USE_OLD_MEMMAN],[1],[USE_OLD_MEMMAN])
-  else
-    memmansrc="$memmansrc \$(newmemmansrc)"
-    memmanincl='$(newmemmanincl)'
-
-    if test "x$enable_memdebug" = xfull; then
-      AC_DEFINE([MDEBUG], [1], [MDEBUG])
-    elif test "x$enable_memdebug" != xno; then
-      AC_DEFINE([MDEBUG], [0], [MDEBUG])
-    fi
-  fi
-fi
 
 # "configurable inline methods"
@@ -458 +411 @@
 AC_SUBST(factorysrc)
 AC_SUBST(factoryincl)
-AC_SUBST(memmansrc)
-AC_SUBST(memmanincl)
 
 AC_SUBST(alltargets)

factory/initgmp.cc

@@ -9 +9 @@
 
 #include "cf_defs.h"
-#ifdef USE_MEMUTIL
-#ifdef USE_OLD_MEMMAN
-#include "memutil.h"
-#else
-#include "memman.h"
-#endif
-#endif
-
-#ifdef USE_MEMUTIL
-#ifndef USE_OLD_MEMMAN
-#ifdef MDEBUG
-void * mgAllocBlock( size_t t)
-{
-  return mmDBAllocBlock(t,"gmp",0);
-}
-void mgFreeBlock( void* a, size_t t)
-{
-  mmDBFreeBlock(a,t,"gmp",0);
-}
-void * mgReallocBlock( void* a, size_t t1, size_t t2)
-{
-  return mmDBReallocBlock(a,t1,t2,"gmp",0);
-}
-#endif
-#endif
-#endif
 
 int initializeGMP()

factory/newdelete.cc

@@ -6 +6 @@
 
 #include "cf_assert.h"
-
-#ifdef USE_OLD_MEMMAN
-#include "memutil.h"
-#else
-#include "memman.h"
-#endif
 
 // The C++ standard has ratified a change to the new operator.
@@ -31 +25 @@
 // Most operating systems will have slowed to be unusable
 // long before the exception gets thrown.
-
-#ifdef USE_OLD_MEMMAN
-
-void * operator new ( size_t size )
-{
-    return getBlock( size );
-}
-
-void operator delete ( void * block )
-{
-    freeBlock( block, 0 );
-}
-
-void * operator new[] ( size_t size )
-{
-    return getBlock( size );
-}
-
-void operator delete[] ( void * block )
-{
-    freeBlock( block, 0 );
-}
-
-void * operator new(size_t size, std::nothrow_t) throw()
-{
-    return getBlock( size );
-}
-void * operator new[](size_t size, std::nothrow_t) throw()
-{
-    return getBlock( size );
-}
-
-#else
 
 void * operator new ( size_t size )
@@ -94 +55 @@
 }
 
-#endif /* USE_OLD_MEMMAN */