diff options
| author | Daniel Lange <DLange@git.local> | 2020-09-03 12:34:39 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2020-09-03 12:34:39 +0200 |
| commit | 59eeadec918a955b40427a1b012992161050c939 (patch) | |
| tree | 4d3a4708e29a6a2f8807b2843a3cbae99f5dfda3 /linux/LinuxProcess.c | |
| parent | f3147ea2d1598914c2db53e8cfb34c8ff81e2ff4 (diff) | |
| download | debian_htop-59eeadec918a955b40427a1b012992161050c939.tar.gz debian_htop-59eeadec918a955b40427a1b012992161050c939.tar.bz2 debian_htop-59eeadec918a955b40427a1b012992161050c939.zip | |
New upstream version 3.0.1upstream/3.0.1
Diffstat (limited to 'linux/LinuxProcess.c')
| -rw-r--r-- | linux/LinuxProcess.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 3a15049..5970c93 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -241,7 +241,7 @@ ProcessFieldData Process_fields[] = { #ifdef HAVE_CGROUP [CGROUP] = { .name = "CGROUP", .title = " CGROUP ", .description = "Which cgroup the process is in", .flags = PROCESS_FLAG_LINUX_CGROUP, }, #endif - [OOM] = { .name = "OOM", .title = " OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, }, + [OOM] = { .name = "OOM", .title = " OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, }, [IO_PRIORITY] = { .name = "IO_PRIORITY", .title = "IO ", .description = "I/O priority", .flags = PROCESS_FLAG_LINUX_IOPRIO, }, #ifdef HAVE_DELAYACCT [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPUD% ", .description = "CPU delay %", .flags = 0, }, @@ -264,7 +264,6 @@ ProcessPidColumn Process_pidColumns[] = { { .id = TGID, .label = "TGID" }, { .id = PGRP, .label = "PGRP" }, { .id = SESSION, .label = "SID" }, - { .id = OOM, .label = "OOM" }, { .id = 0, .label = NULL }, }; @@ -397,7 +396,7 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field) #ifdef HAVE_CGROUP case CGROUP: xSnprintf(buffer, n, "%-10s ", lp->cgroup); break; #endif - case OOM: xSnprintf(buffer, n, Process_pidFormat, lp->oom); break; + case OOM: xSnprintf(buffer, n, "%4u ", lp->oom); break; case IO_PRIORITY: { int klass = IOPriority_class(lp->ioPriority); if (klass == IOPRIO_CLASS_NONE) { @@ -493,7 +492,7 @@ long LinuxProcess_compare(const void* v1, const void* v2) { return strcmp(p1->cgroup ? p1->cgroup : "", p2->cgroup ? p2->cgroup : ""); #endif case OOM: - return (p2->oom - p1->oom); + return ((int)p2->oom - (int)p1->oom); #ifdef HAVE_DELAYACCT case PERCENT_CPU_DELAY: return (p2->cpu_delay_percent > p1->cpu_delay_percent ? 1 : -1); |