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

[17287] Regenerate Type support using Fast DDS-Gen v2.4.0 #3316

Merged
merged 4 commits into from
Feb 23, 2023
Merged

[17287] Regenerate Type support using Fast DDS-Gen v2.4.0 #3316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85fb194
Refs #17287: regenerate TypeSupport with Fast DDS-Gen v2.4.0
JLBuenoLopez Feb 21, 2023
4fa546a
Refs #17287: fix regressions detected in Fast DDS-Gen v2.4.0
JLBuenoLopez Feb 22, 2023
380a43f
Refs #17287: fix Windows warning
JLBuenoLopez Feb 21, 2023
1acfdee
Refs #17287: fix Windows warning
JLBuenoLopez Feb 22, 2023
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
33 changes: 11 additions & 22 deletions examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ using namespace eprosima::fastcdr::exception;

#include <utility>

#define HelloWorld_max_cdr_typesize 25ULL;
#define HelloWorld_max_key_cdr_typesize 0ULL;

HelloWorld::HelloWorld()
{
// m_index com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2b552920
// unsigned long m_index
m_index = 0;
// m_message com.eprosima.idl.parser.typecode.ArrayTypeCode@1f36e637
// char m_message
memset(&m_message, 0, (20) * 1);

}
Expand All @@ -57,7 +60,7 @@ HelloWorld::HelloWorld(
}

