This is an archive of the discontinued LLVM Phabricator instance.

Differential D13293

Trim the output of mktem in PlatformAndroid::DownloadSymbolFile
ClosedPublic

Authored by tberghammer on Sep 30 2015, 8:36 AM.

Details

Reviewers
ovyalov
Commits
rG539cd118b277: Trim the output of mktem in PlatformAndroid::DownloadSymbolFile
rLLDB248998: Trim the output of mktem in PlatformAndroid::DownloadSymbolFile
rL248998: Trim the output of mktem in PlatformAndroid::DownloadSymbolFile
Summary

Trim the output of mktem in PlatformAndroid::DownloadSymbolFile

Diff Detail

Repository
rL LLVM

Event Timeline

tberghammer updated this revision to Diff 36111.Sep 30 2015, 8:36 AM
tberghammer retitled this revision from to Trim the output of mktem in PlatformAndroid::DownloadSymbolFile.
tberghammer updated this object.
tberghammer added a reviewer: ovyalov.
tberghammer added a subscriber: lldb-commits.
Herald added subscribers: danalbert, tberghammer. · View Herald TranscriptSep 30 2015, 8:36 AM
ovyalov accepted this revision.Sep 30 2015, 4:37 PM
ovyalov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Sep 30 2015, 4:37 PM
Closed by commit rL248998: Trim the output of mktem in PlatformAndroid::DownloadSymbolFile (authored by tberghammer). · Explain WhyOct 1 2015, 2:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
source/
Plugins/
Platform/
Android/
2 lines

Diff 36209

lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp

Show First 20 Lines • Show All 325 Lines • ▼ Show 20 Lines if (module_sp->GetSectionList()->FindSectionByName(ConstString(".symtab")) != nullptr)
return Error("Symtab already available in the module"); return Error("Symtab already available in the module");
AdbClient adb(m_device_id); AdbClient adb(m_device_id);
std::string tmpdir; std::string tmpdir;
Error error = adb.Shell("mktemp --directory --tmpdir /data/local/tmp", 5000 /* ms */, &tmpdir); Error error = adb.Shell("mktemp --directory --tmpdir /data/local/tmp", 5000 /* ms */, &tmpdir);
if (error.Fail() || tmpdir.empty()) if (error.Fail() || tmpdir.empty())
return Error("Failed to generate temporary directory on the device (%s)", error.AsCString()); return Error("Failed to generate temporary directory on the device (%s)", error.AsCString());
tmpdir.erase(tmpdir.size() - 1); // Remove trailing new line tmpdir = llvm::StringRef(tmpdir).trim().str();
// Create file remover for the temporary directory created on the device // Create file remover for the temporary directory created on the device
std::unique_ptr<std::string, std::function<void(std::string*)>> tmpdir_remover( std::unique_ptr<std::string, std::function<void(std::string*)>> tmpdir_remover(
&tmpdir, &tmpdir,
[this, &adb](std::string* s) { [this, &adb](std::string* s) {
StreamString command; StreamString command;
command.Printf("rm -rf %s", s->c_str()); command.Printf("rm -rf %s", s->c_str());
Error error = adb.Shell(command.GetData(), 5000 /* ms */, nullptr); Error error = adb.Shell(command.GetData(), 5000 /* ms */, nullptr);
Show All 22 Lines