Handle EAGAIN error for the mincore syscall used

base/trace_event/process_memory_dump.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event/process_memory_dump.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/trace_event/process_memory_totals.h"
@@ skipping 33 matching lines @@
   size_t offset = 0;
   size_t total_resident_size = 0;
   while (offset < mapped_size) {
     void* chunk_start = reinterpret_cast<void*>(start_pointer + offset);
     const size_t chunk_size = std::min(mapped_size - offset, kMaxChunkSize);
     const size_t page_count = (chunk_size + page_size - 1) / page_size;
     size_t resident_page_count = 0;
 
 #if defined(OS_MACOSX) || defined(OS_IOS)
     std::vector<char> vec(page_count + 1);
+    // mincore in MAC does not fail with EAGAIN.
     int res = mincore(chunk_start, chunk_size, vector_as_array(&vec));
     DCHECK(!res);
+    if (res) {
+      LOG(ERROR)
+          << "Mincore call failed. The resident size may not be accurate";

[Primiano Tucci (use gerrit), 2015/10/15 11:20:18]

nit: s/Mincore/mincore()/
also, if you continue here it will not be non-accurate, it will be 0.

[ssid, 2015/10/15 11:23:43]

The call to mincore failed only once. The next set of pages could pass and give
some value. So, mentioned not accurate.

+      continue;
+    }
+
     for (size_t i = 0; i < page_count; i++)
       resident_page_count += vec[i] & MINCORE_INCORE ? 1 : 0;
 #else   // defined(OS_MACOSX) || defined(OS_IOS)
     std::vector<unsigned char> vec(page_count + 1);
-    int res = mincore(chunk_start, chunk_size, vector_as_array(&vec));
+    int error_counter = 0;
+    int res = 0;
+    // HANDLE_EINTR tries for 100 times. So following the same pattern.
+    do {
+      res = mincore(chunk_start, chunk_size, vector_as_array(&vec));
+    } while (res == -1 && errno == EAGAIN && error_counter++ < 100);
     DCHECK(!res);
+    if (res) {
+      LOG(ERROR)
+          << "Mincore call failed. The resident size may not be accurate";

[Primiano Tucci (use gerrit), 2015/10/15 11:20:18]

can we avoid duplicating this and above?

[ssid, 2015/10/15 11:23:43]

I would have to add 3 extra #if defined. that is why duplicating.

[Primiano Tucci (use gerrit), 2015/10/15 11:27:13]

??
how about you just add this to before line 87:

DCHECK_EQ(0, res);
if (res) {
  LOG(ERROR)<< "mincore() call failed. The resident size may not be accurate";
 total_resident_size = 0;
}

[ssid, 2015/10/15 11:39:30]

Yes, sounds good.

+      continue;
+    }
+
     for (size_t i = 0; i < page_count; i++)
       resident_page_count += vec[i];
 #endif  // defined(OS_MACOSX) || defined(OS_IOS)
 
     total_resident_size += resident_page_count * page_size;
     offset += kMaxChunkSize;
   }
   return total_resident_size;
 }
 #endif  // defined(COUNT_RESIDENT_BYTES_SUPPORTED)
@@ skipping 140 matching lines @@
 
 void ProcessMemoryDump::AddSuballocation(const MemoryAllocatorDumpGuid& source,
                                          const std::string& target_node_name) {
   std::string child_mad_name = target_node_name + "/__" + source.ToString();
   MemoryAllocatorDump* target_child_mad = CreateAllocatorDump(child_mad_name);
   AddOwnershipEdge(source, target_child_mad->guid());
 }
 
 }  // namespace trace_event
 }  // namespace base