From: Davide Italiano <davide@freebsd.org>
Date: Thu, 28 Mar 2019 00:07:07 +0000 (+0000)
Subject: [ObjectFileMachO] Disable memory caching for savecore.
X-Git-Tag: llvmorg-10-init~9022
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfbcadf562f6f362537e72661ba0fef6ca0243b9;p=platform%2Fupstream%2Fllvm.git

[ObjectFileMachO] Disable memory caching for savecore.

Summary:
It's not really useful, and largely increases the footprint.

<rdar://problem/49293525>

Reviewers: jasonmolenda

Subscribers: llvm-commits, lldb-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D59896

llvm-svn: 357134
---

diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 7d5386b..ae1eac6 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6128,18 +6128,6 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP &process_sp,
             if (range_info.GetExecutable() == MemoryRegionInfo::eYes)
               prot |= VM_PROT_EXECUTE;
 
-            //                        printf ("[%3u] [0x%16.16" PRIx64 " -
-            //                        0x%16.16" PRIx64 ") %c%c%c\n",
-            //                                range_info_idx,
-            //                                addr,
-            //                                size,
-            //                                (prot & VM_PROT_READ   ) ? 'r' :
-            //                                '-',
-            //                                (prot & VM_PROT_WRITE  ) ? 'w' :
-            //                                '-',
-            //                                (prot & VM_PROT_EXECUTE) ? 'x' :
-            //                                '-');
-
             if (prot != 0) {
               uint32_t cmd_type = LC_SEGMENT_64;
               uint32_t segment_size = sizeof(segment_command_64);
@@ -6346,8 +6334,13 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP &process_sp,
                 while (bytes_left > 0 && error.Success()) {
                   const size_t bytes_to_read =
                       bytes_left > sizeof(bytes) ? sizeof(bytes) : bytes_left;
-                  const size_t bytes_read = process_sp->ReadMemory(
+
+                  // In a savecore setting, we don't really care about caching,
+                  // as the data is dumped and very likely never read again,
+                  // so we call ReadMemoryFromInferior to bypass it.
+                  const size_t bytes_read = process_sp->ReadMemoryFromInferior(
                       addr, bytes, bytes_to_read, memory_read_error);
+
                   if (bytes_read == bytes_to_read) {
                     size_t bytes_written = bytes_read;
                     error = core_file.Write(bytes, bytes_written);