New upstream version 3.0.3upstream/3.0.3

1 files changed, 91 insertions, 56 deletions

diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
index 1a80784..df5002a 100644
--- a/openbsd/OpenBSDProcess.c
+++ b/openbsd/OpenBSDProcess.c
@@ -2,157 +2,177 @@
 htop - OpenBSDProcess.c
 (C) 2015 Hisham H. Muhammad
 (C) 2015 Michael McConville
-Released under the GNU GPL, see the COPYING file
+Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Process.h"
-#include "ProcessList.h"
 #include "OpenBSDProcess.h"
-#include "Platform.h"
-#include "CRT.h"
 
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/syscall.h>
 
+#include "CRT.h"
+#include "Process.h"
+#include "RichString.h"
+#include "XUtils.h"
 
-ProcessClass OpenBSDProcess_class = {
-   .super = {
-      .extends = Class(Process),
-      .display = Process_display,
-      .delete = Process_delete,
-      .compare = OpenBSDProcess_compare
-   },
-   .writeField = (Process_WriteField) OpenBSDProcess_writeField,
-};
 
 ProcessFieldData Process_fields[] = {
    [0] = {
       .name = "",
       .title = NULL,
       .description = NULL,
-      .flags = 0, },
+      .flags = 0,
+   },
    [PID] = {
       .name = "PID",
       .title = "    PID ",
       .description = "Process/thread ID",
-      .flags = 0, },
+      .flags = 0,
+   },
    [COMM] = {
       .name = "Command",
       .title = "Command ",
       .description = "Command line",
-      .flags = 0, },
+      .flags = 0,
+   },
    [STATE] = {
       .name = "STATE",
       .title = "S ",
       .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)",
