← Back to branch summary

~ubuntu-branches/ubuntu/karmic/htop/karmic

« back to all changes in this revision

Viewing changes to Process.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2008-11-11 04:15:57 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20081111041557-jwylxzcj2p11rcfo
Tags: 0.8.1-0ubuntu1
https://launchpad.net/bugs/273943
New upstream release (LP: #273943)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Process.c
49
49
   #ifdef HAVE_OPENVZ
50
50
   VEID, VPID,
51
51
   #endif
 
52
   #ifdef HAVE_VSERVER
 
53
   VXID,
 
54
   #endif
52
55
   #ifdef HAVE_TASKSTATS
53
56
   RCHAR, WCHAR, SYSCR, SYSCW, RBYTES, WBYTES, CNCLWB, IO_READ_RATE, IO_WRITE_RATE, IO_RATE,
54
57
   #endif
124
127
   unsigned int veid;
125
128
   unsigned int vpid;
126
129
   #endif
 
130
   #ifdef HAVE_VSERVER
 
131
   unsigned int vxid;
 
132
   #endif
127
133
   #ifdef HAVE_TASKSTATS
128
134
   unsigned long long io_rchar;
129
135
   unsigned long long io_wchar;
159
165
#ifdef HAVE_OPENVZ
160
166
   "VEID", "VPID",
161
167
#endif
 
168
#ifdef HAVE_VSERVER
 
169
   "VXID",
 
170
#endif
162
171
#ifdef HAVE_TASKSTATS
163
172
   "RCHAR", "WCHAR", "SYSCR", "SYSCW", "RBYTES", "WBYTES", "CNCLWB",
164
173
   "IO_READ_RATE", "IO_WRITE_RATE", "IO_RATE",
178
187
#ifdef HAVE_OPENVZ
179
188
   " VEID ", " VPID ",
180
189
#endif
 
190
#ifdef HAVE_VSERVER
 
191
   " VXID ",
 
192
#endif
181
193
#ifdef HAVE_TASKSTATS
182
194
   "   RD_CHAR ", "   WR_CHAR ", "   RD_SYSC ", "   WR_SYSC ", "     IO_RD ", "     IO_WR ", " IO_CANCEL ",
183
195
   " IORR ", " IOWR ", "   IO ",
388
400
   case VEID: snprintf(buffer, n, "%5u ", this->veid); break;
389
401
   case VPID: snprintf(buffer, n, "%5u ", this->vpid); break;
390
402
   #endif
 
403
   #ifdef HAVE_VSERVER
 
404
   case VXID: snprintf(buffer, n, "%5u ", this->vxid); break;
 
405
   #endif
391
406
   #ifdef HAVE_TASKSTATS
392
407
   case RCHAR:  snprintf(buffer, n, "%10llu ", this->io_rchar); break;
393
408
   case WCHAR:  snprintf(buffer, n, "%10llu ", this->io_wchar); break;   
556
571
   case VPID:
557
572
      return (p1->vpid - p2->vpid);
558
573
   #endif
 
574
   #ifdef HAVE_VSERVER
 
575
   case VXID:
 
576
      return (p1->vxid - p2->vxid);
 
577
   #endif
559
578
   #ifdef HAVE_TASKSTATS
560
579
   case RCHAR:  diff = p2->io_rchar - p1->io_rchar; goto test_diff;
561
580
   case WCHAR:  diff = p2->io_wchar - p1->io_wchar; goto test_diff;