Move APSL code into third_party.

base/process_util_mac.mm

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "base/process_util.h"
 
 #import <Cocoa/Cocoa.h>
 #include <crt_externs.h>
 #include <dlfcn.h>
@@ skipping 12 matching lines @@
 #include <new>
 #include <string>
 
 #include "base/debug_util.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
+#include "third_party/apple_apsl/CFBase.h"
+#include "third_party/apple_apsl/malloc.h"
 
 namespace base {
 
 void RestoreDefaultExceptionHandler() {
   // This function is tailored to remove the Breakpad exception handler.
   // exception_mask matches s_exception_mask in
   // breakpad/src/client/mac/handler/exception_handler.cc
   const exception_mask_t exception_mask = EXC_MASK_BAD_ACCESS |
                                           EXC_MASK_BAD_INSTRUCTION |
                                           EXC_MASK_ARITHMETIC |
@@ skipping 320 matching lines @@
 }
 
 // ------------------------------------------------------------------------
 
 namespace {
 
 bool g_oom_killer_enabled;
 
 // === C malloc/calloc/valloc/realloc/posix_memalign ===
 
-// The extended version of malloc_zone_t from the 10.6 SDK's <malloc/malloc.h>,
-// included here to allow for compilation in 10.5. (10.5 has version 3 zone
-// allocators, while 10.6 has version 6 allocators.)
-struct ChromeMallocZone {
-  void* reserved1;
-  void* reserved2;
-  size_t (*size)(struct _malloc_zone_t* zone, const void* ptr);
-  void* (*malloc)(struct _malloc_zone_t* zone, size_t size);
-  void* (*calloc)(struct _malloc_zone_t* zone, size_t num_items, size_t size);
-  void* (*valloc)(struct _malloc_zone_t* zone, size_t size);
-  void (*free)(struct _malloc_zone_t* zone, void* ptr);
-  void* (*realloc)(struct _malloc_zone_t* zone, void* ptr, size_t size);
-  void (*destroy)(struct _malloc_zone_t* zone);
-  const char* zone_name;
-  unsigned (*batch_malloc)(struct _malloc_zone_t* zone, size_t size,
-                           void** results, unsigned num_requested);
-  void (*batch_free)(struct _malloc_zone_t* zone, void** to_be_freed,
-                     unsigned num_to_be_freed);
-  struct malloc_introspection_t* introspect;
-  unsigned version;
-  void* (*memalign)(struct _malloc_zone_t* zone, size_t alignment,
-                    size_t size);  // version >= 5
-  void (*free_definite_size)(struct _malloc_zone_t* zone, void* ptr,
-                             size_t size);  // version >= 6
-};
-
 typedef void* (*malloc_type)(struct _malloc_zone_t* zone,
                              size_t size);
 typedef void* (*calloc_type)(struct _malloc_zone_t* zone,
                              size_t num_items,
                              size_t size);
 typedef void* (*valloc_type)(struct _malloc_zone_t* zone,
                              size_t size);
 typedef void* (*realloc_type)(struct _malloc_zone_t* zone,
                               void* ptr,
                               size_t size);
@@ skipping 110 matching lines @@
 }
 
 // === C++ operator new ===
 
 void oom_killer_new() {
   DebugUtil::BreakDebugger();
 }
 
 // === Core Foundation CFAllocators ===
 
-// This is the real structure of a CFAllocatorRef behind the scenes. See
-// http://opensource.apple.com/source/CF/CF-476.19/CFBase.c (10.5.8) and
-// http://opensource.apple.com/source/CF/CF-550/CFBase.c (10.6) for details.
-struct ChromeCFRuntimeBase {
-  uintptr_t _cfisa;
-  uint8_t _cfinfo[4];
-#if __LP64__
-  uint32_t _rc;
-#endif
-};
-
-struct ChromeCFAllocator {
-  ChromeCFRuntimeBase cf_runtime_base;
-  size_t (*size)(struct _malloc_zone_t* zone, const void* ptr);
-  void* (*malloc)(struct _malloc_zone_t* zone, size_t size);
-  void* (*calloc)(struct _malloc_zone_t* zone, size_t num_items, size_t size);
-  void* (*valloc)(struct _malloc_zone_t* zone, size_t size);
-  void (*free)(struct _malloc_zone_t* zone, void* ptr);
-  void* (*realloc)(struct _malloc_zone_t* zone, void* ptr, size_t size);
-  void (*destroy)(struct _malloc_zone_t* zone);
-  const char* zone_name;
-  unsigned (*batch_malloc)(struct _malloc_zone_t* zone, size_t size,
-                           void** results, unsigned num_requested);
-  void (*batch_free)(struct _malloc_zone_t* zone, void** to_be_freed,
-                     unsigned num_to_be_freed);
-  struct malloc_introspection_t* introspect;
-  void* reserved5;
-
-  void* allocator;
-  CFAllocatorContext context;
-};
 typedef ChromeCFAllocator* ChromeCFAllocatorRef;
 
 CFAllocatorAllocateCallBack g_old_cfallocator_system_default;
 CFAllocatorAllocateCallBack g_old_cfallocator_malloc;
 CFAllocatorAllocateCallBack g_old_cfallocator_malloc_zone;
 
 void* oom_killer_cfallocator_system_default(CFIndex alloc_size,
                                             CFOptionFlags hint,
                                             void* info) {
   void* result = g_old_cfallocator_system_default(alloc_size, hint, info);
@@ skipping 196 matching lines @@
   CHECK(!g_old_cfallocator_system_default && !g_old_cfallocator_malloc &&
         !g_old_cfallocator_malloc_zone)
       << "Old allocators unexpectedly non-null";
 
   bool cf_allocator_internals_known =
       darwin_version == 9 || darwin_version == 10;
 
   if (cf_allocator_internals_known) {
     ChromeCFAllocatorRef allocator = const_cast<ChromeCFAllocatorRef>(
         reinterpret_cast<const ChromeCFAllocator*>(kCFAllocatorSystemDefault));
-    g_old_cfallocator_system_default = allocator->context.allocate;
+    g_old_cfallocator_system_default = allocator->_context.allocate;
     CHECK(g_old_cfallocator_system_default)
         << "Failed to get kCFAllocatorSystemDefault allocation function.";
-    allocator->context.allocate = oom_killer_cfallocator_system_default;
+    allocator->_context.allocate = oom_killer_cfallocator_system_default;
 
     allocator = const_cast<ChromeCFAllocatorRef>(
         reinterpret_cast<const ChromeCFAllocator*>(kCFAllocatorMalloc));
-    g_old_cfallocator_malloc = allocator->context.allocate;
+    g_old_cfallocator_malloc = allocator->_context.allocate;
     CHECK(g_old_cfallocator_malloc)
         << "Failed to get kCFAllocatorMalloc allocation function.";
-    allocator->context.allocate = oom_killer_cfallocator_malloc;
+    allocator->_context.allocate = oom_killer_cfallocator_malloc;
 
     allocator = const_cast<ChromeCFAllocatorRef>(
         reinterpret_cast<const ChromeCFAllocator*>(kCFAllocatorMallocZone));
-    g_old_cfallocator_malloc_zone = allocator->context.allocate;
+    g_old_cfallocator_malloc_zone = allocator->_context.allocate;
     CHECK(g_old_cfallocator_malloc_zone)
         << "Failed to get kCFAllocatorMallocZone allocation function.";
-    allocator->context.allocate = oom_killer_cfallocator_malloc_zone;
+    allocator->_context.allocate = oom_killer_cfallocator_malloc_zone;
   } else {
     NSLog(@"Internals of CFAllocator not known; out-of-memory failures via "
         "CFAllocator will not result in termination. http://crbug.com/45650");
   }
 
   // === Cocoa NSObject allocation ===
 
   // Note that both +[NSObject new] and +[NSObject alloc] call through to
   // +[NSObject allocWithZone:].
 
   CHECK(!g_old_allocWithZone)
       << "Old allocator unexpectedly non-null";
 
   Class nsobject_class = [NSObject class];
   Method orig_method = class_getClassMethod(nsobject_class,
                                             @selector(allocWithZone:));
   g_old_allocWithZone = reinterpret_cast<allocWithZone_t>(
       method_getImplementation(orig_method));
   CHECK(g_old_allocWithZone)
       << "Failed to get allocWithZone allocation function.";
   method_setImplementation(orig_method,
                            reinterpret_cast<IMP>(oom_killer_allocWithZone));
 }
 
 }  // namespace base