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

Kernel+SystemMonitor+lscpu: Rename 'CPUID' -> 'Vendor ID'

Browse source 
This is what the Intel manual, as well as Linux's cpuinfo calls it.
This commit is contained in:
Linus Groh 2022-04-03 17:09:29 +01:00 committed by Andreas Kling
parent 3f9c2495e5
commit 0f27432ec6
Notes: sideshowbarker 2024-07-17 14:30:32 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/0f27432ec6
Pull-request: https://github.com/SerenityOS/serenity/pull/13482
Reviewed-by: https://github.com/bgianfo ✅
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Kernel/GlobalProcessExposed.cpp
View file

@ -582,8 +582,7 @@ private:
auto& info = proc.info(); auto& info = proc.info();
auto obj = TRY(array.add_object()); auto obj = TRY(array.add_object());
TRY(obj.add("processor", proc.id())); TRY(obj.add("processor", proc.id()));
// FIXME: Rename this to use the same name everywhere. TRY(obj.add("vendor_id", info.vendor_id_string()));
TRY(obj.add("cpuid", info.vendor_id_string()));
TRY(obj.add("family", info.display_family())); TRY(obj.add("family", info.display_family()));
auto features_array = TRY(obj.add_array("features")); auto features_array = TRY(obj.add_array("features"));

2
Userland/Applications/SystemMonitor/main.cpp
View file

@ -133,7 +133,7 @@ public:
{ {
Vector<GUI::JsonArrayModel::FieldSpec> processors_field; Vector<GUI::JsonArrayModel::FieldSpec> processors_field;
processors_field.empend("processor", "Processor", Gfx::TextAlignment::CenterRight); processors_field.empend("processor", "Processor", Gfx::TextAlignment::CenterRight);
processors_field.empend("cpuid", "CPUID", Gfx::TextAlignment::CenterLeft); processors_field.empend("vendor_id", "Vendor ID", Gfx::TextAlignment::CenterLeft);
processors_field.empend("brand", "Brand", Gfx::TextAlignment::CenterLeft); processors_field.empend("brand", "Brand", Gfx::TextAlignment::CenterLeft);
processors_field.empend("Features", Gfx::TextAlignment::CenterLeft, [](auto& object) { processors_field.empend("Features", Gfx::TextAlignment::CenterLeft, [](auto& object) {
StringBuilder builder; StringBuilder builder;

4
Userland/Utilities/lscpu.cpp
View file

@ -14,8 +14,8 @@
static void print_cpu_info(JsonObject const& value) static void print_cpu_info(JsonObject const& value)
{ {
outln("CPU {}:", value.get("processor").as_u32()); outln("CPU {}:", value.get("processor").as_u32());
outln("\tVendor ID: {}", value.get("cpuid").as_string()); outln("\tVendor ID: {}", value.get("vendor_id").as_string());
outln("\tModel: {}", value.get("brand").as_string()); outln("\tBrand: {}", value.get("brand").as_string());
outln("\tFamily: {}", value.get("family").as_u32()); outln("\tFamily: {}", value.get("family").as_u32());
outln("\tModel: {}", value.get("model").as_u32()); outln("\tModel: {}", value.get("model").as_u32());
outln("\tStepping: {}", value.get("stepping").as_u32()); outln("\tStepping: {}", value.get("stepping").as_u32());