Implement create_sample and create_dynamic_sample

MPC/modules/IDLBase.pm

@@ -115,7 +115,11 @@ sub do_cached_parse {
   $self->{'default_nested'} = 1;
 
   ## Set up the macros and include paths supplied in the command flags
-  my %macros = ('__OPENDDS_IDL' => 1, '__OPENDDS_MPC' => 1);
+  my %macros = (
+    __OPENDDS_IDL => 1,
+    __OPENDDS_MPC => 1,
+    OPENDDS_HIDE_DYNMIC_DATA => 1,
+  );
   my %mparams;
   my @include;
   if (defined $flags) {

dds/DCPS/TypeSupportImpl.h

@@ -167,7 +167,10 @@
 };
 
 template <typename NativeType>
-class TypeSupportImpl_T : public TypeSupportImpl {
+class TypeSupportImpl_T
+  : public virtual LocalObject<typename DDSTraits<NativeType>::TypeSupportType>
+  , public TypeSupportImpl
+{
 public:
   typedef DDSTraits<NativeType> TraitsType;
   typedef MarshalTraits<NativeType> MarshalTraitsType;
@@ -218,6 +221,50 @@
     get_type_from_type_lookup_service();
     return TypeSupportImpl::get_type();
   }
+
+  /// The IDL is `NativeType create_sample(DDS::DynamicData src)`, but in the
+  /// C++ mapping this can return NativeType* or just NativeType depending on if
+  /// the type is "variable length". If it has something like a sequence then
+  /// it's variable length and returns a pointer else it's fixed and returns on
+  /// the stack. opendds_idl will wrap this in the correct form.
+  bool create_sample(NativeType* dest, DDS::DynamicData_ptr src)
+  {
+    OpenDDS::DCPS::set_default(*dest);
+#  if OPENDDS_HAS_DYNAMIC_DATA_ADAPTOR
+    DDS::DynamicData_var dest_dd = get_dynamic_data_adapter<NativeType>(get_type(), dest);
+    const DDS::ReturnCode_t rc = XTypes::copy(dest_dd, src);
+    if (rc == DDS::RETCODE_OK) {
+      return true;
+    }
+    if (log_level >= LogLevel::Warning) {
+      ACE_ERROR((LM_WARNING, "(%P|%t) WARNING: TypeSupportImpl_T::create_sample: "
+        "failed to copy from DynamicData: %C\n", retcode_to_string(rc)));
+    }
+#  else
+    ACE_UNUSED_ARG(dest);
+    ACE_UNUSED_ARG(src);
+#  endif
+    return false;
+  }
+
+  DDS::DynamicData_ptr create_dynamic_sample(const NativeType& src)
+  {
+#  if OPENDDS_HAS_DYNAMIC_DATA_ADAPTOR
+    DDS::DynamicData_var dest_dd = DDS::DynamicDataFactory::get_instance()->create_data(type_);
+    DDS::DynamicData_var src_dd = get_dynamic_data_adapter<NativeType>(get_type(), &src);
+    const DDS::ReturnCode_t rc = XTypes::copy(dest_dd, src_dd);
+    if (rc == DDS::RETCODE_OK) {
+      return dest_dd._retn();
+    }
+    if (log_level >= LogLevel::Notice) {
+      ACE_ERROR((LM_NOTICE, "(%P|%t) NOTICE: TypeSupportImpl_T::create_dynamic_sample: "
+        "failed to copy to DynamicData: %C\n", retcode_to_string(rc)));
+    }
+#  else
+    ACE_UNUSED_ARG(src);
+#  endif
+    return 0;
+  }
 #endif
 };
 

dds/DdsDcpsTopic.idl

@@ -74,7 +74,7 @@ module DDS {
         // valuetype isn't supported in Java. This will exclude this operation
         // from the generated Java code and return null in get_type method of
         // the TAOPeer generated C++ class so it isn't a pure virtual function.
-        @OpenDDS::hidden_op_in_java("return 0;")
+        @OpenDDS::internal::hidden_op_in_java("return 0;")
         DynamicType get_type();
 #endif
     };

dds/DdsDynamicData.idl

@@ -1,6 +1,4 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
@@ -9,13 +7,15 @@
 #define OPENDDS_DDS_DYNAMIC_DATA_IDL
 
 #ifndef OPENDDS_SAFETY_PROFILE
-
-#include <dds/DdsDcpsInfrastructure.idl>
-#include <dds/DdsDcpsDomain.idl>
-#include <dds/DdsDynamicDataSeq.idl>
+#  ifndef OPENDDS_HIDE_DYNMIC_DATA
+#    include <dds/DdsDcpsInfrastructure.idl>
+#    include <dds/DdsDcpsDomain.idl>
+#    include <dds/DdsDynamicDataSeq.idl>
+#  endif // OPENDDS_HIDE_DYNMIC_DATA
 
 module DDS {
   local interface DynamicType;
+#  ifndef OPENDDS_HIDE_DYNMIC_DATA
   valuetype TypeDescriptor;
 
   typedef sequence<string> IncludePathSeq;
@@ -158,9 +158,11 @@ module DDS {
 
     void clear();
   };
+#  endif // OPENDDS_HIDE_DYNMIC_DATA
 
   local interface DynamicData;
 
+#  ifndef OPENDDS_HIDE_DYNMIC_DATA
   local interface DynamicDataFactoryInterf {
     // Implemented in C++
     // static DynamicDataFactory get_instance();
@@ -401,6 +403,7 @@ module DDS {
                                          in MemberId id,
                                          in WstringSeq value);
   }; // local interface DynamicData
+#  endif // OPENDDS_HIDE_DYNMIC_DATA
 };
 
 #endif // OPENDDS_SAFETY_PROFILE

dds/idl/IDLTemplate.txt

@@ -9,6 +9,16 @@ typedef sequence<<%SCOPED%>> <%TYPE%><%SEQ%>;
  * this interface.
  */
 local interface <%TYPE%>TypeSupport : OpenDDS::DCPS::TypeSupport {
+#ifndef OPENDDS_SAFETY_PROFILE
+    // valuetype isn't supported in Java, so we can't use DynamicData. This
+    // will exclude this operation from the generated Java code and return null
+    // in get_type method of the TAOPeer generated C++ class so it isn't a pure
+    // virtual function.
+    @OpenDDS::internal::hidden_op_in_java("(void)(src); return 0;")
+    <%SCOPED%> create_sample(in ::DDS::DynamicData src);
+    @OpenDDS::internal::hidden_op_in_java("(void)(src); return 0;")
+    ::DDS::DynamicData create_dynamic_sample(in <%SCOPED%> src);
+#endif
 
     ::DDS::ReturnCode_t encode_to_string(in <%SCOPED%> sample, out string encoded, in OpenDDS::DCPS::RepresentationFormat format);
     ::DDS::ReturnCode_t encode_to_bytes(in <%SCOPED%> sample, out ::DDS::OctetSeq encoded, in OpenDDS::DCPS::RepresentationFormat format);

dds/idl/be_init.cpp

@@ -66,5 +66,6 @@ BE_post_init(char*[], long)
   be_global->builtin_annotations_.register_all();
   // This annotation isn't used, but must match the one in idl2jni to avoid
   // warnings or errors.
-  idl_global->eval("module OpenDDS {@annotation hidden_op_in_java {string impl;};};\n");
+  idl_global->eval(
+    "module OpenDDS {module internal {@annotation hidden_op_in_java {string impl;};};};\n");
 }