diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2014-04-25 19:37:41 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-04-25 19:37:41 -0300 |
commit | d7e5020169d79cad593af93780063f7cc4d880d3 (patch) | |
tree | af9aabae730b53a347053eeebd2892f78eb0362f /Process.c | |
parent | ea191b53bd1ad35a737985c271c7c247fb6494e7 (diff) | |
parent | 88c3758051e4f9b93cc4912a7f75078901869f0e (diff) |
Merge branch 'master' of https://github.com/hishamhm/htop
Diffstat (limited to 'Process.c')
-rw-r--r-- | Process.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -168,11 +168,11 @@ typedef struct Process_ { int basenameOffset; bool updated; - #ifdef DEBUG unsigned long int minflt; unsigned long int cminflt; unsigned long int majflt; unsigned long int cmajflt; + #ifdef DEBUG long int itrealvalue; unsigned long int vsize; long int rss; @@ -254,7 +254,7 @@ const int Process_fieldFlags[] = { const char *Process_fieldTitles[] = { "", " PID ", "Command ", "S ", " PPID ", " PGRP ", " SESN ", - " TTY ", " TPGID ", "- ", "- ", "- ", "- ", "- ", + " TTY ", " TPGID ", "- ", " MINFLT ", " CMINFLT ", " MAJFLT ", " CMAJFLT ", " UTIME+ ", " STIME+ ", " CUTIME+ ", " CSTIME+ ", "PRI ", " NI ", "- ", "START ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", "- ", @@ -483,6 +483,10 @@ static void Process_writeField(Process* this, RichString* str, ProcessField fiel case TTY_NR: snprintf(buffer, n, "%5u ", this->tty_nr); break; case TGID: snprintf(buffer, n, Process_pidFormat, this->tgid); break; case TPGID: snprintf(buffer, n, Process_tpgidFormat, this->tpgid); break; + case MINFLT: Process_colorNumber(str, this->minflt, coloring); return; + case CMINFLT: Process_colorNumber(str, this->cminflt, coloring); return; + case MAJFLT: Process_colorNumber(str, this->majflt, coloring); return; + case CMAJFLT: Process_colorNumber(str, this->cmajflt, coloring); return; case PROCESSOR: snprintf(buffer, n, "%3d ", ProcessList_cpuId(this->pl, this->processor)); break; case NLWP: snprintf(buffer, n, "%4ld ", this->nlwp); break; case COMM: { |