FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-05 02:19:31 +00:00
Code Issues Releases Wiki Activity

HandleTimout moved...

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1040 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-10-02 12:27:51 +00:00
parent 9c57d9ae86
commit 0b2cb17fa0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/fhem.pl
View File

@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.153 2011-09-30 15:46:19 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.154 2011-10-02 12:27:51 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -342,6 +342,8 @@ my $errcount= 0;
while (1) { while (1) {
my ($rout, $rin) = ('', ''); my ($rout, $rin) = ('', '');
my $timeout = HandleTimeout();
vec($rin, $server->fileno(), 1) = 1; vec($rin, $server->fileno(), 1) = 1;
foreach my $p (keys %selectlist) { foreach my $p (keys %selectlist) {
vec($rin, $selectlist{$p}{FD}, 1) = 1; vec($rin, $selectlist{$p}{FD}, 1) = 1;
@ -353,7 +355,6 @@ while (1) {
# for documentation see # for documentation see
# man 2 select # man 2 select
# http://perldoc.perl.org/functions/select.html # http://perldoc.perl.org/functions/select.html
my $timeout = HandleTimeout();
$timeout = $readytimeout if(keys(%readyfnlist) && $timeout = $readytimeout if(keys(%readyfnlist) &&
(!defined($timeout) || $timeout > $readytimeout)); (!defined($timeout) || $timeout > $readytimeout));
my $nfound = select($rout=$rin, undef, undef, $timeout); my $nfound = select($rout=$rin, undef, undef, $timeout);
@ -1261,8 +1262,9 @@ CommandDelete($$)
# Delete releated hashes # Delete releated hashes
foreach my $p (keys %selectlist) { foreach my $p (keys %selectlist) {
delete $selectlist{$p} if($selectlist{$p} && $selectlist{$p}{NAME} eq $sdev) {
if($selectlist{$p} && $selectlist{$p}{NAME} eq $sdev); delete $selectlist{$p};
}
} }
foreach my $p (keys %readyfnlist) { foreach my $p (keys %readyfnlist) {
delete $readyfnlist{$p} delete $readyfnlist{$p}
@ -1270,8 +1272,9 @@ CommandDelete($$)
} }
delete($attr{$sdev}); delete($attr{$sdev});
my $temporary = $defs{$sdev}{TEMPORARY};
delete($defs{$sdev}); # Remove the main entry delete($defs{$sdev}); # Remove the main entry
DoTrigger("global", "DELETED $sdev"); DoTrigger("global", "DELETED $sdev") if(!$temporary);
} }
return join("\n", @rets); return join("\n", @rets);