Libc-391.5.21.tar.gz

[apple/libc.git] / gen / malloc.c

diff --git a/gen/malloc.c b/gen/malloc.c
index 1261d58b92e6bdf5f3a5b51f91ebff5551c8d58a..44e770584aa28794aca28427877f761753bb5a58 100644 (file)
--- a/gen/malloc.c
+++ b/gen/malloc.c
@@ -3,39 +3,42 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  

-#define __POSIX_LIB__
+#include <pthread_internals.h>
+

 #import <stdlib.h>
 #import <stdio.h>
 #import <string.h>
 #import <unistd.h>
 #import <objc/zone.h>
 #import <stdlib.h>
 #import <stdio.h>
 #import <string.h>
 #import <unistd.h>
 #import <objc/zone.h>

-#import <pthread_internals.h>  // for spin lock
-#import <objc/malloc.h>
-#include <crt_externs.h>
+#import <malloc/malloc.h>
+#import <fcntl.h>
+#import <crt_externs.h>
+#import <errno.h>
+#import <pthread_internals.h>

 
 #import "scalable_malloc.h"
 #import "stack_logging.h"
 
 #define USE_SLEEP_RATHER_THAN_ABORT    0
 
 
 #import "scalable_malloc.h"
 #import "stack_logging.h"
 
 #define USE_SLEEP_RATHER_THAN_ABORT    0
 

-#define MAX_ALLOCATION 0xc0000000 // beyond this, assume a programming error

 #define INITIAL_ZONES  8  // After this number, we reallocate for new zones
 
 typedef void (malloc_logger_t)(unsigned type, unsigned arg1, unsigned arg2, unsigned arg3, unsigned result, unsigned num_hot_frames_to_skip);
 #define INITIAL_ZONES  8  // After this number, we reallocate for new zones
 
 typedef void (malloc_logger_t)(unsigned type, unsigned arg1, unsigned arg2, unsigned arg3, unsigned result, unsigned num_hot_frames_to_skip);


@@ -54,6 +57,13 @@ unsigned malloc_check_start = 0; // 0 means don't check
 unsigned malloc_check_counter = 0;
 unsigned malloc_check_each = 1000;
 
 unsigned malloc_check_counter = 0;
 unsigned malloc_check_each = 1000;
 

+static int malloc_check_sleep = 100; // default 100 second sleep
+static int malloc_check_abort = 0; // default is to sleep, not abort
+
+static int malloc_free_abort = 0; // default is not to abort
+
+static int malloc_debug_file;
+

 #define MALLOC_LOCK()          LOCK(_malloc_lock)
 #define MALLOC_UNLOCK()                UNLOCK(_malloc_lock)
 
 #define MALLOC_LOCK()          LOCK(_malloc_lock)
 #define MALLOC_UNLOCK()                UNLOCK(_malloc_lock)
 


@@ -64,7 +74,9 @@ unsigned malloc_check_each = 1000;
 
 /*********     Utilities       ************/
 
 
 /*********     Utilities       ************/
 

