mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blocking.pm: fix some windows problems (Forum #79222)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15412 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2017-11-09 14:34:29 +00:00
parent a8b214ccb3
commit ac3de8a9c7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/Blocking.pm
View File

@@ -187,7 +187,7 @@ BlockingStart(;$)
# Child here
BlockingInformParent("BlockingRegisterTelnet", "\$cl,$h->{bc_pid}", 1, 1)
if($h->{abortFn});
if($h->{abortFn} && $^O !~ m/Win/);
no strict "refs";
my $ret = &{$h->{fn}}($h->{arg});
use strict "refs";
@@ -272,7 +272,7 @@ BlockingKill($)
return if($h->{terminated});
if($^O !~ m/Win/) {
# if($^O !~ m/Win/) {
if($h->{pid} && $h->{pid} !~ m/:/ && kill(9, $h->{pid})) {
my $ll = (defined($h->{loglevel}) ? $h->{loglevel} : 1); # Forum #77057
Log $ll, "Timeout for $h->{fn} reached, terminated process $h->{pid}";
@@ -289,10 +289,11 @@ BlockingKill($)
use strict "refs";
}
delete($BC_hash{$h->{bc_pid}});
InternalTimer(gettimeofday()+1, "BlockingStart", \%BC_hash, 0)
if(looks_like_number($h->{pid}) && kill(0, $h->{pid})); # Forum #58867
}
}
# }
BlockingStart();
}