commit 83ba19ecb19c6e0d642dcc9e47776f181bdb6c17
author Yabin Cui <yabinc@google.com> Fri Feb 14 19:46:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 19:46:55 2020 +0000
tree c27366dce63c94ec0bb675c57bebfed1da8907a9
parent ae435853a9c4a397181a779fafd48a30fb46b876
parent 1d2672498152f45a6d23698fac1be9d7ef689a36

Merge "simpleperf: add app_api doc."

ext4_utils/mke2fs.conf

diff --git a/ext4_utils/mke2fs.conf b/ext4_utils/mke2fs.conf
index abf0dae..8ea960d 100644
--- a/ext4_utils/mke2fs.conf
+++ b/ext4_utils/mke2fs.conf
@@ -1,5 +1,5 @@
 [defaults]
-    base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
+    base_features = sparse_super,large_file,filetype,dir_index,ext_attr
     default_mntopts = acl,user_xattr
     enable_periodic_fsck = 0
     blocksize = 4096

memory_replay/NativeInfo.cpp

diff --git a/memory_replay/NativeInfo.cpp b/memory_replay/NativeInfo.cpp
index ec131dd..3439a29 100644
--- a/memory_replay/NativeInfo.cpp
+++ b/memory_replay/NativeInfo.cpp
@@ -76,7 +76,8 @@
                  &name_pos) == 2) {
         char* map_name = &buf[buf_start + name_pos];
         if (strcmp(map_name, "[anon:libc_malloc]") == 0 || strcmp(map_name, "[heap]") == 0 ||
-            strncmp(map_name, "[anon:scudo:", 12) == 0) {
+            strncmp(map_name, "[anon:scudo:", 12) == 0 ||
+            strncmp(map_name, "[anon:GWP-ASan", 14) == 0) {
           total_va_bytes += end - start;
           native_map = true;
         } else {

memory_replay/tests/NativeInfoTest.cpp

diff --git a/memory_replay/tests/NativeInfoTest.cpp b/memory_replay/tests/NativeInfoTest.cpp
index 845ec04..5c33eb7 100644
--- a/memory_replay/tests/NativeInfoTest.cpp
+++ b/memory_replay/tests/NativeInfoTest.cpp
@@ -269,7 +269,55 @@
       "KernelPageSize:        4 kB\n"
       "MMUPageSize:           4 kB\n"
       "Locked:                0 kB\n"
-      "Name:           [anon:scudo:test]\n";
+      "Name:           [anon:scudo:test]\n"
+      "b8f4c000-b8f4d000 rw-p 00000000 00:00 0          [anon:GWP-ASan Guard Page]\n"
+      "Size:                  4 kB\n"
+      "Rss:                   0 kB\n"
+      "Pss:                   0 kB\n"
+      "Shared_Clean:          0 kB\n"
+      "Shared_Dirty:          0 kB\n"
+      "Private_Clean:         0 kB\n"
+      "Private_Dirty:         0 kB\n"
+      "Referenced:            0 kB\n"
+      "Anonymous:             0 kB\n"
+      "AnonHugePages:         0 kB\n"
+      "Swap:                  0 kB\n"
+      "KernelPageSize:        4 kB\n"
+      "MMUPageSize:           4 kB\n"
+      "Locked:                0 kB\n"
+      "Name:           [anon:GWP-ASan Guard Page]\n"
+      "b8f4d000-b8f4e000 rw-p 00000000 00:00 0          [anon:GWP-ASan Alive Slot]\n"
+      "Size:                  4 kB\n"
+      "Rss:                   4 kB\n"
+      "Pss:                   0 kB\n"
+      "Shared_Clean:          0 kB\n"
+      "Shared_Dirty:          0 kB\n"
+      "Private_Clean:         0 kB\n"
+      "Private_Dirty:         0 kB\n"
+      "Referenced:            0 kB\n"
+      "Anonymous:             0 kB\n"
+      "AnonHugePages:         0 kB\n"
+      "Swap:                  0 kB\n"
+      "KernelPageSize:        4 kB\n"
+      "MMUPageSize:           4 kB\n"
+      "Locked:                0 kB\n"
+      "Name:           [anon:GWP-ASan Alive Slot]\n"
+      "b8f4e000-b8f4f000 rw-p 00000000 00:00 0          [anon:GWP-ASan Guard Page]\n"
+      "Size:                  4 kB\n"
+      "Rss:                   0 kB\n"
+      "Pss:                   0 kB\n"
+      "Shared_Clean:          0 kB\n"
+      "Shared_Dirty:          0 kB\n"
+      "Private_Clean:         0 kB\n"
+      "Private_Dirty:         0 kB\n"
+      "Referenced:            0 kB\n"
+      "Anonymous:             0 kB\n"
+      "AnonHugePages:         0 kB\n"
+      "Swap:                  0 kB\n"
+      "KernelPageSize:        4 kB\n"
+      "MMUPageSize:           4 kB\n"
+      "Locked:                0 kB\n"
+      "Name:           [anon:GWP-ASan Guard Page]\n";
 
   ASSERT_TRUE(TEMP_FAILURE_RETRY(
       write(tmp_file_->fd, smaps_data.c_str(), smaps_data.size())) != -1);
@@ -278,6 +326,6 @@
   size_t rss_bytes = 1;
   size_t va_bytes = 1;
   NativeGetInfo(tmp_file_->fd, &rss_bytes, &va_bytes);
-  EXPECT_EQ(126976U, rss_bytes);
-  EXPECT_EQ(147456U, va_bytes);
+  EXPECT_EQ(131072U, rss_bytes);
+  EXPECT_EQ(159744U, va_bytes);
 }