From f27d5e6b7a2a322e9e708ec7c93cca4df94a3a43 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 8 Jan 2020 10:31:39 +0100 Subject: [PATCH] sort module usage + some newlines for readabilty Signed-off-by: Thomas Lamprecht --- src/PVE/Network.pm | 11 ++++++----- src/PVE/ProcFSTools.pm | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index e91aeb2..5f40353 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -2,15 +2,16 @@ package PVE::Network; use strict; use warnings; -use PVE::Tools qw(run_command lock_file); -use PVE::ProcFSTools; + use PVE::INotify; +use PVE::ProcFSTools; +use PVE::Tools qw(run_command lock_file); + use File::Basename; use IO::Socket::IP; -use Socket qw(NI_NUMERICHOST NI_NUMERICSERV); -use POSIX qw(ECONNREFUSED); - use Net::IP; +use POSIX qw(ECONNREFUSED); +use Socket qw(NI_NUMERICHOST NI_NUMERICSERV); # host network related utility functions diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index 94a2d54..d170ef5 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -147,9 +147,11 @@ sub read_proc_stat { my $useddiff = $res->{used} - $last_proc_stat->{used}; $useddiff = $diff if $useddiff > $diff; $res->{cpu} = $useddiff/$diff; + my $waitdiff = $res->{iowait} - $last_proc_stat->{iowait}; $waitdiff = $diff if $waitdiff > $diff; $res->{wait} = $waitdiff/$diff; + $last_proc_stat = $res; } else { $res->{cpu} = $last_proc_stat->{cpu};