HelloWorld::HelloWorld(
HelloWorld&& x) noexcept
HelloWorld&& x) noexcept
{
m_index = x.m_index;
m_message = std::move(x.m_message);
Expand Down Expand Up @@ -99,17 +102,8 @@ bool HelloWorld::operator !=(
size_t HelloWorld::getMaxCdrSerializedSize(
size_t current_alignment)
{
size_t initial_alignment = current_alignment;


current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);



return current_alignment - initial_alignment;
static_cast<void>(current_alignment);
return HelloWorld_max_cdr_typesize;
}

size_t HelloWorld::getCdrSerializedSize(
Expand Down Expand Up @@ -214,16 +208,12 @@ std::array<char, 20>& HelloWorld::message()
return m_message;
}


size_t HelloWorld::getKeyMaxCdrSerializedSize(
size_t current_alignment)
{
size_t current_align = current_alignment;





return current_align;
static_cast<void>(current_alignment);
return HelloWorld_max_key_cdr_typesize;
}

bool HelloWorld::isKeyDefined()
Expand All @@ -235,5 +225,4 @@ void HelloWorld::serializeKey(
eprosima::fastcdr::Cdr& scdr) const
{
(void) scdr;

}
11 changes: 6 additions & 5 deletions examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ class HelloWorld
eProsima_user_DllExport std::array<char, 20>& message();

/*!
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
size_t current_alignment = 0);

Expand Down Expand Up @@ -229,6 +229,7 @@ class HelloWorld

uint32_t m_index;
std::array<char, 20> m_message;

};

#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
33 changes: 11 additions & 22 deletions examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ using namespace eprosima::fastcdr::exception;

#include <utility>

#define HelloWorld_max_cdr_typesize 25ULL;
#define HelloWorld_max_key_cdr_typesize 0ULL;

HelloWorld::HelloWorld()
{
// m_index com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2b552920
// unsigned long m_index
m_index = 0;
// m_message com.eprosima.idl.parser.typecode.ArrayTypeCode@1f36e637
// char m_message
memset(&m_message, 0, (20) * 1);

}
Expand All @@ -57,7 +60,7 @@ HelloWorld::HelloWorld(
}

HelloWorld::HelloWorld(
HelloWorld&& x) noexcept
HelloWorld&& x) noexcept
{
m_index = x.m_index;
m_message = std::move(x.m_message);
Expand Down Expand Up @@ -99,17 +102,8 @@ bool HelloWorld::operator !=(
size_t HelloWorld::getMaxCdrSerializedSize(
size_t current_alignment)
{
size_t initial_alignment = current_alignment;


current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);



return current_alignment - initial_alignment;
static_cast<void>(current_alignment);
return HelloWorld_max_cdr_typesize;
}

size_t HelloWorld::getCdrSerializedSize(
Expand Down Expand Up @@ -214,16 +208,12 @@ std::array<char, 20>& HelloWorld::message()
return m_message;
}


size_t HelloWorld::getKeyMaxCdrSerializedSize(
size_t current_alignment)
{
size_t current_align = current_alignment;





return current_align;
static_cast<void>(current_alignment);
return HelloWorld_max_key_cdr_typesize;
}

bool HelloWorld::isKeyDefined()
Expand All @@ -235,5 +225,4 @@ void HelloWorld::serializeKey(
eprosima::fastcdr::Cdr& scdr) const
{
(void) scdr;

}
11 changes: 6 additions & 5 deletions examples/cpp/dds/BasicConfigurationExample/HelloWorld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ class HelloWorld
eProsima_user_DllExport std::array<char, 20>& message();

/*!
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
size_t current_alignment = 0);

Expand Down Expand Up @@ -229,6 +229,7 @@ class HelloWorld

uint32_t m_index;
std::array<char, 20> m_message;

};

#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
23 changes: 9 additions & 14 deletions examples/cpp/dds/Benchmark/Benchmark.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ using namespace eprosima::fastcdr::exception;

#include <utility>

#define BenchMark_max_cdr_typesize 4ULL;
#define BenchMark_max_key_cdr_typesize 0ULL;

BenchMark::BenchMark()
{
// m_index com.eprosima.idl.parser.typecode.PrimitiveTypeCode@610694f1
// unsigned long m_index
m_index = 0;

}
Expand Down Expand Up @@ -91,13 +94,8 @@ bool BenchMark::operator !=(
size_t BenchMark::getMaxCdrSerializedSize(
size_t current_alignment)
{
size_t initial_alignment = current_alignment;


current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


return current_alignment - initial_alignment;
static_cast<void>(current_alignment);
return BenchMark_max_cdr_typesize;
}

size_t BenchMark::getCdrSerializedSize(
Expand Down Expand Up @@ -158,14 +156,12 @@ uint32_t& BenchMark::index()
}



size_t BenchMark::getKeyMaxCdrSerializedSize(
size_t current_alignment)
{
size_t current_align = current_alignment;



return current_align;
static_cast<void>(current_alignment);
return BenchMark_max_key_cdr_typesize;
}

bool BenchMark::isKeyDefined()
Expand All @@ -177,5 +173,4 @@ void BenchMark::serializeKey(
eprosima::fastcdr::Cdr& scdr) const
{
(void) scdr;

}
11 changes: 6 additions & 5 deletions examples/cpp/dds/Benchmark/Benchmark.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ class BenchMark


/*!
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
size_t current_alignment = 0);

Expand Down Expand Up @@ -203,6 +203,7 @@ class BenchMark
private:

uint32_t m_index;

};

#endif // _FAST_DDS_GENERATED_BENCHMARK_H_
33 changes: 11 additions & 22 deletions examples/cpp/dds/Benchmark/Benchmark_big.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ using namespace eprosima::fastcdr::exception;

#include <utility>

#define BenchMarkBig_max_cdr_typesize 8388616ULL;
#define BenchMarkBig_max_key_cdr_typesize 0ULL;

BenchMarkBig::BenchMarkBig()
{
// m_data com.eprosima.idl.parser.typecode.ArrayTypeCode@2b552920
// char m_data
memset(&m_data, 0, (8388608) * 1);
// m_index com.eprosima.idl.parser.typecode.PrimitiveTypeCode@1f36e637
// unsigned long m_index
m_index = 0;

}
Expand All @@ -57,7 +60,7 @@ BenchMarkBig::BenchMarkBig(
}

BenchMarkBig::BenchMarkBig(
BenchMarkBig&& x) noexcept
BenchMarkBig&& x) noexcept
{
m_data = std::move(x.m_data);
m_index = x.m_index;
Expand Down Expand Up @@ -99,17 +102,8 @@ bool BenchMarkBig::operator !=(
size_t BenchMarkBig::getMaxCdrSerializedSize(
size_t current_alignment)
{
size_t initial_alignment = current_alignment;


current_alignment += ((8388608) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);



return current_alignment - initial_alignment;
static_cast<void>(current_alignment);
return BenchMarkBig_max_cdr_typesize;
}

size_t BenchMarkBig::getCdrSerializedSize(
Expand Down Expand Up @@ -214,16 +208,12 @@ uint32_t& BenchMarkBig::index()
}



size_t BenchMarkBig::getKeyMaxCdrSerializedSize(
size_t current_alignment)
{
size_t current_align = current_alignment;





return current_align;
static_cast<void>(current_alignment);
return BenchMarkBig_max_key_cdr_typesize;
}

bool BenchMarkBig::isKeyDefined()
Expand All @@ -235,5 +225,4 @@ void BenchMarkBig::serializeKey(
eprosima::fastcdr::Cdr& scdr) const
{
(void) scdr;

}
11 changes: 6 additions & 5 deletions examples/cpp/dds/Benchmark/Benchmark_big.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ class BenchMarkBig


/*!
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
* @brief This function returns the maximum serialized size of an object
* depending on the buffer alignment.
* @param current_alignment Buffer alignment.
* @return Maximum serialized size.
*/
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
size_t current_alignment = 0);

Expand Down Expand Up @@ -229,6 +229,7 @@ class BenchMarkBig

std::array<char, 8388608> m_data;
uint32_t m_index;

};

#endif // _FAST_DDS_GENERATED_BENCHMARK_BIG_H_
Loading