Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Unified Diff: third_party/apple_apsl/CFBase.h

Issue 6711017: Update OOM killer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/apple_apsl/CFBase.h
diff --git a/third_party/apple_apsl/CFBase.h b/third_party/apple_apsl/CFBase.h
index ae3e2fa0d1047f7c8073bba6dd764e4f9f500af7..97e370455461ecd64dbdbcd2e720e8625efd4162 100644
--- a/third_party/apple_apsl/CFBase.h
+++ b/third_party/apple_apsl/CFBase.h
@@ -30,9 +30,7 @@
#include "CFRuntime.h"
-struct ChromeCFAllocator {
-
-
+struct ChromeCFAllocator9and10 {
ChromeCFRuntimeBase _base;
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */
@@ -52,4 +50,29 @@ struct ChromeCFAllocator {
CFAllocatorContext _context;
};
+// TODO(avi):update upon source release; http://crbug.com/74589
Mark Mentovai 2011/03/17 23:10:46 Space after colon again.
Avi (use Gerrit) 2011/03/18 13:18:35 Done.
+struct ChromeCFAllocator11 {
+ ChromeCFRuntimeBase _base;
+ // CFAllocator in Darwin 9 included a complete copy of _malloc_zone_t. The
+ // version in Darwin 10 had an abbreviated _malloc_zone_t that ended after the
+ // version/"reserved" field (see above). Darwin 11 appears to have a truncated
+ // _malloc_zone_t as well, but two fields larger than 9/10.
+ void* presumedSizeFunctionPtr;
+ void* presumedMallocFunctionPtr;
+ void* presumedCallocFunctionPtr;
+ void* presumedVallocFunctionPtr;
+ void* presumedFreeFunctionPtr;
+ void* presumedReallocFunctionPtr;
+ void* presumedDestroyFunctionPtr;
+ const char *zone_name;
+ void* presumedBatchMallocFunctionPtr;
+ void* presumedBatchFreeFunctionPtr;
+ void* presumedIntrospectStructPtr;
+ void* presumedReservedSlashVersion; // always 6 in CFAllocators
+ void* presumedMemalignFunctionPtr;
+ void* presumedFreeDefiniteSizeFunctionPtr;
+ CFAllocatorRef _allocator;
+ CFAllocatorContext _context;
+};
+
#endif // THIRD_PARTY_APPLE_APSL_CFBASE_H_

Powered by Google App Engine
This is Rietveld 408576698