Your message dated Mon, 30 Jun 2008 16:47:03 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#486921: fixed in xosview 1.8.3+debian-9
has caused the Debian Bug report #486921,
regarding xosview: Add guest time to linux cpumeter
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
486921: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486921
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: xosview
Version: 1.8.3+debian-8guest
Severity: wishlist
Tags: patch
Hello,
Linux 2.6.24 added a ninth value on the cpu lines of /proc/stat. The
attached patch shows it in xosview.
Samuel
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'oldstable'), (500, 'unstable'), (500,
'stable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.25
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.7-10 GNU C Library: Shared libraries
ii libgcc1 1:4.3.0-5 GCC support library
ii libstdc++6 4.3.0-5 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
Be warned that typing \fBkillall \fIname\fP may not have the desired
effect on non-Linux systems, especially when done by a privileged user.
(From the killall manual page)
diff -ur xosview-1.8.3+debian/linux/cpumeter.cc
xosview-1.8.3+debian-mine/linux/cpumeter.cc
--- xosview-1.8.3+debian/linux/cpumeter.cc 2008-06-18 23:20:20.000000000
+0100
+++ xosview-1.8.3+debian-mine/linux/cpumeter.cc 2008-06-18 23:09:20.000000000
+0100
@@ -19,10 +19,10 @@
#define MAX_PROCSTAT_LENGTH 4096
CPUMeter::CPUMeter(XOSView *parent, const char *cpuID)
-: FieldMeterGraph( parent, 8, toUpper(cpuID), "USR/NICE/SYS/SI/HI/WIO/FREE/ST"
) {
+: FieldMeterGraph( parent, 9, toUpper(cpuID),
"USR/NICE/SYS/SI/HI/WIO/FREE/GST/ST" ) {
_lineNum = findLine(cpuID);
for ( int i = 0 ; i < 2 ; i++ )
- for ( int j = 0 ; j < 8 ; j++ )
+ for ( int j = 0 ; j < 9 ; j++ )
cputime_[i][j] = 0;
cpuindex_ = 0;
@@ -41,7 +41,8 @@
setfieldcolor( 4, parent_->getResource( "cpuInterruptColor" ) );
setfieldcolor( 5, parent_->getResource( "cpuWaitColor" ) );
setfieldcolor( 6, parent_->getResource( "cpuFreeColor" ) );
- setfieldcolor( 7, parent_->getResource( "cpuStolenColor" ) );
+ setfieldcolor( 7, parent_->getResource( "cpuGuestColor" ) );
+ setfieldcolor( 8, parent_->getResource( "cpuStolenColor" ) );
priority_ = atoi (parent_->getResource( "cpuPriority" ) );
dodecay_ = parent_->isResourceTrue( "cpuDecay" );
useGraph_ = parent_->isResourceTrue( "cpuGraph" );
@@ -77,18 +78,19 @@
>>cputime_[cpuindex_][4]
>>cputime_[cpuindex_][5]
>>cputime_[cpuindex_][6]
- >>cputime_[cpuindex_][7];
+ >>cputime_[cpuindex_][7]
+ >>cputime_[cpuindex_][8];
int oldindex = (cpuindex_+1)%2;
- for ( int i = 0 ; i < 8 ; i++ ){
- static int cputime_to_field[8] = { 0, 1, 2, 6, 5, 4, 3, 7 };
+ for ( int i = 0 ; i < 9 ; i++ ){
+ static int cputime_to_field[9] = { 0, 1, 2, 6, 5, 4, 3, 8, 7 };
int field = cputime_to_field[i];
fields_[field] = cputime_[cpuindex_][i] - cputime_[oldindex][i];
total_ += fields_[field];
}
if (total_){
- setUsed (total_ - (fields_[5] + fields_[6] + fields_[7]), total_);
+ setUsed (total_ - (fields_[5] + fields_[6] + fields_[7] + fields_[8]),
total_);
cpuindex_ = (cpuindex_ + 1) % 2;
}
}
diff -ur xosview-1.8.3+debian/linux/cpumeter.h
xosview-1.8.3+debian-mine/linux/cpumeter.h
--- xosview-1.8.3+debian/linux/cpumeter.h 2008-06-18 23:20:20.000000000
+0100
+++ xosview-1.8.3+debian-mine/linux/cpumeter.h 2008-06-18 23:18:38.000000000
+0100
@@ -25,7 +25,7 @@
static const char *cpuStr(int num);
protected:
int _lineNum;
- long cputime_[2][8];
+ long cputime_[2][9];
int cpuindex_;
void getcputime(void);
diff -ur xosview-1.8.3+debian/Xdefaults xosview-1.8.3+debian-mine/Xdefaults
--- xosview-1.8.3+debian/Xdefaults 2008-06-18 23:20:20.000000000 +0100
+++ xosview-1.8.3+debian-mine/Xdefaults 2008-06-18 23:09:33.000000000 +0100
@@ -75,7 +75,8 @@
xosview*cpuSoftIntColor: red
xosview*cpuWaitColor: lightblue
xosview*cpuFreeColor: aquamarine
-xosview*cpuStolenColor: blue
+xosview*cpuGuestColor: blue
+xosview*cpuStolenColor: purple
xosview*cpuPriority: 1
xosview*cpuDecay: True
xosview*cpuGraph: True
diff -ur xosview-1.8.3+debian/Xdefaults.in
xosview-1.8.3+debian-mine/Xdefaults.in
--- xosview-1.8.3+debian/Xdefaults.in 2008-06-18 23:20:20.000000000 +0100
+++ xosview-1.8.3+debian-mine/Xdefaults.in 2008-06-18 23:09:20.000000000
+0100
@@ -75,7 +75,8 @@
xosview*cpuSoftIntColor: red
xosview*cpuWaitColor: lightblue
xosview*cpuFreeColor: aquamarine
-xosview*cpuStolenColor: blue
+xosview*cpuGuestColor: blue
+xosview*cpuStolenColor: purple
xosview*cpuPriority: 1
xosview*cpuDecay: True
xosview*cpuGraph: True
diff -ur xosview-1.8.3+debian/Xdefaults.stipple
xosview-1.8.3+debian-mine/Xdefaults.stipple
--- xosview-1.8.3+debian/Xdefaults.stipple 2008-06-18 23:20:20.000000000
+0100
+++ xosview-1.8.3+debian-mine/Xdefaults.stipple 2008-06-18 23:09:20.000000000
+0100
@@ -12,6 +12,7 @@
xosvstipple*cpuInterruptColor: red
xosvstipple*cpuSInterruptColor: red
xosvstipple*cpuFreeColor: red
+xosvstipple*cpuGuestColor: red
xosvstipple*cpuStolenColor: red
xosvstipple*memUsedColor: orange
xosvstipple*memSharedColor: orange
@@ -51,6 +52,7 @@
xosvstipplebw*cpuInterruptColor:black
xosvstipplebw*cpuSInterruptColor:black
xosvstipplebw*cpuFreeColor: black
+xosvstipplebw*cpuGuestColor: black
xosvstipplebw*cpuStolenColor: black
xosvstipplebw*memUsedColor: black
xosvstipplebw*memSharedColor: black
--- End Message ---
--- Begin Message ---
Source: xosview
Source-Version: 1.8.3+debian-9
We believe that the bug you reported is fixed in the latest version of
xosview, which is due to be installed in the Debian FTP archive:
xosview_1.8.3+debian-9.diff.gz
to pool/main/x/xosview/xosview_1.8.3+debian-9.diff.gz
xosview_1.8.3+debian-9.dsc
to pool/main/x/xosview/xosview_1.8.3+debian-9.dsc
xosview_1.8.3+debian-9_amd64.deb
to pool/main/x/xosview/xosview_1.8.3+debian-9_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Kartik Mistry <[EMAIL PROTECTED]> (supplier of updated xosview package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Tue, 24 Jun 2008 21:18:43 +0530
Source: xosview
Binary: xosview
Architecture: source amd64
Version: 1.8.3+debian-9
Distribution: unstable
Urgency: low
Maintainer: Kartik Mistry <[EMAIL PROTECTED]>
Changed-By: Kartik Mistry <[EMAIL PROTECTED]>
Description:
xosview - X based system monitor
Closes: 323996 486921
Changes:
xosview (1.8.3+debian-9) unstable; urgency=low
.
* debian/control:
+ Updated Standards-Version to 3.8.0 (no changes needed)
* debian/rules:
+ [Lintian] Fixed order of dh_makeshlibs
* debian/patches/22_fix_valgrind_reports.dpatch:
+ Added patch to fix uninitialized values reported by Valgrind tool,
Thanks to Michael Karcher <[EMAIL PROTECTED]>
for patch (Closes: #323996)
* debian/patches/23_cpumeter_guest_time.dpatch:
+ Added patch to add guest time in Linux cpumeter, Thanks to
Samuel Thibault <[EMAIL PROTECTED]> for patch
(Closes: #486921)
Checksums-Sha1:
45dd821f616f8ee3ef7a43ef5da0f185a43f5dd7 1118 xosview_1.8.3+debian-9.dsc
59163fd913fad63416923575a44a5da31af61440 28396 xosview_1.8.3+debian-9.diff.gz
62fa6c3e9d4b11f26d3cb08e73f8938f802eb5c5 105636
xosview_1.8.3+debian-9_amd64.deb
Checksums-Sha256:
c54e3431c7c9557ecf906b461a63b7379fe3225b57f1fa8a020451e9819b3807 1118
xosview_1.8.3+debian-9.dsc
634385def0bf3b4b289a23c61153aecc1b2631f83f69320ff4b61c418be2284c 28396
xosview_1.8.3+debian-9.diff.gz
3eccccdfde835582cf1ced672a581c9bdcdc774af9d5d257c7c02a3c0e613ad3 105636
xosview_1.8.3+debian-9_amd64.deb
Files:
cb7d7a52a1aefe47ea7ab1fa7e494aad 1118 utils optional xosview_1.8.3+debian-9.dsc
f3b9f0d0ef6fc9c30a96072a410e4308 28396 utils optional
xosview_1.8.3+debian-9.diff.gz
a9391e6656915b0d34dea673cc617b1f 105636 utils optional
xosview_1.8.3+debian-9_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkhpC6wACgkQ2A7zWou1J68Y3wCgppla3/g5h3vXp3vqUtU3N2ON
tukAnjTLlI3ItWcDOFZImo+L1W8ptXh+
=x1GB
-----END PGP SIGNATURE-----
--- End Message ---
