c34698a811
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.
45 lines
1.7 KiB
C++
45 lines
1.7 KiB
C++
//===-- Support.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/Host/linux/Support.h"
|
|
#include "lldb/Utility/LLDBLog.h"
|
|
#include "lldb/Utility/Log.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
|
|
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
|
|
lldb_private::getProcFile(::pid_t pid, ::pid_t tid, const llvm::Twine &file) {
|
|
Log *log = GetLog(LLDBLog::Host);
|
|
std::string File =
|
|
("/proc/" + llvm::Twine(pid) + "/task/" + llvm::Twine(tid) + "/" + file)
|
|
.str();
|
|
auto Ret = llvm::MemoryBuffer::getFileAsStream(File);
|
|
if (!Ret)
|
|
LLDB_LOG(log, "Failed to open {0}: {1}", File, Ret.getError().message());
|
|
return Ret;
|
|
}
|
|
|
|
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
|
|
lldb_private::getProcFile(::pid_t pid, const llvm::Twine &file) {
|
|
Log *log = GetLog(LLDBLog::Host);
|
|
std::string File = ("/proc/" + llvm::Twine(pid) + "/" + file).str();
|
|
auto Ret = llvm::MemoryBuffer::getFileAsStream(File);
|
|
if (!Ret)
|
|
LLDB_LOG(log, "Failed to open {0}: {1}", File, Ret.getError().message());
|
|
return Ret;
|
|
}
|
|
|
|
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
|
|
lldb_private::getProcFile(const llvm::Twine &file) {
|
|
Log *log = GetLog(LLDBLog::Host);
|
|
std::string File = ("/proc/" + file).str();
|
|
auto Ret = llvm::MemoryBuffer::getFileAsStream(File);
|
|
if (!Ret)
|
|
LLDB_LOG(log, "Failed to open {0}: {1}", File, Ret.getError().message());
|
|
return Ret;
|
|
}
|