Merge "libmeminfo: Report VMA flags in showmap report" (9186612f) · Commits · e / os / android_system_core

libmeminfo/tools/showmap.cpp

+19 −0

Original line number	Diff line number	Diff line
		@@ -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 @@ static void print_header() {
		if (!g_verbose && !g_show_addr) {
		printf(" # ");
		}
		if (g_verbose) {
		printf(" flags ");
		}
		printf(" object\n");
		}

		@@ -150,6 +154,9 @@ static void print_divider() {
		if (!g_verbose && !g_show_addr) {
		printf("---- ");
		}
		if (g_verbose) {
		printf("------ ");
		}
		printf("------------------------------\n");
		}

		@@ -169,6 +176,18 @@ static void print_vmainfo(const VmaInfo& v, bool total) {
		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) {