Patches and bugfixes from upstream pull requests #2
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
…r in clean workspaces
…tivate() The removed line triggered a failed assert in StateMachine::enableEvents(). Signed-off-by: Johannes Meyer <[email protected]>
Yielding in the run program of state INIT already triggers the global transition to the FINI state, before the send event can be processed and trigger a transition to NEXT. This patch adds a condition to the global transition that only evaluates to true after the run program has finished. Signed-off-by: Johannes Meyer <[email protected]>
Signed-off-by: Peter Soetens <[email protected]>
Signed-off-by: Johannes Meyer <[email protected]>
… protection to StateMachine::activate() Signed-off-by: Johannes Meyer <[email protected]>
… if the state machine is not active smStatus member variable is not protected by the mutex in other methods, e.g. StateMachine::activate(). Signed-off-by: Johannes Meyer <[email protected]>
… branch toolchain-2.9-statemachine-execution-logic Follow-up of 6537ae7 after the state machine execution logic patches have been implemented in 2015. I am not sure why these checks have been missing in rdt. This commit syncs the rdt version of RTT::scripting::StateMachine with upstream toolchain-2.9-statemachine-execution-logic. Signed-off-by: Johannes Meyer <[email protected]>
…tantiation The loop that removed SendHandleAlias variables from the StateMachineService could have skipped the second one for the case the first two variables are SendHandles. Signed-off-by: Johannes Meyer <[email protected]>
…mdFunction instances Signed-off-by: Johannes Meyer <[email protected]>
…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 <[email protected]>
Signed-off-by: Johannes Meyer <[email protected]>
Signed-off-by: Johannes Meyer <[email protected]>
|
Already merged to rdt-next |
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.
Most of them are from orocos-toolchain#135 or even already in master, but have never been merged into rdt-next.