Changeset 3720 for branches/libc-0.6

Timestamp:

Mar 17, 2011, 10:19:43 PM (14 years ago)

Author:

bird

Message:

0.6: Backported r3719: posix_memalign: Fixed problem with large alignment values. Fixes #223.

File:

• branches/libc-0.6/src/emx/src/lib/malloc/ialloc.c (modified) (3 diffs)

branches/libc-0.6/src/emx/src/lib/malloc/ialloc.c

@@ -246 +246 @@
 
 /* Attempt to expand the heap to enable allocation of a lump of SIZE
-   bytes.  Return true iff successful. */
-
-static int _um_heap_expand (Heap_t h, size_t size)
+   bytes suitable for an ALIGN aligned allocation.  
+   Return true iff successful. */
+
+static int _um_heap_expand (Heap_t h, size_t size, size_t align)
 {
   size_t rsize, add_size;
@@ -259 +260 @@
     return 0;
 
-  rsize = _UM_ROUND_LUMP (size);
+  if (align < _UM_PAGE_SIZE / 2)
+    rsize = _UM_ROUND_LUMP (size);
+  else
+    rsize = _UM_ROUND_LUMP (size + align + align / 2);
   if (rsize >= _UM_MAX_SIZE)
     return 0;
@@ -292 +296 @@
   if (block != NULL)
     return block;
-  if (!_um_heap_expand (h, size))
+  if (!_um_heap_expand (h, size, align))
     return NULL;