Changeset e51781 in git

Timestamp:

Mar 31, 2017, 4:12:25 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

735b48d0599e2d14512034dc106eefa76e038991

Parents:

61145cc38c432ee38d9db52c5a952b1ed522ae9f

Message:

omalloc: malloc_usable_sie, malloc_size

Location:

omalloc

Files:

• configure.ac (modified) (3 diffs)
• omAllocEmulate.c (modified) (1 diff)
• omAllocSystem.c (modified) (6 diffs)
• omAllocSystem.h (modified) (1 diff)
• omMallocSystem.h (modified) (1 diff)

omalloc/configure.ac

@@ -145 +145 @@
 AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h /usr/include/malloc.h)
 
-AC_CHECK_FUNCS(popen mmap sbrk random)
+AC_CHECK_FUNCS(popen mmap sbrk random malloc_usable_size malloc_size)
 
 dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -188 +188 @@
   FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
-  fprintf(f, "%d\n", omalloc_getpagesize);
+  fprintf(f, "%d\n", (int)omalloc_getpagesize);
   exit(0);
 }], ac_cv_pagesize=`cat conftestval`, ac_cv_pagesize=0, ac_cv_pagesize=0))
@@ -296 +296 @@
 fi
 
-AC_MSG_CHECKING(whether malloc provides SizeOfAddr)
-if test "${ac_cv_malloc_sizeof_addr}" = no; then
-  AC_MSG_RESULT( (cached) no)
-elif test "${ac_cv_malloc_sizeof_addr}" = "${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}"; then
-   AC_MSG_RESULT( (cached) yes)
-else
-AC_TRY_RUN([
-#include <stdlib.h>
-#include "$OM_MALLOC_HEADER"
-#ifdef OM_HAVE_MALLOC_SOURCE
-#include "$OM_MALLOC_SOURCE"
-#endif
-
-int main()
-{
-  void* addr = OM_MALLOC_MALLOC(512);
-#ifdef OM_MALLOC_SIZEOF_ADDR
-  if (OM_MALLOC_SIZEOF_ADDR(addr) < 512)
-    exit(1);
-  exit(0);
-#else
-  exit(1);
-#endif
-}
-], ac_cv_malloc_sizeof_addr="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}", ac_cv_malloc_sizeof_addr=no, ac_cv_malloc_sizeof_addr=no)
-if test "${ac_cv_malloc_sizeof_addr}" = no; then
-AC_MSG_RESULT(no)
-else
-AC_MSG_RESULT(yes)
-fi
-fi
-if test "$ac_cv_malloc_sizeof_addr" != no; then
-AC_DEFINE(OM_MALLOC_PROVIDES_SIZEOF_ADDR,1,"Whether malloc provides SIZEOF_ADDR")
-fi
-
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 dnl check whether valloc is provided and that it works

omalloc/omAllocEmulate.c

@@ -31 +31 @@
 void* omEmulateRealloc0(void* o_addr, size_t n_size)
 {
-#ifdef OM_MALLOC_SIZEOF_ADDR
   size_t o_size = OM_MALLOC_SIZEOF_ADDR(o_addr);
-#endif
   void* addr = OM_MALLOC_REALLOC(o_addr, n_size);
-#ifdef OM_MALLOC_SIZEOF_ADDR
   if (n_size > o_size)
     memset((char *)addr + o_size, 0, n_size - o_size);
-#endif
   return addr;
 }

omalloc/omAllocSystem.c

@@ -29 +29 @@
  *******************************************************************/
 /* allocation of large addr */
-#if defined(OM_MALLOC_PROVIDES_SIZEOF_ADDR)
-#define _omSizeOfLargeAddr(addr) (OM_MALLOC_SIZEOF_ADDR(addr) & (~SIZEOF_OM_ALIGNMENT_1))
+#if defined(HAVE_MALLOC_SIZE)
+#define _omSizeOfLargeAddr(addr) (malloc_size(addr))
+#elif defined(HAVE_MALLOC_USABLE_SIZE)
+#define _omSizeOfLargeAddr(addr) (malloc_usable_size(addr))
 #else
 void* omAllocLarge(size_t size)
@@ -64 +66 @@
 
 #define _omSizeOfLargeAddr(addr)  (*((size_t*) ((char*) addr - SIZEOF_STRICT_ALIGNMENT)))
-#endif /* OM_MALLOC_PROVIDES_SIZEOF_ADDR */
+#endif /* HAVE_MALLOC_SIZE/HAVE_MALLOC_USABLE_SIZE */
 
 void* omAlloc0Large(size_t size)
@@ -97 +99 @@
 size_t omSizeOfAddr(const void* addr)
 {
+  /*if (addr==NULL) return 0; */
 
   return (omIsBinPageAddr(addr) ?
@@ -194 +197 @@
   }
 
+  size=omSizeOfAddr(ptr);
 #ifndef OM_NDEBUG
   if (((unsigned long) ptr) + size > om_MaxAddr)
@@ -234 +238 @@
   void* res;
 
+  oldsize=omSizeOfAddr(addr);
   res = OM_REALLOC_FROM_SYSTEM(addr, newsize);
   if (res == NULL)
@@ -250 +255 @@
     }
   }
+  newsize=omSizeOfAddr(res);
 
 #ifndef OM_NDEBUG

omalloc/omAllocSystem.h

@@ -27 +27 @@
 
 
-#ifdef OM_MALLOC_PROVIDES_SIZEOF_ADDR
-#define omAllocLarge(size)             omAllocFromSystem(OM_ALIGN_SIZE(size))
-#define omReallocLarge(addr, new_size) omReallocSizeFromSystem(addr, omSizeOfLargeAddr(addr), OM_ALIGN_SIZE(new_size))
+#if defined(HAVE_MALLOC_SIZE) || defined(HAVE_MALLOC_USABLE_SIZE)
+#define omAllocLarge(size)             omAllocFromSystem(size)
+#define omReallocLarge(addr, new_size) omReallocSizeFromSystem(addr, omSizeOfLargeAddr(addr), new_size)
 #define omFreeLarge(addr)              omFreeSizeToSystem(addr, omSizeOfLargeAddr(addr))
 #else

omalloc/omMallocSystem.h

@@ -14 +14 @@
 #define OM_MALLOC_VALLOC   valloc
 #define OM_MALLOC_VFREE(addr, size) OM_MALLOC_FREE(addr)
+#ifdef HAVE_MALLOC_SIZE
 /* the following will work under Mac OS X */
 #define OM_MALLOC_SIZEOF_ADDR(addr)  (malloc_size(addr))
+#elif (defined(HAVE_MALLOC_USABLE_SIZE))
+/* and this will work under Linux */
+#define OM_MALLOC_SIZEOF_ADDR(addr) (malloc_usable_size(addr))
+#else
+static inline OM_MALLOC_SIZEOF_ADDR(void *d) { long*dd=(long*)d; return *(dd-1); }
+#endif
 
 #endif /* OM_MALLOC_SYSTEM_H */