Changeset 715936 in git

Timestamp:

Sep 9, 2011, 7:41:13 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

f29ab6c2e7fe07c324d37a46dfb6a9760b4ecb66

Parents:

534886637bbc60712e1adffc56bba8346d98e245

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-09 19:41:13+02:00

git-committer:

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

Message:

FIX: omalloc should be configured with with-external-config_h=../Singular/omSingularConfig.h (?)
FIX: moved memory management to Singular/
FIX: mmstd.c should not provide mm/c/v -alloc & free (recursion problem!)

Files:

• Singular/makefile (modified) (3 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• Singular/mmalloc.h (moved) (moved from kernel/mmalloc.h)
• Singular/mmstd.c (moved) (moved from kernel/mmstd.c) (3 diffs)
• Singular/mpsr_GetMisc.cc (modified) (1 diff)
• Singular/test.cc (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• kernel/makefile (modified) (2 diffs)
• kernel/test.cc (modified) (2 diffs)
• omalloc/configure.ac (modified) (1 diff)
• omalloc/omConfig.h.in (modified) (1 diff)

Singular/makefile

@@ -145 +145 @@
 CXXSOURCES2     = SingularBuilder.cpp
 
-CSOURCES = fereadl.c
+CSOURCES = fereadl.c mmstd.c 
 
 SOURCES=${CSOURCES} ${CXXSOURCES} \
@@ -181 +181 @@
    minpoly.h \
    misc_ip.h \
+   mmalloc.h \
+   omSingularConfig.h \
    mpsr.h \
    mpsr_Get.h \
@@ -189 +191 @@
    ndbm.h \
    newstruct.h \
-   omSingularConfig.h \
    pcv.h \
    pipeLink.h \

Singular/misc_ip.cc

@@ -676 +676 @@
     v=v->next;
   } while (v!=NULL);
+   
   // set global variable to show memory usage
   extern int om_sing_opt_show_mem;
   if (BVERBOSE(V_SHOW_MEM)) om_sing_opt_show_mem = 1;
   else om_sing_opt_show_mem = 0;
+   
   return FALSE;
 }

Singular/mmstd.c

@@ -11 +11 @@
 
 #include <omalloc/omalloc.h>
-#include <Singular/static.h>
+#include <omalloc/config.h>
+#include <omalloc/omConfig.h>
+
+#include "static.h"
 
 // we provide these functions, so that the settings of OM_CHECK
@@ -18 +21 @@
 // already provided in libomalloc
 #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 */
+
+/* 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 */
 
 // define this so that all addr allocated there are marked 
@@ -27 +31 @@
 #define OM_MALLOC_MARK_AS_STATIC
 #define strdup_ strdup__
-#include <omalloc/omalloc.c>
+#include <omalloc/omalloc.c> /// UGLY!!!!!!!!!!!!!!!!
+
 #else
 #include <stdlib.h>

Singular/mpsr_GetMisc.cc

@@ -436 +436 @@
 #undef freeSize
 
-#include "kernel/mmalloc.h"
+#include "mmalloc.h"
 
 static int mpsr_is_initialized = 0;

Singular/test.cc

@@ -98 +98 @@
 #include <kernel/ratgring.h>
 #include <kernel/shiftgb.h>
-#include <kernel/mmalloc.h>
+#include "mmalloc.h"
 #include <kernel/gfan.h>
 
@@ -146 +146 @@
 
 // #include "lplist.h" // Too old!
-#include <kernel/mmalloc.h>
+#include "mmalloc.h"
 #include <kernel/multicnt.h>
 #include <kernel/npolygon.h>

configure.ac

@@ -1 +1 @@
 AC_INIT([singular], [3.1.2.sw])
+
 AC_CONFIG_AUX_DIR([.])
+
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE
@@ -13 +15 @@
 LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 
-AC_CONFIG_FILES([Makefile])
+
+#if test x$ac_configure_args != x; then
+#  old_ac_configure_args="$ac_configure_args"
+#  ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
+#else
+#  old_ac_configure_args=""
+#fi
+
+ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
+
 AC_CONFIG_SUBDIRS(omalloc)
+
+# ac_configure_args="$old_ac_configure_args"
+
 if test x$ENABLE_FACTORY = xyes; then
   AC_CONFIG_SUBDIRS(factory)
 fi
+
 AC_CONFIG_SUBDIRS(libpolys)
+
+AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([numeric/Makefile])
 

kernel/makefile

@@ -90 +90 @@
 
 # normal C source files
-CSOURCES=fegetopt.c mmstd.c
+CSOURCES = fegetopt.c
 
 # special C++ source files (need extra compiling and/or linking), for which
@@ -114 +114 @@
         fegetopt.h \
         ratgring.h shiftgb.h nc.h \
-        mmalloc.h \
         semic.h \
         gfan.h preimage.h

kernel/test.cc

@@ -95 +95 @@
 #include "ratgring.h"
 #include "shiftgb.h"
-#include "mmalloc.h"
+// #include "mmalloc.h" // move to Singular!?
 #include "gfan.h"
 
@@ -143 +143 @@
 
 // #include "lplist.h" // Too old!
-#include "mmalloc.h"
 #include "multicnt.h"
 #include "npolygon.h"

omalloc/configure.ac

@@ -574 +574 @@
 
 
+AC_DEFINE(OM_PROVIDE_MALLOC,0,[Provide NO standard routines!])
+
+
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll

omalloc/omConfig.h.in

@@ -96 +96 @@
 #endif
 
+/* Provide NO standard routines! */
+#ifndef OM_PROVIDE_MALLOC
+#undef OM_PROVIDE_MALLOC
+#endif
+
 /* "Disable debug" */
 #ifndef OM_NDEBUG