mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-01 01:09:47 +00:00
use of Blocking
git-svn-id: https://svn.fhem.de/fhem/trunk@4492 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
bentele
parent
87096f7a68
commit
70fdf0b58f
@ -8,7 +8,7 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# Version = 2.3
|
||||
# Version = 2.5
|
||||
#
|
||||
##############################################################################
|
||||
#
|
||||
@ -26,6 +26,7 @@
|
||||
|
||||
package main;
|
||||
use IO::Socket::INET;
|
||||
use Blocking;
|
||||
|
||||
my @gets = ('minPower', # min value
|
||||
'maxPower', # max value
|
||||
@ -54,12 +55,8 @@ sub
|
||||
energy_State($$$$)
|
||||
{
|
||||
my ($hash, $tim, $vt, $val) = @_;
|
||||
#Log 4, "time: $tim";
|
||||
#Log 4, "name: $vt";
|
||||
#Log 4, "value: $val";
|
||||
$hash->{READINGS}{$vt}{VAL} = $val;
|
||||
$hash->{READINGS}{$vt}{TIME} = TimeNow();
|
||||
#Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}";
|
||||
Log3 $hash, 4, "time: $tim name: $vt value: $val";
|
||||
return undef;
|
||||
}
|
||||
@ -67,15 +64,14 @@ sub
|
||||
energy_Set($$$$)
|
||||
{
|
||||
my ($hash, $tim, $vt, $val) = @_;
|
||||
#Log 4, "time: $tim";
|
||||
#Log 4, "name: $vt";
|
||||
#Log 4, "value: $val";
|
||||
$hash->{READINGS}{$vt}{VAL} = $val;
|
||||
$hash->{READINGS}{$vt}{TIME} = TimeNow();
|
||||
#Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}";
|
||||
Log3 $hash, 4, "time: $tim name: $vt value: $val";
|
||||
if ( $vt eq "?"){
|
||||
return "Unknown argument ?, choose one of DAYPOWER MONTHPOWER YEARPOWER TOTALPOWER";
|
||||
return "Unknown argument ?, choose one of Interval DAYPOWER MONTHPOWER YEARPOWER TOTALPOWER";
|
||||
}
|
||||
if ( $vt eq "Interval"){
|
||||
$hash->{Interval} = $val;
|
||||
}
|
||||
return undef;
|
||||
}
|
||||
@ -107,24 +103,24 @@ energy_Define($$)
|
||||
|
||||
#Log 4, "$hash->{NAME} will read from SML at $hash->{Host}:$hash->{Port} " ;
|
||||
Log3 $hash, 4, "$hash->{NAME} will read from SML at $hash->{Host}:$hash->{Port} " ;
|
||||
$hash->{Invalid} = -1; # default value for invalid readings
|
||||
$hash->{Rereads} = 2; # number of retries when reading curPwr of 0
|
||||
$hash->{UseSVTime} = ''; # use the SV time as timestamp (else: TimeNow())
|
||||
|
||||
$hash->{STATE} = 'Initializing';
|
||||
$hash->{READINGS}{STATE}{VAL} = "Initializing";
|
||||
$hash->{READINGS}{STATE}{TIME} = $timenow;
|
||||
|
||||
my $timenow = TimeNow();
|
||||
|
||||
for my $get (@gets)
|
||||
{
|
||||
$hash->{READINGS}{$get}{VAL} = $hash->{Invalid};
|
||||
$hash->{READINGS}{$get}{VAL} = -1;
|
||||
$hash->{READINGS}{$get}{TIME} = $timenow;
|
||||
}
|
||||
|
||||
energy_Update($hash);
|
||||
RemoveInternalTimer($hash);
|
||||
InternalTimer(gettimeofday()+$hash->{Interval}, "sml_energy_Update", $hash, 0);
|
||||
#sml_energy_Update($hash);
|
||||
|
||||
#Log 3, "$hash->{NAME} will read from SML at $hash->{Host}:$hash->{Port} " .
|
||||
# ($hash->{Interval} ? "every $hash->{Interval} seconds" : "for every 'get $hash->{NAME} <key>' request");
|
||||
Log3 $hash, 3, "$hash->{NAME} will read from SML at $hash->{Host}:$hash->{Port} " ;
|
||||
return undef;
|
||||
}
|
||||
@ -200,25 +196,32 @@ energy_Counter($)
|
||||
}
|
||||
|
||||
sub
|
||||
energy_Update($)
|
||||
sml_energy_Update($)
|
||||
{
|
||||
my ($hash) = @_;
|
||||
|
||||
if ($hash->{Interval} > 0) {
|
||||
InternalTimer(gettimeofday() + $hash->{Interval}, "energy_Update", $hash, 0);
|
||||
InternalTimer(gettimeofday() + $hash->{Interval}, "sml_energy_Update", $hash, 0);
|
||||
}
|
||||
|
||||
#Log 4, "$hash->{NAME} tries to contact SML at $hash->{Host}:$hash->{Port}";
|
||||
Log3 $hash, 4, "$hash->{NAME} tries to contact SML at $hash->{Host}:$hash->{Port}";
|
||||
|
||||
my $success = 0;
|
||||
my %readings = ();
|
||||
my $timenow = TimeNow();
|
||||
my $rereads = $hash->{Rereads};
|
||||
my $name = $hash->{NAME};
|
||||
my $ip = $hash->{Host};
|
||||
my $port = $hash->{Port};
|
||||
my $interval = $hash->{Interval};
|
||||
my $timeout = $hash->{Timeout};
|
||||
|
||||
#Log 4, "$hash->{NAME} tries to contact SML at $hash->{Host}:$hash->{Port}";
|
||||
Log3 $hash, 4, "$hash->{NAME} tries to contact SML at $hash->{Host}:$hash->{Port}";
|
||||
$hash->{helper}{RUNNING_PID} = BlockingCall("sml_energy_DoUpdate", $name."|".$ip."|".$port."|".$interval, "sml_energy_energyDone", 120, "sml_energy_energyAborted", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
|
||||
}
|
||||
|
||||
sub
|
||||
sml_energy_DoUpdate($)
|
||||
{
|
||||
my ($string) = @_;
|
||||
my ($name, $ip, $port,$interval) = split("\\|", $string);
|
||||
|
||||
my $success = 0;
|
||||
my %readings = ();
|
||||
my $timenow = TimeNow();
|
||||
my $counts = 0 ;
|
||||
my $summary = 0 ;
|
||||
#my $url = "/InstantView/request/getPowerProfile.html?ts=0\&n=$interval\¶m=Wirkleistung\&format=1";
|
||||
@ -231,22 +234,21 @@ energy_Update($)
|
||||
my $avg;
|
||||
my $min = 20000;
|
||||
my $max = 0;
|
||||
my $log = "";
|
||||
|
||||
#Log 4, "$hash->{NAME} $url";
|
||||
Log3 $hash, 4, "$hash->{NAME} $url";
|
||||
$socket = new IO::Socket::INET (
|
||||
#Log 4, "$hash->{NAME} $url";
|
||||
Log3 $hash, 4, "$hash->{NAME} $url";
|
||||
$socket = new IO::Socket::INET (
|
||||
PeerAddr => $ip,
|
||||
PeerPort => $port,
|
||||
Proto => 'tcp',
|
||||
Reuse => 0,
|
||||
Timeout => $timeout
|
||||
Timeout => 10
|
||||
);
|
||||
|
||||
Log3 $hash, 4, "$hash->{NAME} socket new";
|
||||
if (defined ($socket) and $socket and $socket->connected())
|
||||
{
|
||||
Log3 $hash, 4, "$hash->{NAME} Connected ...";
|
||||
Log3 $hash, 4, "$name socket new";
|
||||
if (defined ($socket) and $socket and $socket->connected())
|
||||
{
|
||||
Log3 $name, 4, "$name Connected ...";
|
||||
print $socket "GET $url HTTP/1.0\r\n\r\n";
|
||||
$socket->autoflush(1);
|
||||
while ((read $socket, $buf, 1024) > 0)
|
||||
@ -276,21 +278,43 @@ if (defined ($socket) and $socket and $socket->connected())
|
||||
if ( $1 eq "true" )
|
||||
{
|
||||
$success = 1;
|
||||
Log3 $hash, 4, "$hash->{NAME} error from the $ip ($1)";
|
||||
Log3 $name, 4, "$name error from the $ip ($1)";
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
}else{
|
||||
Log3 $hash, 3, "$hash->{NAME} Cannot open socket ...";
|
||||
$success = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Log3 $hash, 5, "reading done.";
|
||||
if ( $success == 0 and $summary > 0 and $counts > 0)
|
||||
{
|
||||
# return 0;
|
||||
}
|
||||
|
||||
if ( $success == 0 and $summary > 0 and $counts > 0){
|
||||
$avg = $summary/$counts;
|
||||
$avg =sprintf("%.2f",$avg);
|
||||
|
||||
return "$name|$min|$max|$last|$avg|0" ;
|
||||
}elese{
|
||||
return "$name|1|1|1|1|1";
|
||||
}
|
||||
|
||||
} #sub ende
|
||||
|
||||
sub
|
||||
sml_energy_energyDone($)
|
||||
{
|
||||
my ($string) = @_;
|
||||
return unless(defined($string));
|
||||
my (@a) = split("\\|", $string);
|
||||
my $hash = $defs{$a[0]};
|
||||
my ($min,$max,$last,$avg,$success) = ($a[1],$a[2],$a[3],$a[4],$a[5]);
|
||||
my $log = "";
|
||||
my $timenow = TimeNow();
|
||||
my $interval = $hash->{Interval};
|
||||
|
||||
Log3 $hash, 4, "sml_energy_energyDone min: $min max: $max last: $last avg: $avg";
|
||||
delete($hash->{helper}{RUNNING_PID});
|
||||
|
||||
if ( $success == 0){
|
||||
$hash->{READINGS}{minPower}{VAL} = $min;
|
||||
$hash->{READINGS}{minPower}{TIME} = $timenow;
|
||||
$hash->{READINGS}{maxPower}{VAL} = $max;
|
||||
@ -369,21 +393,42 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
|
||||
}else{
|
||||
my ($dateLast, $monthLast, $dayLast, $hourLast, $minLast, $secLast) = $hash->{READINGS}{TOTALPOWER}{TIME} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/;
|
||||
my ($powLast) = $hash->{READINGS}{TOTALPOWER}{VAL} =~ /^(.*)$/;
|
||||
Log3 $hash, 4, "$hash->{NAME} total: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast";
|
||||
Log3 $hash, 5, "$hash->{NAME} total: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast";
|
||||
$powLast += $newpower ;
|
||||
$hash->{READINGS}{TOTALPOWER}{VAL} = $powLast;
|
||||
$log .= " total: $powLast";
|
||||
}
|
||||
|
||||
$hash->{READINGS}{STATE}{VAL} = 'Connected';
|
||||
$hash->{READINGS}{STATE}{TIME} = $timenow;
|
||||
push @{$hash->{CHANGED}}, $log;
|
||||
DoTrigger($hash->{NAME}, undef) if ($init_done);
|
||||
Log3 $hash, 4, "$hash->{NAME} write log file: $log";
|
||||
}else{
|
||||
Log3 $hash, 4, "$hash->{NAME} STATE: $hash->{READINGS}{STATE}{VAL} timenow: $timenow";
|
||||
|
||||
}else{
|
||||
$hash->{STATE}{VAL} = 'disconnected';
|
||||
Log3 $hash, 3, "$hash->{NAME} can't update - device send a error";
|
||||
}
|
||||
|
||||
push @{$hash->{CHANGED}}, $log;
|
||||
DoTrigger($hash->{NAME}, undef) if ($init_done);
|
||||
Log3 $hash, 4, "$hash->{NAME} write log file: $log";
|
||||
Log3 $hash, 4, "$hash->{NAME} STATE: $hash->{READINGS}{STATE}{VAL} timenow: $timenow";
|
||||
}
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub
|
||||
sml_energy_energyAborted($)
|
||||
{
|
||||
my ($hash) = @_;
|
||||
|
||||
Log3 $hash, 3, "$hash->{NAME} sml_energy_energyAborted";
|
||||
|
||||
delete($hash->{helper}{RUNNING_PID});
|
||||
}
|
||||
|
||||
sub
|
||||
energy_Get($@)
|
||||
{
|
||||
@ -392,7 +437,7 @@ my ($hash, @args) = @_;
|
||||
|
||||
return 'energy_Get needs two arguments' if (@args != 2);
|
||||
|
||||
energy_Update($hash) unless $hash->{Interval};
|
||||
sml_energy_Update($hash) unless $hash->{Interval};
|
||||
|
||||
my $get = $args[1];
|
||||
my $val = $hash->{Invalid};
|
||||
@ -419,7 +464,7 @@ energy_Undef($$)
|
||||
my ($hash, $args) = @_;
|
||||
|
||||
RemoveInternalTimer($hash) if $hash->{Interval};
|
||||
|
||||
BlockingKill($hash->{helper}{RUNNING_PID}) if(defined($hash->{helper}{RUNNING_PID}));
|
||||
return undef;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user