Changeset a36f9e8 in git

Timestamp:

Jul 28, 2009, 5:22:04 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

1305eacb0ae9e37f13cfc9e1a6df9828bff15c3b

Parents:

4f673c00a1e6542d18d704394190f2ac7b88173f

Message:

*hannes: mminit->tesths.cc


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

File:

• Singular/tesths.cc (modified) (2 diffs)

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.117 2009-07-28 14:59:52 Singular Exp $ */
+/* $Id: tesths.cc,v 1.118 2009-07-28 15:22:04 Singular Exp $ */
 
 /*
@@ -40 +40 @@
 const char *singular_date=__DATE__ " " __TIME__;
 
+#include <si_gmp.h>
+
+int mmInit( void );
+int mmIsInitialized=mmInit();
+
+extern "C"
+{
+  void omSingOutOfMemoryFunc()
+  {
+    fprintf(stderr, "\nerror: no more memory\n");
+    omPrintStats(stderr);
+    m2_end(14);
+    /* should never get here */
+    exit(1);
+  }
+}
+
+int mmInit( void )
+{
+  if(mmIsInitialized==0)
+  {
+
+#ifndef LIBSINGULAR
+#if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
+    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
+    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
+    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
+    /* do not rely on the default in Singular as libsingular may be different */
+    mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
+#else
+    mp_set_memory_functions(malloc,reallocSize,freeSize);
+#endif
+#endif // ifndef LIBSINGULAR
+    om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;
+#ifndef OM_NDEBUG
+    om_Opts.ErrorHook = dErrorBreak;
+#endif
+    omInitInfo();
+#ifdef OM_SING_KEEP
+    om_Opts.Keep = OM_SING_KEEP;
+#endif
+  }
+  mmIsInitialized=1;
+  return 1;
+}
+
 #ifdef LIBSINGULAR
 int siInit(char *name)