RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:47:35 +00:00
Code Issues Activity Actions

Profiler: Replace uses of JsonObject::get_deprecated()/get_ptr()

Browse source
This commit is contained in:
Sam Atkins 2022-12-21 20:56:33 +00:00 • committed by Tim Flynn
parent 33ab3a212f
commit b592629fe5
1 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Userland/DevTools/Profiler/Profile.cpp
View file

@ -253,21 +253,21 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
} }
} }
auto const* strings_value = object.get_ptr("strings"sv); auto strings_value = object.get_array("strings"sv);
if (!strings_value || !strings_value->is_array()) if (!strings_value.has_value())
return Error::from_string_literal("Malformed profile (strings is not an array)"); return Error::from_string_literal("Malformed profile (strings is not an array)");
auto const& strings = strings_value.value();
HashMap<FlatPtr, DeprecatedString> profile_strings; HashMap<FlatPtr, DeprecatedString> profile_strings;
for (FlatPtr string_id = 0; string_id < strings_value->as_array().size(); ++string_id) { for (FlatPtr string_id = 0; string_id < strings.size(); ++string_id) {
auto const& value = strings_value->as_array().at(string_id); auto const& value = strings.at(string_id);
profile_strings.set(string_id, value.to_deprecated_string()); profile_strings.set(string_id, value.to_deprecated_string());
} }
auto const* events_value = object.get_ptr("events"sv); auto events_value = object.get_array("events"sv);
if (!events_value || !events_value->is_array()) if (!events_value.has_value())
return Error::from_string_literal("Malformed profile (events is not an array)"); return Error::from_string_literal("Malformed profile (events is not an array)");
auto const& perf_events = events_value.value();
auto const& perf_events = events_value->as_array();
NonnullOwnPtrVector<Process> all_processes; NonnullOwnPtrVector<Process> all_processes;
HashMap<pid_t, Process*> current_processes; HashMap<pid_t, Process*> current_processes;
@ -281,34 +281,34 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
event.serial = next_serial; event.serial = next_serial;
next_serial.increment(); next_serial.increment();
event.timestamp = perf_event.get_deprecated("timestamp"sv).to_number<u64>(); event.timestamp = perf_event.get_u64("timestamp"sv).value_or(0);
event.lost_samples = perf_event.get_deprecated("lost_samples"sv).to_number<u32>(); event.lost_samples = perf_event.get_u32("lost_samples"sv).value_or(0);
event.pid = perf_event.get_deprecated("pid"sv).to_i32(); event.pid = perf_event.get_i32("pid"sv).value_or(0);
event.tid = perf_event.get_deprecated("tid"sv).to_i32(); event.tid = perf_event.get_i32("tid"sv).value_or(0);
auto type_string = perf_event.get_deprecated("type"sv).to_deprecated_string(); auto type_string = perf_event.get_deprecated_string("type"sv).value_or({});
if (type_string == "sample"sv) { if (type_string == "sample"sv) {
event.data = Event::SampleData {}; event.data = Event::SampleData {};
} else if (type_string == "malloc"sv) { } else if (type_string == "malloc"sv) {
event.data = Event::MallocData { event.data = Event::MallocData {
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(), .ptr = perf_event.get_addr("ptr"sv).value_or(0),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(), .size = perf_event.get_integer<size_t>("size"sv).value_or(0),
}; };
} else if (type_string == "free"sv) { } else if (type_string == "free"sv) {
event.data = Event::FreeData { event.data = Event::FreeData {
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(), .ptr = perf_event.get_addr("ptr"sv).value_or(0),
}; };
} else if (type_string == "signpost"sv) { } else if (type_string == "signpost"sv) {
auto string_id = perf_event.get_deprecated("arg1"sv).to_number<FlatPtr>(); auto string_id = perf_event.get_addr("arg1"sv).value_or(0);
event.data = Event::SignpostData { event.data = Event::SignpostData {
.string = profile_strings.get(string_id).value_or(DeprecatedString::formatted("Signpost #{}", string_id)), .string = profile_strings.get(string_id).value_or(DeprecatedString::formatted("Signpost #{}", string_id)),
.arg = perf_event.get_deprecated("arg2"sv).to_number<FlatPtr>(), .arg = perf_event.get_addr("arg2"sv).value_or(0),
}; };
} else if (type_string == "mmap"sv) { } else if (type_string == "mmap"sv) {
auto ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(); auto ptr = perf_event.get_addr("ptr"sv).value_or(0);
auto size = perf_event.get_deprecated("size"sv).to_number<size_t>(); auto size = perf_event.get_integer<size_t>("size"sv).value_or(0);
auto name = perf_event.get_deprecated("name"sv).to_deprecated_string(); auto name = perf_event.get_deprecated_string("name"sv).value_or({});
event.data = Event::MmapData { event.data = Event::MmapData {
.ptr = ptr, .ptr = ptr,
@ -322,13 +322,13 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
continue; continue;
} else if (type_string == "munmap"sv) { } else if (type_string == "munmap"sv) {
event.data = Event::MunmapData { event.data = Event::MunmapData {
.ptr = perf_event.get_deprecated("ptr"sv).to_number<FlatPtr>(), .ptr = perf_event.get_addr("ptr"sv).value_or(0),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(), .size = perf_event.get_integer<size_t>("size"sv).value_or(0),
}; };
continue; continue;
} else if (type_string == "process_create"sv) { } else if (type_string == "process_create"sv) {
auto parent_pid = perf_event.get_deprecated("parent_pid"sv).to_number<pid_t>(); auto parent_pid = perf_event.get_integer<pid_t>("parent_pid"sv).value_or(0);
auto executable = perf_event.get_deprecated("executable"sv).to_deprecated_string(); auto executable = perf_event.get_deprecated_string("executable"sv).value_or({});
event.data = Event::ProcessCreateData { event.data = Event::ProcessCreateData {
.parent_pid = parent_pid, .parent_pid = parent_pid,
.executable = executable, .executable = executable,
@ -346,7 +346,7 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
all_processes.append(move(sampled_process)); all_processes.append(move(sampled_process));
continue; continue;
} else if (type_string == "process_exec"sv) { } else if (type_string == "process_exec"sv) {
auto executable = perf_event.get_deprecated("executable"sv).to_deprecated_string(); auto executable = perf_event.get_deprecated_string("executable"sv).value_or({});
event.data = Event::ProcessExecData { event.data = Event::ProcessExecData {
.executable = executable, .executable = executable,
}; };
@ -374,7 +374,7 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
current_processes.remove(event.pid); current_processes.remove(event.pid);
continue; continue;
} else if (type_string == "thread_create"sv) { } else if (type_string == "thread_create"sv) {
auto parent_tid = perf_event.get_deprecated("parent_tid"sv).to_number<pid_t>(); auto parent_tid = perf_event.get_integer<pid_t>("parent_tid"sv).value_or(0);
event.data = Event::ThreadCreateData { event.data = Event::ThreadCreateData {
.parent_tid = parent_tid, .parent_tid = parent_tid,
}; };
@ -388,13 +388,13 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
it->value->handle_thread_exit(event.tid, event.serial); it->value->handle_thread_exit(event.tid, event.serial);
continue; continue;
} else if (type_string == "read"sv) { } else if (type_string == "read"sv) {
auto const string_index = perf_event.get_deprecated("filename_index"sv).to_number<FlatPtr>(); auto const string_index = perf_event.get_addr("filename_index"sv).value_or(0);
event.data = Event::ReadData { event.data = Event::ReadData {
.fd = perf_event.get_deprecated("fd"sv).to_number<int>(), .fd = perf_event.get_integer<int>("fd"sv).value_or(0),
.size = perf_event.get_deprecated("size"sv).to_number<size_t>(), .size = perf_event.get_integer<size_t>("size"sv).value_or(0),
.path = profile_strings.get(string_index).value(), .path = profile_strings.get(string_index).value(),
.start_timestamp = perf_event.get_deprecated("start_timestamp"sv).to_number<size_t>(), .start_timestamp = perf_event.get_integer<size_t>("start_timestamp"sv).value_or(0),
.success = perf_event.get_deprecated("success"sv).to_bool() .success = perf_event.get_bool("success"sv).value_or(false)
}; };
} else { } else {
dbgln("Unknown event type '{}'", type_string); dbgln("Unknown event type '{}'", type_string);
@ -403,9 +403,9 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path
auto maybe_kernel_base = Symbolication::kernel_base(); auto maybe_kernel_base = Symbolication::kernel_base();
auto const* stack = perf_event.get_ptr("stack"sv); auto stack = perf_event.get_array("stack"sv);
VERIFY(stack); VERIFY(stack.has_value());
auto const& stack_array = stack->as_array(); auto const& stack_array = stack.value();
for (ssize_t i = stack_array.values().size() - 1; i >= 0; --i) { for (ssize_t i = stack_array.values().size() - 1; i >= 0; --i) {
auto const& frame = stack_array.at(i); auto const& frame = stack_array.at(i);
auto ptr = frame.to_number<u64>(); auto ptr = frame.to_number<u64>();