packages/php-modbus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor timeout_usec to millisecond precision and add setter for ms.

Browse Source
This commit is contained in:
toimtoimtoim
2016-11-05 17:57:19 +02:00
parent e10bb250d8
commit cff8493205
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ModbusMaster.php
+19 -4
View File
@@ -59,7 +59,7 @@ class ModbusMaster
public $timeout_sec = 5; // Timeout 5 sec public $timeout_sec = 5; // Timeout 5 sec
public $timeout_usec = 0; // is added to $timeout_sec when calculating real read timeout public $timeout_msec = 0; // milliseconds. is added to $timeout_sec when calculating real read timeout
public $socket_read_timeout_usec = 300000; // socket read timeout 300 ms public $socket_read_timeout_usec = 300000; // socket read timeout 300 ms
@@ -179,8 +179,9 @@ class ModbusMaster
$writesocks = null; $writesocks = null;
$exceptsocks = null; $exceptsocks = null;
$rec = ""; $rec = "";
$timeoutInSeconds = $this->timeout_sec + ($this->timeout_usec / 1000000); $timeoutInSeconds = $this->timeout_sec + ($this->timeout_msec / 1000);
$lastAccess = microtime(true); $lastAccess = microtime(true);
echo $lastAccess . PHP_EOL;
while (socket_select($readsocks, $writesocks, $exceptsocks, 0, $this->socket_read_timeout_usec) !== false) { while (socket_select($readsocks, $writesocks, $exceptsocks, 0, $this->socket_read_timeout_usec) !== false) {
$this->status .= "Wait data ... " . PHP_EOL; $this->status .= "Wait data ... " . PHP_EOL;
if (in_array($this->sock, $readsocks)) { if (in_array($this->sock, $readsocks)) {
@@ -190,8 +191,9 @@ class ModbusMaster
} }
$lastAccess = microtime(true); $lastAccess = microtime(true);
} else { } else {
$usecSpentWaiting = microtime(true) - $lastAccess; $timeSpentWaiting = microtime(true) - $lastAccess;
if ($usecSpentWaiting >= $timeoutInSeconds) { if ($timeSpentWaiting >= $timeoutInSeconds) {
echo $timeoutInSeconds . PHP_EOL;
throw new Exception("Watchdog time expired [ " . throw new Exception("Watchdog time expired [ " .
$timeoutInSeconds . " sec]!!! Connection to " . $timeoutInSeconds . " sec]!!! Connection to " .
$this->host . " is not established."); $this->host . " is not established.");
@@ -1385,4 +1387,17 @@ class ModbusMaster
$str .= "\n"; $str .= "\n";
return $str; return $str;
} }
/**
* setTimeoutMs
*
* Set timeout used when receiving data in milliseconds. NB: Method overrides $timeout_sec variable value.
*
* @param integer $milliseconds milliseconds
*/
public function setTimeoutMs($milliseconds)
{
$this->timeout_sec = 0;
$this->timeout_msec = $milliseconds;
}
} }