Tag release 0.6.6 in revision history.

AffinityPanel.c

@@ -1,48 +0,0 @@
-
-#include "AffinityPanel.h"
-
-#include "Panel.h"
-#include "CheckItem.h"
-
-#include "debug.h"
-#include <assert.h>
-
-Panel* AffinityPanel_new(int processorCount, unsigned long mask) {
-   Panel* this = Panel_new(1, 1, 1, 1, CHECKITEM_CLASS, true, ListItem_compare);
-   this->eventHandler = AffinityPanel_eventHandler;
-
-   Panel_setHeader(this, "Use CPUs:");
-   for (int i = 0; i < processorCount; i++) {
-      char number[10];
-      snprintf(number, 9, "%d", i+1);
-      Panel_add(this, (Object*) CheckItem_new(String_copy(number), NULL, mask & (1 << i)));
-   }
-   return this;
-}
-
-unsigned long AffinityPanel_getAffinity(Panel* this) {
-   int size = Panel_getSize(this);
-   unsigned long mask = 0;
-   for (int i = 0; i < size; i++) {
-      if (CheckItem_get((CheckItem*)Panel_get(this, i)))
-         mask = mask | (1 << i);
-   }
-   return mask;
-}
-
-HandlerResult AffinityPanel_eventHandler(Panel* this, int ch) {
-   HandlerResult result = IGNORED;
-   CheckItem* selected = (CheckItem*) Panel_getSelected(this);
-   switch(ch) {
-   case ' ':
-      CheckItem_set(selected, ! (CheckItem_get(selected)) );
-      result = HANDLED;
-      break;
-   case 0x0a:
-   case 0x0d:
-   case KEY_ENTER:
-      result = BREAK_LOOP;
-      break;
-   }
-   return result;
-}

AffinityPanel.h

@@ -1,19 +0,0 @@
-/* Do not edit this file. It was automatically generated. */
-
-#ifndef HEADER_AffinityPanel
-#define HEADER_AffinityPanel
-
-
-#include "Panel.h"
-#include "CheckItem.h"
-
-#include "debug.h"
-#include <assert.h>
-
-Panel* AffinityPanel_new(int processorCount, unsigned long mask);
-
-unsigned long AffinityPanel_getAffinity(Panel* this);
-
-HandlerResult AffinityPanel_eventHandler(Panel* this, int ch);
-
-#endif

CPUMeter.c

