Skip to content

Commit 6ce8fef

Browse files
committed
Use the process' ReadCStringFromMemory from DYLDRendezvous::ReadStringFromMemory.
Tested: Ubuntu 14.04 x86_64, clang-3.5-built lldb. MacOSX 10.9.4, Xcode6-Beta7-built lldb. Visual packet inspection on lldb <-> llgs shows significant reduction in overly-verbose memory read traffic on start-up when scanning shared library info. Change by Stephane Sezer. llvm-svn: 217153
1 parent ab005ed commit 6ce8fef

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp

+1-13
Original file line numberDiff line numberDiff line change
@@ -320,23 +320,11 @@ DYLDRendezvous::ReadStringFromMemory(addr_t addr)
320320
{
321321
std::string str;
322322
Error error;
323-
size_t size;
324-
char c;
325323

326324
if (addr == LLDB_INVALID_ADDRESS)
327325
return std::string();
328326

329-
for (;;) {
330-
size = m_process->DoReadMemory(addr, &c, 1, error);
331-
if (size != 1 || error.Fail())
332-
return std::string();
333-
if (c == 0)
334-
break;
335-
else {
336-
str.push_back(c);
337-
addr++;
338-
}
339-
}
327+
m_process->ReadCStringFromMemory(addr, str, error);
340328

341329
return str;
342330
}

0 commit comments

Comments
 (0)