Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

third_party/tcmalloc/chromium/src/windows/port.cc

 /* Copyright (c) 2007, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 131 matching lines @@
 }
 
 static void NTAPI on_tls_callback(HINSTANCE h, DWORD dwReason, PVOID pv) {
   if (dwReason == DLL_THREAD_DETACH) {   // thread is being destroyed!
     on_process_term();
   }
 }
 
 #ifdef _MSC_VER
 
-// extern "C" suppresses C++ name mangling so we know the symbol names
-// for the linker /INCLUDE:symbol pragmas above.
+// extern "C" suppresses C++ name mangling so we know the symbol names for the
+// linker /INCLUDE:symbol pragmas above.
 extern "C" {
 // This tells the linker to run these functions.
 #pragma data_seg(push, old_seg)
   // Use CRT$XLY instead of CRT$XLB to ensure we're called LATER in sequence.
 #pragma data_seg(".CRT$XLY")
 void (NTAPI *p_thread_callback_tcmalloc)(
     HINSTANCE h, DWORD dwReason, PVOID pv) = on_tls_callback;
 #pragma data_seg(".CRT$XTU")
 int (*p_process_term_tcmalloc)(void) = on_process_term;
 #pragma data_seg(pop, old_seg)
@@ skipping 48 matching lines @@
       }
     }
   }
   return 0;
 }
 
 
 // -----------------------------------------------------------------------
 // These functions replace system-alloc.cc
 
+// The current system allocator. Because we don't link with system-alloc.cc,
+// we need to define our own.
+SysAllocator* sys_alloc = NULL;
+
 // This is mostly like MmapSysAllocator::Alloc, except it does these weird
 // munmap's in the middle of the page, which is forbidden in windows.
 extern void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size,
                                   size_t alignment) {
   // Align on the pagesize boundary
   const int pagesize = getpagesize();
   if (alignment < pagesize) alignment = pagesize;
   size = ((size + alignment - 1) / alignment) * alignment;
 
   // Report the total number of bytes the OS actually delivered.  This might be
@@ skipping 95 matching lines @@
 }
 
 bool RegisterSystemAllocator(SysAllocator *allocator, int priority) {
   return false;   // we don't allow registration on windows, right now
 }
 
 void DumpSystemAllocatorStats(TCMalloc_Printer* printer) {
   // We don't dump stats on windows, right now
 }
 
-// The current system allocator
-SysAllocator* sys_alloc = NULL;
-
 
 // -----------------------------------------------------------------------
 // These functions rework existing functions of the same name in the
 // Google codebase.
 
 // A replacement for HeapProfiler::CleanupOldProfiles.
 void DeleteMatchingFiles(const char* prefix, const char* full_glob) {
   WIN32_FIND_DATAA found;  // that final A is for Ansi (as opposed to Unicode)
   HANDLE hFind = FindFirstFileA(full_glob, &found);   // A is for Ansi
   if (hFind != INVALID_HANDLE_VALUE) {
     const int prefix_length = strlen(prefix);
     do {
       const char *fname = found.cFileName;
       if ((strlen(fname) >= prefix_length) &&
           (memcmp(fname, prefix, prefix_length) == 0)) {
         RAW_VLOG(0, "Removing old heap profile %s\n", fname);
         // TODO(csilvers): we really need to unlink dirname + fname
         _unlink(fname);
       }
     } while (FindNextFileA(hFind, &found) != FALSE);  // A is for Ansi
     FindClose(hFind);
   }
 }