@@ -19,7 +19,7 @@ in the source distribution for its full text.
 #include <assert.h>
 
 int CPUMeter_attributes[] = {
-   CPU_NICE, CPU_NORMAL, CPU_KERNEL, CPU_IRQ, CPU_SOFTIRQ, CPU_IOWAIT
+   CPU_NICE, CPU_NORMAL, CPU_KERNEL, CPU_IOWAIT, CPU_IRQ, CPU_SOFTIRQ
 };
 
 MeterType CPUMeter = {
@@ -74,14 +74,14 @@ void CPUMeter_setValues(Meter* this, char* buffer, int size) {
    double cpu;
    this->values[0] = pl->nicePeriod[processor] / total * 100.0;
    this->values[1] = pl->userPeriod[processor] / total * 100.0;
-   if (pl->detailedCPUTime) {
+   if (pl->expandSystemTime) {
       this->values[2] = pl->systemPeriod[processor] / total * 100.0;
-      this->values[3] = pl->irqPeriod[processor] / total * 100.0;
+      this->values[3] = pl->ioWaitPeriod[processor] / total * 100.0;
-      this->values[4] = pl->softIrqPeriod[processor] / total * 100.0;
+      this->values[4] = pl->irqPeriod[processor] / total * 100.0;
-      this->values[5] = pl->ioWaitPeriod[processor] / total * 100.0;
+      this->values[5] = pl->softIrqPeriod[processor] / total * 100.0;
       this->type->items = 6;
       cpu = MIN(100.0, MAX(0.0, (this->values[0]+this->values[1]+this->values[2]+
-                       this->values[3]+this->values[4])));
+                       this->values[3]+this->values[4]+this->values[5])));
    } else {
       this->values[2] = pl->systemAllPeriod[processor] / total * 100.0;
       this->type->items = 3;
@@ -97,7 +97,7 @@ void CPUMeter_display(Object* cast, RichString* out) {
    sprintf(buffer, "%5.1f%% ", this->values[1]);
    RichString_append(out, CRT_colors[METER_TEXT], ":");
    RichString_append(out, CRT_colors[CPU_NORMAL], buffer);
-   if (this->pl->detailedCPUTime) {
+   if (this->pl->expandSystemTime) {
       sprintf(buffer, "%5.1f%% ", this->values[2]);
       RichString_append(out, CRT_colors[METER_TEXT], "sy:");
       RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
@@ -105,14 +105,14 @@ void CPUMeter_display(Object* cast, RichString* out) {
       RichString_append(out, CRT_colors[METER_TEXT], "ni:");
       RichString_append(out, CRT_colors[CPU_NICE], buffer);
       sprintf(buffer, "%5.1f%% ", this->values[3]);
+      RichString_append(out, CRT_colors[METER_TEXT], "wa:");
+      RichString_append(out, CRT_colors[CPU_IOWAIT], buffer);
+      sprintf(buffer, "%5.1f%% ", this->values[4]);
       RichString_append(out, CRT_colors[METER_TEXT], "hi:");
       RichString_append(out, CRT_colors[CPU_IRQ], buffer);
       sprintf(buffer, "%5.1f%% ", this->values[4]);
       RichString_append(out, CRT_colors[METER_TEXT], "si:");
       RichString_append(out, CRT_colors[CPU_SOFTIRQ], buffer);
-      sprintf(buffer, "%5.1f%% ", this->values[5]);
-      RichString_append(out, CRT_colors[METER_TEXT], "wa:");
-      RichString_append(out, CRT_colors[CPU_IOWAIT], buffer);
    } else {
       sprintf(buffer, "%5.1f%% ", this->values[2]);
       RichString_append(out, CRT_colors[METER_TEXT], "sys:");

CRT.c

@@ -14,7 +14,6 @@ in the source distribution for its full text.
 
 #include "String.h"
 
-#include "config.h"
 #include "debug.h"
 
 #define ColorPair(i,j) COLOR_PAIR((7-i)*8+j)
@@ -182,7 +181,7 @@ void CRT_enableDelay() {
 
 void CRT_handleSIGSEGV(int signal) {
    CRT_done();
-   fprintf(stderr, "htop " VERSION " aborted. Please report bug at http://htop.sf.net\n");
+   fprintf(stderr, "Aborted. Please report bug at http://htop.sf.net");
    exit(1);
 }
 
@@ -255,7 +254,7 @@ void CRT_setColors(int colorScheme) {
       CRT_colors[CHECK_BOX] = A_BOLD;
       CRT_colors[CHECK_MARK] = A_NORMAL;
       CRT_colors[CHECK_TEXT] = A_NORMAL;
-      CRT_colors[CPU_IOWAIT] = A_NORMAL;
+      CRT_colors[CPU_IOWAIT] = A_BOLD;
       CRT_colors[CPU_IRQ] = A_BOLD;
       CRT_colors[CPU_SOFTIRQ] = A_BOLD;
    } else if (CRT_colorScheme == COLORSCHEME_BLACKONWHITE) {
@@ -310,7 +309,7 @@ void CRT_setColors(int colorScheme) {
       CRT_colors[CHECK_BOX] = ColorPair(Blue,White);
       CRT_colors[CHECK_MARK] = ColorPair(Black,White);
       CRT_colors[CHECK_TEXT] = ColorPair(Black,White);
-      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
+      CRT_colors[CPU_IOWAIT] = ColorPair(Yellow,White);
       CRT_colors[CPU_IRQ] = ColorPair(Blue,White);
       CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,White);
    } else if (CRT_colorScheme == COLORSCHEME_BLACKONWHITE2) {
@@ -365,7 +364,7 @@ void CRT_setColors(int colorScheme) {
       CRT_colors[CHECK_BOX] = ColorPair(Blue,Black);
       CRT_colors[CHECK_MARK] = ColorPair(Black,Black);
       CRT_colors[CHECK_TEXT] = ColorPair(Black,Black);
-      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
+      CRT_colors[CPU_IOWAIT] = ColorPair(Yellow,Black);
       CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black);
       CRT_colors[CPU_SOFTIRQ] = ColorPair(Blue,Black);
    } else if (CRT_colorScheme == COLORSCHEME_MIDNIGHT) {
@@ -420,7 +419,7 @@ void CRT_setColors(int colorScheme) {
       CRT_colors[CHECK_BOX] = ColorPair(Cyan,Blue);
       CRT_colors[CHECK_MARK] = A_BOLD | ColorPair(White,Blue);
       CRT_colors[CHECK_TEXT] = A_NORMAL | ColorPair(White,Blue);
-      CRT_colors[CPU_IOWAIT] = ColorPair(Yellow,Blue);
+      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Yellow,Blue);
       CRT_colors[CPU_IRQ] = A_BOLD | ColorPair(Black,Blue);
       CRT_colors[CPU_SOFTIRQ] = ColorPair(Black,Blue);
    } else if (CRT_colorScheme == COLORSCHEME_BLACKNIGHT) {
@@ -531,7 +530,7 @@ void CRT_setColors(int colorScheme) {
       CRT_colors[CHECK_BOX] = ColorPair(Cyan,Black);
       CRT_colors[CHECK_MARK] = A_BOLD;
       CRT_colors[CHECK_TEXT] = A_NORMAL;
-      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
+      CRT_colors[CPU_IOWAIT] = ColorPair(Cyan,Black);
       CRT_colors[CPU_IRQ] = ColorPair(Yellow,Black);
       CRT_colors[CPU_SOFTIRQ] = ColorPair(Magenta,Black);
    }

CRT.h

@@ -17,7 +17,6 @@ in the source distribution for its full text.
 
 #include "String.h"
 
-#include "config.h"
 #include "debug.h"
 
 #define ColorPair(i,j) COLOR_PAIR((7-i)*8+j)

ChangeLog

@@ -1,23 +1,3 @@
-
-What's new in version 0.7
-
-* CPU affinity configuration ('a' key)
-* Improve display of tree view, properly nesting
-  threads of the same app based on TGID.
-* IO-wait time now counts as idle time, which is a more
-  accurate description. It is still available in
-  split time, now called detailed CPU time.
-  (thanks to Samuel Thibault for the report)
-* BUGFIX: Correct display of TPGID field
-* Add TGID field
-* BUGFIX: Don't crash with invalid command-line flags
-  (thanks to Nico Golde for the report)
-* Fix GCC 4.3 compilation issues
-  (thanks to Martin Michlmayr for the report)
-* OpenVZ support, enabled at compile-time with
-  the --enable-openvz flag.
-  (thanks to Sergey Lychko)
-
 What's new in version 0.6.6
 
 * Add support of NLWP field

CheckItem.c

@@ -16,8 +16,7 @@ in the source distribution for its full text.
 typedef struct CheckItem_ {
    Object super;
    char* text;
-   bool value;
+   bool* value;
-   bool* ref;
 } CheckItem;
 
 }*/
@@ -28,14 +27,13 @@ char* CHECKITEM_CLASS = "CheckItem";
 #define CHECKITEM_CLASS NULL
 #endif
 
-CheckItem* CheckItem_new(char* text, bool* ref, bool value) {
+CheckItem* CheckItem_new(char* text, bool* value) {
    CheckItem* this = malloc(sizeof(CheckItem));
    Object_setClass(this, CHECKITEM_CLASS);
    ((Object*)this)->display = CheckItem_display;
    ((Object*)this)->delete = CheckItem_delete;
    this->text = text;
    this->value = value;
-   this->ref = ref;
    return this;
 }
 
@@ -47,25 +45,11 @@ void CheckItem_delete(Object* cast) {
    free(this);
 }
 
-void CheckItem_set(CheckItem* this, bool value) {
-   if (this->ref) 
-      *(this->ref) = value;
-   else
-      this->value = value;
-}
-
-bool CheckItem_get(CheckItem* this) {
-   if (this->ref) 
-      return *(this->ref);
-   else
-      return this->value;
-}
-
 void CheckItem_display(Object* cast, RichString* out) {
    CheckItem* this = (CheckItem*)cast;
    assert (this != NULL);
    RichString_write(out, CRT_colors[CHECK_BOX], "[");
-   if (CheckItem_get(this))
+   if (*(this->value))
       RichString_append(out, CRT_colors[CHECK_MARK], "x");
    else
       RichString_append(out, CRT_colors[CHECK_MARK], " ");

CheckItem.h

@@ -18,8 +18,7 @@ in the source distribution for its full text.
 typedef struct CheckItem_ {
    Object super;
    char* text;
-   bool value;
+   bool* value;
-   bool* ref;
 } CheckItem;
 
 
@@ -29,14 +28,10 @@ extern char* CHECKITEM_CLASS;
 #define CHECKITEM_CLASS NULL
 #endif
 
-CheckItem* CheckItem_new(char* text, bool* ref, bool value);
+CheckItem* CheckItem_new(char* text, bool* value);
 
 void CheckItem_delete(Object* cast);
 
-void CheckItem_set(CheckItem* this, bool value);
-
-bool CheckItem_get(CheckItem* this);
-
 void CheckItem_display(Object* cast, RichString* out);
 
 #endif

ColorsPanel.c

@@ -23,6 +23,7 @@ typedef struct ColorsPanel_ {
 
    Settings* settings;
    ScreenManager* scr;
+   bool check[5];
 } ColorsPanel;
 
 }*/
@@ -49,9 +50,10 @@ ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr) {
 
    Panel_setHeader(super, "Colors");
    for (int i = 0; ColorSchemes[i] != NULL; i++) {
-      Panel_add(super, (Object*) CheckItem_new(String_copy(ColorSchemes[i]), NULL, false));
+      Panel_add(super, (Object*) CheckItem_new(String_copy(ColorSchemes[i]), &(this->check[i])));
+      this->check[i] = false;
    }
-   CheckItem_set((CheckItem*)Panel_get(super, settings->colorScheme), true);
+   this->check[settings->colorScheme] = true;
    return this;
 }
 
@@ -73,9 +75,10 @@ HandlerResult ColorsPanel_EventHandler(Panel* super, int ch) {
    case 0x0d:
    case KEY_ENTER:
    case ' ':
-      for (int i = 0; ColorSchemes[i] != NULL; i++)
+      for (int i = 0; ColorSchemes[i] != NULL; i++) {
-         CheckItem_set((CheckItem*)Panel_get(super, i), false);
+         this->check[i] = false;
-      CheckItem_set((CheckItem*)Panel_get(super, mark), true);
+      }
+      this->check[mark] = true;
       this->settings->colorScheme = mark;
       result = HANDLED;
    }

ColorsPanel.h

@@ -25,6 +25,7 @@ typedef struct ColorsPanel_ {
 
    Settings* settings;
    ScreenManager* scr;
+   bool check[5];
 } ColorsPanel;
 
 

DisplayOptionsPanel.c

@@ -28,17 +28,17 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
 
    this->settings = settings;
    this->scr = scr;
-   super->eventHandler = DisplayOptionsPanel_eventHandler;
+   super->eventHandler = DisplayOptionsPanel_EventHandler;
 
    Panel_setHeader(super, "Display options");
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Tree view"), &(settings->pl->treeView), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Tree view"), &(settings->pl->treeView)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Shadow other users' processes"), &(settings->pl->shadowOtherUsers), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Shadow other users' processes"), &(settings->pl->shadowOtherUsers)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Hide kernel threads"), &(settings->pl->hideKernelThreads), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Hide kernel threads"), &(settings->pl->hideKernelThreads)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Hide userland threads"), &(settings->pl->hideUserlandThreads), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Hide userland threads"), &(settings->pl->hideUserlandThreads)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Highlight program \"basename\""), &(settings->pl->highlightBaseName), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Highlight program \"basename\""), &(settings->pl->highlightBaseName)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Highlight megabytes in memory counters"), &(settings->pl->highlightMegabytes), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Highlight megabytes in memory counters"), &(settings->pl->highlightMegabytes)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Leave a margin around header"), &(settings->header->margin), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Leave a margin around header"), &(settings->header->margin)));
-   Panel_add(super, (Object*) CheckItem_new(String_copy("Detailed CPU time (System/IO-Wait/Hard-IRQ/Soft-IRQ)"), &(settings->pl->detailedCPUTime), false));
+   Panel_add(super, (Object*) CheckItem_new(String_copy("Split System Time into System/IO-Wait/Hard-IRQ/Soft-IRQ"), &(settings->pl->expandSystemTime)));
    return this;
 }
 
