From 6fefdd8711af61d6f7b5bdcca9b242a92a529e1d Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 23 Jun 2012 15:49:59 +0200
Subject: calculate loadavg remote

---
 lib/Loadbars/Main.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'lib/Loadbars')

diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm
index ba9c6cd..afce58c 100644
--- a/lib/Loadbars/Main.pm
+++ b/lib/Loadbars/Main.pm
@@ -114,9 +114,16 @@ sub stats_thread ($;$) {
                     close \\\$fh;
                 }
 
-                for (0..$C{samples}) {
+                sub loadavg {
                     printf qq(LOADAVG\n);
-                    cat(qq(/proc/loadavg));
+                    open my \\\$fh, qq(/proc/loadavg);
+                    printf qq(%s\n), join qq(;), (split qq( ), <\\\$fh>)[0..2];
+                    close \\\$fh;
+                }
+
+                for (0..$C{samples}) {
+                    loadavg();
+
                     printf qq(CPUSTATS\n);
                     cat(qq(/proc/stat));
                     printf qq(MEMSTATS\n);
@@ -156,9 +163,8 @@ REMOTECODE
                     $mode = 1;
 
                 }
-                elsif ($_ =~ $loadavg_re) {
-                    $AVGSTATS{$host} = "$1;$2;$3";
-
+                else {
+                    $AVGSTATS{$host} = $_;
                 }
             }
             elsif ( $mode == 1 ) {
-- 
cgit v1.2.3