Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/cx-use-systime-for-locking has been created at 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/cx-use-systime-for-locking - *Log* --------------------------------------------------------------- commit 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sun Jun 17 16:07:55 2018 -0400 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sun Jun 17 16:07:55 2018 -0400 clips-executive: use truncated systime when checking lock expiration The timestamp comes from the database, thus use the systime to check whether the lock has expired. http://git.fawkesrobotics.org/fawkes.git/commit/7ebe94a http://trac.fawkesrobotics.org/changeset/7ebe94a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sun Jun 17 16:07:55 2018 -0400 Subject: clips-executive: use truncated systime when checking lock expiration .../clips-executive/clips/coordination-mutex.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 26df003..5e458a4 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -365,7 +365,7 @@ (wm-fact (id "/config/coordination/mutex/renew-interval") (type FLOAT|UINT|INT) (value ?renew-interval)) ?mf <- (mutex (name ?name) (state LOCKED) (request NONE) (pending-requests) (locked-by ?lb&:(eq ?lb (cx-identity))) - (lock-time $?lt&:(timeout ?now ?lt ?renew-interval))) + (lock-time $?lt&:(timeout (time-trunc-ms (now-systime)) ?lt ?renew-interval))) => (printout t "Automatic renewal of lock for mutex " ?name crlf) (modify ?mf (request RENEW-LOCK) (response NONE) (pending-requests AUTO-RENEW-PROC)) -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits