commit ad280cdb3f827b32dfb4bec83e1a40fa97b048b9
author Christopher Ferris <cferris@google.com> Sat Dec 09 03:28:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 09 03:28:06 2017 +0000
tree 833d2a333814f682f2e5c9f64166ee6ded248d42
parent 2602e2c289164c402c47b16b20f808996efda823
parent 0a01547a8b2645058da1a5a1815f7a981a946c60

Merge "Make sure at least XX maps are created."
am: 4dac55d5fd

Change-Id: I047d03fe7be34d9ba1e48568beb25f1eaeefb9d8

libbacktrace/backtrace_benchmarks.cpp

diff --git a/libbacktrace/backtrace_benchmarks.cpp b/libbacktrace/backtrace_benchmarks.cpp
index bb4134f..a23e3b4 100644
--- a/libbacktrace/backtrace_benchmarks.cpp
+++ b/libbacktrace/backtrace_benchmarks.cpp
@@ -103,8 +103,9 @@
       exit(1);
     }
 
-    if (num_maps != kNumMaps) {
-      fprintf(stderr, "Maps set incorrectly: %zu found, %zu expected.\n", num_maps, kNumMaps);
+    if (num_maps < kNumMaps) {
+      fprintf(stderr, "Maps set incorrectly: %zu found, %zu expected at least.\n", num_maps,
+              kNumMaps);
       std::string str;
       android::base::ReadFileToString("/proc/self/maps", &str);
       fprintf(stderr, "%s\n", str.c_str());
@@ -121,12 +122,12 @@
 
   size_t num_maps = 0;
   for (size_t i = 0; i < 2000; i++) {
-    if (CountMaps(pid, &num_maps) && num_maps == kNumMaps) {
+    if (CountMaps(pid, &num_maps) && num_maps >= kNumMaps) {
       break;
     }
     usleep(1000);
   }
-  if (num_maps != kNumMaps) {
+  if (num_maps < kNumMaps) {
     fprintf(stderr, "Timed out waiting for the number of maps available: %zu\n", num_maps);
     return;
   }