Hello community, here is the log from the commit of package procinfo checked in at Fri Jun 2 14:31:18 CEST 2006. -------- --- procinfo/procinfo.changes 2006-05-26 19:16:40.000000000 +0200 +++ procinfo/procinfo.changes 2006-06-02 14:26:11.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 2 14:22:53 CEST 2006 - werner@suse.de + +- The members of the array used for storing irq are unsigned longs, + many thansk to Harald Koenig. + +------------------------------------------------------------------- +Fri Jun 2 12:59:42 CEST 2006 - werner@suse.de + +- The timer ticks on ix86 are given in kernel space HZ, use correct + factor to get them into user space HZ (bug #56081) + +------------------------------------------------------------------- New: ---- procinfo-irq.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procinfo.spec ++++++ --- /var/tmp/diff_new_pack.JaxaeM/_old 2006-06-02 14:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JaxaeM/_new 2006-06-02 14:31:12.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Monitoring Autoreqprov: on Version: 18 -Release: 55 +Release: 56 Summary: Display System Status Gathered from /proc Provides: ps:/usr/bin/lsdev Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2 @@ -26,6 +26,7 @@ Patch3: procinfo-TERM.dif Patch4: procinfo-26.diff Patch5: procinfo-gccver.diff +Patch6: procinfo-irq.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,7 @@ %patch3 %patch4 -p1 %patch5 -p1 +%patch6 %build CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${RPM_OPT_FLAGS} -pipe" @@ -71,6 +73,12 @@ %{_mandir}/man8/socklist.8* %changelog -n procinfo +* Fri Jun 02 2006 - werner@suse.de +- The members of the array used for storing irq are unsigned longs, + many thansk to Harald Koenig. +* Fri Jun 02 2006 - werner@suse.de +- The timer ticks on ix86 are given in kernel space HZ, use correct + factor to get them into user space HZ (bug #56081) * Fri May 26 2006 - schwab@suse.de - Don't strip binaries. * Wed Jan 25 2006 - mls@suse.de ++++++ procinfo-hz ++++++ --- /var/tmp/diff_new_pack.JaxaeM/_old 2006-06-02 14:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JaxaeM/_new 2006-06-02 14:31:12.000000000 +0200 @@ -52,6 +52,22 @@ static void first_page (long sl) { +@@ -424,13 +424,13 @@ + #ifdef __i386__ /* IRQ 0 is timer tick on i386's... */ + if (nr_irqs) { + if (fs && old.uptime) +- elapsed = DIFF (intr[0]); ++ elapsed = (DIFF(intr[0]) * HZ) / hz; + } else + #endif + #ifdef __sparc__ /* IRQ 10 is timer tick on sparc's... */ + if (nr_irqs) { + if (fs && old.uptime) +- elapsed = DIFF (intr[10]); ++ elapsed = (DIFF(intr[10]) * HZ) / hz; + } else + #endif + { @@ -702,8 +718,9 @@ main (int ac, char **av) uname(&ut); linux_version_code = (atol(strtok(ut.release, ".")) * 0x10000) + ++++++ procinfo-irq.dif ++++++ --- procinfo.c +++ procinfo.c 2006-06-02 14:19:13.000000000 +0200 @@ -992,10 +992,10 @@ for(i = 5; i < len; i++) if(line[i] == ' ') nr_irqs++; - new.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); - old.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); + new.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); + old.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); memset (&base, 0, sizeof (struct info)); - base.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); + base.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); continue; } /* While we're at it, fill in booted. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org