diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:09:51 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:09:51 +0000 |
| commit | 042b7f24c2af6deabeddd6a31b5fada277b046ff (patch) | |
| tree | 6075b2a155117facd1b842cd13d779eab77c01c2 /tools/android | |
| parent | f2d7d646f95a01bac784758e7f7f483e4c04b6c1 (diff) | |
| download | chromium_src-042b7f24c2af6deabeddd6a31b5fada277b046ff.zip chromium_src-042b7f24c2af6deabeddd6a31b5fada277b046ff.tar.gz chromium_src-042b7f24c2af6deabeddd6a31b5fada277b046ff.tar.bz2 | |
Add HANDLE_EINTR in some places missing it.
This implements agl's comments on https://codereview.chromium.org/191673003/
R=agl@chromium.org
TBR=agl
Review URL: https://codereview.chromium.org/203213005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/memdump/memdump.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index 4f4dd14..56b4771 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; |