mirror of
https://github.com/xzeldon/htop.git
synced 2024-12-25 23:35:45 +00:00
0af08bcfc9
Since commit edf319e[1], we're dynamically adjusting column width of
"CPU%", showing single digit precision also for values greater than
"99.9%" makes "CPU%" column consistent with all other values.
[1]: edf319e53d
Change "Process_printPercentage()" function's logic to always display
value (i.e. "val") with single precision. Except when value is greater
than "99.9%" for columns like "MEM%", whose width is fixed to "4" and
value cannot go beyond "100%".
Credits: @Explorer09, thanks for the patch[2] to fix title alignment
issue.
[2]: https://github.com/htop-dev/htop/pull/959#issuecomment-1092480951
Closes: #957
258 lines
6.7 KiB
C
258 lines
6.7 KiB
C
/*
|
|
htop - OpenBSDProcess.c
|
|
(C) 2015 Hisham H. Muhammad
|
|
(C) 2015 Michael McConville
|
|
Released under the GNU GPLv2+, see the COPYING file
|
|
in the source distribution for its full text.
|
|
*/
|
|
|
|
#include "openbsd/OpenBSDProcess.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "CRT.h"
|
|
#include "Process.h"
|
|
#include "RichString.h"
|
|
#include "XUtils.h"
|
|
|
|
|
|
const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
|
|
[0] = {
|
|
.name = "",
|
|
.title = NULL,
|
|
.description = NULL,
|
|
.flags = 0,
|
|
},
|
|
[PID] = {
|
|
.name = "PID",
|
|
.title = "PID",
|
|
.description = "Process/thread ID",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[COMM] = {
|
|
.name = "Command",
|
|
.title = "Command ",
|
|
.description = "Command line",
|
|
.flags = 0,
|
|
},
|
|
[STATE] = {
|
|
.name = "STATE",
|
|
.title = "S ",
|
|
.description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)",
|
|
.flags = 0,
|
|
},
|
|
[PPID] = {
|
|
.name = "PPID",
|
|
.title = "PPID",
|
|
.description = "Parent process ID",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[PGRP] = {
|
|
.name = "PGRP",
|
|
.title = "PGRP",
|
|
.description = "Process group ID",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[SESSION] = {
|
|
.name = "SESSION",
|
|
.title = "SESN",
|
|
.description = "Process's session ID",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[TTY] = {
|
|
.name = "TTY",
|
|
.title = "TTY ",
|
|
.description = "Controlling terminal",
|
|
.flags = 0,
|
|
},
|
|
[TPGID] = {
|
|
.name = "TPGID",
|
|
.title = "TPGID",
|
|
.description = "Process ID of the fg process group of the controlling terminal",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[MINFLT] = {
|
|
.name = "MINFLT",
|
|
.title = " MINFLT ",
|
|
.description = "Number of minor faults which have not required loading a memory page from disk",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[MAJFLT] = {
|
|
.name = "MAJFLT",
|
|
.title = " MAJFLT ",
|
|
.description = "Number of major faults which have required loading a memory page from disk",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[PRIORITY] = {
|
|
.name = "PRIORITY",
|
|
.title = "PRI ",
|
|
.description = "Kernel's internal priority for the process",
|
|
.flags = 0,
|
|
},
|
|
[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,
|
|
},
|
|
[ELAPSED] = {
|
|
.name = "ELAPSED",
|
|
.title = "ELAPSED ",
|
|
.description = "Time since the process was started",
|
|
.flags = 0,
|
|
},
|
|
[PROCESSOR] = {
|
|
.name = "PROCESSOR",
|
|
.title = "CPU ",
|
|
.description = "Id of the CPU the process last executed on",
|
|
.flags = 0,
|
|
},
|
|
[M_VIRT] = {
|
|
.name = "M_VIRT",
|
|
.title = " VIRT ",
|
|
.description = "Total program size in virtual memory",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[M_RESIDENT] = {
|
|
.name = "M_RESIDENT",
|
|
.title = " RES ",
|
|
.description = "Resident set size, size of the text and data sections, plus stack usage",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[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,
|
|
.defaultSortDesc = true,
|
|
.autoWidth = true,
|
|
},
|
|
[PERCENT_NORM_CPU] = {
|
|
.name = "PERCENT_NORM_CPU",
|
|
.title = "NCPU%",
|
|
.description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
.autoWidth = true,
|
|
},
|
|
[PERCENT_MEM] = {
|
|
.name = "PERCENT_MEM",
|
|
.title = "MEM% ",
|
|
.description = "Percentage of the memory the process is using, based on resident memory size",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[USER] = {
|
|
.name = "USER",
|
|
.title = "USER ",
|
|
.description = "Username of the process owner (or user ID if name cannot be determined)",
|
|
.flags = 0,
|
|
},
|
|
[TIME] = {
|
|
.name = "TIME",
|
|
.title = " TIME+ ",
|
|
.description = "Total time the process has spent in user and system time",
|
|
.flags = 0,
|
|
.defaultSortDesc = true,
|
|
},
|
|
[NLWP] = {
|
|
.name = "NLWP",
|
|
.title = "NLWP ",
|
|
.description = "Number of threads in the process",
|
|
.flags = 0,
|
|
},
|
|
[TGID] = {
|
|
.name = "TGID",
|
|
.title = "TGID",
|
|
.description = "Thread group ID (i.e. process ID)",
|
|
.flags = 0,
|
|
.pidColumn = true,
|
|
},
|
|
[PROC_COMM] = {
|
|
.name = "COMM",
|
|
.title = "COMM ",
|
|
.description = "comm string of the process",
|
|
.flags = 0,
|
|
},
|
|
[CWD] = {
|
|
.name = "CWD",
|
|
.title = "CWD ",
|
|
.description = "The current working directory of the process",
|
|
.flags = PROCESS_FLAG_CWD,
|
|
},
|
|
|
|
};
|
|
|
|
Process* OpenBSDProcess_new(const Settings* settings) {
|
|
OpenBSDProcess* this = xCalloc(1, sizeof(OpenBSDProcess));
|
|
Object_setClass(this, Class(OpenBSDProcess));
|
|
Process_init(&this->super, settings);
|
|
return &this->super;
|
|
}
|
|
|
|
void Process_delete(Object* cast) {
|
|
OpenBSDProcess* this = (OpenBSDProcess*) cast;
|
|
Process_done((Process*)cast);
|
|
free(this);
|
|
}
|
|
|
|
static void OpenBSDProcess_writeField(const Process* this, RichString* str, ProcessField field) {
|
|
//const OpenBSDProcess* op = (const OpenBSDProcess*) this;
|
|
char buffer[256]; buffer[255] = '\0';
|
|
int attr = CRT_colors[DEFAULT_COLOR];
|
|
//int n = sizeof(buffer) - 1;
|
|
switch (field) {
|
|
// add OpenBSD-specific fields here
|
|
default:
|
|
Process_writeField(this, str, field);
|
|
return;
|
|
}
|
|
RichString_appendWide(str, attr, buffer);
|
|
}
|
|
|
|
static int OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
|
|
const OpenBSDProcess* p1 = (const OpenBSDProcess*)v1;
|
|
const OpenBSDProcess* p2 = (const OpenBSDProcess*)v2;
|
|
|
|
// remove if actually used
|
|
(void)p1; (void)p2;
|
|
|
|
switch (key) {
|
|
// add OpenBSD-specific fields here
|
|
default:
|
|
return Process_compareByKey_Base(v1, v2, key);
|
|
}
|
|
}
|
|
|
|
const ProcessClass OpenBSDProcess_class = {
|
|
.super = {
|
|
.extends = Class(Process),
|
|
.display = Process_display,
|
|
.delete = Process_delete,
|
|
.compare = Process_compare
|
|
},
|
|
.writeField = OpenBSDProcess_writeField,
|
|
.compareByKey = OpenBSDProcess_compareByKey
|
|
};
|