Skip to content

[23504] Optimize (de)serialization of flat, non-primitive arrays #5953

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[23504] Optimize (de)serialization of flat, non-primitive arrays #5953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9c5f92
Refs #23504: Regenerate types with the corresponding Fast DDS Gen branch
Mario-DL Jul 23, 2025
b677858
Refs #23504: Add DDSXtypesCommunication tests cases tests
Mario-DL Jul 23, 2025
a93c74c
Refs #23504: Update dds-types-tests submodule ref
Mario-DL Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions examples/cpp/benchmark/types/BenchmarkCdrAux.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ eProsima_user_DllExport void serialize_key(
const BenchMark& data);



} // namespace fastcdr
} // namespace eprosima

Expand Down
83 changes: 83 additions & 0 deletions examples/cpp/benchmark/types/BenchmarkCdrAux.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,22 @@
#include <fastcdr/Cdr.h>
#include <fastcdr/CdrSizeCalculator.hpp>

#include <fastdds/dds/core/policy/QosPolicies.hpp>

#include <fastcdr/exceptions/BadParamException.h>
using namespace eprosima::fastcdr::exception;

namespace eprosima {
namespace fastcdr {


eProsima_user_DllExport bool is_BenchMark_cdr_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation)
{
static_cast<void>(data_representation);
return false;
}

template<>
eProsima_user_DllExport size_t calculate_serialized_size(
eprosima::fastcdr::CdrSizeCalculator& calculator,
Expand Down Expand Up @@ -76,6 +85,44 @@ eProsima_user_DllExport void serialize(
scdr.end_serialize_type(current_state);
}

#if FASTCDR_VERSION_MAJOR > 2
template<>
eProsima_user_DllExport void serialize_array(
eprosima::fastcdr::Cdr& scdr,
const BenchMark* array_ptr,
const std::size_t array_size)
{
if (array_size > 0)
{
using namespace ::eprosima::fastdds::dds;
DataRepresentationId_t data_representation = (scdr.get_cdr_version() == eprosima::fastcdr::CdrVersion::XCDRv1 ?
DataRepresentationId_t::XCDR_DATA_REPRESENTATION : DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);

if (is_BenchMark_cdr_plain(data_representation) &&
sizeof(BenchMark) == BenchMark_max_cdr_typesize)
{
// Serialize the first element
// to ensure correct alignment
scdr.serialize(
array_ptr[0]);

++array_ptr;

std::memcpy(
scdr.get_current_position(),
array_ptr,
(array_size - 1) * sizeof(BenchMark));

scdr.jump((array_size -1) * sizeof(BenchMark));
}
else
{
scdr.serialize_array(array_ptr, array_size);
}
}
}
#endif // FASTCDR_VERSION_MAJOR > 2

template<>
eProsima_user_DllExport void deserialize(
eprosima::fastcdr::Cdr& cdr,
Expand All @@ -101,6 +148,42 @@ eProsima_user_DllExport void deserialize(
});
}

#if FASTCDR_VERSION_MAJOR > 2
template<>
eProsima_user_DllExport void deserialize_array(
eprosima::fastcdr::Cdr& scdr,
BenchMark* array_ptr,
const std::size_t array_size)
{
if (array_size > 0)
{
using namespace ::eprosima::fastdds::dds;
DataRepresentationId_t data_representation = (scdr.get_cdr_version() == eprosima::fastcdr::CdrVersion::XCDRv1 ?
DataRepresentationId_t::XCDR_DATA_REPRESENTATION : DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);

if (is_BenchMark_cdr_plain(data_representation) &&
sizeof(BenchMark) == BenchMark_max_cdr_typesize)
{
// Deserialize the first element
// accounting for alignment
scdr.deserialize_array(&array_ptr[0], 1);
++array_ptr;

std::memcpy(
reinterpret_cast<char*>(array_ptr),
scdr.get_current_position(),
(array_size - 1) * sizeof(BenchMark));

scdr.jump((array_size - 1) * sizeof(BenchMark));
}
else
{
scdr.deserialize_array(array_ptr, array_size);
}
}
}
#endif // FASTCDR_VERSION_MAJOR > 2

void serialize_key(
eprosima::fastcdr::Cdr& scdr,
const BenchMark& data)
Expand Down
20 changes: 20 additions & 0 deletions examples/cpp/benchmark/types/BenchmarkPubSubTypes.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;

namespace eprosima {
namespace fastcdr {

bool is_BenchMark_cdr_plain(
DataRepresentationId_t data_representation);

} // namespace fastcdr
} // namespace eprosima

BenchMarkPubSubType::BenchMarkPubSubType()
{
set_name("BenchMark");
Expand Down Expand Up @@ -149,6 +158,17 @@ void BenchMarkPubSubType::delete_data(
delete(reinterpret_cast<::BenchMark*>(data));
}

#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

bool BenchMarkPubSubType::is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const
{
static_cast<void>(data_representation);
return false;
}

#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

bool BenchMarkPubSubType::compute_key(
SerializedPayload_t& payload,
InstanceHandle_t& handle,
Expand Down
8 changes: 2 additions & 6 deletions examples/cpp/benchmark/types/BenchmarkPubSubTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,8 @@ class BenchMarkPubSubType : public eprosima::fastdds::dds::TopicDataType

#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
}
eProsima_user_DllExport bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override;

#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

Expand Down
1 change: 1 addition & 0 deletions examples/cpp/benchmark/types/Benchmark_bigCdrAux.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ eProsima_user_DllExport void serialize_key(
const BenchMarkBig& data);



} // namespace fastcdr
} // namespace eprosima