-      .flags = 0, },
+      .flags = 0,
+   },
    [PPID] = {
       .name = "PPID",
       .title = "   PPID ",
       .description = "Parent process ID",
-      .flags = 0, },
+      .flags = 0,
+   },
    [PGRP] = {
       .name = "PGRP",
       .title = "   PGRP ",
       .description = "Process group ID",
-      .flags = 0, },
+      .flags = 0,
+   },
    [SESSION] = {
       .name = "SESSION",
       .title = "   SESN ",
       .description = "Process's session ID",
-      .flags = 0, },
+      .flags = 0,
+   },
    [TTY_NR] = {
       .name = "TTY_NR",
       .title = "    TTY ",
       .description = "Controlling terminal",
-      .flags = 0, },
+      .flags = 0,
+   },
    [TPGID] = {
       .name = "TPGID",
       .title = "  TPGID ",
       .description = "Process ID of the fg process group of the controlling terminal",
-      .flags = 0, },
+      .flags = 0,
+   },
    [MINFLT] = {
       .name = "MINFLT",
       .title = "     MINFLT ",
       .description = "Number of minor faults which have not required loading a memory page from disk",
-      .flags = 0, },
+      .flags = 0,
+   },
    [MAJFLT] = {
       .name = "MAJFLT",
       .title = "     MAJFLT ",
       .description = "Number of major faults which have required loading a memory page from disk",
-      .flags = 0, },
+      .flags = 0,
+   },
    [PRIORITY] = {
       .name = "PRIORITY",
       .title = "PRI ",
       .description = "Kernel's internal priority for the process",
-      .flags = 0, },
+      .flags = 0,
+   },
    [NICE] = {
       .name = "NICE",
       .title = " NI ",
       .description = "Nice value (the higher the value, the more it lets other processes take priority)",
-      .flags = 0, },
+      .flags = 0,
+   },
    [STARTTIME] = {
       .name = "STARTTIME",
       .title = "START ",
       .description = "Time the process was started",
-      .flags = 0, },
+      .flags = 0,
+   },
    [PROCESSOR] = {
       .name = "PROCESSOR",
       .title = "CPU ",
       .description = "Id of the CPU the process last executed on",
-      .flags = 0, },
-   [M_SIZE] = {
-      .name = "M_SIZE",
+      .flags = 0,
+   },
+   [M_VIRT] = {
+      .name = "M_VIRT",
       .title = " VIRT ",
       .description = "Total program size in virtual memory",
-      .flags = 0, },
+      .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, },
+      .flags = 0,
+   },
    [ST_UID] = {
       .name = "ST_UID",
       .title = "  UID ",
       .description = "User ID of the process owner",
-      .flags = 0, },
+      .flags = 0,
+   },
    [PERCENT_CPU] = {
       .name = "PERCENT_CPU",
       .title = "CPU% ",
       .description = "Percentage of the CPU time the process used in the last sampling",
-      .flags = 0, },
+      .flags = 0,
+   },
+   [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,
+   },
    [PERCENT_MEM] = {
       .name = "PERCENT_MEM",
       .title = "MEM% ",
       .description = "Percentage of the memory the process is using, based on resident memory size",
-      .flags = 0, },
+      .flags = 0,
+   },
    [USER] = {
       .name = "USER",
       .title = "USER      ",
       .description = "Username of the process owner (or user ID if name cannot be determined)",
-      .flags = 0, },
+      .flags = 0,
+   },
    [TIME] = {
       .name = "TIME",
       .title = "  TIME+  ",
       .description = "Total time the process has spent in user and system time",
-      .flags = 0, },
+      .flags = 0,
+   },
    [NLWP] = {
       .name = "NLWP",
       .title = "NLWP ",
       .description = "Number of threads in the process",
-      .flags = 0, },
+      .flags = 0,
+   },
    [TGID] = {
       .name = "TGID",
       .title = "   TGID ",
       .description = "Thread group ID (i.e. process ID)",
-      .flags = 0, },
+      .flags = 0,
+   },
    [LAST_PROCESSFIELD] = {
       .name = "*** report bug! ***",
       .title = NULL,
       .description = NULL,
-      .flags = 0, },
+      .flags = 0,
+   },
 };
 
 ProcessPidColumn Process_pidColumns[] = {
@@ -165,11 +185,11 @@ ProcessPidColumn Process_pidColumns[] = {
    { .id = 0, .label = NULL },
 };
 
-OpenBSDProcess* OpenBSDProcess_new(Settings* settings) {
+Process* OpenBSDProcess_new(const Settings* settings) {
    OpenBSDProcess* this = xCalloc(sizeof(OpenBSDProcess), 1);
    Object_setClass(this, Class(OpenBSDProcess));
    Process_init(&this->super, settings);
-   return this;
+   return &this->super;
 }
 
 void Process_delete(Object* cast) {
@@ -178,8 +198,8 @@ void Process_delete(Object* cast) {
    free(this);
 }
 
-void OpenBSDProcess_writeField(Process* this, RichString* str, ProcessField field) {
-   //OpenBSDProcess* fp = (OpenBSDProcess*) 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;
@@ -192,16 +212,21 @@ void OpenBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
    RichString_append(str, attr, buffer);
 }
 
-long OpenBSDProcess_compare(const void* v1, const void* v2) {
-   OpenBSDProcess *p1, *p2;
-   Settings *settings = ((Process*)v1)->settings;
+static long OpenBSDProcess_compare(const void* v1, const void* v2) {
+   const OpenBSDProcess *p1, *p2;
+   const Settings *settings = ((const Process*)v1)->settings;
+
    if (settings->direction == 1) {
-      p1 = (OpenBSDProcess*)v1;
-      p2 = (OpenBSDProcess*)v2;
+      p1 = (const OpenBSDProcess*)v1;
+      p2 = (const OpenBSDProcess*)v2;
    } else {
-      p2 = (OpenBSDProcess*)v1;
-      p1 = (OpenBSDProcess*)v2;
+      p2 = (const OpenBSDProcess*)v1;
+      p1 = (const OpenBSDProcess*)v2;
    }
+
+   // remove if actually used
+   (void)p1; (void)p2;
+
    switch (settings->sortKey) {
    // add OpenBSD-specific fields here
    default:
@@ -209,6 +234,16 @@ long OpenBSDProcess_compare(const void* v1, const void* v2) {
    }
 }
 
-bool Process_isThread(Process* this) {
-   return (Process_isKernelThread(this));
+const ProcessClass OpenBSDProcess_class = {
+   .super = {
+      .extends = Class(Process),
+      .display = Process_display,
+      .delete = Process_delete,
+      .compare = OpenBSDProcess_compare
+   },
+   .writeField = OpenBSDProcess_writeField,
+};
+
+bool Process_isThread(const Process* this) {
+   return Process_isKernelThread(this) || Process_isUserlandThread(this);
 }