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 5b25356b171789ed473e4978e491a17ee36b4cfc (commit) from 817f10153f5adf75d2db7dfb8713c635a799667e (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 5b25356b171789ed473e4978e491a17ee36b4cfc Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 13 13:55:27 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 13 13:55:27 2018 +0200 clips-executive: print a warning if a resource lock was rejected http://git.fawkesrobotics.org/fawkes.git/commit/5b25356 http://trac.fawkesrobotics.org/changeset/5b25356 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../clips-executive/clips/resource-locks.clp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 5b25356b171789ed473e4978e491a17ee36b4cfc - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 13 13:55:27 2018 +0200 Subject: clips-executive: print a warning if a resource lock was rejected .../clips-executive/clips/resource-locks.clp | 6 ++++++ 1 files changed, 6 insertions(+), 0 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 1329894..0a877b4 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -55,6 +55,7 @@ and we have no pending requests, then we can directly reject the goal." (wm-fact (key cx identity) (value ?identity)) ?g <- (goal (mode COMMITTED) + (id ?goal-id) (acquired-resources) (required-resources $?req)) (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) @@ -62,6 +63,8 @@ (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) (request ~NONE))) => + (printout warn "Rejecting goal " ?goal-id ", " (mutex-to-resource ?n) + " is already locked by " ?locker crlf) (modify ?g (mode FINISHED) (outcome REJECTED)) ) @@ -102,6 +105,7 @@ "A lock was rejected and no resource is acquired anymore. Reject the goal." (mutex (name ?res) (request LOCK) (response REJECTED|ERROR) (error-msg ?err)) ?g <- (goal (mode COMMITTED) + (id ?goal-id) (required-resources $?req &:(member$ (mutex-to-resource ?res) ?req)) (acquired-resources)) @@ -111,6 +115,8 @@ (not (mutex (name ?ores&:(member$ (mutex-to-resource ?ores) ?req)) (response PENDING|ACQUIRED))) => + (printout warn "Rejecting goal " ?goal-id ", resource lock " + (mutex-to-resource ?res) " was rejected" crlf) (modify ?g (mode FINISHED) (outcome REJECTED) (message ?err)) (delayed-do-for-all-facts ((?om mutex)) -- 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
