From 47b510272665b3257b8d78eabe1fc3b9ee259bac Mon Sep 17 00:00:00 2001 From: Philip Oetinger Date: Wed, 15 Nov 2023 11:11:32 +0100 Subject: [PATCH] introduce the lifecycle state transition The only supported operation is transitioning from initialisation to operational. --- src/core/ddsc/include/dds/dds.h | 19 +++++++++++++++++++ src/core/ddsc/src/dds_domain.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/core/ddsc/include/dds/dds.h b/src/core/ddsc/include/dds/dds.h index f61a0d4b6d..d6380a68d5 100644 --- a/src/core/ddsc/include/dds/dds.h +++ b/src/core/ddsc/include/dds/dds.h @@ -1110,6 +1110,25 @@ enum dds_domain_lifecycle{ DDS_DOMAIN_LIFECYCLE_OPERATIONAL }; +/// @brief Function to indicate where we are in the domain's lifecycle +/// @note Domains starts out in the INITIALISATION +/// state. The only transition currently allowed is to set it OPERATIONAL. +/// The transition is currently only possible when applied to all domains via +/// the `DDS_CYCLONEDDS_HANDLE`. +/// +/// @param[in] domain The domain entity for which to set the lifecycle state. Only accepts `DDS_CYCLONEDDS_HANDLE`. +/// @param[in] state The new state +/// @return a dds_retcode_t indicating success or failure +/// @retval DDS_RETCODE_OK transition was successful +/// @retval DDS_RETCODE_ERROR Internal error prevented the transition. Should not be possible. +/// @retval DDS_RETCODE_ILLEGAL_OPERATION handle refers to a non-domain entity +/// @retval DDS_RETCODE_PRECONDITION_NOT_MET attempt at an disallowed transition +/// @retval DDS_RETCODE_PRECONDITION_NOT_MET Cyclone DDS has not been initialised yet +DDS_EXPORT +dds_return_t dds_set_domain_lifecycle ( + const dds_entity_t domain, + const enum dds_domain_lifecycle state); + /** * @brief Get entity parent. * @ingroup entity diff --git a/src/core/ddsc/src/dds_domain.c b/src/core/ddsc/src/dds_domain.c index 14ed7dc8f2..da37075ca9 100644 --- a/src/core/ddsc/src/dds_domain.c +++ b/src/core/ddsc/src/dds_domain.c @@ -491,4 +491,36 @@ dds_return_t dds_free_typeobj (dds_typeobj_t *type_obj) return DDS_RETCODE_UNSUPPORTED; } +dds_return_t dds_set_domain_lifecycle(const dds_entity_t domain, const enum dds_domain_lifecycle state) { + dds_return_t result = DDS_RETCODE_ERROR; + if (dds_init () < 0) { + result = DDS_RETCODE_PRECONDITION_NOT_MET; + } else { + if (DDS_CYCLONEDDS_HANDLE == domain) { + switch (state) { + case DDS_DOMAIN_LIFECYCLE_OPERATIONAL: + // Only initialisation->operational is valid + if (LIFECYCLE_STATE == DDS_DOMAIN_LIFECYCLE_INITIALISATION) { + result = ddsrt_lock(); + if (result == DDS_RETCODE_SUCCESS) { + LIFECYCLE_STATE = state; + } // else result is the error from ddsrt_lock() + } else { + result = DDS_RETCODE_PRECONDITION_NOT_MET; + } + break; + case DDS_DOMAIN_LIFECYCLE_INITIALISATION: + result = DDS_RETCODE_PRECONDITION_NOT_MET; + break; + default: + result = DDS_RETCODE_ERROR; + break; + } + } else { + result = DDS_RETCODE_ILLEGAL_OPEATION; + } + } + return result; +} + #endif /* DDS_HAS_TYPE_DISCOVERY */