-static inline malloc_zone_t *find_registered_zone(const void *ptr, size_t *returned_size) {
+static inline malloc_zone_t * find_registered_zone(const void *, size_t *) __attribute__((always_inline));
+static inline malloc_zone_t *
+find_registered_zone(const void *ptr, size_t *returned_size) {

     // locates the proper zone
     // if zone found fills returnedSize; else returns NULL
     // See comment in malloc_zone_register() about clients non locking to call this function
     // locates the proper zone
     // if zone found fills returnedSize; else returns NULL
     // See comment in malloc_zone_register() about clients non locking to call this function


@@ -85,37 +97,54 @@ static inline malloc_zone_t *find_registered_zone(const void *ptr, size_t *retur
 
 /*********     Creation and destruction        ************/
 
 
 /*********     Creation and destruction        ************/
 

-static void _malloc_initialize(void) {
+static void
+_malloc_initialize(void) {

     // guaranteed to be called only once
     (void)malloc_create_zone(0, 0);
     malloc_set_zone_name(malloc_zones[0], "DefaultMallocZone");
     LOCK_INIT(_malloc_lock);
     // guaranteed to be called only once
     (void)malloc_create_zone(0, 0);
     malloc_set_zone_name(malloc_zones[0], "DefaultMallocZone");
     LOCK_INIT(_malloc_lock);

-    // malloc_printf("Malloc: %d registered zones\n", malloc_num_zones);
-    // malloc_printf("malloc: malloc_zones is at 0x%x; malloc_num_zones is at 0x%x\n", (unsigned)&malloc_zones, (unsigned)&malloc_num_zones);
+    // malloc_printf("%d registered zones\n", malloc_num_zones);
+    // malloc_printf("malloc_zones is at %p; malloc_num_zones is at %p\n", (unsigned)&malloc_zones, (unsigned)&malloc_num_zones);

 }
 
 }
 

-static inline malloc_zone_t *inline_malloc_default_zone(void) {
+static inline malloc_zone_t *inline_malloc_default_zone(void) __attribute__((always_inline));
+static inline malloc_zone_t *
+inline_malloc_default_zone(void) {

     if (!malloc_num_zones) _malloc_initialize();
     // malloc_printf("In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
     return malloc_zones[0];
 }
 
     if (!malloc_num_zones) _malloc_initialize();
     // malloc_printf("In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
     return malloc_zones[0];
 }
 

-malloc_zone_t *malloc_default_zone(void) {
+malloc_zone_t *
+malloc_default_zone(void) {

     return inline_malloc_default_zone();
 }
 
     return inline_malloc_default_zone();
 }
 

-static void set_flags_from_environment(void) {
+static void
+set_flags_from_environment(void) {

     const char *flag;
     const char *flag;

+    int fd;
+
+    flag = getenv("MallocLogFile");
+    if (flag) {
+       fd = open(flag, O_WRONLY|O_APPEND|O_CREAT, 0644);
+       if (fd >= 0) {
+           malloc_debug_file = fd;
+          fcntl(fd, F_SETFD, 0); // clear close-on-exec flag  XXX why?
+       } else {
+           malloc_printf("Could not open %s, using stderr\n", flag);
+       }
+    }

     if (getenv("MallocGuardEdges")) {
        malloc_debug_flags = SCALABLE_MALLOC_ADD_GUARD_PAGES;
     if (getenv("MallocGuardEdges")) {
        malloc_debug_flags = SCALABLE_MALLOC_ADD_GUARD_PAGES;

-       malloc_printf("malloc[%d]: protecting edges\n", getpid());
+       malloc_printf("protecting edges\n");

        if (getenv("MallocDoNotProtectPrelude")) {
            malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_PRELUDE;
        if (getenv("MallocDoNotProtectPrelude")) {
            malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_PRELUDE;

-           malloc_printf("malloc[%d]: ... but not protecting prelude guard page\n", getpid());
+           malloc_printf("... but not protecting prelude guard page\n");

        }
        if (getenv("MallocDoNotProtectPostlude")) {
            malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_POSTLUDE;
        }
        if (getenv("MallocDoNotProtectPostlude")) {
            malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_POSTLUDE;

-           malloc_printf("malloc[%d]: ... but not protecting postlude guard page\n", getpid());
+           malloc_printf("... but not protecting postlude guard page\n");

        }
     }
     flag = getenv("MallocStackLogging");
        }
     }
     flag = getenv("MallocStackLogging");


@@ -130,15 +159,15 @@ static void set_flags_from_environment(void) {
        malloc_logger = (val) ? (void *)val : stack_logging_log_stack;
        stack_logging_enable_logging = 1;
        if (malloc_logger == stack_logging_log_stack) {
        malloc_logger = (val) ? (void *)val : stack_logging_log_stack;
        stack_logging_enable_logging = 1;
        if (malloc_logger == stack_logging_log_stack) {

-           malloc_printf("malloc[%d]: recording stacks using standard recorder\n", getpid());
+           malloc_printf("recording stacks using standard recorder\n");

        } else {
        } else {

-           malloc_printf("malloc[%d]: recording stacks using recorder %p\n", getpid(), malloc_logger);
+           malloc_printf("recording stacks using recorder %p\n", malloc_logger);

        }
        }

-       if (stack_logging_dontcompact) malloc_printf("malloc[%d]: stack logging compaction turned off; VM can increase rapidly\n", getpid());
+       if (stack_logging_dontcompact) malloc_printf("stack logging compaction turned off; VM can increase rapidly\n");

     }
     if (getenv("MallocScribble")) {
        malloc_debug_flags |= SCALABLE_MALLOC_DO_SCRIBBLE;
     }
     if (getenv("MallocScribble")) {
        malloc_debug_flags |= SCALABLE_MALLOC_DO_SCRIBBLE;

-       malloc_printf("malloc[%d]: enabling scribbling to detect mods to free blocks\n", getpid());
+       malloc_printf("enabling scribbling to detect mods to free blocks\n");

     }
     flag = getenv("MallocCheckHeapStart");
     if (flag) {
     }
     flag = getenv("MallocCheckHeapStart");
     if (flag) {


@@ -151,50 +180,88 @@ static void set_flags_from_environment(void) {
            if (malloc_check_each == 0) malloc_check_each = 1;
            if (malloc_check_each == -1) malloc_check_each = 1;
        }
            if (malloc_check_each == 0) malloc_check_each = 1;
            if (malloc_check_each == -1) malloc_check_each = 1;
        }

-       malloc_printf("malloc[%d]: checks heap after %dth operation and each %d operations\n", getpid(), malloc_check_start, malloc_check_each);
+       malloc_printf("checks heap after %dth operation and each %d operations\n", malloc_check_start, malloc_check_each);
+       flag = getenv("MallocCheckHeapAbort");
+       if (flag)
+           malloc_check_abort = strtol(flag, NULL, 0);
+       if (malloc_check_abort)
+           malloc_printf("will abort on heap corruption\n");
+       else {
+           flag = getenv("MallocCheckHeapSleep");
+           if (flag)
+               malloc_check_sleep = strtol(flag, NULL, 0);
+           if (malloc_check_sleep > 0)
+               malloc_printf("will sleep for %d seconds on heap corruption\n", malloc_check_sleep);
+           else if (malloc_check_sleep < 0)
+               malloc_printf("will sleep once for %d seconds on heap corruption\n", -malloc_check_sleep);
+           else
+               malloc_printf("no sleep on heap corruption\n");
+       }

     }
     }

+    flag = getenv("MallocBadFreeAbort");
+    if (flag)
+       malloc_free_abort = strtol(flag, NULL, 0);

     if (getenv("MallocHelp")) {
        malloc_printf(
     if (getenv("MallocHelp")) {
        malloc_printf(

-           "malloc[%d]: environment variables that can be set for debug:\n"
+           "environment variables that can be set for debug:\n"
+           "- MallocLogFile <f> to create/append messages to file <f> instead of stderr\n"

            "- MallocGuardEdges to add 2 guard pages for each large block\n"
            "- MallocDoNotProtectPrelude to disable protection (when previous flag set)\n"
            "- MallocDoNotProtectPostlude to disable protection (when previous flag set)\n"
            "- MallocStackLogging to record all stacks.  Tools like leaks can then be applied\n"
            "- MallocStackLoggingNoCompact to record all stacks.  Needed for malloc_history\n"
            "- MallocGuardEdges to add 2 guard pages for each large block\n"
            "- MallocDoNotProtectPrelude to disable protection (when previous flag set)\n"
            "- MallocDoNotProtectPostlude to disable protection (when previous flag set)\n"
            "- MallocStackLogging to record all stacks.  Tools like leaks can then be applied\n"
            "- MallocStackLoggingNoCompact to record all stacks.  Needed for malloc_history\n"

-           "- MallocScribble to detect writing on free blocks: 0x55 is written upon free\n"
-           "- MallocCheckHeapStart <n> to check the heap from time to time after <n> operations \n"
-           "- MallocHelp - this help!\n", getpid());
+           "- MallocScribble to detect writing on free blocks and missing initializers:\n"
+           "  0x55 is written upon free and 0xaa is written on allocation\n"
+           "- MallocCheckHeapStart <n> to start checking the heap after <n> operations\n"
+           "- MallocCheckHeapEach <s> to repeat the checking of the heap after <s> operations\n"
+           "- MallocCheckHeapSleep <t> to sleep <t> seconds on heap corruption\n"
+           "- MallocCheckHeapAbort <b> to abort on heap corruption if <b> is non-zero\n"
+           "- MallocBadFreeAbort <b> to abort on a bad free if <b> is non-zero\n"
+           "- MallocHelp - this help!\n");

     }
 }
 
     }
 }
 

-malloc_zone_t *malloc_create_zone(vm_size_t start_size, unsigned flags) {
+malloc_zone_t *
+malloc_create_zone(vm_size_t start_size, unsigned flags)
+{

     malloc_zone_t      *zone;
     malloc_zone_t      *zone;

+

     if (!malloc_num_zones) {
        char    **env = * _NSGetEnviron();
        char    **p;
        char    *c;
     if (!malloc_num_zones) {
        char    **env = * _NSGetEnviron();
        char    **p;
        char    *c;

-       /* Given that all environment variables start with "Malloc" we optimize by scanning quickly first the environment, therefore avoiding repeated calls to getenv() */
+
+       malloc_debug_file = STDERR_FILENO;
+       
+       /*
+        * Given that all environment variables start with "Malloc" we optimize by scanning quickly
+        * first the environment, therefore avoiding repeated calls to getenv().
+        * If we are setu/gid these flags are ignored to prevent a malicious invoker from changing
+        * our behaviour.
+        */

        for (p = env; (c = *p) != NULL; ++p) {
            if (!strncmp(c, "Malloc", 6)) {
        for (p = env; (c = *p) != NULL; ++p) {
            if (!strncmp(c, "Malloc", 6)) {

-               set_flags_from_environment(); 
+               if (!issetugid())
+                   set_flags_from_environment(); 

                break;
            }
        }
                break;
            }
        }

-

     }
     zone = create_scalable_zone(start_size, malloc_debug_flags);
     malloc_zone_register(zone);
     return zone;
 }
 
     }
     zone = create_scalable_zone(start_size, malloc_debug_flags);
     malloc_zone_register(zone);
     return zone;
 }
 

-void malloc_destroy_zone(malloc_zone_t *zone) {
+void
+malloc_destroy_zone(malloc_zone_t *zone) {

     malloc_zone_unregister(zone);
     zone->destroy(zone);
 }
 
 /*********     Block creation and manipulation ************/
 
     malloc_zone_unregister(zone);
     zone->destroy(zone);
 }
 
 /*********     Block creation and manipulation ************/
 

-static void internal_check(void) {
+static void
+internal_check(void) {

     static vm_address_t        *frames = NULL;
     static unsigned    num_frames;
     if (malloc_zone_check(NULL)) {
     static vm_address_t        *frames = NULL;
     static unsigned    num_frames;
     if (malloc_zone_check(NULL)) {


@@ -206,7 +273,7 @@ static void internal_check(void) {
        if (frames) {
            unsigned    index = 1;
            malloc_printf("Stack for last operation where the malloc check succeeded: ");
        if (frames) {
            unsigned    index = 1;
            malloc_printf("Stack for last operation where the malloc check succeeded: ");

-           while (index < num_frames) malloc_printf("0x%x ", frames[index++]);
+           while (index < num_frames) malloc_printf("%p ", frames[index++]);

            malloc_printf("\n(Use 'atos' for a symbolic stack)\n");
        }
        if (malloc_check_each > 1) {
            malloc_printf("\n(Use 'atos' for a symbolic stack)\n");
        }
        if (malloc_check_each > 1) {


@@ -214,19 +281,25 @@ static void internal_check(void) {
            unsigned    recomm_start = (malloc_check_counter > malloc_check_each+1) ? malloc_check_counter-1-malloc_check_each : 1;
            malloc_printf("*** Recommend using 'setenv MallocCheckHeapStart %d; setenv MallocCheckHeapEach %d' to narrow down failure\n", recomm_start, recomm_each);
        }
            unsigned    recomm_start = (malloc_check_counter > malloc_check_each+1) ? malloc_check_counter-1-malloc_check_each : 1;
            malloc_printf("*** Recommend using 'setenv MallocCheckHeapStart %d; setenv MallocCheckHeapEach %d' to narrow down failure\n", recomm_start, recomm_each);
        }

-       malloc_printf("*** Sleeping for 100 seconds to leave time to attach\n");
-       sleep(100);
+       if (malloc_check_abort)
+           abort();
+       if (malloc_check_sleep > 0) {
+           malloc_printf("*** Sleeping for %d seconds to leave time to attach\n",
+               malloc_check_sleep);
+           sleep(malloc_check_sleep);
+       } else if (malloc_check_sleep < 0) {
+           malloc_printf("*** Sleeping once for %d seconds to leave time to attach\n",
+               -malloc_check_sleep);
+           sleep(-malloc_check_sleep);
+           malloc_check_sleep = 0;
+       }

     }
     malloc_check_start += malloc_check_each;
 }
 
     }
     malloc_check_start += malloc_check_each;
 }
 

-void *malloc_zone_malloc(malloc_zone_t *zone, size_t size) {
+void *
+malloc_zone_malloc(malloc_zone_t *zone, size_t size) {

     void       *ptr;
     void       *ptr;

-    if ((unsigned)size >= MAX_ALLOCATION) {
-        /* Probably a programming error */
-        fprintf(stderr, "*** malloc_zone_malloc[%d]: argument too large: %d\n", getpid(), (unsigned)size);
-        return NULL;
-    }

     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }


@@ -235,28 +308,20 @@ void *malloc_zone_malloc(malloc_zone_t *zone, size_t size) {
     return ptr;
 }
 
     return ptr;
 }
 

-void *malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size) {
+void *
+malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size) {

     void       *ptr;
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }
     void       *ptr;
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }

-    if (((unsigned)num_items >= MAX_ALLOCATION) || ((unsigned)size >= MAX_ALLOCATION) || ((long long)size * num_items >= (long long) MAX_ALLOCATION)) {
-        /* Probably a programming error */
-        fprintf(stderr, "*** malloc_zone_calloc[%d]: arguments too large: %d,%d\n", getpid(), (unsigned)num_items, (unsigned)size);
-        return NULL;
-    }

     ptr = zone->calloc(zone, num_items, size);
     if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED, (unsigned)zone, num_items * size, 0, (unsigned)ptr, 0);
     return ptr;
 }
 
     ptr = zone->calloc(zone, num_items, size);
     if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED, (unsigned)zone, num_items * size, 0, (unsigned)ptr, 0);
     return ptr;
 }
 

