X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/5b2abdfbf4211b6592cdd02b9507555a0ecbb04b..5f4d86c1219d56604890d932a3152b3b5dd15b55:/gen/scalable_malloc.h?ds=sidebyside

diff --git a/gen/scalable_malloc.h b/gen/scalable_malloc.h
index 8891c3d..e6f4b02 100644
--- a/gen/scalable_malloc.h
+++ b/gen/scalable_malloc.h
@@ -3,24 +3,25 @@
  *
  * @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,
- * 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@
  */
 
-#import <objc/malloc.h>
+#import <malloc/malloc.h>
 
 #define SCALABLE_MALLOC_ADD_GUARD_PAGES		(1 << 0)
     // add a guard page before and after each VM region to help debug
@@ -30,18 +31,17 @@
     // do not protect postlude page
 #define SCALABLE_MALLOC_DO_SCRIBBLE		(1 << 3)
     // write 0x55 onto free blocks
-
+#define SCALABLE_MALLOC_ABORT_ON_ERROR (1 << 4)
+    // call abort() on a malloc or free error, such as a double free
+	
 extern malloc_zone_t *create_scalable_zone(size_t initial_size, unsigned debug_flags);
     /* Create a new zone that scales for small objects or large objects */
 
 /*****	Private API for debug and performance tools	********/
 
-#define scalable_zone_info_count	9	// maximum number of numbers
-
-extern void scalable_zone_info(malloc_zone_t *zone, unsigned *info, unsigned count);
-    /* Fills info[] with some statistical information:
-    info[0]: number of objects in use
-    info[1]: number of bytes in use
-    ...
+extern boolean_t scalable_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats, unsigned subzone);
+    /* Fills stats with some statistics;
+    1 is returned on success; else 0 is returned
+    Currently: subzone=0 => tiny; subzone=1 => small; subzone=2 => large; subzone=3 => huge; any other subzone => returns 0 
     */