Merge leveldb subtree

MarcoFalke · MarcoFalke · commit fa14fa742d33 · 2018-08-09T11:31:45.000-04:00
Merge commit 'ec749b1bcdf2483b642fb51d635800e272c68ba6' into HEAD
diff --git a/src/leveldb/util/env_posix.cc b/src/leveldb/util/env_posix.cc
@@ -585,8 +585,8 @@ static int MaxMmaps() {
   if (mmap_limit >= 0) {
     return mmap_limit;
   }
-  // Up to 1000 mmaps for 64-bit binaries; none for smaller pointer sizes.
-  mmap_limit = sizeof(void*) >= 8 ? 1000 : 0;
+  // Up to 4096 mmaps for 64-bit binaries; none for smaller pointer sizes.
+  mmap_limit = sizeof(void*) >= 8 ? 4096 : 0;
   return mmap_limit;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -585,8 +585,8 @@ static int MaxMmaps() {`
`585`	`585`	`if (mmap_limit >= 0) {`
`586`	`586`	`return mmap_limit;`
`587`	`587`	`}`
`588`		`- // Up to 1000 mmaps for 64-bit binaries; none for smaller pointer sizes.`
`589`		`- mmap_limit = sizeof(void*) >= 8 ? 1000 : 0;`
	`588`	`+ // Up to 4096 mmaps for 64-bit binaries; none for smaller pointer sizes.`
	`589`	`+ mmap_limit = sizeof(void*) >= 8 ? 4096 : 0;`
`590`	`590`	`return mmap_limit;`
`591`	`591`	`}`
`592`	`592`