-void *malloc_zone_valloc(malloc_zone_t *zone, size_t size) {
+void *
+malloc_zone_valloc(malloc_zone_t *zone, size_t size) {

     void       *ptr;
     void       *ptr;

-    if ((unsigned)size >= MAX_ALLOCATION) {
-        /* Probably a programming error */
-        fprintf(stderr, "*** malloc_zone_valloc[%d]: argument too large: %d\n", getpid(), (unsigned)size);
-        return NULL;
-    }

     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     }


@@ -265,7 +330,8 @@ void *malloc_zone_valloc(malloc_zone_t *zone, size_t size) {
     return ptr;
 }
 
     return ptr;
 }
 

-void *malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size) {
+void *
+malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size) {

     void       *new_ptr;
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     void       *new_ptr;
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();


@@ -275,7 +341,8 @@ void *malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size) {
     return new_ptr;
 }
 
     return new_ptr;
 }
 

-void malloc_zone_free(malloc_zone_t *zone, void *ptr) {
+void
+malloc_zone_free(malloc_zone_t *zone, void *ptr) {

     if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)ptr, 0, 0, 0);
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();
     if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)ptr, 0, 0, 0);
     if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
        internal_check();


@@ -283,7 +350,8 @@ void malloc_zone_free(malloc_zone_t *zone, void *ptr) {
     zone->free(zone, ptr);
 }
 
     zone->free(zone, ptr);
 }
 

