beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibSymbolication: Use Core::File instead of Core::DeprecatedFile

Browse source
This commit is contained in:
Lucas CHOLLET 2023-04-26 22:22:35 -04:00 committed by Andreas Kling
parent c50b072852
commit 309a15e2aa
Notes: sideshowbarker 2024-07-17 18:08:55 +09:00 
Author: https://github.com/LucasChollet
Commit: https://github.com/SerenityOS/serenity/commit/309a15e2aa
Pull-request: https://github.com/SerenityOS/serenity/pull/18531
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Userland/Libraries/LibSymbolication/Symbolication.cpp
View file

@ -10,7 +10,7 @@
#include <AK/JsonObject.h>
#include <AK/JsonValue.h>
#include <AK/LexicalPath.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
#include <LibCore/MappedFile.h>
#include <LibDebug/DebugInfo.h>
#include <LibFileSystem/FileSystem.h>
@ -38,12 +38,19 @@ static KernelBaseState s_kernel_base_state = KernelBaseState::Uninitialized;
Optional<FlatPtr> kernel_base()
{
if (s_kernel_base_state == KernelBaseState::Uninitialized) {
auto file = Core::DeprecatedFile::open("/sys/kernel/constants/load_base", Core::OpenMode::ReadOnly);
auto file = Core::File::open("/sys/kernel/constants/load_base"sv, Core::File::OpenMode::Read);
if (file.is_error()) {
s_kernel_base_state = KernelBaseState::Invalid;
return {};
}
auto kernel_base_str = DeprecatedString { file.value()->read_all(), NoChomp };
auto file_content = file.value()->read_until_eof();
if (file_content.is_error()) {
s_kernel_base_state = KernelBaseState::Invalid;
return {};
}
auto kernel_base_str = DeprecatedString { file_content.value(), NoChomp };
using AddressType = u64;
auto maybe_kernel_base = kernel_base_str.to_uint<AddressType>();
if (!maybe_kernel_base.has_value()) {
@ -148,13 +155,19 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid, IncludeSourcePosition in
{
auto stack_path = DeprecatedString::formatted("/proc/{}/stacks/{}", pid, tid);
auto file_or_error = Core::DeprecatedFile::open(stack_path, Core::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(stack_path, Core::File::OpenMode::Read);
if (file_or_error.is_error()) {
warnln("Could not open {}: {}", stack_path, file_or_error.error());
return {};
}
auto json = JsonValue::from_string(file_or_error.value()->read_all());
auto file_content = file_or_error.value()->read_until_eof();
if (file_content.is_error()) {
warnln("Could not read {}: {}", stack_path, file_or_error.error());
return {};
}
auto json = JsonValue::from_string(file_content.value());
if (json.is_error() || !json.value().is_array()) {
warnln("Invalid contents in {}", stack_path);
return {};
@ -168,13 +181,19 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid, IncludeSourcePosition in
{
auto vm_path = DeprecatedString::formatted("/proc/{}/vm", pid);
auto file_or_error = Core::DeprecatedFile::open(vm_path, Core::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(vm_path, Core::File::OpenMode::Read);
if (file_or_error.is_error()) {
warnln("Could not open {}: {}", vm_path, file_or_error.error());
return {};
}
auto json = JsonValue::from_string(file_or_error.value()->read_all());
auto file_content = file_or_error.value()->read_until_eof();
if (file_content.is_error()) {
warnln("Could not read {}: {}", vm_path, file_or_error.error());
return {};
}
auto json = JsonValue::from_string(file_content.value());
if (json.is_error() || !json.value().is_array()) {
warnln("Invalid contents in {}", vm_path);
return {};