Most of our code was including Log.h even though that is not where the "lldb" log channel is defined (Log.h defines the generic logging infrastructure). This worked because Log.h included Logging.h, even though it should. After the recent refactor, it became impossible the two files include each other in this direction (the opposite inclusion is needed), so this patch removes the workaround that was put in place and cleans up all files to include the right thing. It also renames the file to LLDBLog to better reflect its purpose.
55 lines
1.8 KiB
C++
55 lines
1.8 KiB
C++
//===-- StreamFile.cpp ----------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Core/StreamFile.h"
|
|
#include "lldb/Host/FileSystem.h"
|
|
#include "lldb/Utility/LLDBLog.h"
|
|
#include "lldb/Utility/Log.h"
|
|
|
|
#include <cstdio>
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
StreamFile::StreamFile(uint32_t flags, uint32_t addr_size, ByteOrder byte_order)
|
|
: Stream(flags, addr_size, byte_order) {
|
|
m_file_sp = std::make_shared<File>();
|
|
}
|
|
|
|
StreamFile::StreamFile(int fd, bool transfer_ownership) : Stream() {
|
|
m_file_sp = std::make_shared<NativeFile>(fd, File::eOpenOptionWriteOnly,
|
|
transfer_ownership);
|
|
}
|
|
|
|
StreamFile::StreamFile(FILE *fh, bool transfer_ownership) : Stream() {
|
|
m_file_sp = std::make_shared<NativeFile>(fh, transfer_ownership);
|
|
}
|
|
|
|
StreamFile::StreamFile(const char *path, File::OpenOptions options,
|
|
uint32_t permissions)
|
|
: Stream() {
|
|
auto file = FileSystem::Instance().Open(FileSpec(path), options, permissions);
|
|
if (file)
|
|
m_file_sp = std::move(file.get());
|
|
else {
|
|
// TODO refactor this so the error gets popagated up instead of logged here.
|
|
LLDB_LOG_ERROR(GetLog(LLDBLog::Host), file.takeError(),
|
|
"Cannot open {1}: {0}", path);
|
|
m_file_sp = std::make_shared<File>();
|
|
}
|
|
}
|
|
|
|
StreamFile::~StreamFile() = default;
|
|
|
|
void StreamFile::Flush() { m_file_sp->Flush(); }
|
|
|
|
size_t StreamFile::WriteImpl(const void *s, size_t length) {
|
|
m_file_sp->Write(s, length);
|
|
return length;
|
|
}
|