r37473 - in /trunk/libsys-statistics-linux-perl: ./ debian/ lib/Sys/Statistics/ lib/Sys/Statistics/Linux/ t/
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Fri Jun 5 15:14:37 UTC 2009
Author: ryan52-guest
Date: Fri Jun 5 15:14:32 2009
New Revision: 37473
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37473
Log:
New upstream release
Removed:
trunk/libsys-statistics-linux-perl/t/200-backward_compatibility
Modified:
trunk/libsys-statistics-linux-perl/ChangeLog
trunk/libsys-statistics-linux-perl/MANIFEST
trunk/libsys-statistics-linux-perl/META.yml
trunk/libsys-statistics-linux-perl/debian/changelog
trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm
trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm
trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm
trunk/libsys-statistics-linux-perl/t/010-sysinfo.t
trunk/libsys-statistics-linux-perl/t/020-cpustats.t
trunk/libsys-statistics-linux-perl/t/030-procstats.t
trunk/libsys-statistics-linux-perl/t/040-memstat.t
trunk/libsys-statistics-linux-perl/t/050-pgswstats.t
trunk/libsys-statistics-linux-perl/t/060-netstats.t
trunk/libsys-statistics-linux-perl/t/070-sockstats.t
trunk/libsys-statistics-linux-perl/t/090-diskusage.t
trunk/libsys-statistics-linux-perl/t/100-loadavg.t
trunk/libsys-statistics-linux-perl/t/110-filestats.t
Modified: trunk/libsys-statistics-linux-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/ChangeLog?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/ChangeLog (original)
+++ trunk/libsys-statistics-linux-perl/ChangeLog Fri Jun 5 15:14:32 2009
@@ -1,3 +1,13 @@
+0.52 Released at 2009-06-05.
+ - No changes, just a full release.
+
+0.51_01 Released at 2009-05-29.
+ - Fixed tests 060-netstats.t and 070-sockstats.t.
+ - Updated the most of the other test files.
+ - Fixed a bug in Processes.pm - actime wasn't calculated correct.
+ - Added $RAWTIME to SysInfo.pm to get the raw time with jiffies
+ for uptime and idletime.
+
0.50 Released at 2009-05-17.
- ProcStats: renamed stat "procs_blocked" to "blocked" and added
stat "running".
Modified: trunk/libsys-statistics-linux-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/MANIFEST?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/MANIFEST (original)
+++ trunk/libsys-statistics-linux-perl/MANIFEST Fri Jun 5 15:14:32 2009
@@ -40,4 +40,3 @@
t/130-search.t
t/140-psfind.t
t/150-pstop.t
-t/200-backward_compatibility
Modified: trunk/libsys-statistics-linux-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/META.yml?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/META.yml (original)
+++ trunk/libsys-statistics-linux-perl/META.yml Fri Jun 5 15:14:32 2009
@@ -1,6 +1,6 @@
---
name: Sys-Statistics-Linux
-version: 0.50
+version: 0.52
author:
- Jonny Schulz
abstract: Front-end module to collect system statistics
@@ -18,7 +18,7 @@
provides:
Sys::Statistics::Linux:
file: lib/Sys/Statistics/Linux.pm
- version: 0.50
+ version: 0.52
Sys::Statistics::Linux::Compilation:
file: lib/Sys/Statistics/Linux/Compilation.pm
version: 0.10
@@ -51,13 +51,13 @@
version: 0.17
Sys::Statistics::Linux::Processes:
file: lib/Sys/Statistics/Linux/Processes.pm
- version: 0.25
+ version: 0.26
Sys::Statistics::Linux::SockStats:
file: lib/Sys/Statistics/Linux/SockStats.pm
version: 0.07
Sys::Statistics::Linux::SysInfo:
file: lib/Sys/Statistics/Linux/SysInfo.pm
- version: 0.07
+ version: 0.08
generated_by: Module::Build version 0.32
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
Modified: trunk/libsys-statistics-linux-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/changelog?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/changelog (original)
+++ trunk/libsys-statistics-linux-perl/debian/changelog Fri Jun 5 15:14:32 2009
@@ -1,3 +1,9 @@
+libsys-statistics-linux-perl (0.52-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Fri, 05 Jun 2009 08:14:23 -0700
+
libsys-statistics-linux-perl (0.50-1) unstable; urgency=low
* New upstream release
Modified: trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm (original)
+++ trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm Fri Jun 5 15:14:32 2009
@@ -433,7 +433,7 @@
=cut
package Sys::Statistics::Linux;
-our $VERSION = '0.50';
+our $VERSION = '0.52';
use strict;
use warnings;
Modified: trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm (original)
+++ trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm Fri Jun 5 15:14:32 2009
@@ -136,7 +136,7 @@
use Time::HiRes;
use constant NUMBER => qr/^-{0,1}\d+(?:\.\d+){0,1}\z/;
-our $VERSION = '0.25';
+our $VERSION = '0.26';
our $PAGES_TO_BYTES = 0;
sub new {
@@ -144,6 +144,7 @@
my %self = (
files => {
+ uptime => '/proc/uptime',
basedir => '/proc',
stat => 'stat',
statm => 'statm',
@@ -227,9 +228,10 @@
}
sub _load {
- my $self = shift;
- my $class = ref $self;
- my $file = $self->{files};
+ my $self = shift;
+ my $class = ref $self;
+ my $file = $self->{files};
+ my $uptime = $self->_uptime();
my ($pids, %stats, %userids);
$stats{time} = Time::HiRes::gettimeofday();
@@ -285,7 +287,7 @@
}
# calculate the active time of each process
- my ($d, $h, $m, $s) = $self->_calsec(sprintf('%li', $stats{time} - $stats{$pid}{sttime} / 100));
+ my ($d, $h, $m, $s) = $self->_calsec(sprintf('%li', $uptime - $stats{$pid}{sttime} / 100));
$stats{$pid}{actime} = "$d:".sprintf('%02d:%02d:%02d', $h, $m, $s);
# determine the owner of the process
@@ -395,6 +397,16 @@
}
}
+sub _uptime {
+ my $self = shift;
+ my $class = ref $self;
+ my $file = $self->{files};
+ open my $fh, '<', $file->{uptime} or croak "$class: unable to open $file->{uptime} ($!)";
+ my ($up, $idle) = split /\s+/, <$fh>;
+ close($fh);
+ return $up;
+}
+
sub _calsec {
my $self = shift;
my ($s, $m, $h, $d) = (shift, 0, 0, 0);
Modified: trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm (original)
+++ trunk/libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm Fri Jun 5 15:14:32 2009
@@ -30,6 +30,12 @@
countcpus - The total (maybe logical) number of CPUs.
uptime - The uptime of the system.
idletime - The idle time of the system.
+
+You can set
+
+ $Sys::Statistics::Linux::SysInfo::RAWTIME = 1;
+
+to get C<uptime> and C<idletime> as raw value.
=head1 METHODS
@@ -75,7 +81,8 @@
use warnings;
use Carp qw(croak);
-our $VERSION = '0.07';
+our $VERSION = '0.08';
+our $RAWTIME = 0;
sub new {
my $class = shift;
@@ -148,13 +155,14 @@
{ # up- and idletime
open my $fh, '<', $file->{uptime} or croak "$class: unable to open $file->{uptime} ($!)";
- foreach my $x (split /\s+/, <$fh>) {
- my ($d, $h, $m, $s) = $self->_calsec(sprintf('%li', $x));
- unless (defined $stats->{uptime}) {
- $stats->{uptime} = "${d}d ${h}h ${m}m ${s}s";
- next;
+ ($stats->{uptime}, $stats->{idletime}) = split /\s+/, <$fh>;
+ close $fh;
+
+ if (!$RAWTIME) {
+ foreach my $x (qw/uptime idletime/) {
+ my ($d, $h, $m, $s) = $self->_calsec(sprintf('%li', $stats->{$x}));
+ $stats->{$x} = "${d}d ${h}h ${m}m ${s}s";
}
- $stats->{idletime} = "${d}d ${h}h ${m}m ${s}s";
}
close($fh);
}
Modified: trunk/libsys-statistics-linux-perl/t/010-sysinfo.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/010-sysinfo.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/010-sysinfo.t (original)
+++ trunk/libsys-statistics-linux-perl/t/010-sysinfo.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,27 @@
use strict;
use warnings;
-use Test::More tests => 10;
+use Test::More;
use Sys::Statistics::Linux;
+
+my @pf = qw(
+ /proc/sys/kernel/hostname
+ /proc/sys/kernel/domainname
+ /proc/sys/kernel/ostype
+ /proc/sys/kernel/osrelease
+ /proc/sys/kernel/version
+ /proc/cpuinfo
+ /proc/meminfo
+ /proc/uptime
+);
+
+foreach my $f (@pf) {
+ if (!-r $f) {
+ plan skip_all => "$f is not readable";
+ exit(0);
+ }
+}
+
+plan tests => 10;
my @sysinfo = qw(
hostname
Modified: trunk/libsys-statistics-linux-perl/t/020-cpustats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/020-cpustats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/020-cpustats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/020-cpustats.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 5;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/stat') {
+ plan skip_all => "it seems that your system doesn't provide cpu statistics";
+ exit(0);
+}
+
+plan tests => 5;
my @cpustats = qw(
user
Modified: trunk/libsys-statistics-linux-perl/t/030-procstats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/030-procstats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/030-procstats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/030-procstats.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/stat' || !-r '/proc/loadavg') {
+ plan skip_all => "it seems that your system doesn't provide process statistics";
+ exit(0);
+}
+
+plan tests => 3;
my @procstats = qw(
new
Modified: trunk/libsys-statistics-linux-perl/t/040-memstat.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/040-memstat.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/040-memstat.t (original)
+++ trunk/libsys-statistics-linux-perl/t/040-memstat.t Fri Jun 5 15:14:32 2009
@@ -2,6 +2,11 @@
use warnings;
use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/meminfo') {
+ plan skip_all => "it seems that your system doesn't provide memory statistics";
+ exit(0);
+}
my @memstats = qw(
memused
Modified: trunk/libsys-statistics-linux-perl/t/050-pgswstats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/050-pgswstats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/050-pgswstats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/050-pgswstats.t Fri Jun 5 15:14:32 2009
@@ -12,7 +12,7 @@
my $sys = Sys::Statistics::Linux->new();
-if (!-r '/proc/diskstats' || !-r '/proc/partitions') {
+if (!-r '/proc/diskstats' || !-r '/proc/partitions' || !-r '/proc/stat' || !-r '/proc/vmstat') {
plan skip_all => "it seems that your system doesn't provide paging/swapping statistics";
exit(0);
}
Modified: trunk/libsys-statistics-linux-perl/t/060-netstats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/060-netstats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/060-netstats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/060-netstats.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 36;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/net/dev') {
+ plan skip_all => "it seems that your system doesn't provide net statistics";
+ exit(0);
+}
+
+plan tests => 36;
my @netstats = qw(
rxbyt
Modified: trunk/libsys-statistics-linux-perl/t/070-sockstats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/070-sockstats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/070-sockstats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/070-sockstats.t Fri Jun 5 15:14:32 2009
@@ -12,7 +12,7 @@
my $sys = Sys::Statistics::Linux->new();
-if (!-r '/proc/diskstats' || !-r '/proc/partitions') {
+if (!-r '/proc/diskstats' || !-r '/proc/partitions' || !-r '/proc/net/sockstat') {
plan skip_all => "it seems that your system doesn't provide socket statistics";
exit(0);
}
Modified: trunk/libsys-statistics-linux-perl/t/090-diskusage.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/090-diskusage.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/090-diskusage.t (original)
+++ trunk/libsys-statistics-linux-perl/t/090-diskusage.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 5;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-x '/bin/df') {
+ plan skip_all => "it seems that your system doesn't provide /bin/df";
+ exit(0);
+}
+
+plan tests => 5;
my @diskusage = qw(
total
Modified: trunk/libsys-statistics-linux-perl/t/100-loadavg.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/100-loadavg.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/100-loadavg.t (original)
+++ trunk/libsys-statistics-linux-perl/t/100-loadavg.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/loadavg') {
+ plan skip_all => "it seems that your system doesn't provide load statistics";
+ exit(0);
+}
+
+plan tests => 3;
my @loadavg = qw(
avg_1
Modified: trunk/libsys-statistics-linux-perl/t/110-filestats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/t/110-filestats.t?rev=37473&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/t/110-filestats.t (original)
+++ trunk/libsys-statistics-linux-perl/t/110-filestats.t Fri Jun 5 15:14:32 2009
@@ -1,7 +1,14 @@
use strict;
use warnings;
-use Test::More tests => 10;
+use Test::More;
use Sys::Statistics::Linux;
+
+if (!-r '/proc/sys/fs/file-nr' || !-r '/proc/sys/fs/inode-nr' || !-r '/proc/sys/fs/dentry-state') {
+ plan skip_all => "it seems that your system doesn't provide file statistics";
+ exit(0);
+}
+
+plan tests => 10;
my @filestats = qw(
fhalloc
More information about the Pkg-perl-cvs-commits
mailing list