Changeset 9f82971 in git

Timestamp:

Nov 5, 2010, 12:02:15 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

088214122d919b931fc5e2a3bda1528332aedcc0

Parents:

ce2fa9e3304caaa51b9f2278ca19da5ae34105d0

Message:

init stuff moved to misc_ip.cc

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

Location:

Singular

Files:

• misc_ip.cc (modified) (1 diff)
• tesths.cc (modified) (1 diff)

Singular/misc_ip.cc

@@ -1074 +1074 @@
 }
 }
+
+const char *singular_date=__DATE__ " " __TIME__;
+
+int mmInit( void );
+int mmIsInitialized=mmInit();
+
+extern "C"
+{
+  void omSingOutOfMemoryFunc()
+  {
+    fprintf(stderr, "\nSingular error: 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 */
+#include <omalloc/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
+#ifndef __OPTIMIZE__
+    om_Opts.ErrorHook = dErrorBreak;
+#endif
+#endif
+    omInitInfo();
+#ifdef OM_SING_KEEP
+    om_Opts.Keep = OM_SING_KEEP;
+#endif
+  }
+  mmIsInitialized=1;
+  return 1;
+}
+
+#ifdef LIBSINGULAR
+int siInit(char *name)
+{
+  // hack such that all shared' libs in the bindir are loaded correctly
+  feInitResources(name);
+  iiInitArithmetic();
+
+#if 0
+  SingularBuilder::Ptr SingularInstance = SingularBuilder::instance();
+#else
+  basePack=(package)omAlloc0(sizeof(*basePack));
+  currPack=basePack;
+  idhdl h;
+  h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE);
+  IDPACKAGE(h)->language = LANG_TOP;
+  IDPACKAGE(h)=basePack;
+  currPackHdl=h;
+  basePackHdl=h;
+
+  slStandardInit();
+  myynest=0;
+#endif
+  if (! feOptValue(FE_OPT_NO_STDLIB))
+  {
+    int vv=verbose;
+    verbose &= ~Sy_bit(V_LOAD_LIB);
+    iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
+    verbose=vv;
+  }
+  errorreported = 0;
+}
+#endif
+

Singular/tesths.cc

@@ -40 +40 @@
 extern int iiInitArithmetic();
 
-const char *singular_date=__DATE__ " " __TIME__;
-
-#include <kernel/si_gmp.h>
-
-int mmInit( void );
-int mmIsInitialized=mmInit();
-
-extern "C"
-{
-  void omSingOutOfMemoryFunc()
-  {
-    fprintf(stderr, "\nSingular error: 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 */
-#include <omalloc/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
-#ifndef __OPTIMIZE__
-    om_Opts.ErrorHook = dErrorBreak;
-#endif
-#endif
-    omInitInfo();
-#ifdef OM_SING_KEEP
-    om_Opts.Keep = OM_SING_KEEP;
-#endif
-  }
-  mmIsInitialized=1;
-  return 1;
-}
-
-#ifdef LIBSINGULAR
-int siInit(char *name)
-{
-  // hack such that all shared' libs in the bindir are loaded correctly
-  feInitResources(name);
-  iiInitArithmetic();
-
-#if 0
-  SingularBuilder::Ptr SingularInstance = SingularBuilder::instance();
-#else
-  basePack=(package)omAlloc0(sizeof(*basePack));
-  currPack=basePack;
-  idhdl h;
-  h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE);
-  IDPACKAGE(h)->language = LANG_TOP;
-  IDPACKAGE(h)=basePack;
-  currPackHdl=h;
-  basePackHdl=h;
-
-  slStandardInit();
-  myynest=0;
-#endif
-  if (! feOptValue(FE_OPT_NO_STDLIB))
-  {
-    int vv=verbose;
-    verbose &= ~Sy_bit(V_LOAD_LIB);
-    iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
-    verbose=vv;
-  }
-  errorreported = 0;
-}
-#endif
-
 #if ! defined(LIBSINGULAR)
 /*0 implementation*/