-malloc_zone_t *malloc_zone_from_ptr(const void *ptr) {
+malloc_zone_t *
+malloc_zone_from_ptr(const void *ptr) {

     malloc_zone_t      *zone;
     if (!ptr) return NULL;
     zone = find_registered_zone(ptr, NULL);
     malloc_zone_t      *zone;
     if (!ptr) return NULL;
     zone = find_registered_zone(ptr, NULL);


@@ -292,7 +360,8 @@ malloc_zone_t *malloc_zone_from_ptr(const void *ptr) {
 
 /*********     Functions for zone implementors ************/
 
 
 /*********     Functions for zone implementors ************/
 

-void malloc_zone_register(malloc_zone_t *zone) {
+void
+malloc_zone_register(malloc_zone_t *zone) {

     /* Note that given the sequencing it is always safe to first get the number of zones, then get malloc_zones without taking the lock, if all you need is to iterate through the list */
     MALLOC_LOCK();
     if (malloc_num_zones >= INITIAL_ZONES) {
     /* Note that given the sequencing it is always safe to first get the number of zones, then get malloc_zones without taking the lock, if all you need is to iterate through the list */
     MALLOC_LOCK();
     if (malloc_num_zones >= INITIAL_ZONES) {


@@ -312,7 +381,8 @@ void malloc_zone_register(malloc_zone_t *zone) {
     // malloc_printf("Registered %p malloc_zones at address %p is %p [%d zones]\n", zone, &malloc_zones, malloc_zones, malloc_num_zones);
 }
 
     // malloc_printf("Registered %p malloc_zones at address %p is %p [%d zones]\n", zone, &malloc_zones, malloc_zones, malloc_num_zones);
 }
 

-void malloc_zone_unregister(malloc_zone_t *z) {
+void
+malloc_zone_unregister(malloc_zone_t *z) {

     unsigned   index;
     MALLOC_LOCK();
     index = malloc_num_zones;
     unsigned   index;
     MALLOC_LOCK();
     index = malloc_num_zones;


@@ -325,10 +395,11 @@ void malloc_zone_unregister(malloc_zone_t *z) {
         }
     }
     MALLOC_UNLOCK();
         }
     }
     MALLOC_UNLOCK();

-    fprintf(stderr, "*** malloc[%d]: malloc_zone_unregister() failed for %p\n", getpid(), z);
+    malloc_printf("*** malloc_zone_unregister() failed for %p\n", z);

 }
 
 }
 

-void malloc_set_zone_name(malloc_zone_t *z, const char *name) {
+void
+malloc_set_zone_name(malloc_zone_t *z, const char *name) {

     char       *newName;
     if (z->zone_name) {
         free((char *)z->zone_name);
     char       *newName;
     if (z->zone_name) {
         free((char *)z->zone_name);


@@ -339,115 +410,175 @@ void malloc_set_zone_name(malloc_zone_t *z, const char *name) {
     z->zone_name = (const char *)newName;
 }
 
     z->zone_name = (const char *)newName;
 }
 

-const char *malloc_get_zone_name(malloc_zone_t *zone) {
+const char *
+malloc_get_zone_name(malloc_zone_t *zone) {

     return zone->zone_name;
 }
 
     return zone->zone_name;
 }
 

-static char *_malloc_append_unsigned(unsigned value, unsigned base, char *head) {
-    if (!value) {
-        head[0] = '0';
+/*
+ * XXX malloc_printf now uses _simple_{,v}dprintf.  It only deals with a
+ * subset of printf format specifiers, but it doesn't call malloc.
+ */
+void _simple_dprintf(int, const char *, ...);
+void _simple_vdprintf(int, const char *, va_list);
+
+void
+malloc_printf(const char *format, ...)
+{
+    va_list ap;
+
+    if (__is_threaded) {
+       /* XXX somewhat rude 'knowing' that pthread_t is a pointer */
+       _simple_dprintf(malloc_debug_file, "%s(%d,%p) malloc: ", getprogname(), getpid(), (void *)pthread_self());

     } else {
     } else {

-        if (value >= base) head = _malloc_append_unsigned(value / base, base, head);
-        value = value % base;
-        head[0] = (value < 10) ? '0' + value : 'a' + value - 10;
-    }
-    return head+1;
-}
-
-void malloc_printf(const char *format, ...) {
-    va_list    args;
-    char       buf[1024];
-    char       *head = buf;
-    char       ch;
-    unsigned   *nums;
-    va_start(args, format);
-#if LOG_THREAD
-    head = _malloc_append_unsigned(((unsigned)&args) >> 12, 16, head);
-    *head++ = ' ';
-#endif
-    nums = args;
-    while (ch = *format++) {
-        if (ch == '%') {
-            ch = *format++;
-            if (ch == 's') {
-                char   *str = (char *)(*nums++);
-                write(2, buf, head - buf);
-                head = buf;
-                write(2, str, strlen(str));
-            } else {
-                if (ch == 'p') {
-                    *head++ = '0'; *head++ = 'x';
-                }
-                head = _malloc_append_unsigned(*nums++, (ch == 'd') ? 10 : 16, head);
-            }
-        } else {
-            *head++ = ch;
-        }
+       _simple_dprintf(malloc_debug_file, "%s(%d) malloc: ", getprogname(), getpid());

     }
     }

-    write(2, buf, head - buf); fflush(stderr);
-    va_end(args);
+    va_start(ap, format);
+    _simple_vdprintf(malloc_debug_file, format, ap);
+    va_end(ap);

 }
 
 /*********     Generic ANSI callouts   ************/
 
 }
 
 /*********     Generic ANSI callouts   ************/
 

-void *malloc(size_t size) {
-    return malloc_zone_malloc(inline_malloc_default_zone(), size);
+void *
+malloc(size_t size) {
+    void       *retval;
+    retval = malloc_zone_malloc(inline_malloc_default_zone(), size);
+    if (retval == NULL) {
+       errno = ENOMEM;
+    }
+    return retval;

 }
 
 }
 

-void *calloc(size_t num_items, size_t size) {
-    return malloc_zone_calloc(inline_malloc_default_zone(), num_items, size);
+void *
+calloc(size_t num_items, size_t size) {
+    void       *retval;
+    retval = malloc_zone_calloc(inline_malloc_default_zone(), num_items, size);
+    if (retval == NULL) {
+       errno = ENOMEM;
+    }
+    return retval;

 }
 
 }
 

-void free(void *ptr) {
+void
+free(void *ptr) {

     malloc_zone_t      *zone;
     if (!ptr) return;
     zone = find_registered_zone(ptr, NULL);
     if (zone) {
         malloc_zone_free(zone, ptr);
     } else {
     malloc_zone_t      *zone;
     if (!ptr) return;
     zone = find_registered_zone(ptr, NULL);
     if (zone) {
         malloc_zone_free(zone, ptr);
     } else {

-        fprintf(stderr, "*** malloc[%d]: Deallocation of a pointer not malloced: %p; This could be a double free(), or free() called with the middle of an allocated block; Try setting environment variable MallocHelp to see tools to help debug\n", getpid(), ptr);
+        malloc_printf("***  Deallocation of a pointer not malloced: %p; "
+         "This could be a double free(), or free() called with the middle of an allocated block; "
+         "Try setting environment variable MallocHelp to see tools to help debug\n", ptr);
+       if (malloc_free_abort)
+           abort();

     }
 }
 
     }
 }
 

-void *realloc(void *old_ptr, size_t new_size) {
+void *
+realloc(void *old_ptr, size_t new_size) {
+    void       *retval;

     malloc_zone_t      *zone;
     size_t     old_size = 0;
     malloc_zone_t      *zone;
     size_t     old_size = 0;

-    if (!old_ptr) return malloc_zone_malloc(inline_malloc_default_zone(), new_size);
-    zone = find_registered_zone(old_ptr, &old_size);
-    if (zone && (old_size >= new_size)) return old_ptr;
-    if (!zone) zone = inline_malloc_default_zone();
-    return malloc_zone_realloc(zone, old_ptr, new_size);
+    if (!old_ptr) {
+       retval = malloc_zone_malloc(inline_malloc_default_zone(), new_size);
+    } else {
+       zone = find_registered_zone(old_ptr, &old_size);
+       if (zone && (old_size >= new_size)) return old_ptr;
+       if (!zone) zone = inline_malloc_default_zone();
+       retval = malloc_zone_realloc(zone, old_ptr, new_size);
+    }
+    if (retval == NULL) {
+       errno = ENOMEM;
+    }
+    return retval;

 }
 
 }
 

-void *valloc(size_t size) {
+void *
+valloc(size_t size) {
+    void       *retval;

     malloc_zone_t      *zone = inline_malloc_default_zone();
     malloc_zone_t      *zone = inline_malloc_default_zone();

-    return malloc_zone_valloc(zone, size);
+    retval = malloc_zone_valloc(zone, size);
+    if (retval == NULL) {
+       errno = ENOMEM;
+    }
+    return retval;

 }
 
 }
 

-extern void vfree(void *ptr) {
+extern void
+vfree(void *ptr) {

     free(ptr);
 }
 
     free(ptr);
 }
 

-size_t malloc_size(const void *ptr) {
+size_t
+malloc_size(const void *ptr) {

     size_t     size = 0;
     if (!ptr) return size;
     (void)find_registered_zone(ptr, &size);
     return size;
 }
 
     size_t     size = 0;
     if (!ptr) return size;
     (void)find_registered_zone(ptr, &size);
     return size;
 }
 

-size_t malloc_good_size (size_t size) {
+size_t
+malloc_good_size (size_t size) {

     malloc_zone_t      *zone = inline_malloc_default_zone();
     return zone->introspect->good_size(zone, size);
 }
 
     malloc_zone_t      *zone = inline_malloc_default_zone();
     return zone->introspect->good_size(zone, size);
 }
 

+/*********     Batch methods   ************/
+
+unsigned
+malloc_zone_batch_malloc(malloc_zone_t *zone, size_t size, void **results, unsigned num_requested) {
+    unsigned   (*batch_malloc)(malloc_zone_t *, size_t, void **, unsigned) = zone-> batch_malloc;
+    if (! batch_malloc) return 0;
+    if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
+       internal_check();
+    }
+    unsigned   batched = batch_malloc(zone, size, results, num_requested);
+    if (malloc_logger) {
+       unsigned        index = 0;
+       while (index < batched) {
+           malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, size, 0, (unsigned)results[index], 0);
+           index++;
+       }
+    }
+    return batched;
+}
+
+void
+malloc_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned num) {
+    if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
+       internal_check();
+    }
+    if (malloc_logger) {
+       unsigned        index = 0;
+       while (index < num) {
+           malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)to_be_freed[index], 0, 0, 0);
+           index++;
+       }
+    }
+    void       (*batch_free)(malloc_zone_t *, void **, unsigned) = zone-> batch_free;
+    if (batch_free) {
+       batch_free(zone, to_be_freed, num);
+    } else {
+       void    (*free_fun)(malloc_zone_t *, void *) = zone->free;
+       while (num--) {
+           void        *ptr = *to_be_freed++;
+           free_fun(zone, ptr);
+       }
+    }
+}
+

 /*********     Functions for performance tools ************/
 
 /*********     Functions for performance tools ************/
 

