diff --git a/Kernel/Tasks/Thread.h b/Kernel/Tasks/Thread.h index 412fb069f7..b5aa4f0dba 100644 --- a/Kernel/Tasks/Thread.h +++ b/Kernel/Tasks/Thread.h @@ -896,41 +896,41 @@ public: unsigned cow_faults() const { return m_cow_faults; } void did_cow_fault() { ++m_cow_faults; } - unsigned file_read_bytes() const { return m_file_read_bytes; } - unsigned file_write_bytes() const { return m_file_write_bytes; } + u64 file_read_bytes() const { return m_file_read_bytes; } + u64 file_write_bytes() const { return m_file_write_bytes; } - void did_file_read(unsigned bytes) + void did_file_read(u64 bytes) { m_file_read_bytes += bytes; } - void did_file_write(unsigned bytes) + void did_file_write(u64 bytes) { m_file_write_bytes += bytes; } - unsigned unix_socket_read_bytes() const { return m_unix_socket_read_bytes; } - unsigned unix_socket_write_bytes() const { return m_unix_socket_write_bytes; } + u64 unix_socket_read_bytes() const { return m_unix_socket_read_bytes; } + u64 unix_socket_write_bytes() const { return m_unix_socket_write_bytes; } - void did_unix_socket_read(unsigned bytes) + void did_unix_socket_read(u64 bytes) { m_unix_socket_read_bytes += bytes; } - void did_unix_socket_write(unsigned bytes) + void did_unix_socket_write(u64 bytes) { m_unix_socket_write_bytes += bytes; } - unsigned ipv4_socket_read_bytes() const { return m_ipv4_socket_read_bytes; } - unsigned ipv4_socket_write_bytes() const { return m_ipv4_socket_write_bytes; } + u64 ipv4_socket_read_bytes() const { return m_ipv4_socket_read_bytes; } + u64 ipv4_socket_write_bytes() const { return m_ipv4_socket_write_bytes; } - void did_ipv4_socket_read(unsigned bytes) + void did_ipv4_socket_read(u64 bytes) { m_ipv4_socket_read_bytes += bytes; } - void did_ipv4_socket_write(unsigned bytes) + void did_ipv4_socket_write(u64 bytes) { m_ipv4_socket_write_bytes += bytes; } @@ -1210,14 +1210,14 @@ private: unsigned m_zero_faults { 0 }; unsigned m_cow_faults { 0 }; - unsigned m_file_read_bytes { 0 }; - unsigned m_file_write_bytes { 0 }; + u64 m_file_read_bytes { 0 }; + u64 m_file_write_bytes { 0 }; - unsigned m_unix_socket_read_bytes { 0 }; - unsigned m_unix_socket_write_bytes { 0 }; + u64 m_unix_socket_read_bytes { 0 }; + u64 m_unix_socket_write_bytes { 0 }; - unsigned m_ipv4_socket_read_bytes { 0 }; - unsigned m_ipv4_socket_write_bytes { 0 }; + u64 m_ipv4_socket_read_bytes { 0 }; + u64 m_ipv4_socket_write_bytes { 0 }; FPUState m_fpu_state {}; State m_state { Thread::State::Invalid }; diff --git a/Userland/Applications/SystemMonitor/ProcessModel.h b/Userland/Applications/SystemMonitor/ProcessModel.h index f1db941ca2..d26a63b5fd 100644 --- a/Userland/Applications/SystemMonitor/ProcessModel.h +++ b/Userland/Applications/SystemMonitor/ProcessModel.h @@ -123,12 +123,12 @@ private: unsigned inode_faults { 0 }; unsigned zero_faults { 0 }; unsigned cow_faults { 0 }; - unsigned unix_socket_read_bytes { 0 }; - unsigned unix_socket_write_bytes { 0 }; - unsigned ipv4_socket_read_bytes { 0 }; - unsigned ipv4_socket_write_bytes { 0 }; - unsigned file_read_bytes { 0 }; - unsigned file_write_bytes { 0 }; + u64 unix_socket_read_bytes { 0 }; + u64 unix_socket_write_bytes { 0 }; + u64 ipv4_socket_read_bytes { 0 }; + u64 ipv4_socket_write_bytes { 0 }; + u64 file_read_bytes { 0 }; + u64 file_write_bytes { 0 }; float cpu_percent { 0 }; float cpu_percent_kernel { 0 }; Process& process; diff --git a/Userland/Libraries/LibCore/ProcessStatisticsReader.cpp b/Userland/Libraries/LibCore/ProcessStatisticsReader.cpp index aff504a9e4..43e8d3bab2 100644 --- a/Userland/Libraries/LibCore/ProcessStatisticsReader.cpp +++ b/Userland/Libraries/LibCore/ProcessStatisticsReader.cpp @@ -68,12 +68,12 @@ ErrorOr ProcessStatisticsReader::get_all(SeekableStream& thread.inode_faults = thread_object.get_u32("inode_faults"sv).value_or(0); thread.zero_faults = thread_object.get_u32("zero_faults"sv).value_or(0); thread.cow_faults = thread_object.get_u32("cow_faults"sv).value_or(0); - thread.unix_socket_read_bytes = thread_object.get_u32("unix_socket_read_bytes"sv).value_or(0); - thread.unix_socket_write_bytes = thread_object.get_u32("unix_socket_write_bytes"sv).value_or(0); - thread.ipv4_socket_read_bytes = thread_object.get_u32("ipv4_socket_read_bytes"sv).value_or(0); - thread.ipv4_socket_write_bytes = thread_object.get_u32("ipv4_socket_write_bytes"sv).value_or(0); - thread.file_read_bytes = thread_object.get_u32("file_read_bytes"sv).value_or(0); - thread.file_write_bytes = thread_object.get_u32("file_write_bytes"sv).value_or(0); + thread.unix_socket_read_bytes = thread_object.get_u64("unix_socket_read_bytes"sv).value_or(0); + thread.unix_socket_write_bytes = thread_object.get_u64("unix_socket_write_bytes"sv).value_or(0); + thread.ipv4_socket_read_bytes = thread_object.get_u64("ipv4_socket_read_bytes"sv).value_or(0); + thread.ipv4_socket_write_bytes = thread_object.get_u64("ipv4_socket_write_bytes"sv).value_or(0); + thread.file_read_bytes = thread_object.get_u64("file_read_bytes"sv).value_or(0); + thread.file_write_bytes = thread_object.get_u64("file_write_bytes"sv).value_or(0); process.threads.append(move(thread)); }); diff --git a/Userland/Libraries/LibCore/ProcessStatisticsReader.h b/Userland/Libraries/LibCore/ProcessStatisticsReader.h index c42576dab9..ded72705a4 100644 --- a/Userland/Libraries/LibCore/ProcessStatisticsReader.h +++ b/Userland/Libraries/LibCore/ProcessStatisticsReader.h @@ -22,12 +22,12 @@ struct ThreadStatistics { unsigned inode_faults; unsigned zero_faults; unsigned cow_faults; - unsigned unix_socket_read_bytes; - unsigned unix_socket_write_bytes; - unsigned ipv4_socket_read_bytes; - unsigned ipv4_socket_write_bytes; - unsigned file_read_bytes; - unsigned file_write_bytes; + u64 unix_socket_read_bytes; + u64 unix_socket_write_bytes; + u64 ipv4_socket_read_bytes; + u64 ipv4_socket_write_bytes; + u64 file_read_bytes; + u64 file_write_bytes; DeprecatedString state; u32 cpu; u32 priority;