Package: xosview
Version: 1.8.2-11
Severity: normal
Tags: patch
Hi,
Here is a patch to implement support for interrupt, waitio and stolen
times in xosview.
("stolen" time is time stolen by other Operating Systems in a
virtualized environment for instance).
Samuel
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.22
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages xosview depends on:
ii libc6 2.6-2 GNU C Library: Shared libraries
ii libgcc1 1:4.2-20070712-1 GCC support library
ii libstdc++6 4.2-20070712-1 The GNU Standard C++ Library v3
ii libx11-6 2:1.0.3-7 X11 client-side library
xosview recommends no packages.
-- no debconf information
--
Samuel Thibault <[EMAIL PROTECTED]>
«Le monochrome, c'est pour ceux qui s'intéressent (encore) au contenu.
Usenet dans ces conditions, c'est comme le web avec lynx, on prend
trop conscience du vide, c'est déprimant.»
-+- JLC in Guide du linuxien pervers : "Coup de cafard..." -+-
diff -ur xosview-1.8.2/Xdefaults xosview-1.8.2-mine/Xdefaults
--- xosview-1.8.2/Xdefaults 2007-08-10 14:42:02.000000000 +0200
+++ xosview-1.8.2-mine/Xdefaults 2007-08-10 14:45:42.000000000 +0200
@@ -70,8 +70,10 @@
xosview*cpuNiceColor: yellow
xosview*cpuSystemColor: orange
xosview*cpuInterruptColor: red
+xosview*cpuSInterruptColor: orange red
xosview*cpuWaitColor: lightblue
xosview*cpuFreeColor: aquamarine
+xosview*cpuStolenColor: blue
xosview*cpuPriority: 1
xosview*cpuDecay: True
xosview*cpuGraph: True
diff -ur xosview-1.8.2/Xdefaults.in xosview-1.8.2-mine/Xdefaults.in
--- xosview-1.8.2/Xdefaults.in 2007-08-10 14:41:43.000000000 +0200
+++ xosview-1.8.2-mine/Xdefaults.in 2007-08-10 14:44:09.000000000 +0200
@@ -70,8 +70,10 @@
xosview*cpuNiceColor: yellow
xosview*cpuSystemColor: orange
xosview*cpuInterruptColor: red
+xosview*cpuSInterruptColor: orange red
xosview*cpuWaitColor: lightblue
xosview*cpuFreeColor: aquamarine
+xosview*cpuStolenColor: blue
xosview*cpuPriority: 1
xosview*cpuDecay: True
xosview*cpuGraph: True
diff -ur xosview-1.8.2/Xdefaults.stipple xosview-1.8.2-mine/Xdefaults.stipple
--- xosview-1.8.2/Xdefaults.stipple 1999-11-06 23:48:16.000000000 +0100
+++ xosview-1.8.2-mine/Xdefaults.stipple 2007-08-10 14:44:20.000000000
+0200
@@ -10,7 +10,9 @@
xosvstipple*cpuNiceColor: red
xosvstipple*cpuSystemColor: red
xosvstipple*cpuInterruptColor: red
+xosvstipple*cpuSInterruptColor: red
xosvstipple*cpuFreeColor: red
+xosvstipple*cpuStolenColor: red
xosvstipple*memUsedColor: orange
xosvstipple*memSharedColor: orange
xosvstipple*memBufferColor: orange
@@ -47,7 +49,9 @@
xosvstipplebw*cpuNiceColor: black
xosvstipplebw*cpuSystemColor: black
xosvstipplebw*cpuInterruptColor:black
+xosvstipplebw*cpuSInterruptColor:black
xosvstipplebw*cpuFreeColor: black
+xosvstipplebw*cpuStolenColor: black
xosvstipplebw*memUsedColor: black
xosvstipplebw*memSharedColor: black
xosvstipplebw*memBufferColor: black
Seulement dans xosview-1.8.2-mine/linux: .cpumeter.cc.swp
diff -ur xosview-1.8.2/linux/cpumeter.cc xosview-1.8.2-mine/linux/cpumeter.cc
--- xosview-1.8.2/linux/cpumeter.cc 2004-06-01 06:21:54.000000000 +0200
+++ xosview-1.8.2-mine/linux/cpumeter.cc 2007-08-10 14:45:31.000000000
+0200
@@ -19,10 +19,10 @@
#define MAX_PROCSTAT_LENGTH 4096
CPUMeter::CPUMeter(XOSView *parent, const char *cpuID)
-: FieldMeterGraph( parent, 4, toUpper(cpuID), "USR/NICE/SYS/FREE" ) {
+: FieldMeterGraph( parent, 8, toUpper(cpuID), "USR/NICE/SYS/SI/HI/WIO/FREE/ST"
) {
_lineNum = findLine(cpuID);
for ( int i = 0 ; i < 2 ; i++ )
- for ( int j = 0 ; j < 4 ; j++ )
+ for ( int j = 0 ; j < 8 ; j++ )
cputime_[i][j] = 0;
cpuindex_ = 0;
@@ -37,7 +37,11 @@
setfieldcolor( 0, parent_->getResource( "cpuUserColor" ) );
setfieldcolor( 1, parent_->getResource( "cpuNiceColor" ) );
setfieldcolor( 2, parent_->getResource( "cpuSystemColor" ) );
- setfieldcolor( 3, parent_->getResource( "cpuFreeColor" ) );
+ setfieldcolor( 3, parent_->getResource( "cpuSInterruptColor" ) );
+ setfieldcolor( 4, parent_->getResource( "cpuInterruptColor" ) );
+ setfieldcolor( 5, parent_->getResource( "cpuWaitColor" ) );
+ setfieldcolor( 6, parent_->getResource( "cpuFreeColor" ) );
+ setfieldcolor( 7, parent_->getResource( "cpuStolenColor" ) );
priority_ = atoi (parent_->getResource( "cpuPriority" ) );
dodecay_ = parent_->isResourceTrue( "cpuDecay" );
useGraph_ = parent_->isResourceTrue( "cpuGraph" );
@@ -69,16 +73,22 @@
stats >>tmp >>cputime_[cpuindex_][0]
>>cputime_[cpuindex_][1]
>>cputime_[cpuindex_][2]
- >>cputime_[cpuindex_][3];
+ >>cputime_[cpuindex_][3]
+ >>cputime_[cpuindex_][4]
+ >>cputime_[cpuindex_][5]
+ >>cputime_[cpuindex_][6]
+ >>cputime_[cpuindex_][7];
int oldindex = (cpuindex_+1)%2;
- for ( int i = 0 ; i < 4 ; i++ ){
- fields_[i] = cputime_[cpuindex_][i] - cputime_[oldindex][i];
- total_ += fields_[i];
+ for ( int i = 0 ; i < 8 ; i++ ){
+ static int cputime_to_field[8] = { 0, 1, 2, 6, 5, 4, 3, 7 };
+ int field = cputime_to_field[i];
+ fields_[field] = cputime_[cpuindex_][i] - cputime_[oldindex][i];
+ total_ += fields_[field];
}
if (total_){
- setUsed (total_ - fields_[3], total_);
+ setUsed (total_ - (fields_[5] + fields_[6] + fields_[7]), total_);
cpuindex_ = (cpuindex_ + 1) % 2;
}
}
diff -ur xosview-1.8.2/linux/cpumeter.h xosview-1.8.2-mine/linux/cpumeter.h
--- xosview-1.8.2/linux/cpumeter.h 2004-05-22 08:24:15.000000000 +0200
+++ xosview-1.8.2-mine/linux/cpumeter.h 2007-08-10 14:38:25.000000000 +0200
@@ -25,7 +25,7 @@
static const char *cpuStr(int num);
protected:
int _lineNum;
- long cputime_[2][4];
+ long cputime_[2][8];
int cpuindex_;
void getcputime(void);
