Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

add timer delay detction

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4737 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-01-25 15:30:41 +00:00
parent a8ddcbc483
commit eb3b488ac2
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/98_apptime.pm
View File

@ -42,7 +42,7 @@ sub HandleTimeout() {
my $arg = $intAt{$i}{ARG}; my $arg = $intAt{$i}{ARG};
$arg = "" if (!$arg); $arg = "" if (!$arg);
apptime_getTiming("global","tmr-".$fn.";".$arg,$fn,$arg); apptime_getTiming("global","tmr-".$fn.";".$arg,$fn,$tim,$arg);
delete($intAt{$i}); delete($intAt{$i});
} else { } else {
@ -71,25 +71,34 @@ sub CallFn(@) {
my $fn = $modules{$defs{$d}{TYPE}}{$n}; my $fn = $modules{$defs{$d}{TYPE}}{$n};
return "" if(!$fn); return "" if(!$fn);
my @ret = apptime_getTiming($d,$fn,$fn,@_); my @ret = apptime_getTiming($d,$fn,$fn,0,@_);
if(wantarray){return @ret;} if(wantarray){return @ret;}
else {return $ret[0];} else {return $ret[0];}
} }
sub apptime_getTiming($$$@) { sub apptime_getTiming($$$@) {
my ($e,$fnName,$fn,@arg) = @_; my ($e,$fnName,$fn,$tim,@arg) = @_;
my $h;
if (!$defs{$e}{helper} || if (!$defs{$e}{helper} ||
!$defs{$e}{helper}{bm} || !$defs{$e}{helper}{bm} ||
!$defs{$e}{helper}{bm}{$fnName} ){ !$defs{$e}{helper}{bm}{$fnName} ){
$defs{$e}{helper}{bm}{$fnName}{max}=0;
$defs{$e}{helper}{bm}{$fnName}{mAr}=""; $defs{$e}{helper}{bm}{$fnName} =(max =>0, mAr =>"",
$defs{$e}{helper}{bm}{$fnName}{cnt}=0; cnt =>1, tot =>0,
$defs{$e}{helper}{bm}{$fnName}{tot}=0; dmx =>0);
$h = $defs{$e}{helper}{bm}{$fnName};
} }
my $h = $defs{$e}{helper}{bm}{$fnName}; else{
$h = $defs{$e}{helper}{bm}{$fnName};
$h->{cnt}++; $h->{cnt}++;
}
my $ts1 = gettimeofday(); my $ts1 = gettimeofday();
if ($tim){
my $td = int(($ts1-$tim)*1000);
$h->{dmx} = $td if ($h->{dmx} < $td);
}
no strict "refs"; no strict "refs";
my @ret = &{$fn}(@arg); my @ret = &{$fn}(@arg);
@ -111,7 +120,7 @@ sub apptime_CommandDispTiming($$@) {
my ($sFld,$top,$filter) = split" ",$param; my ($sFld,$top,$filter) = split" ",$param;
$sFld = "max" if (!$sFld); $sFld = "max" if (!$sFld);
$top = "top" if (!$top); $top = "top" if (!$top);
my %fld = (name=>0,funktion=>1,max=>2,count=>3,total=>4,average=>5,clear=>99); my %fld = (name=>0,funktion=>1,max=>2,count=>3,total=>4,average=>5,maxDly=>6,clear=>99);
return "$sFld undefined field, use one of ".join(",",keys %fld) return "$sFld undefined field, use one of ".join(",",keys %fld)
if(!defined $fld{$sFld}); if(!defined $fld{$sFld});
my @bmArr; my @bmArr;
@ -133,6 +142,7 @@ sub apptime_CommandDispTiming($$@) {
,$h->{cnt} ,$h->{cnt}
,$h->{tot} ,$h->{tot}
,$h->{tot} /$h->{cnt} ,$h->{tot} /$h->{cnt}
,$h->{dmx}
,$h->{mAr} ,$h->{mAr}
)]; )];
} }
@ -141,11 +151,11 @@ sub apptime_CommandDispTiming($$@) {
if ($field>1){@bmArr = sort { $b->[$field] <=> $a->[$field] } @bmArr;} if ($field>1){@bmArr = sort { $b->[$field] <=> $a->[$field] } @bmArr;}
else {@bmArr = sort { $b->[$field] cmp $a->[$field] } @bmArr;} else {@bmArr = sort { $b->[$field] cmp $a->[$field] } @bmArr;}
my $ret = sprintf("\n %35s %20s %6s %6s %8s %8s %s", my $ret = sprintf("\n %35s %20s %6s %6s %8s %8s %s",
"name","function","max","count","total","average","param Max call"); "name","function","max","count","total","average","maxDly","param Max call");
my $end = ($top && $top eq "top")?20:@bmArr-1; my $end = ($top && $top eq "top")?20:@bmArr-1;
$end = @bmArr-1 if ($end>@bmArr-1); $end = @bmArr-1 if ($end>@bmArr-1);
$ret .= sprintf("\n %35s %20s %6d %6d %8d %8.2f %s",@{$bmArr[$_]})for (0..$end); $ret .= sprintf("\n %35s %20s %6d %6d %8d %8.2f %6d %s",@{$bmArr[$_]})for (0..$end);
return $ret; return $ret;
} }
@ -199,6 +209,9 @@ sub apptime_CommandDispTiming($$@) {
accumulated duration of this procedure over all calls monitored<br> </li> accumulated duration of this procedure over all calls monitored<br> </li>
<li><b>average</b><br> <li><b>average</b><br>
average time a call of this procedure takes<br> </li> average time a call of this procedure takes<br> </li>
<li><b>maxDly</b><br>
maximum delay of a timer call to its schedules time. This column is not relevant
for non-timer calls.<br> </li>
<li><b>param Max call</b><br> <li><b>param Max call</b><br>
gives the parameter of the call with the max duration<br> </li> gives the parameter of the call with the max duration<br> </li>
</ul> </ul>