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

SystemMonitor: Use u64 for all GraphWidget values

Browse source 
Turns out size_t is not guaranteed to be 64-bit on i686 and trying to
set the max value using a u64 caused a narrowing conversion.
This commit is contained in:
sin-ack 2021-10-06 22:32:56 +00:00 committed by Andreas Kling
parent 4444bcabde
commit c330ad27b6
Notes: sideshowbarker 2024-07-18 02:59:16 +09:00 
Author: https://github.com/sin-ack
Commit: https://github.com/SerenityOS/serenity/commit/c330ad27b63
Pull-request: https://github.com/SerenityOS/serenity/pull/10386
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ GraphWidget::~GraphWidget()
{
}
void GraphWidget::add_value(Vector<size_t, 1>&& value)
void GraphWidget::add_value(Vector<u64, 1>&& value)
{
m_values.enqueue(move(value));
update();

10
Userland/Applications/SystemMonitor/GraphWidget.h
View file

@ -15,10 +15,10 @@ class GraphWidget final : public GUI::Frame {
public:
virtual ~GraphWidget() override;
void set_max(size_t max) { m_max = max; }
size_t max() const { return m_max; }
void set_max(u64 max) { m_max = max; }
u64 max() const { return m_max; }
void add_value(Vector<size_t, 1>&&);
void add_value(Vector<u64, 1>&&);
struct ValueFormat {
Gfx::ColorRole graph_color_role { Gfx::ColorRole::Base };
@ -38,9 +38,9 @@ private:
virtual void paint_event(GUI::PaintEvent&) override;
size_t m_max { 100 };
u64 m_max { 100 };
Vector<ValueFormat, 1> m_value_format;
CircularQueue<Vector<size_t, 1>, 4000> m_values;
CircularQueue<Vector<u64, 1>, 4000> m_values;
bool m_stack_values { false };
Vector<Gfx::IntPoint, 1> m_calculated_points;

36
Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp
View file

@ -62,7 +62,7 @@ MemoryStatsWidget::~MemoryStatsWidget()
{
}
static inline u64 page_count_to_bytes(u64 count)
static inline u64 page_count_to_bytes(size_t count)
{
return count * 4096;
}
@ -88,25 +88,25 @@ void MemoryStatsWidget::refresh()
VERIFY(json_result.has_value());
auto json = json_result.value().as_object();
[[maybe_unused]] unsigned kmalloc_eternal_allocated = json.get("kmalloc_eternal_allocated").to_u32();
unsigned kmalloc_allocated = json.get("kmalloc_allocated").to_u32();
unsigned kmalloc_available = json.get("kmalloc_available").to_u32();
unsigned user_physical_allocated = json.get("user_physical_allocated").to_u64();
unsigned user_physical_available = json.get("user_physical_available").to_u64();
unsigned user_physical_committed = json.get("user_physical_committed").to_u64();
unsigned user_physical_uncommitted = json.get("user_physical_uncommitted").to_u64();
unsigned super_physical_alloc = json.get("super_physical_allocated").to_u64();
unsigned super_physical_free = json.get("super_physical_available").to_u64();
unsigned kmalloc_call_count = json.get("kmalloc_call_count").to_u32();
unsigned kfree_call_count = json.get("kfree_call_count").to_u32();
[[maybe_unused]] u32 kmalloc_eternal_allocated = json.get("kmalloc_eternal_allocated").to_u32();
u32 kmalloc_allocated = json.get("kmalloc_allocated").to_u32();
u32 kmalloc_available = json.get("kmalloc_available").to_u32();
u64 user_physical_allocated = json.get("user_physical_allocated").to_u64();
u64 user_physical_available = json.get("user_physical_available").to_u64();
u64 user_physical_committed = json.get("user_physical_committed").to_u64();
u64 user_physical_uncommitted = json.get("user_physical_uncommitted").to_u64();
u64 super_physical_alloc = json.get("super_physical_allocated").to_u64();
u64 super_physical_free = json.get("super_physical_available").to_u64();
u32 kmalloc_call_count = json.get("kmalloc_call_count").to_u32();
u32 kfree_call_count = json.get("kfree_call_count").to_u32();
size_t kmalloc_bytes_total = kmalloc_allocated + kmalloc_available;
size_t user_physical_pages_total = user_physical_allocated + user_physical_available;
size_t supervisor_pages_total = super_physical_alloc + super_physical_free;
u64 kmalloc_bytes_total = kmalloc_allocated + kmalloc_available;
u64 user_physical_pages_total = user_physical_allocated + user_physical_available;
u64 supervisor_pages_total = super_physical_alloc + super_physical_free;
size_t physical_pages_total = user_physical_pages_total + supervisor_pages_total;
size_t physical_pages_in_use = user_physical_allocated + super_physical_alloc;
size_t total_userphysical_and_swappable_pages = user_physical_allocated + user_physical_committed + user_physical_uncommitted;
u64 physical_pages_total = user_physical_pages_total + supervisor_pages_total;
u64 physical_pages_in_use = user_physical_allocated + super_physical_alloc;
u64 total_userphysical_and_swappable_pages = user_physical_allocated + user_physical_committed + user_physical_uncommitted;
m_kmalloc_space_label->set_text(String::formatted("{}/{}", human_readable_size(kmalloc_allocated), human_readable_size(kmalloc_bytes_total)));
m_user_physical_pages_label->set_text(String::formatted("{}/{}", human_readable_size(page_count_to_bytes(physical_pages_in_use)), human_readable_size(page_count_to_bytes(physical_pages_total))));