Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatic TypeObject representation registration for DynamicTypes [21058] #130

Merged
merged 1 commit into from
May 20, 2024
Merged

Automatic TypeObject representation registration for DynamicTypes [21058] #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,962 changes: 1,179 additions & 1,783 deletions fastdds_python/test/types/test_completeTypeObjectSupport.cxx
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions fastdds_python/test/types/test_completeTypeObjectSupport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef _FAST_DDS_GENERATED_TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP_
#define _FAST_DDS_GENERATED_TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP_

#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>

#include "test_included_modulesTypeObjectSupport.hpp"

#if defined(_WIN32)
Expand All @@ -46,22 +48,37 @@ eProsima_user_DllExport void register_test_complete_type_objects();
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_StructType_type_identifier();
eProsima_user_DllExport void register_StructType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
/**
* @brief Register CompleteTestType related TypeIdentifier.
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_CompleteTestType_type_identifier();
eProsima_user_DllExport void register_CompleteTestType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
/**
* @brief Register KeyedCompleteTestType related TypeIdentifier.
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_KeyedCompleteTestType_type_identifier();
eProsima_user_DllExport void register_KeyedCompleteTestType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);


#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
Expand Down
58 changes: 35 additions & 23 deletions fastdds_python/test/types/test_included_modulesTypeObjectSupport.cxx
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion fastdds_python/test/types/test_included_modulesTypeObjectSupport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULES_TYPE_OBJECT_SUPPORT_HPP_
#define _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULES_TYPE_OBJECT_SUPPORT_HPP_

#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>


#if defined(_WIN32)
#if defined(EPROSIMA_USER_DLL_EXPORT)
Expand All @@ -47,8 +49,13 @@ namespace test2 {
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_eprosima_test2_StructType2_type_identifier();
eProsima_user_DllExport void register_eprosima_test2_StructType2_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);

} // namespace test2

Expand Down
2,374 changes: 819 additions & 1,555 deletions fastdds_python/test/types/test_modulesTypeObjectSupport.cxx
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions fastdds_python/test/types/test_modulesTypeObjectSupport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef _FAST_DDS_GENERATED_EPROSIMA_TEST_TEST_MODULES_TYPE_OBJECT_SUPPORT_HPP_
#define _FAST_DDS_GENERATED_EPROSIMA_TEST_TEST_MODULES_TYPE_OBJECT_SUPPORT_HPP_

#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>


#if defined(_WIN32)
#if defined(EPROSIMA_USER_DLL_EXPORT)
Expand All @@ -47,8 +49,13 @@ namespace test {
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_eprosima_test_StructType_type_identifier();
eProsima_user_DllExport void register_eprosima_test_StructType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);



Expand All @@ -57,16 +64,26 @@ eProsima_user_DllExport void register_eprosima_test_StructType_type_identifier()
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_eprosima_test_CompleteTestType_type_identifier();
eProsima_user_DllExport void register_eprosima_test_CompleteTestType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);

/**
* @brief Register eprosima_test_KeyedCompleteTestType related TypeIdentifier.
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_eprosima_test_KeyedCompleteTestType_type_identifier();
eProsima_user_DllExport void register_eprosima_test_KeyedCompleteTestType_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);

} // namespace test

Expand Down
34 changes: 11 additions & 23 deletions fastdds_python_examples/HelloWorldExample/HelloWorldTypeObjectSupport.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ void register_HelloWorld_type_objects()
static std::once_flag once_flag;
std::call_once(once_flag, []()
{
register_HelloWorld_type_identifier();
TypeIdentifier type_id;
register_HelloWorld_type_identifier(type_id);

});
}

void register_HelloWorld_type_identifier()
// TypeIdentifier is returned by reference: dependent structures/unions are registered in this same method
void register_HelloWorld_type_identifier(
TypeIdentifier& type_id)
{
{
StructTypeFlag struct_flags_HelloWorld = TypeObjectUtils::build_struct_type_flag(eprosima::fastdds::dds::xtypes::ExtensibilityKind::NOT_APPLIED,
Expand All @@ -71,6 +74,7 @@ void register_HelloWorld_type_identifier()
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"index Structure member TypeIdentifier unknown to TypeObjectRegistry.");
type_id = TypeIdentifier();
return;
}
StructMemberFlag member_flags_index = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructKind::NOT_APPLIED,
Expand Down Expand Up @@ -117,6 +121,7 @@ void register_HelloWorld_type_identifier()
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"Structure index member TypeIdentifier inconsistent.");
type_id = TypeIdentifier();
return;
}
MemberName name_index = "index";
Expand All @@ -133,8 +138,6 @@ void register_HelloWorld_type_identifier()

if (return_code_HelloWorld != eprosima::fastdds::dds::RETCODE_OK)
{
std::string type_id_kind_anonymous_string_unbounded("TI_STRING8_SMALL");
if (type_id_kind_anonymous_string_unbounded == "TI_STRING8_SMALL")
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
Expand All @@ -146,31 +149,14 @@ void register_HelloWorld_type_identifier()
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
else if (type_id_kind_anonymous_string_unbounded == "TI_STRING8_LARGE")
{
LBound bound = 255;
StringLTypeDefn string_ldefn = TypeObjectUtils::build_string_l_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_l_string_type_identifier(string_ldefn,
"anonymous_string_unbounded"))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
else
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded: Unknown String kind.");
return;
}
return_code_HelloWorld =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_HelloWorld);
if (return_code_HelloWorld != eprosima::fastdds::dds::RETCODE_OK)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded: Given String TypeIdentifier unknown to TypeObjectRegistry.");
type_id = TypeIdentifier();
return;
}
}
Expand Down Expand Up @@ -218,6 +204,7 @@ void register_HelloWorld_type_identifier()
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"Structure message member TypeIdentifier inconsistent.");
type_id = TypeIdentifier();
return;
}
MemberName name_message = "message";
Expand All @@ -229,7 +216,7 @@ void register_HelloWorld_type_identifier()
}
CompleteStructType struct_type_HelloWorld = TypeObjectUtils::build_complete_struct_type(struct_flags_HelloWorld, header_HelloWorld, member_seq_HelloWorld);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_struct_type_object(struct_type_HelloWorld, type_name_HelloWorld.to_string()))
TypeObjectUtils::build_and_register_struct_type_object(struct_type_HelloWorld, type_name_HelloWorld.to_string(), type_id))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"HelloWorld already registered in TypeObjectRegistry for a different type.");
Expand All @@ -241,6 +228,7 @@ void register_HelloWorld_type_identifier()
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"HelloWorld: Given Struct TypeIdentifier unknown to TypeObjectRegistry.");
type_id = TypeIdentifier();
return;
}
}
Expand Down
9 changes: 8 additions & 1 deletion fastdds_python_examples/HelloWorldExample/HelloWorldTypeObjectSupport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_

#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>


#if defined(_WIN32)
#if defined(EPROSIMA_USER_DLL_EXPORT)
Expand All @@ -45,8 +47,13 @@ eProsima_user_DllExport void register_HelloWorld_type_objects();
* Fully-descriptive TypeIdentifiers are directly registered.
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
* indirectly registered as well.
*
* @param[out] TypeIdentifier of the registered type.
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
* Invalid TypeIdentifier is returned in case of error.
*/
eProsima_user_DllExport void register_HelloWorld_type_identifier();
eProsima_user_DllExport void register_HelloWorld_type_identifier(
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);


#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
Expand Down
Loading