@@ -49,7 +49,7 @@ void DisplayOptionsPanel_delete(Object* object) {
    free(this);
 }
 
-HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) {
+HandlerResult DisplayOptionsPanel_EventHandler(Panel* super, int ch) {
    DisplayOptionsPanel* this = (DisplayOptionsPanel*) super;
    
    HandlerResult result = IGNORED;
@@ -60,7 +60,7 @@ HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) {
    case 0x0d:
    case KEY_ENTER:
    case ' ':
-      CheckItem_set(selected, ! (CheckItem_get(selected)) );
+      *(selected->value) = ! *(selected->value);
       result = HANDLED;
    }
 

DisplayOptionsPanel.h

@@ -25,7 +25,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
 
 void DisplayOptionsPanel_delete(Object* object);
 
-HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch);
+HandlerResult DisplayOptionsPanel_EventHandler(Panel* super, int ch);
 
 
 #endif

Hashtable.h

@@ -47,13 +47,13 @@ Hashtable* Hashtable_new(int size, bool owner);
 
 void Hashtable_delete(Hashtable* this);
 
-extern int Hashtable_size(Hashtable* this);
+inline int Hashtable_size(Hashtable* this);
 
 void Hashtable_put(Hashtable* this, unsigned int key, void* value);
 
 void* Hashtable_remove(Hashtable* this, unsigned int key);
 
-extern void* Hashtable_get(Hashtable* this, unsigned int key);
+inline void* Hashtable_get(Hashtable* this, unsigned int key);
 
 void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
 

Makefile.am

@@ -17,7 +17,7 @@ DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \
 LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \
 Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \
 SignalItem.c SignalsPanel.c String.c SwapMeter.c TasksMeter.c TraceScreen.c \
-UptimeMeter.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c
+UptimeMeter.c UsersTable.c Vector.c AvailableColumnsPanel.c
 
 myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \
 CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \
@@ -26,7 +26,7 @@ Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \
 Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \
 ScreenManager.h Settings.h SignalItem.h SignalsPanel.h String.h \
 SwapMeter.h TasksMeter.h TraceScreen.h UptimeMeter.h UsersTable.h Vector.h \
-Process.h AffinityPanel.h
+Process.h
 
 SUFFIXES = .h
 

Panel.h

@@ -72,9 +72,9 @@ void Panel_init(Panel* this, int x, int y, int w, int h, char* type, bool owner)
 
 void Panel_done(Panel* this);
 
-extern void Panel_setRichHeader(Panel* this, RichString header);
+inline void Panel_setRichHeader(Panel* this, RichString header);
 
-extern void Panel_setHeader(Panel* this, char* header);
+inline void Panel_setHeader(Panel* this, char* header);
 
 void Panel_setEventHandler(Panel* this, Panel_EventHandler eh);
 

Process.c

@@ -25,7 +25,6 @@ in the source distribution for its full text.
 #include <string.h>
 #include <stdbool.h>
 #include <pwd.h>
-#include <sched.h>
 
 // This works only with glibc 2.1+. On earlier versions
 // the behavior is similar to have a hardcoded page size.
@@ -42,11 +41,7 @@ typedef enum ProcessField_ {
    STIME, CUTIME, CSTIME, PRIORITY, NICE, ITREALVALUE, STARTTIME, VSIZE, RSS, RLIM, STARTCODE, ENDCODE,
    STARTSTACK, KSTKESP, KSTKEIP, SIGNAL, BLOCKED, SSIGIGNORE, SIGCATCH, WCHAN, NSWAP, CNSWAP, EXIT_SIGNAL,
    PROCESSOR, M_SIZE, M_RESIDENT, M_SHARE, M_TRS, M_DRS, M_LRS, M_DT, ST_UID, PERCENT_CPU, PERCENT_MEM,
-   USER, TIME, NLWP, TGID
+   USER, TIME, NLWP, LAST_PROCESSFIELD
-   #ifdef HAVE_OPENVZ
-   VEID, VPID,
-   #endif
-   LAST_PROCESSFIELD
 } ProcessField;
 
 struct ProcessList_;
@@ -66,8 +61,7 @@ typedef struct Process_ {
    unsigned int pgrp;
    unsigned int session;
    unsigned int tty_nr;
-   unsigned int tgid;
+   unsigned int tpgid;
-   int tpgid;
    unsigned long int flags;
    #ifdef DEBUG
    unsigned long int minflt;
@@ -114,10 +108,6 @@ typedef struct Process_ {
    float percent_cpu;
    float percent_mem;
    char* user;
-   #ifdef HAVE_OPENVZ
-   unsigned int veid;
-   unsigned int vpid;
-   #endif
 } Process;
 
 }*/
