Changeset 5374da in git

Timestamp:

Jun 14, 2011, 3:50:42 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

9189e93eec836e1bd1e7b9961d718cb4ecce03c9

Parents:

1b74f33756e72aff51761ea644ac69f9ea6861ff

Message:

libsingular stuff

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

Location:

Singular

Files:

• misc_ip.cc (modified) (5 diffs)
• tesths.cc (modified) (3 diffs)

Singular/misc_ip.cc

@@ -1055 +1055 @@
 const char *singular_date=__DATE__ " " __TIME__;
 
-int mmInit( void );
-int mmIsInitialized=mmInit();
-
 extern "C"
 {
@@ -1070 +1067 @@
 }
 
-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;
-}
-
 /*2
 * initialize components of Singular
@@ -1107 +1073 @@
 {
 #ifdef HAVE_FACTORY
+// factory default settings: -----------------------------------------------
   On(SW_USE_NTL);
   Off(SW_USE_GCD_P);
@@ -1118 +1085 @@
   On(SW_USE_QGCD);
   Off(SW_USE_NTL_SORT); // may be changed by an command line option
-#endif
-
+  factoryError=WerrorS;
+#endif
+
+// memory initialization: -----------------------------------------------
+    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
+
+// interpreter tables etc.: -----------------------------------------------
 #ifdef INIT_BUG
   jjInitTab1();
 #endif
-  /* initialize components */
-  factoryError=WerrorS;
-/*4 randomize: */
-  int t=initTimer();
-  /*t=(int)time(NULL);*/
-  if (t==0) t=1;
-  initRTimer();
-  siSeed=t;
-#ifdef HAVE_FACTORY
-  factoryseed(t);
-#endif
-  siRandomStart=t;
-/*4 private data of other modules*/
   memset(&sLastPrinted,0,sizeof(sleftv));
   sLastPrinted.rtyp=NONE;
-  feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
-
-  // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
-  // hack such that all shared' libs in the bindir are loaded correctly
-  feInitResources(name);
   extern int iiInitArithmetic();
   iiInitArithmetic();
-
   basePack=(package)omAlloc0(sizeof(*basePack));
   currPack=basePack;
@@ -1155 +1117 @@
   basePackHdl=h;
 
+// random generator: -----------------------------------------------
+  int t=initTimer();
+  if (t==0) t=1;
+  initRTimer();
+  siSeed=t;
+#ifdef HAVE_FACTORY
+  factoryseed(t);
+#endif
+  siRandomStart=t;
+  feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
+
+// ressource table: ----------------------------------------------------
+  // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
+  // hack such that all shared' libs in the bindir are loaded correctly
+  feInitResources(name);
+
+// singular links: --------------------------------------------------
   slStandardInit();
   myynest=0;
 
+// loading standard.lib -----------------------------------------------
   if (! feOptValue(FE_OPT_NO_STDLIB))
   {

Singular/tesths.cc

@@ -36 +36 @@
 #include <Singular/bbfan.h>
 #include <Singular/pyobject_setup.h>
+#include <omalloc/omalloc.h>
 
 
@@ -46 +47 @@
 
 #if ! defined(LIBSINGULAR)
+int mmInit( void )
+{
+#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 */
+    /* 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
+  return 1;
+}
+
+
 /*0 implementation*/
 int main(          /* main entry to Singular */
@@ -51 +66 @@
     char** argv)   /* parameter array */
 {
+  mmInit();
   // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
   omInitRet_2_Info(argv[0]);