Temporary remove perror() calls before we can log from inside of arena

igorcanadi · igorcanadi · commit 6785a52b1b13 · 2014-05-05T07:13:48.000-07:00
diff --git a/util/arena.cc b/util/arena.cc
@@ -43,7 +43,6 @@ Arena::~Arena() {
     auto ret = munmap(mmap_info.addr_, mmap_info.length_);
     if (ret != 0) {
       // TODO(sdong): Better handling
-      perror("munmap");
     }
   }
 }
@@ -84,7 +83,7 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size) {
     void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
                       (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0);
     if (addr == MAP_FAILED) {
-      perror("mmap");
+      // TODO(sdong): Better handling
       // fail back to malloc
     } else {
       blocks_memory_ += reserved_size;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ Arena::~Arena() {`
`43`	`43`	`auto ret = munmap(mmap_info.addr_, mmap_info.length_);`
`44`	`44`	`if (ret != 0) {`
`45`	`45`	`// TODO(sdong): Better handling`
`46`		`- perror("munmap");`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`	`}`
`@@ -84,7 +83,7 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size) {`
`84`	`83`	`void* addr = mmap(nullptr, reserved_size, (PROT_READ \| PROT_WRITE),`
`85`	`84`	`(MAP_PRIVATE \| MAP_ANONYMOUS \| MAP_HUGETLB), 0, 0);`
`86`	`85`	`if (addr == MAP_FAILED) {`
`87`		`- perror("mmap");`
	`86`	`+ // TODO(sdong): Better handling`
`88`	`87`	`// fail back to malloc`
`89`	`88`	`} else {`
`90`	`89`	`blocks_memory_ += reserved_size;`