zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make VPID use PID-width format. Closes #79.

This commit is contained in:
Hisham Muhammad 2014-05-03 17:26:11 -03:00
parent ebd5de37ac
commit c3e66b2d81
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Process.c
View File

@ -262,7 +262,7 @@ const char *Process_fieldTitles[] = {
" CODE ", " DATA ", " LIB ", " DIRTY ", " UID ", "CPU% ", "MEM% ", " CODE ", " DATA ", " LIB ", " DIRTY ", " UID ", "CPU% ", "MEM% ",
"USER ", " TIME+ ", "NLWP ", " TGID ", "USER ", " TIME+ ", "NLWP ", " TGID ",
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
" CTID ", " VPID ", " CTID ", " VPID ",
#endif #endif
#ifdef HAVE_VSERVER #ifdef HAVE_VSERVER
" VXID ", " VXID ",
@ -295,6 +295,9 @@ void Process_getMaxPid() {
if (maxPid > 99999) { if (maxPid > 99999) {
Process_fieldTitles[PID] = " PID "; Process_fieldTitles[PID] = " PID ";
Process_fieldTitles[PPID] = " PPID "; Process_fieldTitles[PPID] = " PPID ";
#ifdef HAVE_OPENVZ
Process_fieldTitles[VPID] = " VPID ";
#endif
Process_fieldTitles[TPGID] = " TPGID "; Process_fieldTitles[TPGID] = " TPGID ";
Process_fieldTitles[TGID] = " TGID "; Process_fieldTitles[TGID] = " TGID ";
Process_fieldTitles[PGRP] = " PGRP "; Process_fieldTitles[PGRP] = " PGRP ";
@ -307,6 +310,9 @@ void Process_getMaxPid() {
} else { } else {
Process_fieldTitles[PID] = " PID "; Process_fieldTitles[PID] = " PID ";
Process_fieldTitles[PPID] = " PPID "; Process_fieldTitles[PPID] = " PPID ";
#ifdef HAVE_OPENVZ
Process_fieldTitles[VPID] = " VPID ";
#endif
Process_fieldTitles[TPGID] = "TPGID "; Process_fieldTitles[TPGID] = "TPGID ";
Process_fieldTitles[TGID] = " TGID "; Process_fieldTitles[TGID] = " TGID ";
Process_fieldTitles[PGRP] = " PGRP "; Process_fieldTitles[PGRP] = " PGRP ";
@ -593,8 +599,8 @@ static void Process_writeField(Process* this, RichString* str, ProcessField fiel
} }
case STARTTIME: snprintf(buffer, n, "%s", this->starttime_show); break; case STARTTIME: snprintf(buffer, n, "%s", this->starttime_show); break;
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
case CTID: snprintf(buffer, n, "%5u ", this->ctid); break; case CTID: snprintf(buffer, n, "%7u ", this->ctid); break;
case VPID: snprintf(buffer, n, "%5u ", this->vpid); break; case VPID: snprintf(buffer, n, Process_pidFormat, this->vpid); break;
#endif #endif
#ifdef HAVE_VSERVER #ifdef HAVE_VSERVER
case VXID: snprintf(buffer, n, "%5u ", this->vxid); break; case VXID: snprintf(buffer, n, "%5u ", this->vxid); break;