Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

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 200 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 70 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);
   }
 }