From bd103c489bd26a0b68c5f87e03d0c9dc74f9c580 Mon Sep 17 00:00:00 2001
From: markusbloch <markusbloch@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 22 May 2013 16:09:38 +0000
Subject: [PATCH] preventing dead lock of ctlmgr_ctl calls in case of killed
 thread

git-svn-id: https://svn.fhem.de/fhem/trunk@3206 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/73_PRESENCE.pm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/fhem/FHEM/73_PRESENCE.pm b/fhem/FHEM/73_PRESENCE.pm
index 71c8d954f..a10bc92ac 100755
--- a/fhem/FHEM/73_PRESENCE.pm
+++ b/fhem/FHEM/73_PRESENCE.pm
@@ -1,4 +1,4 @@
-# $Id$
+# $Id$
 ##############################################################################
 #
 #     73_PRESENCE.pm
@@ -540,29 +540,30 @@ PRESENCE_DoLocalPingScan($)
 
 }
 
-sub
+sub 
 PRESENCE_ExecuteFritzBoxCMD($$)
 {
 
-my ($name, $cmd) = @_;
-my $status;
-my $wait;
- while(-e "/var/tmp/fhem-PRESENCE-cmd-lock.tmp")
- { 
-   $wait = int(rand(4))+2;
-   Log GetLogLevel($name, 5), "PRESENCE_ExecuteFritzBoxCMD: ($name) - ctlmgr_ctl is locked. waiting $wait seconds...";
-   sleep $wait;
- }
+	my ($name, $cmd) = @_;
+	my $status;
+	my $wait;
 
- qx(touch /var/tmp/fhem-PRESENCE-cmd-lock.tmp);
+	while(-e "/var/tmp/fhem-PRESENCE-cmd-lock.tmp" and (stat("/var/tmp/fhem-PRESENCE-cmd-lock.tmp"))[9] > (gettimeofday() - 2))
+	{	 
+		$wait = int(rand(4))+2;
+		Log GetLogLevel($name, 5), "PRESENCE_ExecuteFritzBoxCMD: ($name) - ctlmgr_ctl is locked. waiting $wait seconds...";
+		sleep $wait;
+	}
 
- $status = qx($cmd);
+	unlink("/var/tmp/fhem-PRESENCE-cmd-lock.tmp") if(-e "/var/tmp/fhem-PRESENCE-cmd-lock.tmp");
+	
+	qx(touch /var/tmp/fhem-PRESENCE-cmd-lock.tmp);
 
- qx(rm /var/tmp/fhem-PRESENCE-cmd-lock.tmp);
+	$status = qx($cmd);
 
- return $status;
+	unlink("/var/tmp/fhem-PRESENCE-cmd-lock.tmp") if(-e "/var/tmp/fhem-PRESENCE-cmd-lock.tmp");
 
-  
+	return $status;
 }
 
 sub