@@ -129,11 +119,7 @@ char* PROCESS_CLASS = "Process";
 #endif
 
 char *Process_fieldNames[] = {
-   "", "PID", "Command", "STATE", "PPID", "PGRP", "SESSION", "TTY_NR", "TPGID", "FLAGS", "MINFLT", "CMINFLT", "MAJFLT", "CMAJFLT", "UTIME", "STIME", "CUTIME", "CSTIME", "PRIORITY", "NICE", "ITREALVALUE", "STARTTIME", "VSIZE", "RSS", "RLIM", "STARTCODE", "ENDCODE", "STARTSTACK", "KSTKESP", "KSTKEIP", "SIGNAL", "BLOCKED", "SIGIGNORE", "SIGCATCH", "WCHAN", "NSWAP", "CNSWAP", "EXIT_SIGNAL",  "PROCESSOR", "M_SIZE", "M_RESIDENT", "M_SHARE", "M_TRS", "M_DRS", "M_LRS", "M_DT", "ST_UID", "PERCENT_CPU", "PERCENT_MEM", "USER", "TIME", "NLWP", "TGID", 
+   "", "PID", "Command", "STATE", "PPID", "PGRP", "SESSION", "TTY_NR", "TPGID", "FLAGS", "MINFLT", "CMINFLT", "MAJFLT", "CMAJFLT", "UTIME", "STIME", "CUTIME", "CSTIME", "PRIORITY", "NICE", "ITREALVALUE", "STARTTIME", "VSIZE", "RSS", "RLIM", "STARTCODE", "ENDCODE", "STARTSTACK", "KSTKESP", "KSTKEIP", "SIGNAL", "BLOCKED", "SIGIGNORE", "SIGCATCH", "WCHAN", "NSWAP", "CNSWAP", "EXIT_SIGNAL",  "PROCESSOR", "M_SIZE", "M_RESIDENT", "M_SHARE", "M_TRS", "M_DRS", "M_LRS", "M_DT", "ST_UID", "PERCENT_CPU", "PERCENT_MEM", "USER", "TIME", "NLWP", "*** report bug! ***"
-#ifdef HAVE_OPENVZ
-"VEID", "VPID",
-#endif
-"*** report bug! ***"
 };
 
 static int Process_getuid = -1;
@@ -195,16 +181,6 @@ void Process_setPriority(Process* this, int priority) {
    }
 }
 
-unsigned long Process_getAffinity(Process* this) {
-   unsigned long mask = 0;
-   sched_getaffinity(this->pid, sizeof(unsigned long), (cpu_set_t*) &mask);
-   return mask;
-}
-
-void Process_setAffinity(Process* this, unsigned long mask) {
-   sched_setaffinity(this->pid, sizeof(unsigned long), (cpu_set_t*) &mask);
-}
-
 void Process_sendSignal(Process* this, int signal) {
    kill(this->pid, signal);
 }
@@ -293,8 +269,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
    case PGRP: snprintf(buffer, n, "%5u ", this->pgrp); break;
    case SESSION: snprintf(buffer, n, "%5u ", this->session); break;
    case TTY_NR: snprintf(buffer, n, "%5u ", this->tty_nr); break;
-   case TGID: snprintf(buffer, n, "%5u ", this->tgid); break;
+   case TPGID: snprintf(buffer, n, "%5u ", this->tpgid); break;
-   case TPGID: snprintf(buffer, n, "%5d ", this->tpgid); break;
    case PROCESSOR: snprintf(buffer, n, "%3d ", this->processor+1); break;
    case NLWP: snprintf(buffer, n, "%4ld ", this->nlwp); break;
    case COMM: {
@@ -388,10 +363,6 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
       }
       break;
    }
-   #ifdef HAVE_OPENVZ
-   case VEID: snprintf(buffer, n, "%5u ", this->veid); break;
-   case VPID: snprintf(buffer, n, "%5u ", this->vpid); break;
-   #endif
    default:
       snprintf(buffer, n, "- ");
    }
@@ -456,12 +427,6 @@ int Process_compare(const void* v1, const void* v2) {
       return strcmp(p1->comm, p2->comm);
    case NLWP:
       return (p1->nlwp - p2->nlwp);
-   #ifdef HAVE_OPENVZ
-   case VEID:
-      return (p1->veid - p2->veid);
-   case VPID:
-      return (p1->vpid - p2->vpid);
-   #endif
    default:
       return (p1->pid - p2->pid);
    }
@@ -475,8 +440,7 @@ char* Process_printField(ProcessField field) {
    case PGRP: return " PGRP ";
    case SESSION: return " SESN ";
    case TTY_NR: return "  TTY ";
-   case TGID: return " TGID ";
+   case TPGID: return " TGID ";
-   case TPGID: return "TPGID ";
    case COMM: return "Command ";
    case STATE: return "S ";
    case PRIORITY: return "PRI ";
@@ -497,10 +461,6 @@ char* Process_printField(ProcessField field) {
    case PERCENT_MEM: return "MEM% ";
    case PROCESSOR: return "CPU ";
    case NLWP: return "NLWP ";
-   #ifdef HAVE_OPENVZ
-   case VEID: return " VEID ";
-   case VPID: return " VPID ";
-   #endif
    default: return "- ";
    }
 }

Process.h

@@ -28,7 +28,6 @@ in the source distribution for its full text.
 #include <string.h>
 #include <stdbool.h>
 #include <pwd.h>
-#include <sched.h>
 
 // This works only with glibc 2.1+. On earlier versions
 // the behavior is similar to have a hardcoded page size.
@@ -44,11 +43,7 @@ typedef enum ProcessField_ {
    STIME, CUTIME, CSTIME, PRIORITY, NICE, ITREALVALUE, STARTTIME, VSIZE, RSS, RLIM, STARTCODE, ENDCODE,
    STARTSTACK, KSTKESP, KSTKEIP, SIGNAL, BLOCKED, SSIGIGNORE, SIGCATCH, WCHAN, NSWAP, CNSWAP, EXIT_SIGNAL,
    PROCESSOR, M_SIZE, M_RESIDENT, M_SHARE, M_TRS, M_DRS, M_LRS, M_DT, ST_UID, PERCENT_CPU, PERCENT_MEM,
-   USER, TIME, NLWP, TGID,
+   USER, TIME, NLWP, LAST_PROCESSFIELD
-   #ifdef HAVE_OPENVZ
-   VEID, VPID,
-   #endif
-   LAST_PROCESSFIELD
 } ProcessField;
 
 struct ProcessList_;
@@ -68,8 +63,7 @@ typedef struct Process_ {
    unsigned int pgrp;
    unsigned int session;
    unsigned int tty_nr;
-   unsigned int tgid;
+   unsigned int tpgid;
-   int tpgid;
    unsigned long int flags;
    #ifdef DEBUG
    unsigned long int minflt;
@@ -116,10 +110,6 @@ typedef struct Process_ {
    float percent_cpu;
    float percent_mem;
    char* user;
-   #ifdef HAVE_OPENVZ
-   unsigned int veid;
-   unsigned int vpid;
-   #endif
 } Process;
 
 
@@ -143,10 +133,6 @@ void Process_toggleTag(Process* this);
 
 void Process_setPriority(Process* this, int priority);
 
-unsigned long Process_getAffinity(Process* this);
-
-void Process_setAffinity(Process* this, unsigned long mask);
-
 void Process_sendSignal(Process* this, int signal);
 
 #define ONE_K 1024

ProcessList.c

@@ -53,7 +53,7 @@ in the source distribution for its full text.
 #endif
 
 #ifndef PER_PROCESSOR_FIELDS
-#define PER_PROCESSOR_FIELDS 22
+#define PER_PROCESSOR_FIELDS 20
 #endif
 
 }*/
