Skip to content

Commit 691e75e

Browse files
richiwarerichiware
authored
Refactor TopicDataType (#165)
* Refs #21349. Regenerate source code Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #21349. Fix Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 1d811c3 commit 691e75e

12 files changed

Lines changed: 636 additions & 820 deletions

‎fastdds_python/test/types/test_completePubSubTypes.cxx‎

Lines changed: 186 additions & 225 deletions
Large diffs are not rendered by default.

‎fastdds_python/test/types/test_completePubSubTypes.hpp‎

Lines changed: 50 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333

3434
#include "test_included_modulesPubSubTypes.hpp"
3535

36-
#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
36+
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
3737
#error \
3838
Generated test_complete is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
39-
#endif // GEN_API_VER
39+
#endif // FASTDDS_GEN_API_VER
4040

4141

4242
/*!
@@ -55,38 +55,30 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
5555

5656
eProsima_user_DllExport bool serialize(
5757
const void* const data,
58-
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
59-
{
60-
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
61-
}
62-
63-
eProsima_user_DllExport bool serialize(
64-
const void* const data,
65-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
58+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
6659
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
6760

6861
eProsima_user_DllExport bool deserialize(
69-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
62+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
7063
void* data) override;
7164

72-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
73-
const void* const data) override
74-
{
75-
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
76-
}
77-
78-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
65+
eProsima_user_DllExport uint32_t calculate_serialized_size(
7966
const void* const data,
8067
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
8168

82-
eProsima_user_DllExport bool getKey(
69+
eProsima_user_DllExport bool compute_key(
70+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
71+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
72+
bool force_md5 = false) override;
73+
74+
eProsima_user_DllExport bool compute_key(
8375
const void* const data,
84-
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
76+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
8577
bool force_md5 = false) override;
8678

87-
eProsima_user_DllExport void* createData() override;
79+
eProsima_user_DllExport void* create_data() override;
8880

89-
eProsima_user_DllExport void deleteData(
81+
eProsima_user_DllExport void delete_data(
9082
void* data) override;
9183

9284
//Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -101,10 +93,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
10193
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
10294

10395
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
104-
eProsima_user_DllExport inline bool is_plain() const override
105-
{
106-
return false;
107-
}
10896

10997
eProsima_user_DllExport inline bool is_plain(
11098
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -125,8 +113,10 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
125113

126114
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
127115

128-
eprosima::fastdds::MD5 m_md5;
129-
unsigned char* m_keyBuffer;
116+
private:
117+
118+
eprosima::fastdds::MD5 md5_;
119+
unsigned char* key_buffer_;
130120

131121
};
132122

@@ -148,38 +138,30 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
148138

149139
eProsima_user_DllExport bool serialize(
150140
const void* const data,
151-
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
152-
{
153-
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
154-
}
155-
156-
eProsima_user_DllExport bool serialize(
157-
const void* const data,
158-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
141+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
159142
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
160143

161144
eProsima_user_DllExport bool deserialize(
162-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
145+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
163146
void* data) override;
164147

165-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
166-
const void* const data) override
167-
{
168-
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
169-
}
170-
171-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
148+
eProsima_user_DllExport uint32_t calculate_serialized_size(
172149
const void* const data,
173150
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
174151

175-
eProsima_user_DllExport bool getKey(
152+
eProsima_user_DllExport bool compute_key(
153+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
154+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
155+
bool force_md5 = false) override;
156+
157+
eProsima_user_DllExport bool compute_key(
176158
const void* const data,
177-
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
159+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
178160
bool force_md5 = false) override;
179161

180-
eProsima_user_DllExport void* createData() override;
162+
eProsima_user_DllExport void* create_data() override;
181163

182-
eProsima_user_DllExport void deleteData(
164+
eProsima_user_DllExport void delete_data(
183165
void* data) override;
184166

185167
//Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -194,10 +176,6 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
194176
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
195177

196178
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
197-
eProsima_user_DllExport inline bool is_plain() const override
198-
{
199-
return false;
200-
}
201179

202180
eProsima_user_DllExport inline bool is_plain(
203181
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -218,8 +196,10 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
218196

219197
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
220198

221-
eprosima::fastdds::MD5 m_md5;
222-
unsigned char* m_keyBuffer;
199+
private:
200+
201+
eprosima::fastdds::MD5 md5_;
202+
unsigned char* key_buffer_;
223203

224204
};
225205

@@ -239,38 +219,30 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
239219

240220
eProsima_user_DllExport bool serialize(
241221
const void* const data,
242-
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
243-
{
244-
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
245-
}
246-
247-
eProsima_user_DllExport bool serialize(
248-
const void* const data,
249-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
222+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
250223
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
251224

252225
eProsima_user_DllExport bool deserialize(
253-
eprosima::fastdds::rtps::SerializedPayload_t* payload,
226+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
254227
void* data) override;
255228

256-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
257-
const void* const data) override
258-
{
259-
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
260-
}
261-
262-
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
229+
eProsima_user_DllExport uint32_t calculate_serialized_size(
263230
const void* const data,
264231
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
265232

266-
eProsima_user_DllExport bool getKey(
233+
eProsima_user_DllExport bool compute_key(
234+
eprosima::fastdds::rtps::SerializedPayload_t& payload,
235+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
236+
bool force_md5 = false) override;
237+
238+
eProsima_user_DllExport bool compute_key(
267239
const void* const data,
268-
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
240+
eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
269241
bool force_md5 = false) override;
270242

271-
eProsima_user_DllExport void* createData() override;
243+
eProsima_user_DllExport void* create_data() override;
272244

273-
eProsima_user_DllExport void deleteData(
245+
eProsima_user_DllExport void delete_data(
274246
void* data) override;
275247

276248
//Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -285,10 +257,6 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
285257
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
286258

287259
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
288-
eProsima_user_DllExport inline bool is_plain() const override
289-
{
290-
return false;
291-
}
292260

293261
eProsima_user_DllExport inline bool is_plain(
294262
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -309,8 +277,10 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
309277

310278
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
311279

312-
eprosima::fastdds::MD5 m_md5;
313-
unsigned char* m_keyBuffer;
280+
private:
281+
282+
eprosima::fastdds::MD5 md5_;
283+
unsigned char* key_buffer_;
314284

315285
};
316286

‎fastdds_python/test/types/test_completePubSubTypes.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
#include "test_completePubSubTypes.hpp"
2626
%}
2727

28-
#define GEN_API_VER 2
28+
#define FASTDDS_GEN_API_VER 3
2929

3030
%include "test_completePubSubTypes.hpp"

0 commit comments

Comments
 (0)