carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 06:44:46 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

[Debugger] Use FileSystem instead of calling openFileForWrite directly.

Browse Source 
This replaces the (only) call to llvm::sys::fs::openFileForWrite with
FileSystem::Open. This guarantees that we include log files in the
reproducers.

Differential revision: https://reviews.llvm.org/D81499
This commit is contained in:
Jonas Devlieghere
2020-06-10 18:13:32 -07:00
parent 1cf14860db
commit 6b2e676555
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lldb/source/Core/Debugger.cpp
+13 -8
View File
@@ -1154,17 +1154,22 @@ bool Debugger::EnableLog(llvm::StringRef channel,
if (pos != m_log_streams.end())
log_stream_sp = pos->second.lock();
if (!log_stream_sp) {
llvm::sys::fs::OpenFlags flags = llvm::sys::fs::OF_Text;
File::OpenOptions flags =
File::eOpenOptionWrite | File::eOpenOptionCanCreate;
if (log_options & LLDB_LOG_OPTION_APPEND)
flags |= llvm::sys::fs::OF_Append;
int FD;
if (std::error_code ec = llvm::sys::fs::openFileForWrite(
log_file, FD, llvm::sys::fs::CD_CreateAlways, flags)) {
error_stream << "Unable to open log file: " << ec.message();
flags |= File::eOpenOptionAppend;
else
flags |= File::eOpenOptionTruncate;
auto file = FileSystem::Instance().Open(
FileSpec(log_file), flags, lldb::eFilePermissionsFileDefault, false);
if (!file) {
// FIXME: This gets garbled when called from the log command.
error_stream << "Unable to open log file: " << log_file;
return false;
}
log_stream_sp =
std::make_shared<llvm::raw_fd_ostream>(FD, should_close, unbuffered);
log_stream_sp = std::make_shared<llvm::raw_fd_ostream>(
(*file)->GetDescriptor(), should_close, unbuffered);
m_log_streams[log_file] = log_stream_sp;
}
}