niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace rcl_lifecycle_ret_t with lifecycle_msgs__TRANSITION__CALLBACK* (#153)

Browse source
This commit is contained in:
Karsten Knese 2017-08-02 14:05:03 -07:00 • committed by GitHub
parent 5cdef527de
commit 3cff9020d1
7 changed files with 94 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rcl_lifecycle/src/default_state_machine.c
View file

@ -32,6 +32,10 @@ extern "C"
{
#endif
rcl_lifecycle_transition_key_t * empty_transition_key = NULL;
rcl_lifecycle_transition_t * empty_transition = NULL;
unsigned int empty_transition_size = 0;
// Primary States
const rcl_lifecycle_state_t rcl_state_unknown =
{"unknown", lifecycle_msgs__msg__State__PRIMARY_STATE_UNKNOWN,
@ -235,7 +239,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_configure_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -243,7 +247,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_configure_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -251,7 +255,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_configure_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -269,7 +273,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_cleanup_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -277,7 +281,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_cleanup_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -285,7 +289,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_cleanup_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -303,7 +307,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_activate_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -311,7 +315,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_activate_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -319,7 +323,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_activate_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -337,7 +341,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_deactivate_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -345,7 +349,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_deactivate_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -353,7 +357,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_deactivate_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -387,7 +391,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_shutdown_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -395,7 +399,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_shutdown_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -403,7 +407,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_shutdown_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -413,7 +417,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_error_success,
RCL_LIFECYCLE_RET_OK,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_SUCCESS,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -421,7 +425,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_error_failure,
RCL_LIFECYCLE_RET_FAILURE,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_FAILURE,
allocator);
if (ret != RCL_RET_OK) {
goto fail;
@ -429,7 +433,7 @@ rcl_lifecycle_init_default_state_machine(
ret = rcl_lifecycle_register_transition(
&state_machine->transition_map,
rcl_transition_error_error,
RCL_LIFECYCLE_RET_ERROR,
lifecycle_msgs__msg__Transition__TRANSITION_CALLBACK_ERROR,
allocator);
if (ret != RCL_RET_OK) {
goto fail;

4
rcl_lifecycle/src/rcl_lifecycle.c
View file

@ -139,7 +139,7 @@ rcl_lifecycle_state_machine_is_initialized(const rcl_lifecycle_state_machine_t *
const rcl_lifecycle_transition_t *
rcl_lifecycle_is_valid_transition(
rcl_lifecycle_state_machine_t * state_machine,
rcl_lifecycle_ret_t key)
rcl_lifecycle_transition_key_t key)
{
unsigned int current_id = state_machine->current_state->id;
const rcl_lifecycle_state_t * current_state = rcl_lifecycle_get_state(
@ -158,7 +158,7 @@ rcl_lifecycle_is_valid_transition(
rcl_ret_t
rcl_lifecycle_trigger_transition(
rcl_lifecycle_state_machine_t * state_machine,
rcl_lifecycle_ret_t key, bool publish_notification)
rcl_lifecycle_transition_key_t key, bool publish_notification)
{
const rcl_lifecycle_transition_t * transition =
rcl_lifecycle_is_valid_transition(state_machine, key);

6
rcl_lifecycle/src/transition_map.c
View file

@ -107,7 +107,7 @@ rcl_ret_t
rcl_lifecycle_register_transition(
rcl_lifecycle_transition_map_t * transition_map,
rcl_lifecycle_transition_t transition,
rcl_lifecycle_ret_t key,
rcl_lifecycle_transition_key_t key,
const rcutils_allocator_t * allocator)
{
RCUTILS_CHECK_ALLOCATOR_WITH_MSG(
@ -154,9 +154,9 @@ rcl_lifecycle_register_transition(
}
state->valid_transitions = new_valid_transitions;
rcl_lifecycle_ret_t * new_valid_transition_keys = allocator->reallocate(
rcl_lifecycle_transition_key_t * new_valid_transition_keys = allocator->reallocate(
state->valid_transition_keys,
state->valid_transition_size * sizeof(rcl_lifecycle_ret_t),
state->valid_transition_size * sizeof(rcl_lifecycle_transition_key_t),
allocator->state);
if (!new_valid_transitions) {
RCL_SET_ERROR_MSG(