Hello community, here is the log from the commit of package xosview checked in at Thu Dec 6 01:46:29 CET 2007. -------- --- xosview/xosview.changes 2007-11-26 11:44:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/xosview/xosview.changes 2007-12-04 17:47:40.790138000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 4 17:46:32 CET 2007 - werner@suse.de + +- Use I/O block size for hd if lstat(8) has success (bug #342107) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xosview.spec ++++++ --- /var/tmp/diff_new_pack.A10513/_old 2007-12-06 01:45:34.000000000 +0100 +++ /var/tmp/diff_new_pack.A10513/_new 2007-12-06 01:45:34.000000000 +0100 @@ -19,7 +19,7 @@ # desktop selections. #Requires: desktop-data-SuSE Version: 1.8.3 -Release: 113 +Release: 116 Summary: System Load Information Url: http://sourceforge.net/projects/xosview/ Source: xosview-%{version}.tar.bz2 @@ -142,6 +142,8 @@ %doc %{_docdir}/xosview/README.linux %changelog +* Tue Dec 04 2007 - werner@suse.de +- Use I/O block size for hd if lstat(8) has success (bug #342107) * Mon Nov 26 2007 - werner@suse.de - Take ACPI and Xresources in account for battery option (#343806) * Fri Sep 07 2007 - werner@suse.de ++++++ xosview-1.8.3.dif ++++++ --- /var/tmp/diff_new_pack.A10513/_old 2007-12-06 01:45:34.000000000 +0100 +++ /var/tmp/diff_new_pack.A10513/_new 2007-12-06 01:45:34.000000000 +0100 @@ -10,7 +10,7 @@ +patch -p0 -s --suffix=".float" < ../xosview-1.8.2-float-conv.patch +patch -p0 -s --suffix=".conf" < ../xosview-1.8.2-configure.patch +patch -p0 -s --suffix=".appdef" < ../xosview-1.8.3-appdef.dif -+patch -p0 -s --suffix=".diskstat" < ../xosview-1.8.3-diskstat.dif ++#patch -p0 -s --suffix=".diskstat" < ../xosview-1.8.3-diskstat.dif --- README.linux +++ README.linux 2006-07-26 18:08:30.000000000 +0200 @@ -26,7 +26,7 @@ To install xosview: ++++++ xosview-1.8.3-diskstat.dif ++++++ --- /var/tmp/diff_new_pack.A10513/_old 2007-12-06 01:45:34.000000000 +0100 +++ /var/tmp/diff_new_pack.A10513/_new 2007-12-06 01:45:34.000000000 +0100 @@ -1,5 +1,5 @@ --- linux/diskmeter.cc -+++ linux/diskmeter.cc 2007-09-07 18:53:59.750917026 +0200 ++++ linux/diskmeter.cc 2007-12-04 17:44:22.000787012 +0100 @@ -255,19 +255,14 @@ void DiskMeter::getsysfsdiskinfo( void ) // just sum up everything in /sys/block/*/stat @@ -20,7 +20,7 @@ IntervalTimerStop(); total_ = maxspeed_; -@@ -279,29 +274,75 @@ void DiskMeter::getsysfsdiskinfo( void ) +@@ -279,29 +274,83 @@ void DiskMeter::getsysfsdiskinfo( void ) // reset all sums all_bytes_read=all_bytes_written=0L; @@ -47,36 +47,44 @@ + // only scan for real HW (raid, md, and lvm all mapped on them) + tmp = disk + "/device"; + if (lstat(tmp.c_str(), &buf) != 0 || (buf.st_mode & S_IFLNK) == 0) -+ continue; ++ continue; + + // ignore removable devices + tmp = disk + "/removable"; + if (stat(tmp.c_str(), &buf) == 0 && buf.st_mode & S_IFREG) { -+ std::ifstream removable; -+ int isremovable = 0; ++ std::ifstream removable; ++ int isremovable = 0; + -+ removable.open(tmp.c_str()); -+ if (removable.good()) { ++ removable.open(tmp.c_str()); ++ if (removable.good()) { + removable >> isremovable; + removable.close(); + removable.clear(); -+ } ++ } + -+ if (isremovable) continue; ++ if (isremovable) continue; + } + + sect_size = 0L; -+ tmp = disk + "/queue/max_sectors_kb"; -+ if (stat(tmp.c_str(), &buf) == 0 && buf.st_mode & S_IFREG) { -+ std::ifstream max_sectors_kb; + -+ max_sectors_kb.open(tmp.c_str()); -+ if (max_sectors_kb.good()) { ++ tmp = "/dev/"; ++ tmp += dirent->d_name; ++ if (lstat(tmp.c_str(), &buf) == 0) ++ sect_size = (long)buf.st_blksize; ++ ++ if (sect_size == 0L) { ++ tmp = disk + "/queue/max_sectors_kb"; ++ if (stat(tmp.c_str(), &buf) == 0 && (buf.st_mode & S_IFREG)) { ++ std::ifstream max_sectors_kb; ++ ++ max_sectors_kb.open(tmp.c_str()); ++ if (max_sectors_kb.good()) { + max_sectors_kb >> sect_size; + //XOSDEBUG("disk stat: %lu\n", sect_size); + max_sectors_kb.close(); + max_sectors_kb.clear(); -+ } ++ } ++ } + } + + if (sect_size == 0L) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org