mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 06:48:12 +00:00
ProcessManager+top: Rename "linear" size to "virtual" size.
I originally called it "linear" because that's how the Intel manual names virtual addresses in many cases. I'm ready to accept that most people know this as "virtual" so let's just call it that.
This commit is contained in:
parent
54448b5d24
commit
0ed89440f1
5 changed files with 27 additions and 27 deletions
|
@ -52,8 +52,8 @@ String ProcessModel::column_name(int column) const
|
||||||
return "User";
|
return "User";
|
||||||
case Column::Priority:
|
case Column::Priority:
|
||||||
return "Pr";
|
return "Pr";
|
||||||
case Column::Linear:
|
case Column::Virtual:
|
||||||
return "Linear";
|
return "Virtual";
|
||||||
case Column::Physical:
|
case Column::Physical:
|
||||||
return "Physical";
|
return "Physical";
|
||||||
case Column::CPU:
|
case Column::CPU:
|
||||||
|
@ -80,7 +80,7 @@ GModel::ColumnMetadata ProcessModel::column_metadata(int column) const
|
||||||
return { 16, TextAlignment::CenterLeft };
|
return { 16, TextAlignment::CenterLeft };
|
||||||
case Column::User:
|
case Column::User:
|
||||||
return { 50, TextAlignment::CenterLeft };
|
return { 50, TextAlignment::CenterLeft };
|
||||||
case Column::Linear:
|
case Column::Virtual:
|
||||||
return { 65, TextAlignment::CenterRight };
|
return { 65, TextAlignment::CenterRight };
|
||||||
case Column::Physical:
|
case Column::Physical:
|
||||||
return { 65, TextAlignment::CenterRight };
|
return { 65, TextAlignment::CenterRight };
|
||||||
|
@ -128,10 +128,10 @@ GVariant ProcessModel::data(const GModelIndex& index, Role role) const
|
||||||
return 3;
|
return 3;
|
||||||
ASSERT_NOT_REACHED();
|
ASSERT_NOT_REACHED();
|
||||||
return 3;
|
return 3;
|
||||||
case Column::Linear:
|
case Column::Virtual:
|
||||||
return (int)process.current_state.linear;
|
return (int)process.current_state.virtual_size;
|
||||||
case Column::Physical:
|
case Column::Physical:
|
||||||
return (int)process.current_state.physical;
|
return (int)process.current_state.physical_size;
|
||||||
case Column::CPU:
|
case Column::CPU:
|
||||||
return process.current_state.cpu_percent;
|
return process.current_state.cpu_percent;
|
||||||
case Column::Name:
|
case Column::Name:
|
||||||
|
@ -164,10 +164,10 @@ GVariant ProcessModel::data(const GModelIndex& index, Role role) const
|
||||||
if (process.current_state.priority == "Normal")
|
if (process.current_state.priority == "Normal")
|
||||||
return *m_normal_priority_icon;
|
return *m_normal_priority_icon;
|
||||||
return process.current_state.priority;
|
return process.current_state.priority;
|
||||||
case Column::Linear:
|
case Column::Virtual:
|
||||||
return pretty_byte_size(process.current_state.linear);
|
return pretty_byte_size(process.current_state.virtual_size);
|
||||||
case Column::Physical:
|
case Column::Physical:
|
||||||
return pretty_byte_size(process.current_state.physical);
|
return pretty_byte_size(process.current_state.physical_size);
|
||||||
case Column::CPU:
|
case Column::CPU:
|
||||||
return process.current_state.cpu_percent;
|
return process.current_state.cpu_percent;
|
||||||
case Column::Name:
|
case Column::Name:
|
||||||
|
@ -221,9 +221,9 @@ void ProcessModel::update()
|
||||||
ASSERT(ok);
|
ASSERT(ok);
|
||||||
state.state = parts[7];
|
state.state = parts[7];
|
||||||
state.name = parts[11];
|
state.name = parts[11];
|
||||||
state.linear = parts[12].to_uint(ok);
|
state.virtual_size = parts[12].to_uint(ok);
|
||||||
ASSERT(ok);
|
ASSERT(ok);
|
||||||
state.physical = parts[13].to_uint(ok);
|
state.physical_size = parts[13].to_uint(ok);
|
||||||
ASSERT(ok);
|
ASSERT(ok);
|
||||||
sum_nsched += nsched;
|
sum_nsched += nsched;
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
Priority,
|
Priority,
|
||||||
User,
|
User,
|
||||||
PID,
|
PID,
|
||||||
Linear,
|
Virtual,
|
||||||
Physical,
|
Physical,
|
||||||
Syscalls,
|
Syscalls,
|
||||||
__Count
|
__Count
|
||||||
|
@ -48,8 +48,8 @@ private:
|
||||||
String state;
|
String state;
|
||||||
String user;
|
String user;
|
||||||
String priority;
|
String priority;
|
||||||
size_t linear;
|
size_t virtual_size;
|
||||||
size_t physical;
|
size_t physical_size;
|
||||||
unsigned syscalls;
|
unsigned syscalls;
|
||||||
float cpu_percent;
|
float cpu_percent;
|
||||||
};
|
};
|
||||||
|
|
|
@ -74,13 +74,13 @@ void CProcessStatisticsReader::update_map(HashMap<pid_t, CProcessStatistics>& ma
|
||||||
process.state = parts[7];
|
process.state = parts[7];
|
||||||
|
|
||||||
process.name = parts[11];
|
process.name = parts[11];
|
||||||
process.linear = parts[12].to_uint(ok);
|
process.virtual_size = parts[12].to_uint(ok);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
fprintf(stderr, "CProcessHelper : couldn't convert %s to a valid amount of linear address space used\n", parts[12].characters());
|
fprintf(stderr, "CProcessHelper : couldn't convert %s to a valid amount of virtual address space used\n", parts[12].characters());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
process.physical = parts[13].to_uint(ok);
|
process.physical_size = parts[13].to_uint(ok);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
fprintf(stderr, "CProcessHelper : couldn't convert %s to a valid amount of physical address space used\n", parts[13].characters());
|
fprintf(stderr, "CProcessHelper : couldn't convert %s to a valid amount of physical address space used\n", parts[13].characters());
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -11,8 +11,8 @@ struct CProcessStatistics {
|
||||||
String username;
|
String username;
|
||||||
uid_t uid;
|
uid_t uid;
|
||||||
String priority;
|
String priority;
|
||||||
size_t linear;
|
size_t virtual_size;
|
||||||
size_t physical;
|
size_t physical_size;
|
||||||
unsigned syscalls;
|
unsigned syscalls;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@ struct Process {
|
||||||
String state;
|
String state;
|
||||||
String user;
|
String user;
|
||||||
String priority;
|
String priority;
|
||||||
unsigned linear;
|
unsigned virtual_size;
|
||||||
unsigned committed;
|
unsigned physical_size;
|
||||||
unsigned nsched_since_prev;
|
unsigned nsched_since_prev;
|
||||||
unsigned cpu_percent;
|
unsigned cpu_percent;
|
||||||
unsigned cpu_percent_decimal;
|
unsigned cpu_percent_decimal;
|
||||||
|
@ -61,9 +61,9 @@ static Snapshot get_snapshot()
|
||||||
process.priority = parts[16];
|
process.priority = parts[16];
|
||||||
process.state = parts[7];
|
process.state = parts[7];
|
||||||
process.name = parts[11];
|
process.name = parts[11];
|
||||||
process.linear = parts[12].to_uint(ok);
|
process.virtual_size = parts[12].to_uint(ok);
|
||||||
ASSERT(ok);
|
ASSERT(ok);
|
||||||
process.committed = parts[13].to_uint(ok);
|
process.physical_size = parts[13].to_uint(ok);
|
||||||
ASSERT(ok);
|
ASSERT(ok);
|
||||||
snapshot.map.set(pid, move(process));
|
snapshot.map.set(pid, move(process));
|
||||||
}
|
}
|
||||||
|
@ -93,8 +93,8 @@ int main(int, char**)
|
||||||
"PRI",
|
"PRI",
|
||||||
"USER",
|
"USER",
|
||||||
"STATE",
|
"STATE",
|
||||||
"LINEAR",
|
"VIRT",
|
||||||
"COMMIT",
|
"PHYS",
|
||||||
"%CPU",
|
"%CPU",
|
||||||
"NAME");
|
"NAME");
|
||||||
for (auto& it : current.map) {
|
for (auto& it : current.map) {
|
||||||
|
@ -123,8 +123,8 @@ int main(int, char**)
|
||||||
process->priority[0],
|
process->priority[0],
|
||||||
process->user.characters(),
|
process->user.characters(),
|
||||||
process->state.characters(),
|
process->state.characters(),
|
||||||
process->linear / 1024,
|
process->virtual_size / 1024,
|
||||||
process->committed / 1024,
|
process->physical_size / 1024,
|
||||||
process->cpu_percent,
|
process->cpu_percent,
|
||||||
process->cpu_percent_decimal,
|
process->cpu_percent_decimal,
|
||||||
process->name.characters());
|
process->name.characters());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue