Skip to content

Commit f8a6dee

Browse files
adriancamporichiwareJLBuenoLopez
authored and
EduPonz
committed
Update xtypes 1.3 doc (#730)
* Refs #20359: Updates for xtypes1.3. Removed TypeLookupSettings. Removed auto_fill_typeonject. Renamede discovery methods. Added typelookup_service_threads. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Updates fastddsgen args. Removed TypeObjectFactory. Removed on_type_discovery, on_type_dependencies_reply, on_type_information_received, register_remote_type. Updated references to DDS-XTypes V1.3. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: DDSCodeTester updates for DynamicTypes and discovery callbacks Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Updated xtypes doc. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Applied first suggestions. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Updates to discovery and endpoint matching. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Apply suggestions from code review Co-authored-by: Ricardo González <ricardo@richiware.dev> Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20359: Regenerated example types. Removed classes after monitor service refactor. Signed-off-by: adriancampo <adriancampo@eprosima.com> * Refs #20631: apply review suggestions to Fast DDS-Gen usage Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: inheritance not yet supported with XML. Use correct typelookup service thread name Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: fix tests: trailing whitespaces Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: fix spelling Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: migrate to list tables and use proper C++ types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: rewrite XTypes introduction section Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: rewrite remote data type discovery section Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: implement pending TODO Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: rewrite XTypes sections and related information Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: apply remaining suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: regenerate example types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: little block comment Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20631: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20631: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: adriancampo <adriancampo@eprosima.com> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 56115e7 commit f8a6dee

82 files changed

Lines changed: 4835 additions & 3296 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎code/CodeTester.cpp‎

Lines changed: 1 addition & 718 deletions
Large diffs are not rendered by default.

‎code/DDSCodeTester.cpp‎

Lines changed: 1175 additions & 248 deletions
Large diffs are not rendered by default.

‎code/DynamicTypesIDLExamples.idl‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
//!--TYPEINFORMATION
2+
@extensibility(APPENDABLE) @nested
3+
struct TypeIdentfierWithSize
4+
{
5+
TypeIdentifier type_id;
6+
unsigned long typeobject_serialized_size;
7+
};
8+
9+
@extensibility(APPENDABLE) @nested
10+
struct TypeIdentifierWithDependencies
11+
{
12+
TypeIdentfierWithSize typeid_with_size;
13+
long dependent_type_id_count;
14+
sequence<TypeIdentfierWithSize> dependent_typeids;
15+
};
16+
17+
@extensibility(MUTABLE) @nested
18+
struct TypeInformation
19+
{
20+
@id(0x1001) TypeIdentifierWithDependencies minimal;
21+
@id(0x1002) TypeIdentifierWithDependencies complete;
22+
};
23+
//!--
24+
25+
//!--TYPEOBJECT
26+
@extensibility(APPENDABLE) @nested
27+
union TypeObject switch(octet)
28+
{
29+
case EK_COMPLETE:
30+
CompleteTypeObject complete;
31+
case EK_MINIMAL:
32+
MinimalTypeObject minimal;
33+
};
34+
//!--
35+
36+
//!--IDL_PRIMITIVES
37+
struct PrimitivesStruct
38+
{
39+
boolean my_bool;
40+
octet my_octet;
41+
char my_char;
42+
wchar my_wchar;
43+
long my_long;
44+
unsigned long my_ulong;
45+
int8 my_int8;
46+
uint8 my_uint8;
47+
short my_short;
48+
unsigned short my_ushort;
49+
long long my_longlong;
50+
unsigned long long my_ulonglong;
51+
float my_float;
52+
double my_double;
53+
long double my_longdouble;
54+
};
55+
//!--
56+
57+
//!--IDL_STRINGS
58+
struct StringsStruct
59+
{
60+
string my_string;
61+
wstring my_wstring;
62+
string<41925> my_bounded_string;
63+
wstring<20925> my_bounded_wstring;
64+
};
65+
//!--
66+
67+
//!--IDL_ENUM
68+
enum MyEnum
69+
{
70+
A,
71+
B,
72+
C
73+
};
74+
75+
struct EnumStruct
76+
{
77+
MyEnum my_enum;
78+
};
79+
//!--
80+
81+
//!--IDL_BITMASK
82+
@bit_bound(8)
83+
bitmask MyBitMask
84+
{
85+
@position(0) flag0,
86+
flag1,
87+
flag2,
88+
@position(5) flag5
89+
};
90+
91+
struct BitmaskStruct
92+
{
93+
MyBitMask my_bitmask;
94+
};
95+
//!--
96+
97+
//!--IDL_TYPEDEF
98+
typedef MyEnum MyAliasedEnum;
99+
typedef string<100> MyAliasedBoundedString;
100+
typedef MyAliasedEnum MyRecursiveAlias;
101+
102+
struct AliasStruct
103+
{
104+
MyAliasedEnum my_aliased_enum;
105+
MyAliasedBoundedString my_aliased_bounded_string;
106+
MyRecursiveAlias my_recursive_alias;
107+
};
108+
//!--
109+
110+
//!--IDL_SEQUENCES
111+
struct SequenceStruct
112+
{
113+
sequence<MyBitmask> bitmask_sequence;
114+
sequence<short, 5> short_sequence;
115+
};
116+
//!--
117+
118+
//!--IDL_ARRAYS
119+
struct ArrayStruct
120+
{
121+
long long_array[2][3][4];
122+
};
123+
//!--
124+
125+
//!--IDL_MAPS
126+
struct MapStruct
127+
{
128+
map<string, MyAliasedBoundedString> string_alias_unbounded_map;
129+
map<short, long, 2> short_long_map;
130+
};
131+
//!--
132+
133+
//!--IDL_STRUCT
134+
struct InnerStruct
135+
{
136+
@id(0x10) long first;
137+
};
138+
139+
struct ParentStruct
140+
{
141+
float first;
142+
long long second;
143+
};
144+
145+
struct ComplexStruct : ParentStruct
146+
{
147+
InnerStruct complex_member;
148+
};
149+
//!--
150+
151+
//!--IDL_UNION
152+
union InnerUnion switch (short)
153+
{
154+
case 0:
155+
@id(0x10) PrimitivesStruct first;
156+
case 1:
157+
default:
158+
long long second;
159+
};
160+
161+
union ComplexUnion switch (long)
162+
{
163+
case 0:
164+
case 1:
165+
long third;
166+
default:
167+
InnerUnion fourth;
168+
};
169+
//!--
170+
171+
//!--IDL_BITSET
172+
bitset ParentBitSet
173+
{
174+
bitfield<3> a;
175+
bitfield<1> b;
176+
bitfield<4>;
177+
bitfield<10> c;
178+
bitfield<12, short> d;
179+
};
180+
181+
bitset ChildBitSet : ParentBitSet
182+
{
183+
bitfield<1> e;
184+
bitfield<20, unsigned long> f;
185+
};
186+
187+
struct BitsetStruct
188+
{
189+
ChildBitSet my_bitset;
190+
};
191+
//!--
192+
193+
//!--IDL_CUSTOM_ANNOTATION
194+
@annotation MyAnnotation
195+
{
196+
short length;
197+
};
198+
199+
@MyAnnotation(length = 5)
200+
struct AnnotatedStruct
201+
{
202+
@MyAnnotation(length = 10) string string_var;
203+
};
204+
//!--

‎code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx‎

Lines changed: 0 additions & 168 deletions
This file was deleted.

0 commit comments

Comments
 (0)