Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: tools/android/memdump/memdump.cc

Issue 203213005: Add HANDLE_EINTR in some places missing it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac typo Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/linux/services/yama.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/memdump/memdump.cc
diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc
index 4f4dd14fd548ebc6b5dc672067c890b9ce42b62c..56b47712970bb198940c2cae7e2e448af1187e33 100644
--- a/tools/android/memdump/memdump.cc
+++ b/tools/android/memdump/memdump.cc
@@ -437,8 +437,8 @@ bool CollectProcessMemoryInformation(int page_count_fd,
int page_flags_fd,
ProcessMemory* process_memory) {
const pid_t pid = process_memory->pid;
- base::ScopedFD pagemap_fd(open(
- base::StringPrintf("/proc/%d/pagemap", pid).c_str(), O_RDONLY));
+ base::ScopedFD pagemap_fd(HANDLE_EINTR(open(
+ base::StringPrintf("/proc/%d/pagemap", pid).c_str(), O_RDONLY)));
if (!pagemap_fd.is_valid()) {
PLOG(ERROR) << "open";
return false;
@@ -489,7 +489,8 @@ int main(int argc, char** argv) {
std::vector<ProcessMemory> processes_memory(pids.size());
{
- base::ScopedFD page_count_fd(open("/proc/kpagecount", O_RDONLY));
+ base::ScopedFD page_count_fd(
+ HANDLE_EINTR(open("/proc/kpagecount", O_RDONLY)));
if (!page_count_fd.is_valid()) {
PLOG(ERROR) << "open /proc/kpagecount";
return EXIT_FAILURE;
« no previous file with comments | « sandbox/linux/services/yama.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698