@@ -80,7 +80,6 @@ typedef struct ProcessList_ {
    unsigned long long int* userTime;
    unsigned long long int* systemTime;
    unsigned long long int* systemAllTime;
-   unsigned long long int* idleAllTime;
    unsigned long long int* idleTime;
    unsigned long long int* niceTime;
    unsigned long long int* ioWaitTime;
@@ -91,7 +90,6 @@ typedef struct ProcessList_ {
    unsigned long long int* userPeriod;
    unsigned long long int* systemPeriod;
    unsigned long long int* systemAllPeriod;
-   unsigned long long int* idleAllPeriod;
    unsigned long long int* idlePeriod;
    unsigned long long int* nicePeriod;
    unsigned long long int* ioWaitPeriod;
@@ -119,7 +117,7 @@ typedef struct ProcessList_ {
    bool treeView;
    bool highlightBaseName;
    bool highlightMegabytes;
-   bool detailedCPUTime;
+   bool expandSystemTime;
    #ifdef DEBUG_PROC
    FILE* traceFile;
    #endif
@@ -250,7 +248,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable) {
    this->treeView = false;
    this->highlightBaseName = false;
    this->highlightMegabytes = false;
-   this->detailedCPUTime = false;
+   this->expandSystemTime = false;
 
    return this;
 }
@@ -335,7 +333,7 @@ static void ProcessList_buildTree(ProcessList* this, int pid, int level, int ind
 
    for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
       Process* process = (Process*) (Vector_get(this->processes, i));
-      if (process->tgid == pid || (process->tgid == process->pid && process->ppid == pid)) {
+      if (process->ppid == pid) {
          Process* process = (Process*) (Vector_take(this->processes, i));
          Vector_add(children, process);
       }
@@ -362,34 +360,26 @@ void ProcessList_sort(ProcessList* this) {
    if (!this->treeView) {
       Vector_sort(this->processes);
    } else {
-      // Save settings
       int direction = this->direction;
       int sortKey = this->sortKey;
-      // Sort by PID
       this->sortKey = PID;
       this->direction = 1;
       Vector_sort(this->processes);
-      // Restore settings
       this->sortKey = sortKey;
       this->direction = direction;
-      // Take PID 1 as root and add to the new listing
       int vsize = Vector_size(this->processes);
       Process* init = (Process*) (Vector_take(this->processes, 0));
       assert(init->pid == 1);
       init->indent = 0;
       Vector_add(this->processes2, init);
-      // Recursively empty list
       ProcessList_buildTree(this, init->pid, 0, 0, direction);
-      // Add leftovers
       while (Vector_size(this->processes)) {
          Process* p = (Process*) (Vector_take(this->processes, 0));
          p->indent = 0;
          Vector_add(this->processes2, p);
-         ProcessList_buildTree(this, p->pid, 0, 0, direction);
       }
       assert(Vector_size(this->processes2) == vsize); (void)vsize;
       assert(Vector_size(this->processes) == 0);
-      // Swap listings around
       Vector* t = this->processes;
       this->processes = this->processes2;
       this->processes2 = t;
@@ -418,7 +408,7 @@ static int ProcessList_readStatFile(ProcessList* this, Process *proc, FILE *f, c
    
    #ifdef DEBUG_PROC
    int num = ProcessList_read(this, location, 
-      "%c %u %u %u %u %d %lu %lu %lu %lu "
+      "%c %u %u %u %u %u %lu %lu %lu %lu "
       "%lu %lu %lu %ld %ld %ld %ld %ld %ld "
       "%lu %lu %ld %lu %lu %lu %lu %lu "
       "%lu %lu %lu %lu %lu %lu %lu %lu "
@@ -436,7 +426,7 @@ static int ProcessList_readStatFile(ProcessList* this, Process *proc, FILE *f, c
    #else
    long int uzero;
    int num = ProcessList_read(this, location, 
-      "%c %u %u %u %u %d %lu %lu %lu %lu "
+      "%c %u %u %u %u %u %lu %lu %lu %lu "
       "%lu %lu %lu %ld %ld %ld %ld %ld %ld "
       "%lu %lu %ld %lu %lu %lu %lu %lu "
       "%lu %lu %lu %lu %lu %lu %lu %lu "
@@ -464,12 +454,10 @@ static int ProcessList_readStatFile(ProcessList* this, Process *proc, FILE *f, c
 bool ProcessList_readStatusFile(ProcessList* this, Process* proc, char* dirname, char* name) {
    char statusfilename[MAX_NAME+1];
    statusfilename[MAX_NAME] = '\0';
-
+   /*
    bool success = false;
    char buffer[256];
    buffer[255] = '\0';
-   
-   // We need to parse the status file just for tgid, which is missing in stat.
    snprintf(statusfilename, MAX_NAME, "%s/%s/status", dirname, name);
    FILE* status = ProcessList_fopen(this, statusfilename, "r");
    if (status) {
@@ -477,11 +465,12 @@ bool ProcessList_readStatusFile(ProcessList* this, Process* proc, char* dirname,
          char* ok = fgets(buffer, 255, status);
          if (!ok)
             break;
-         if (String_startsWith(buffer, "Tgid:")) {
+         if (String_startsWith(buffer, "Uid:")) {
-            int tgid;
+            int uid1, uid2, uid3, uid4;
-            int ok = ProcessList_read(this, buffer, "Tgid:\t%d", &tgid);
+            // TODO: handle other uid's.
+            int ok = ProcessList_read(this, buffer, "Uid:\t%d\t%d\t%d\t%d", &uid1, &uid2, &uid3, &uid4);
             if (ok >= 1) {
-               proc->tgid = tgid;
+               proc->st_uid = uid1;
                success = true;
             }
             break;
@@ -489,13 +478,19 @@ bool ProcessList_readStatusFile(ProcessList* this, Process* proc, char* dirname,
       }
       fclose(status);
    }
-   snprintf(statusfilename, MAX_NAME, "%s/%s", dirname, name);
+   if (!success) {
-   struct stat sstat;
+   */
-   int statok = stat(statusfilename, &sstat);
+      snprintf(statusfilename, MAX_NAME, "%s/%s", dirname, name);
-   if (statok == -1)
+      struct stat sstat;
-      return false;
+      int statok = stat(statusfilename, &sstat);
-   proc->st_uid = sstat.st_uid;
+      if (statok == -1)
-   return true;
+         return false;
+      proc->st_uid = sstat.st_uid;
+      return true;
+   /*
+   } else
+      return true;
+   */
 }
 
 void ProcessList_processEntries(ProcessList* this, char* dirname, int parent, float period) {
@@ -526,7 +521,9 @@ void ProcessList_processEntries(ProcessList* this, char* dirname, int parent, fl
             char subdirname[MAX_NAME+1];
             snprintf(subdirname, MAX_NAME, "%s/%s/task", dirname, name);
    
-            ProcessList_processEntries(this, subdirname, pid, period);
+            if (access(subdirname, X_OK) == 0) {
+               ProcessList_processEntries(this, subdirname, pid, period);
+            }
          }
 
          FILE* status;
@@ -583,28 +580,6 @@ void ProcessList_processEntries(ProcessList* this, char* dirname, int parent, fl
 
          if(!existingProcess) {
             process->user = UsersTable_getRef(this->usersTable, process->st_uid);
-
-            #ifdef HAVE_OPENVZ
-            if (access("/proc/vz", R_OK) != 0) {
-               process->vpid = process->pid;
-               process->veid = 0;
-            } else {
-               snprintf(statusfilename, MAX_NAME, "%s/%s/stat", dirname, name);
-               status = ProcessList_fopen(this, statusfilename, "r");
-               if (status == NULL) 
-                  goto errorReadingProcess;
-               num = ProcessList_fread(this, status, 
-                  "%*u %*s %*c %*u %*u %*u %*u %*u %*u %*u "
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
-                  "%*u %*u %*u %*u %*u %*u %*u "
-                  "%u %u",
-                  &process->vpid, &process->veid);
-               fclose(status);
-            }
-            #endif
  
             snprintf(statusfilename, MAX_NAME, "%s/%s/cmdline", dirname, name);
             status = ProcessList_fopen(this, statusfilename, "r");
@@ -658,7 +633,7 @@ void ProcessList_processEntries(ProcessList* this, char* dirname, int parent, fl
 }
 
 void ProcessList_scan(ProcessList* this) {
-   unsigned long long int usertime, nicetime, systemtime, systemalltime, idlealltime, idletime, totaltime;
+   unsigned long long int usertime, nicetime, systemtime, systemalltime, idletime, totaltime;
    unsigned long long int swapFree;
 
    FILE* status;
@@ -718,16 +693,14 @@ void ProcessList_scan(ProcessList* this) {
       }
       // Fields existing on kernels >= 2.6
       // (and RHEL's patched kernel 2.4...)
-      idlealltime = idletime + ioWait;
+      systemalltime = systemtime + ioWait + irq + softIrq + steal;
-      systemalltime = systemtime + irq + softIrq + steal;
+      totaltime = usertime + nicetime + systemalltime + idletime;
-      totaltime = usertime + nicetime + systemalltime + idlealltime;
       assert (usertime >= this->userTime[i]);
       assert (nicetime >= this->niceTime[i]);
       assert (systemtime >= this->systemTime[i]);
       assert (idletime >= this->idleTime[i]);
       assert (totaltime >= this->totalTime[i]);
       assert (systemalltime >= this->systemAllTime[i]);
-      assert (idlealltime >= this->idleAllTime[i]);
       assert (ioWait >= this->ioWaitTime[i]);
       assert (irq >= this->irqTime[i]);
       assert (softIrq >= this->softIrqTime[i]);
@@ -736,7 +709,6 @@ void ProcessList_scan(ProcessList* this) {
       this->nicePeriod[i] = nicetime - this->niceTime[i];
       this->systemPeriod[i] = systemtime - this->systemTime[i];
       this->systemAllPeriod[i] = systemalltime - this->systemAllTime[i];
-      this->idleAllPeriod[i] = idlealltime - this->idleAllTime[i];
       this->idlePeriod[i] = idletime - this->idleTime[i];
       this->ioWaitPeriod[i] = ioWait - this->ioWaitTime[i];
       this->irqPeriod[i] = irq - this->irqTime[i];
@@ -747,7 +719,6 @@ void ProcessList_scan(ProcessList* this) {
       this->niceTime[i] = nicetime;
       this->systemTime[i] = systemtime;
       this->systemAllTime[i] = systemalltime;
-      this->idleAllTime[i] = idlealltime;
       this->idleTime[i] = idletime;
       this->ioWaitTime[i] = ioWait;
       this->irqTime[i] = irq;

ProcessList.h

@@ -55,7 +55,7 @@ in the source distribution for its full text.
 #endif
 
 #ifndef PER_PROCESSOR_FIELDS
-#define PER_PROCESSOR_FIELDS 22
+#define PER_PROCESSOR_FIELDS 20
 #endif
 
 
@@ -80,7 +80,6 @@ typedef struct ProcessList_ {
    unsigned long long int* userTime;
    unsigned long long int* systemTime;
    unsigned long long int* systemAllTime;
-   unsigned long long int* idleAllTime;
    unsigned long long int* idleTime;
    unsigned long long int* niceTime;
    unsigned long long int* ioWaitTime;
@@ -91,7 +90,6 @@ typedef struct ProcessList_ {
    unsigned long long int* userPeriod;
    unsigned long long int* systemPeriod;
    unsigned long long int* systemAllPeriod;
-   unsigned long long int* idleAllPeriod;
    unsigned long long int* idlePeriod;
    unsigned long long int* nicePeriod;
    unsigned long long int* ioWaitPeriod;
@@ -119,7 +117,7 @@ typedef struct ProcessList_ {
    bool treeView;
    bool highlightBaseName;
    bool highlightMegabytes;
-   bool detailedCPUTime;
+   bool expandSystemTime;
    #ifdef DEBUG_PROC
    FILE* traceFile;
    #endif

RichString.c

@@ -26,21 +26,21 @@ typedef struct RichString_ {
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
 
-inline void RichString_appendn(RichString* this, int attrs, char* data, int len) {
+void RichString_write(RichString* this, int attrs, char* data) {
-   int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
+   RichString_init(this);
-   for (int i = this->len, j = 0; i < last; i++, j++)
+   RichString_append(this, attrs, data);
-      this->chstr[i] = data[j] | attrs;
-   this->chstr[last] = 0;
-   this->len = last;
 }
 
 inline void RichString_append(RichString* this, int attrs, char* data) {
    RichString_appendn(this, attrs, data, strlen(data));
 }
 
-void RichString_write(RichString* this, int attrs, char* data) {
+inline void RichString_appendn(RichString* this, int attrs, char* data, int len) {
-   RichString_init(this);
+   int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
-   RichString_append(this, attrs, data);
+   for (int i = this->len, j = 0; i < last; i++, j++)
+      this->chstr[i] = data[j] | attrs;
+   this->chstr[last] = 0;
+   this->len = last;
 }
 
 void RichString_setAttr(RichString *this, int attrs) {

RichString.h

@@ -27,12 +27,12 @@ typedef struct RichString_ {
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
 
-extern void RichString_appendn(RichString* this, int attrs, char* data, int len);
-
-extern void RichString_append(RichString* this, int attrs, char* data);
-
 void RichString_write(RichString* this, int attrs, char* data);
 
+inline void RichString_append(RichString* this, int attrs, char* data);
+
+inline void RichString_appendn(RichString* this, int attrs, char* data, int len);
+
 void RichString_setAttr(RichString *this, int attrs);
 
 void RichString_applyAttr(RichString *this, int attrs);

ScreenManager.h

@@ -43,7 +43,7 @@ ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation ori
 
 void ScreenManager_delete(ScreenManager* this);
 
-extern int ScreenManager_size(ScreenManager* this);
+inline int ScreenManager_size(ScreenManager* this);
 
 void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int size);
 

Settings.c

@@ -140,10 +140,7 @@ bool Settings_read(Settings* this, char* fileName) {
       } else if (String_eq(option[0], "header_margin")) {
          this->header->margin = atoi(option[1]);
       } else if (String_eq(option[0], "expand_system_time")) {
-         // Compatibility option.
+         this->pl->expandSystemTime = atoi(option[1]);
-         this->pl->detailedCPUTime = atoi(option[1]);
-      } else if (String_eq(option[0], "detailed_cpu_time")) {
-         this->pl->detailedCPUTime = atoi(option[1]);
       } else if (String_eq(option[0], "delay")) {
          this->delay = atoi(option[1]);
       } else if (String_eq(option[0], "color_scheme")) {
@@ -200,7 +197,7 @@ bool Settings_write(Settings* this) {
    fprintf(fd, "highlight_megabytes=%d\n", (int) this->pl->highlightMegabytes);
    fprintf(fd, "tree_view=%d\n", (int) this->pl->treeView);
    fprintf(fd, "header_margin=%d\n", (int) this->header->margin);
-   fprintf(fd, "detailed_cpu_time=%d\n", (int) this->pl->detailedCPUTime);
+   fprintf(fd, "expand_system_time=%d\n", (int) this->pl->expandSystemTime);
    fprintf(fd, "color_scheme=%d\n", (int) this->colorScheme);
    fprintf(fd, "delay=%d\n", (int) this->delay);
    fprintf(fd, "left_meters=");
@@ -224,7 +221,6 @@ bool Settings_write(Settings* this) {
    fprintf(fd, "right_meter_modes=");
    for (int i = 0; i < Header_size(this->header, RIGHT_HEADER); i++)
       fprintf(fd, "%d ", Header_readMeterMode(this->header, i, RIGHT_HEADER));
-   fprintf(fd, "\n");
    fclose(fd);
    return true;
 }

SignalsPanel.c

@@ -27,7 +27,7 @@ SignalsPanel* SignalsPanel_new(int x, int y, int w, int h) {
    ((Object*)this)->delete = SignalsPanel_delete;
 
    this->signals = Signal_getSignalTable();
-   super->eventHandler = SignalsPanel_eventHandler;
+   super->eventHandler = SignalsPanel_EventHandler;
    int sigCount = Signal_getSignalCount();
    for(int i = 0; i < sigCount; i++)
       Panel_set(super, i, (Object*) this->signals[i]);
@@ -51,7 +51,7 @@ void SignalsPanel_reset(SignalsPanel* this) {
    this->state = 0;
 }
 
-HandlerResult SignalsPanel_eventHandler(Panel* super, int ch) {
+HandlerResult SignalsPanel_EventHandler(Panel* super, int ch) {
    SignalsPanel* this = (SignalsPanel*) super;
 
    int size = Panel_getSize(super);

SignalsPanel.h

@@ -27,6 +27,6 @@ void SignalsPanel_delete(Object* object);
 
 void SignalsPanel_reset(SignalsPanel* this);
 
-HandlerResult SignalsPanel_eventHandler(Panel* super, int ch);
+HandlerResult SignalsPanel_EventHandler(Panel* super, int ch);
 
 #endif

String.h

@@ -19,9 +19,9 @@ in the source distribution for its full text.
 
 #define String_startsWith(s, match) (strstr((s), (match)) == (s))
 
-extern void String_delete(char* s);
+inline void String_delete(char* s);
 
-extern char* String_copy(char* orig);
+inline char* String_copy(char* orig);
 
 char* String_cat(char* s1, char* s2);
 
@@ -39,7 +39,7 @@ void String_printInt(int i);
 
 void String_printPointer(void* p);
 
-extern int String_eq(const char* s1, const char* s2);
+inline int String_eq(const char* s1, const char* s2);
 
 char** String_split(char* s, char sep);
 

TODO

@@ -5,8 +5,6 @@ BUGS:
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375219
  * add swap column for swap usage in MB
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365038
- * Filter out nonprintable characters in command lines
-   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=419140
 
 FEATURES:
 

UsersTable.h

@@ -30,8 +30,8 @@ void UsersTable_delete(UsersTable* this);
 
 char* UsersTable_getRef(UsersTable* this, unsigned int uid);
 
-extern int UsersTable_size(UsersTable* this);
+inline int UsersTable_size(UsersTable* this);
 
-extern void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
+inline void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
 
 #endif

Vector.h

@@ -61,15 +61,15 @@ void Vector_moveDown(Vector* this, int index);
 
 void Vector_set(Vector* this, int index, void* data_);
 
-extern Object* Vector_get(Vector* this, int index);
+inline Object* Vector_get(Vector* this, int index);
 
-extern int Vector_size(Vector* this);
+inline int Vector_size(Vector* this);
 
 void Vector_merge(Vector* this, Vector* v2);
 
 void Vector_add(Vector* this, void* data_);
 
-extern int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
+inline int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
 
 void Vector_foreach(Vector* this, Vector_procedure f);
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([htop],[0.7],[loderunner@users.sourceforge.net])
+AC_INIT([htop],[0.6.6],[loderunner@users.sourceforge.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([htop.c])
 AC_CONFIG_HEADER([config.h])
@@ -58,11 +58,6 @@ AC_ARG_WITH(proc, [  --with-proc=DIR      Location of a Linux-compatible proc fi
    fi,
    AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
 
-AC_ARG_ENABLE(openvz, [AC_HELP_STRING([--enable-openvz], [enable OpenVZ support])], ,enable_openvz="no")
-if test "x$enable_openvz" = xyes; then
-    AC_DEFINE(HAVE_OPENVZ, 1, [Define if openvz support enabled.])
-fi
-
 AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
 AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
 

htop.1

@@ -1,4 +1,4 @@
-.TH "htop" "1" "0.7" "Bartosz Fenski <fenio@o2.pl>" "Utils"
+.TH "htop" "1" "0.6.6" "Bartosz Fenski <fenio@o2.pl>" "Utils"
 .SH "NAME"
 htop \- interactive process viewer
 .SH "SYNTAX"
@@ -77,9 +77,6 @@ If none is tagged, sends to the currently selected process.
 .B F10, q
 Quit
 .TP
-.B a (on multiprocessor machines)
-Set CPU affinity: mark which CPUs a process is allowed to use.
-.TP
 .B u
 Show only processes owned by a specified user.
 .TP

htop.c

@@ -25,7 +25,6 @@ in the source distribution for its full text.
 #include "CategoriesPanel.h"
 #include "SignalsPanel.h"
 #include "TraceScreen.h"
-#include "AffinityPanel.h"
 
 #include "config.h"
 #include "debug.h"
@@ -63,13 +62,13 @@ void showHelp(ProcessList* pl) {
    mvaddstr(3, 0, "CPU usage bar: ");
    #define addattrstr(a,s) attrset(a);addstr(s)
    addattrstr(CRT_colors[BAR_BORDER], "[");
-   if (pl->detailedCPUTime) {
+   if (pl->expandSystemTime) {
       addattrstr(CRT_colors[CPU_NICE], "low"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
       addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
+      addattrstr(CRT_colors[CPU_IOWAIT], "io-wait"); addstr("/");
       addattrstr(CRT_colors[CPU_IRQ], "irq"); addstr("/");
-      addattrstr(CRT_colors[CPU_SOFTIRQ], "soft-irq"); addstr("/");
+      addattrstr(CRT_colors[CPU_SOFTIRQ], "soft-irq");
-      addattrstr(CRT_colors[CPU_IOWAIT], "io-wait");
       addattrstr(CRT_colors[BAR_SHADOW], " used%");
    } else {
       addattrstr(CRT_colors[CPU_NICE], "low-priority"); addstr("/");
@@ -105,10 +104,7 @@ void showHelp(ProcessList* pl) {
    mvaddstr(15, 0, "   F9 k: kill process/tagged processes      P: sort by CPU%");
    mvaddstr(16, 0, " + [ F7: lower priority (+ nice)            M: sort by MEM%");
    mvaddstr(17, 0, " - ] F8: higher priority (root only)        T: sort by TIME");
-   if (pl->processorCount > 1)
+   mvaddstr(18, 0, "                                         F4 I: invert sort order");
-      mvaddstr(18, 0, "      a: set CPU affinity                F4 I: invert sort order");
-   else
-      mvaddstr(18, 0, "                                         F4 I: invert sort order");
    mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
    mvaddstr(20, 0, "   F1 h: show this help screen");
    mvaddstr(21, 0, "  F10 q: quit                               s: trace syscalls with strace");
@@ -124,8 +120,6 @@ void showHelp(ProcessList* pl) {
    mvaddstr(16, 0, " + [ F7"); mvaddstr(16,40, "    M");
    mvaddstr(17, 0, " - ] F8"); mvaddstr(17,40, "    T");
                                mvaddstr(18,40, " F4 I");
-   if (pl->processorCount > 1)
-      mvaddstr(18, 0, "      a:");
    mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
    mvaddstr(20, 0, "   F1 h");
    mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
@@ -175,7 +169,7 @@ static HandlerResult pickWithEnter(Panel* panel, int ch) {
 static Object* pickFromList(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) {
    char* fuKeys[2] = {"Enter", "Esc"};
    int fuEvents[2] = {13, 27};
-   if (!list->eventHandler)
+   if (!panel->eventHandler)
       Panel_setEventHandler(list, pickWithEnter);
    ScreenManager* scr = ScreenManager_new(0, y, 0, -1, HORIZONTAL, false);
    ScreenManager_add(scr, list, FunctionBar_new(2, keyLabels, fuKeys, fuEvents), x - 1);
@@ -214,38 +208,32 @@ int main(int argc, char** argv) {
    uid_t userId = 0;
    int sortKey = 0;
 
-   int arg = 1;
+   if (argc > 0) {
-   while (arg < argc) {
+      if (String_eq(argv[1], "--help")) {
-      if (String_eq(argv[arg], "--help")) {
          printHelpFlag();
-      } else if (String_eq(argv[arg], "--version")) {
+      } else if (String_eq(argv[1], "--version")) {
          printVersionFlag();
-      } else if (String_eq(argv[arg], "--sort-key")) {
+      } else if (String_eq(argv[1], "--sort-key")) {
-         if (arg == argc - 1) printHelpFlag();
+         if (argc < 2) printHelpFlag();
-         arg++;
+            if (String_eq(argv[2], "help")) {
-         char* field = argv[arg];
-         if (String_eq(field, "help")) {
             for (int j = 1; j < LAST_PROCESSFIELD; j++)
                printf ("%s\n", Process_fieldNames[j]);
             exit(0);
          }
-         sortKey = ColumnsPanel_fieldNameToIndex(field);
+         sortKey = ColumnsPanel_fieldNameToIndex(argv[2]);
          if (sortKey == -1) {
-            fprintf(stderr, "Error: invalid column \"%s\".\n", field);
+            fprintf(stderr, "Error: invalid column \"%s\".\n", argv[2]);
             exit(1);
          }
-      } else if (String_eq(argv[arg], "-d")) {
+      } else if (String_eq(argv[1], "-d")) {
-         if (arg == argc - 1) printHelpFlag();
+         if (argc < 2) printHelpFlag();
-         arg++;
+         sscanf(argv[2], "%d", &delay);
-         sscanf(argv[arg], "%d", &delay);
          if (delay < 1) delay = 1;
          if (delay > 100) delay = 100;
-      } else if (String_eq(argv[arg], "-u")) {
+      } else if (String_eq(argv[1], "-u")) {
-         if (arg == argc - 1) printHelpFlag();
+         if (argc < 2) printHelpFlag();
-         arg++;
+         setUserOnly(argv[2], &userOnly, &userId);
-         setUserOnly(argv[arg], &userOnly, &userId);
       }
-      arg++;
    }
    
    if (access(PROCDIR, R_OK) != 0) {
@@ -598,36 +586,6 @@ int main(int argc, char** argv) {
          refreshTimeout = 0;
          break;
       }
-      case 'a':
-      {
-         if (pl->processorCount == 1)
-            break;
-
-         Process* p = (Process*) Panel_getSelected(panel);
-         unsigned long curr = Process_getAffinity(p);
-         
-         Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr);
-
-         char* fuFunctions[2] = {"Toggle ", "Done  "};
-         pickFromList(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar);
-         unsigned long new = AffinityPanel_getAffinity(affinityPanel);
-         bool anyTagged = false;
-         for (int i = 0; i < Panel_getSize(panel); i++) {
-            Process* p = (Process*) Panel_get(panel, i);
-            if (p->tag) {
-               Process_setAffinity(p, new);
-               anyTagged = true;
-            }
-         }
-         if (!anyTagged) {
-            Process* p = (Process*) Panel_getSelected(panel);
-            Process_setAffinity(p, new);
-         }
-         ((Object*)affinityPanel)->delete((Object*)affinityPanel);
-         Panel_setRichHeader(panel, ProcessList_printHeader(pl));
-         refreshTimeout = 0;
-         break;
-      }
       case KEY_F(10):
       case 'q':
          quit = 1;

htop.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=0.7
+Version=0.6.6
 Name=Htop
 Type=Application
 Comment=Show System Processes

htop.h

@@ -29,7 +29,6 @@ in the source distribution for its full text.
 #include "CategoriesPanel.h"
 #include "SignalsPanel.h"
 #include "TraceScreen.h"
-#include "AffinityPanel.h"
 
 #include "config.h"
 #include "debug.h"
@@ -42,7 +41,7 @@ void printVersionFlag();
 
 void printHelpFlag();
 
-void showHelp(ProcessList* pl);
+void showHelp();
 
 void addUserToList(int key, void* userCast, void* panelCast);
 

scripts/MakeHeader.py

@@ -54,7 +54,7 @@ for line in file.readlines():
          elif equals != -1:
             out.write("extern " + line[:equals] + ";" )
          elif line[-1] == "{":
-            out.write( line[:-2].replace("inline", "extern") + ";" )
+            out.write( line[:-2] + ";" )
             state = SKIP
          else:
             out.write( line )