Changeset b54aa2d in git

Timestamp:

Mar 18, 2009, 7:49:55 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

44959aaf2c6ddbc722d23f97caa1beb1f2d4f88a

Parents:

ca371daac5696a1f6fdcee99b9318e2ed31316d1

Message:

*hannes: static binaries


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

Location:

kernel

Files:

• mminit.cc (modified) (3 diffs)
• mmstd.c (modified) (3 diffs)

kernel/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.2 2009-03-17 09:01:46 Singular Exp $ */
+/* $Id: mminit.cc,v 1.3 2009-03-18 18:49:55 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -32 +32 @@
     exit(1);
   }
+#if defined(HAVE_STATIC)
+void* si_malloc(size_t size);
+#endif
 }
 
@@ -45 +48 @@
     mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
 #else
+  #ifdef HAVE_STATIC
+    mp_set_memory_functions(si_malloc,reallocSize,freeSize);
+  #else
     mp_set_memory_functions(malloc,reallocSize,freeSize);
+  #endif
+
 #endif
     om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;

kernel/mmstd.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmstd.c,v 1.5 2009-03-17 09:01:46 Singular Exp $ */
+/* $Id: mmstd.c,v 1.6 2009-03-18 18:49:55 Singular Exp $ */
 /*
 * ABSTRACT: standard version of C-memory management alloc func 
@@ -18 +18 @@
 // on them
 // already provided in libomalloc
-#if !defined(OMALLOC_USES_MALLOC) && !defined(X_OMALLOC) && !defined(HAVE_STATIC)
+#if defined(HAVE_STATIC)
+void* si_malloc(size_t size)
+{
+  void* addr;
+  if (size == 0) size = 1;
+
+  omTypeAllocAligned(void*, addr, size);
+  OM_MARK_AS_STATIC(addr);
+  return addr;
+}
+
+void freeSize(void* addr, size_t size)
+{
+  if (addr) omFreeSize(addr, size);
+}
+
+void* reallocSize(void* old_addr, size_t old_size, size_t new_size)
+{
+  if (old_addr && new_size)
+  {
+   void* new_addr;
+    omTypeReallocAlignedSize(old_addr, old_size, void*, new_addr, new_size);
+    OM_MARK_AS_STATIC(new_addr);
+    return new_addr;
+  }
+  else
+  {
+    freeSize(old_addr, old_size);
+    return si_malloc(new_size);
+  }
+}
+#else
+#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 */
@@ -48 +80 @@
   }
 }
+
+#endif
 #endif