Expand Down
83 changes: 83 additions & 0 deletions examples/cpp/benchmark/types/Benchmark_bigCdrAux.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,22 @@
#include <fastcdr/Cdr.h>
#include <fastcdr/CdrSizeCalculator.hpp>

#include <fastdds/dds/core/policy/QosPolicies.hpp>

#include <fastcdr/exceptions/BadParamException.h>
using namespace eprosima::fastcdr::exception;

namespace eprosima {
namespace fastcdr {


eProsima_user_DllExport bool is_BenchMarkBig_cdr_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation)
{
static_cast<void>(data_representation);
return false;
}

template<>
eProsima_user_DllExport size_t calculate_serialized_size(
eprosima::fastcdr::CdrSizeCalculator& calculator,
Expand Down Expand Up @@ -80,6 +89,44 @@ eProsima_user_DllExport void serialize(
scdr.end_serialize_type(current_state);
}

#if FASTCDR_VERSION_MAJOR > 2
template<>
eProsima_user_DllExport void serialize_array(
eprosima::fastcdr::Cdr& scdr,
const BenchMarkBig* array_ptr,
const std::size_t array_size)
{
if (array_size > 0)
{
using namespace ::eprosima::fastdds::dds;
DataRepresentationId_t data_representation = (scdr.get_cdr_version() == eprosima::fastcdr::CdrVersion::XCDRv1 ?
DataRepresentationId_t::XCDR_DATA_REPRESENTATION : DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);

if (is_BenchMarkBig_cdr_plain(data_representation) &&
sizeof(BenchMarkBig) == BenchMarkBig_max_cdr_typesize)
{
// Serialize the first element
// to ensure correct alignment
scdr.serialize(
array_ptr[0]);

++array_ptr;

std::memcpy(
scdr.get_current_position(),
array_ptr,
(array_size - 1) * sizeof(BenchMarkBig));

scdr.jump((array_size -1) * sizeof(BenchMarkBig));
}
else
{
scdr.serialize_array(array_ptr, array_size);
}
}
}
#endif // FASTCDR_VERSION_MAJOR > 2

template<>
eProsima_user_DllExport void deserialize(
eprosima::fastcdr::Cdr& cdr,
Expand Down Expand Up @@ -109,6 +156,42 @@ eProsima_user_DllExport void deserialize(
});
}

#if FASTCDR_VERSION_MAJOR > 2
template<>
eProsima_user_DllExport void deserialize_array(
eprosima::fastcdr::Cdr& scdr,
BenchMarkBig* array_ptr,
const std::size_t array_size)
{
if (array_size > 0)
{
using namespace ::eprosima::fastdds::dds;
DataRepresentationId_t data_representation = (scdr.get_cdr_version() == eprosima::fastcdr::CdrVersion::XCDRv1 ?
DataRepresentationId_t::XCDR_DATA_REPRESENTATION : DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);

if (is_BenchMarkBig_cdr_plain(data_representation) &&
sizeof(BenchMarkBig) == BenchMarkBig_max_cdr_typesize)
{
// Deserialize the first element
// accounting for alignment
scdr.deserialize_array(&array_ptr[0], 1);
++array_ptr;

std::memcpy(
reinterpret_cast<char*>(array_ptr),
scdr.get_current_position(),
(array_size - 1) * sizeof(BenchMarkBig));

scdr.jump((array_size - 1) * sizeof(BenchMarkBig));
}
else
{
scdr.deserialize_array(array_ptr, array_size);
}
}
}
#endif // FASTCDR_VERSION_MAJOR > 2

void serialize_key(
eprosima::fastcdr::Cdr& scdr,
const BenchMarkBig& data)
Expand Down
20 changes: 20 additions & 0 deletions examples/cpp/benchmark/types/Benchmark_bigPubSubTypes.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;

namespace eprosima {
namespace fastcdr {

bool is_BenchMarkBig_cdr_plain(
DataRepresentationId_t data_representation);

} // namespace fastcdr
} // namespace eprosima

BenchMarkBigPubSubType::BenchMarkBigPubSubType()
{
set_name("BenchMarkBig");
Expand Down Expand Up @@ -149,6 +158,17 @@ void BenchMarkBigPubSubType::delete_data(
delete(reinterpret_cast<::BenchMarkBig*>(data));
}

#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

bool BenchMarkBigPubSubType::is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const
{
static_cast<void>(data_representation);
return false;
}

#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

bool BenchMarkBigPubSubType::compute_key(
SerializedPayload_t& payload,
InstanceHandle_t& handle,
Expand Down
8 changes: 2 additions & 6 deletions examples/cpp/benchmark/types/Benchmark_bigPubSubTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,8 @@ class BenchMarkBigPubSubType : public eprosima::fastdds::dds::TopicDataType

#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
}
eProsima_user_DllExport bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override;

#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN

Expand Down
1 change: 1 addition & 0 deletions examples/cpp/benchmark/types/Benchmark_mediumCdrAux.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ eProsima_user_DllExport void serialize_key(
const BenchMarkMedium& data);



} // namespace fastcdr
} // namespace eprosima

Expand Down
Loading
Loading