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 discards 860f9d92fa753c0bfe4c23b4842641d3079c1ba8 (commit) to 29f46c9593a995daea50d49a10aabb1fb4852d0d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (860f9d92fa753c0bfe4c23b4842641d3079c1ba8) \ N -- N -- N (29f46c9593a995daea50d49a10aabb1fb4852d0d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 29f46c9593a995daea50d49a10aabb1fb4852d0d Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sat Jun 2 00:05:34 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sat Jun 2 00:05:34 2018 +0200 clips-executive: only release resources that have no pending request In some cases, the goal may be cleaned up multiple times. To make sure that we unlock the goal's resources properly, first check whether there is already a pending request. Only try to unlock the resource if there is no pending request. http://git.fawkesrobotics.org/fawkes.git/commit/29f46c9 http://trac.fawkesrobotics.org/changeset/29f46c9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../clips-executive/clips/resource-locks.clp | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 29f46c9593a995daea50d49a10aabb1fb4852d0d - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sat Jun 2 00:05:34 2018 +0200 Subject: clips-executive: only release resources that have no pending request .../clips-executive/clips/resource-locks.clp | 5 ++++- 1 files changed, 4 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 2de5c3c..2fbb0f2 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -102,7 +102,10 @@ ?g <- (goal (mode RETRACTED) (acquired-resources $?acq)) => (foreach ?res ?acq - (if (not (any-factp ((?m mutex)) (neq ?m:request NONE))) then + (if (not (any-factp ((?m mutex)) + (and (eq ?m:name (resource-to-mutex ?res)) + (eq ?m:request UNLOCK)))) + then (printout warn "Unlocking resource " ?res crlf) (mutex-unlock-async (resource-to-mutex ?res)) ) -- 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
