commit 2303db96f1da51ba5feb84bd9f0633f2164a3574
author Suren Baghdasaryan <surenb@google.com> Thu Oct 10 13:40:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 10 13:40:15 2019 -0700
tree e57231785eca409f017cdc4088df4b7c224b7e45
parent 5185ad5f8cc3e55e795d64ab28a41f0cea028536
parent 5ebd02ea0cfc03f75b0321fa8237be811afefb55

Merge "libmeminfo: Report VMA flags in showmap report"
am: 9186612f9a

Change-Id: Ic607f518e33221e9297565fa0d9f65e1bb2555f3

tools/showmap.cpp

diff --git a/tools/showmap.cpp b/tools/showmap.cpp
index 8ea2108..72ab0f3 100644
--- a/tools/showmap.cpp
+++ b/tools/showmap.cpp
@@ -18,6 +18,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/mman.h>
 #include <sys/signal.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -139,6 +140,9 @@
     if (!g_verbose && !g_show_addr) {
         printf("   # ");
     }
+    if (g_verbose) {
+        printf(" flags ");
+    }
     printf(" object\n");
 }
 
@@ -150,6 +154,9 @@
     if (!g_verbose && !g_show_addr) {
         printf("---- ");
     }
+    if (g_verbose) {
+        printf("------ ");
+    }
     printf("------------------------------\n");
 }
 
@@ -169,6 +176,18 @@
     if (!g_verbose && !g_show_addr) {
         printf("%4" PRIu32 " ", v.count);
     }
+    if (g_verbose) {
+        if (total) {
+            printf("       ");
+        } else {
+            std::string flags_str("---");
+            if (v.vma.flags & PROT_READ) flags_str[0] = 'r';
+            if (v.vma.flags & PROT_WRITE) flags_str[1] = 'w';
+            if (v.vma.flags & PROT_EXEC) flags_str[2] = 'x';
+
+            printf("%6s ", flags_str.c_str());
+        }
+    }
 }
 
 static int showmap(void) {