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/clips-executive-resources has been updated to 159c644ec63999bf37a7727bd8ed1888da830c72 (commit) from 5b25356b171789ed473e4978e491a17ee36b4cfc (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 159c644ec63999bf37a7727bd8ed1888da830c72 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 13 15:05:16 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 13 15:06:29 2018 +0200 clips-executive: try to lock resource if mutex state is UNKNOWN The only case where we should not try to lock the resource is if we know that the resource is locked. If it is unknown, we must try to lock the resource. http://git.fawkesrobotics.org/fawkes.git/commit/159c644 http://trac.fawkesrobotics.org/changeset/159c644 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../clips-executive/clips/resource-locks.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 159c644ec63999bf37a7727bd8ed1888da830c72 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 13 15:05:16 2018 +0200 Subject: clips-executive: try to lock resource if mutex state is UNKNOWN .../clips-executive/clips/resource-locks.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 0a877b4..b352c56 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -42,7 +42,7 @@ (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) (request ~NONE))) (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) - (state ~OPEN))) + (state LOCKED))) => (foreach ?res (set-diff ?req ?acq) (printout warn "Locking resource " ?res crlf) -- 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
