From fa002c0ba95929bef65df57a33471682666b46ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Fri, 20 Nov 2020 17:09:34 +0100 Subject: Rename virtual memory column from M_SIZE to M_VIRT Closes: #325 --- solaris/Platform.c | 2 +- solaris/SolarisProcess.c | 2 +- solaris/SolarisProcessList.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'solaris') diff --git a/solaris/Platform.c b/solaris/Platform.c index 7eff2d5f..ff2e5c61 100644 --- a/solaris/Platform.c +++ b/solaris/Platform.c @@ -86,7 +86,7 @@ const SignalItem Platform_signals[] = { const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals); -ProcessField Platform_defaultFields[] = { PID, LWPID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; +ProcessField Platform_defaultFields[] = { PID, LWPID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; const MeterClass* const Platform_meterTypes[] = { &CPUMeter_class, diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c index c11c6de8..e0a3db24 100644 --- a/solaris/SolarisProcess.c +++ b/solaris/SolarisProcess.c @@ -44,7 +44,7 @@ ProcessFieldData Process_fields[] = { [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, }, [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, }, [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, }, - [M_SIZE] = { .name = "M_SIZE", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, }, + [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, }, [M_RESIDENT] = { .name = "M_RESIDENT", .title = " RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, }, [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, }, [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, }, diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index 49aeb24c..474c0fd1 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -323,7 +323,7 @@ int SolarisProcessList_walkproc(psinfo_t* _psinfo, lwpsinfo_t* _lwpsinfo, void* proc->nlwp = _psinfo->pr_nlwp; proc->tty_nr = _psinfo->pr_ttydev; proc->m_resident = _psinfo->pr_rssize / CRT_pageSizeKB; - proc->m_size = _psinfo->pr_size / CRT_pageSizeKB; + proc->m_virt = _psinfo->pr_size / CRT_pageSizeKB; if (!preExisting) { sproc->realpid = _psinfo->pr_pid; -- cgit v1.2.3