Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

third_party/tcmalloc/chromium/src/memfs_malloc.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 83 matching lines @@
 void HugetlbSysAllocator::DumpStats(TCMalloc_Printer* printer) {
   printer->printf("HugetlbSysAllocator: failed_=%d allocated=%"PRId64"\n",
                   failed_, static_cast<int64_t>(hugetlb_base_));
 }
 
 // No locking needed here since we assume that tcmalloc calls
 // us with an internal lock held (see tcmalloc/system-alloc.cc).
 void* HugetlbSysAllocator::Alloc(size_t size, size_t *actual_size,
                                  size_t alignment) {
 
+  // don't go any further if we haven't opened the backing file
+  if (hugetlb_fd_ == -1) {
+    return NULL;
+  }
+
   // We don't respond to allocation requests smaller than big_page_size_ unless
   // the caller is willing to take more than they asked for.
   if (actual_size == NULL && size < big_page_size_) {
     return NULL;
   }
 
   // Enforce huge page alignment.  Be careful to deal with overflow.
   if (alignment < big_page_size_) alignment = big_page_size_;
   size_t aligned_size = ((size + alignment - 1) / alignment) * alignment;
   if (aligned_size < size) {
@@ skipping 40 matching lines @@
   }
 
   // Note: size + extra does not overflow since:
   //            size + alignment < (1<<NBITS).
   // and        extra <= alignment
   // therefore  size + extra < (1<<NBITS)
   void *result = mmap(0, size + extra, PROT_WRITE|PROT_READ,
                       MAP_SHARED, hugetlb_fd_, hugetlb_base_);
   if (result == reinterpret_cast<void*>(MAP_FAILED)) {
     if (!FLAGS_memfs_malloc_ignore_mmap_fail) {
-      TCMalloc_MESSAGE(__FILE__, __LINE__, "mmap failed: %s\n",
-                       strerror(errno));
+      TCMalloc_MESSAGE(__FILE__, __LINE__, "mmap of size %"PRIuS" failed: %s\n",
+                       size + extra, strerror(errno));
       failed_ = true;
       if (FLAGS_memfs_malloc_abort_on_fail) {
         CRASH("memfs_malloc_abort_on_fail is set\n");
       }
     }
     return NULL;
   }
   uintptr_t ptr = reinterpret_cast<uintptr_t>(result);
 
   // Adjust the return memory so it is aligned
@@ skipping 44 matching lines @@
 
     SysAllocator *alloc = new HugetlbSysAllocator(hugetlb_fd, page_size);
     // Register ourselves with tcmalloc
     RegisterSystemAllocator(alloc, 0);
   }
 }
 
 REGISTER_MODULE_INITIALIZER(memfs_malloc, { InitSystemAllocator(); });
 
 #endif   /* ifdef __linux */