Unify idl and use new annotations (#270)

* Github issue: #270
* Pull request: #271

Author: javmorcas

srcDoc/release_notes.rst

@@ -190,6 +190,15 @@ The combination of the previous issue and a bug in *RTI Connext DDS Micro*
 (MICRO-2191), would cause that the LatencyTopic endpoints were not correctly
 discovered in certain cases, making impossible to gather Latency Numbers.
 
+Update the idl to use prefix annotations (#270)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In previous versions, *RTI Perftest* idls used a combination of the new
+prefix annotations and the old ones. This inconsistency has been fixed.
+
+This imposes a restriction (already existing) in the minimum version for which
+*RTI Perftest* can be compiled to *RTI Connext DDS Professional* 5.3.1.
+
 Release Notes 3.0
 -----------------
 

srcIdl/perftest.idl

@@ -24,6 +24,17 @@ const string THROUGHPUT_TOPIC_NAME = "Throughput";
 const string LATENCY_TOPIC_NAME = "Latency";
 const string ANNOUNCEMENT_TOPIC_NAME = "Announcement";
 
+/*
+ * This idl uses prefix annotations. In order to compile with previous versions
+ * of *Connext DDS Professional* modify the following annotations:
+ *
+ * - @final -- Remove it and replace at the
+ *             end with "//@Extensibility FINAL_EXTENSIBILITY"
+ * - @key   -- Remove it and replace it at the end of the member with "//@key"
+ *
+ */
+
+@final
 struct TestData_t {
     octet key[KEY_SIZE];
 
@@ -40,8 +51,9 @@ struct TestData_t {
     long custom_type_size;
   #endif
 
-}; //@Extensibility FINAL_EXTENSIBILITY
+};
 
+@final
 struct TestDataKeyed_t {
     @key
     octet key[KEY_SIZE];
@@ -57,8 +69,9 @@ struct TestDataKeyed_t {
     RTI_CUSTOM_TYPE custom_type;
     long custom_type_size;
   #endif
-}; //@Extensibility FINAL_EXTENSIBILITY
+};
 
+@final
 struct TestDataLarge_t {
     octet key[KEY_SIZE];
 
@@ -72,8 +85,9 @@ struct TestDataLarge_t {
     RTI_CUSTOM_TYPE custom_type;
     long custom_type_size;
   #endif
-}; //@Extensibility FINAL_EXTENSIBILITY
+};
 
+@final
 struct TestDataKeyedLarge_t {
     @key
     octet key[KEY_SIZE];
@@ -89,12 +103,11 @@ struct TestDataKeyedLarge_t {
     RTI_CUSTOM_TYPE custom_type;
     long custom_type_size;
   #endif
-}; //@Extensibility FINAL_EXTENSIBILITY
+};
 
+/********************************** FLATDATA **********************************/
 #ifdef RTI_FLATDATA_AVAILABLE
-/*
- * FLATDATA
- */
+
 @mutable
 @language_binding(FLAT_DATA)
 struct TestData_FlatData_t {
@@ -168,4 +181,5 @@ struct TestDataKeyedLarge_FlatData_t {
     long custom_type_size;
   #endif
 };
-#endif // RTI_FLATDATA_AVAILABLE
+
+#endif // RTI_FLATDATA_AVAILABLE

srcIdl/perftest_ZeroCopy.idl

@@ -95,4 +95,4 @@ struct TestDataKeyedLarge_ZeroCopy_w_FlatData_t {
     RTI_CUSTOM_TYPE_FLATDATA custom_type;
     long custom_type_size;
   #endif
-};
+};