select

diff --git a/upsgraph.pl b/upsgraph.pl
index 10f622b7f643dd04ec4c6f458ace8d6069457c5d..010d11445a9af2766dc1a5c2d9e67387798c13b5 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -11,6 +11,7 @@ if ((@ARGV != 1) && (@ARGV != 2)) {
 
 use Net::SNMP;
 use IO::Socket::INET;
+use IO::Select;
 use RRDs;
 use File::Copy;
 use Data::Dumper;
@@ -124,7 +125,13 @@ sub fetch_tcp(@) {
 
        return undef if (!$sock);
 
-       chomp(my $value = <$sock>);
+       my $select = IO::Select->new($sock);
+
+       my $value = undef;
+
+       if ($select->can_read(1)) {
+               chomp($value) if (sysread($sock, $value, 4096) > 0);
+       }
 
        close($sock);
 
@@ -150,11 +157,19 @@ sub fetch_tcp_multi(@) {
 
        return undef if (!$sock);
 
-       while(<$sock>) {
-               chomp;
-               (my $key, my $value) = split(/${delimiter}/, $_);
-               $value=~ s/\s//g;
-               $values{$key} = $value;
+       my $select = IO::Select->new($sock);
+
+       while($select->can_read(1)) {
+               if (sysread($sock, my $buf, 16384) > 0) {
+                       $buf=~s/\r//g;
+                       foreach my $line (split(/\n/, $buf)) {
+                               (my $key, my $value) = split(/${delimiter}/, $line);
+                               $value=~ s/\s//g;
+                               $values{$key} = $value;
+                       }
+               } else {
+                       last;
+               }
        }
 
        close($sock);