-static kern_return_t _malloc_default_reader(task_t task, vm_address_t address, vm_size_t size, void **ptr) {
+static kern_return_t
+_malloc_default_reader(task_t task, vm_address_t address, vm_size_t size, void **ptr) {

     *ptr = (void *)address;
     return 0;
 }
 
     *ptr = (void *)address;
     return 0;
 }
 

-kern_return_t malloc_get_all_zones(task_t task, memory_reader_t reader, vm_address_t **addresses, unsigned *count) {
+kern_return_t
+malloc_get_all_zones(task_t task, memory_reader_t reader, vm_address_t **addresses, unsigned *count) {

     // Note that the 2 following addresses are not correct if the address of the target is different from your own.  This notably occurs if the address of System.framework is slid (e.g. different than at B & I )
     vm_address_t       remote_malloc_zones = (vm_address_t)&malloc_zones;
     vm_address_t       remote_malloc_num_zones = (vm_address_t)&malloc_num_zones;
     // Note that the 2 following addresses are not correct if the address of the target is different from your own.  This notably occurs if the address of System.framework is slid (e.g. different than at B & I )
     vm_address_t       remote_malloc_zones = (vm_address_t)&malloc_zones;
     vm_address_t       remote_malloc_num_zones = (vm_address_t)&malloc_num_zones;


@@ -459,25 +590,25 @@ kern_return_t malloc_get_all_zones(task_t task, memory_reader_t reader, vm_addre
     if (!reader) reader = _malloc_default_reader;
     // printf("Read malloc_zones at address %p should be %p\n", &malloc_zones, malloc_zones);
     err = reader(task, remote_malloc_zones, sizeof(void *), (void **)&zones_address_ref);
     if (!reader) reader = _malloc_default_reader;
     // printf("Read malloc_zones at address %p should be %p\n", &malloc_zones, malloc_zones);
     err = reader(task, remote_malloc_zones, sizeof(void *), (void **)&zones_address_ref);

-    // printf("Read malloc_zones[0x%x]=%p\n", remote_malloc_zones, *zones_address_ref);
+    // printf("Read malloc_zones[%p]=%p\n", remote_malloc_zones, *zones_address_ref);

     if (err) {
     if (err) {

-        fprintf(stderr, "*** malloc[%d]: malloc_get_all_zones: error reading zones_address at 0x%x\n", getpid(), (unsigned)remote_malloc_zones);
+        malloc_printf("*** malloc_get_all_zones: error reading zones_address at %p\n", (unsigned)remote_malloc_zones);

         return err;
     }
     zones_address = *zones_address_ref;
     // printf("Reading num_zones at address %p\n", remote_malloc_num_zones);
     err = reader(task, remote_malloc_num_zones, sizeof(unsigned), (void **)&num_zones_ref);
     if (err) {
         return err;
     }
     zones_address = *zones_address_ref;
     // printf("Reading num_zones at address %p\n", remote_malloc_num_zones);
     err = reader(task, remote_malloc_num_zones, sizeof(unsigned), (void **)&num_zones_ref);
     if (err) {

-        fprintf(stderr, "*** malloc[%d]: malloc_get_all_zones: error reading num_zones at 0x%x\n",  getpid(), (unsigned)remote_malloc_num_zones);
+        malloc_printf("*** malloc_get_all_zones: error reading num_zones at %p\n", (unsigned)remote_malloc_num_zones);

         return err;
     }
     num_zones = *num_zones_ref;
         return err;
     }
     num_zones = *num_zones_ref;

-    // printf("Read malloc_num_zones[0x%x]=%d\n", remote_malloc_num_zones, num_zones);
+    // printf("Read malloc_num_zones[%p]=%d\n", remote_malloc_num_zones, num_zones);

     *count = num_zones;
     // printf("malloc_get_all_zones succesfully found %d zones\n", num_zones);
     err = reader(task, zones_address, sizeof(malloc_zone_t *) * num_zones, (void **)addresses);
     if (err) {
     *count = num_zones;
     // printf("malloc_get_all_zones succesfully found %d zones\n", num_zones);
     err = reader(task, zones_address, sizeof(malloc_zone_t *) * num_zones, (void **)addresses);
     if (err) {

-        fprintf(stderr, "*** malloc[%d]: malloc_get_all_zones: error reading zones at 0x%x\n", getpid(), (unsigned)&zones_address);
+        malloc_printf("*** malloc_get_all_zones: error reading zones at %p\n", (unsigned)&zones_address);

         return err;
     }
     // printf("malloc_get_all_zones succesfully read %d zones\n", num_zones);
         return err;
     }
     // printf("malloc_get_all_zones succesfully read %d zones\n", num_zones);


@@ -486,7 +617,8 @@ kern_return_t malloc_get_all_zones(task_t task, memory_reader_t reader, vm_addre
 
 /*********     Debug helpers   ************/
 
 
 /*********     Debug helpers   ************/
 

-void malloc_zone_print_ptr_info(void *ptr) {
+void
+malloc_zone_print_ptr_info(void *ptr) {

     malloc_zone_t      *zone;
     if (!ptr) return;
     zone = find_registered_zone(ptr, NULL);
     malloc_zone_t      *zone;
     if (!ptr) return;
     zone = find_registered_zone(ptr, NULL);


@@ -497,7 +629,8 @@ void malloc_zone_print_ptr_info(void *ptr) {
     }
 }
 
     }
 }
 

-boolean_t malloc_zone_check(malloc_zone_t *zone) {
+boolean_t
+malloc_zone_check(malloc_zone_t *zone) {

     boolean_t  ok = 1;
     if (!zone) {
         unsigned       index = 0;
     boolean_t  ok = 1;
     if (!zone) {
         unsigned       index = 0;


@@ -511,7 +644,8 @@ boolean_t malloc_zone_check(malloc_zone_t *zone) {
     return ok;
 }
 
     return ok;
 }
 

-void malloc_zone_print(malloc_zone_t *zone, boolean_t verbose) {
+void
+malloc_zone_print(malloc_zone_t *zone, boolean_t verbose) {

     if (!zone) {
         unsigned       index = 0;
         while (index < malloc_num_zones) {
     if (!zone) {
         unsigned       index = 0;
         while (index < malloc_num_zones) {


@@ -523,7 +657,27 @@ void malloc_zone_print(malloc_zone_t *zone, boolean_t verbose) {
     }
 }
 
     }
 }
 

-void malloc_zone_log(malloc_zone_t *zone, void *address) {
+void
+malloc_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats) {
+    if (!zone) {
+       memset(stats, 0, sizeof(stats));
+        unsigned       index = 0;
+        while (index < malloc_num_zones) {
+            zone = malloc_zones[index++];
+           malloc_statistics_t this_stats;
+            zone->introspect->statistics(zone, &this_stats);
+           stats->blocks_in_use += this_stats.blocks_in_use;
+           stats->size_in_use += this_stats.size_in_use;
+           stats->max_size_in_use += this_stats.max_size_in_use;
+           stats->size_allocated += this_stats.size_allocated;
+        }
+    } else {
+       zone->introspect->statistics(zone, stats);
+    }
+}
+
+void
+malloc_zone_log(malloc_zone_t *zone, void *address) {

     if (!zone) {
         unsigned       index = 0;
         while (index < malloc_num_zones) {
     if (!zone) {
         unsigned       index = 0;
         while (index < malloc_num_zones) {


@@ -537,8 +691,9 @@ void malloc_zone_log(malloc_zone_t *zone, void *address) {
 
 /*********     Misc other entry points ************/
 
 
 /*********     Misc other entry points ************/
 

-static void DefaultMallocError(int x) {
-    fprintf(stderr, "*** malloc[%d]: error %d\n", getpid(), x);
+static void
+DefaultMallocError(int x) {
+    malloc_printf("*** error %d\n", x);

 #if USE_SLEEP_RATHER_THAN_ABORT
     sleep(3600);
 #else
 #if USE_SLEEP_RATHER_THAN_ABORT
     sleep(3600);
 #else


@@ -546,11 +701,13 @@ static void DefaultMallocError(int x) {
 #endif
 }
 
 #endif
 }
 

-void (*malloc_error(void (*func)(int)))(int) {
+void (*
+malloc_error(void (*func)(int)))(int) {

     return DefaultMallocError;
 }
 
     return DefaultMallocError;
 }
 

-void _malloc_fork_prepare() {
+void
+_malloc_fork_prepare() {

     /* Prepare the malloc module for a fork by insuring that no thread is in a malloc critical section */
     unsigned   index = 0;
     MALLOC_LOCK();
     /* Prepare the malloc module for a fork by insuring that no thread is in a malloc critical section */
     unsigned   index = 0;
     MALLOC_LOCK();


@@ -560,7 +717,8 @@ void _malloc_fork_prepare() {
     }
 }
 
     }
 }
 

-void _malloc_fork_parent() {
+void
+_malloc_fork_parent() {

     /* Called in the parent process after a fork() to resume normal operation. */
     unsigned   index = 0;
     MALLOC_UNLOCK();
     /* Called in the parent process after a fork() to resume normal operation. */
     unsigned   index = 0;
     MALLOC_UNLOCK();


@@ -570,7 +728,8 @@ void _malloc_fork_parent() {
     }
 }
 
     }
 }
 

-void _malloc_fork_child() {
+void
+_malloc_fork_child() {

     /* Called in the child process after a fork() to resume normal operation.  In the MTASK case we also have to change memory inheritance so that the child does not share memory with the parent. */
     unsigned   index = 0;
     MALLOC_UNLOCK();
     /* Called in the child process after a fork() to resume normal operation.  In the MTASK case we also have to change memory inheritance so that the child does not share memory with the parent. */
     unsigned   index = 0;
     MALLOC_UNLOCK();


@@ -580,9 +739,27 @@ void _malloc_fork_child() {
     }
 }
 
     }
 }
 

-size_t mstats(void) {
-    malloc_zone_print(NULL, 0);
-    return 1;
+/*
+ * A Glibc-like mstats() interface.
+ *
+ * Note that this interface really isn't very good, as it doesn't understand
+ * that we may have multiple allocators running at once.  We just massage
+ * the result from malloc_zone_statistics in any case.
+ */
+struct mstats
+mstats(void)
+{
+    malloc_statistics_t s;
+    struct mstats m;
+
+    malloc_zone_statistics(NULL, &s);
+    m.bytes_total = s.size_allocated;
+    m.chunks_used = s.blocks_in_use;
+    m.bytes_used = s.size_in_use;
+    m.chunks_free = 0;
+    m.bytes_free = m.bytes_total - m.bytes_used;       /* isn't this somewhat obvious? */
+
+    return(m);

 }
 
 /*****************     OBSOLETE ENTRY POINTS   ********************/
 }
 
 /*****************     OBSOLETE ENTRY POINTS   ********************/


@@ -593,25 +770,28 @@ size_t mstats(void) {
 #warning PHASE OUT THE FOLLOWING FUNCTIONS
 #endif
 
 #warning PHASE OUT THE FOLLOWING FUNCTIONS
 #endif
 

-void set_malloc_singlethreaded(boolean_t single) {
+void
+set_malloc_singlethreaded(boolean_t single) {

     static boolean_t warned = 0;
     if (!warned) {
 #if PHASE_OUT_OLD_MALLOC
     static boolean_t warned = 0;
     if (!warned) {
 #if PHASE_OUT_OLD_MALLOC

-        fprintf(stderr, "*** malloc[%d]: OBSOLETE: set_malloc_singlethreaded(%d)\n", getpid(), single);
+        malloc_printf("*** OBSOLETE: set_malloc_singlethreaded(%d)\n", single);

 #endif
         warned = 1;
     }
 }
 
 #endif
         warned = 1;
     }
 }
 

-void malloc_singlethreaded() {
+void
+malloc_singlethreaded() {

     static boolean_t warned = 0;
     if (!warned) {
     static boolean_t warned = 0;
     if (!warned) {

-        fprintf(stderr, "*** malloc[%d]: OBSOLETE: malloc_singlethreaded()\n", getpid());
+        malloc_printf("*** OBSOLETE: malloc_singlethreaded()\n");

         warned = 1;
     }
 }
 
         warned = 1;
     }
 }
 

-int malloc_debug(int level) {
-    fprintf(stderr, "*** malloc[%d]: OBSOLETE: malloc_debug()\n", getpid());
+int
+malloc_debug(int level) {
+    malloc_printf("*** OBSOLETE: malloc_debug()\n");

     return 0;
 }
     return 0;
 }