State machine bug fixes #137
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If entry is not done yet, SM would immediately transition to next state instead of finishing entry program. - An event during entry will fail if entry could not be executed atomically (in a single SM step() ). - We're now transitioning to the other state while processing the event callback in eventTransition() ( stepping=false) Unit tests: - Don't read same variable in the global event transitions as in local state transitions, which queries the port and fills it in (see testStateEvents ). - The testStateOperationSignalGuard is not fixed yet, it receives the last event value instead of the first, while both events do arrive in the event queue. It appears that though the callbacks are asyn processed, the datasource is already written in both cases, so the first callback executed already sees the value of the second invocation of 'mo'. Signed-off-by: Peter Soetens <peter@thesourceworks.com> Conflicts: rtt/scripting/StateMachine.cpp tests/state_test.cpp
…nstructor to ready() member function ... so that it can be reused in corba_ipc_server without having initialized the Boost Test framework. This is a regression from 167076a. Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
…tivate() The removed line triggered a failed assert in StateMachine::enableEvents(). Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
This patch prevents that the OperationCaller falls back to a RemoteOperationCaller implementation and logs a warning during the test. Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
|
Merged to toolchain-2.9 branch in 8e4cfc6 and 3acb467. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a subset of the patches in #135, that only fix bugs and do not change the execution semantics of Orocos state machines. We consider to only include those in the 2.9 release but not yet the new execution logic.
167076a solves an issue where the entry program of a state can be aborted by an event in some cases. dc1b39b removes a duplicate call to
enableEvents(), which would trigger an assert if RTT is compiled in debug mode. The other two are minor patches for the unit tests.