Merge branch 'master' of github.com:OpenDDS/OpenDDS into serialized-s…

…ize-writer
sonndinh · Feb 3, 2024 · 24b876d · 24b876d
2 parents 13e2d6e + 932dbb8
commit 24b876d
Show file tree

Hide file tree

Showing 36 changed files with 740 additions and 642 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
diff --git a/.github/workflows/dds-rtps.yml b/.github/workflows/dds-rtps.yml
@@ -49,7 +49,7 @@ jobs:
         cd OpenDDS
         ./configure --optimize --no-debug --static --no-inline
         tools/scripts/show_build_config.pl
-    - uses: ammaraskar/gcc-problem-matcher@0.2.0
+    - uses: ammaraskar/gcc-problem-matcher@0.3.0
     - name: build OpenDDS
       shell: bash
       run: |

diff --git a/.github/workflows/ishapes.yml b/.github/workflows/ishapes.yml
@@ -40,7 +40,7 @@ jobs:
         cd OpenDDS
         ./configure --optimize --no-debug --static --tests --qt
         tools/scripts/show_build_config.pl
-    - uses: ammaraskar/gcc-problem-matcher@0.2.0
+    - uses: ammaraskar/gcc-problem-matcher@0.3.0
     - name: build
       shell: bash
       run: |

diff --git a/configure b/configure
@@ -82,7 +82,7 @@ my %platforminfo =
                                  'specify how the target', 'build should work'],
                     },
    'linux' => {
-               'compilers' => ['g++', 'clang', 'clang++'],
+               'compilers' => ['g++', 'clang++', 'clang'],
                'libpath' => 'LD_LIBRARY_PATH',
                'aceplatform' => 'linux_$NONSTDCOMP', # $NONSTDCOMP = clang
               },
@@ -185,7 +185,7 @@ my @specs = # Array of array-refs, each inner array is an option group which
    ['Build platform and compiler:',
     'host=s', 'Host (auto detect: linux, win32, macosx)',
     'compiler=s', 'Compiler (auto detect / guess by searching PATH)',
-    'std=s', 'C++ standard version (for compilers that use -std)',
+    'std=s', 'C++ standard version (compiler default)',
     'target=s', 'Cross-compile target (none): see --target-help',
     'target-arch=s', 'Architecture for target (none): see --target-help',
     'target-compiler=s', 'Compiler for target (if req\'d): see --target-help',
@@ -733,14 +733,26 @@ EOF
 
     if ($ver >= 19) {
       push(@{$opts{'features'}}, 'no_cxx11=0');
-      print "Visual C++ has C++11 support\n" if $opts{'verbose'};
+      print "Visual C++ has >= C++11 support\n" if $opts{'verbose'};
+    }
+    if ($opts{'std'}) {
+      # Accept any of --std=17, --std=stdcpp17, --std=c++17, etc.
+      $opts{'std'} =~ s/^(std)?(cpp|c\+\+)//;
+      my $prefix = 'stdcpp';
+      push(@{$opts{'mpcopts'}}, "-value_template LanguageStandard=$prefix$opts{'std'}");
+      print "Setting Visual C++ LanguageStandard to $prefix$opts{'std'}\n" if $opts{'verbose'};
+      if ($opts{'std'} eq 'latest' || $opts{'std'} >= 17) {
+        push(@{$opts{'features'}}, 'no_cxx17=0');
+        print "Visual C++ has >= C++17 support\n" if $opts{'verbose'};
+      }
     }
     $ENV{'PATH'} = $savepath;
     print "Detected Visual C++ version: $opts{'compiler_version'}\n"
       if $opts{'verbose'};
   }
-  elsif ($opts{'compiler'} =~ /g\+\+/) { # GCC or Clang
+  elsif ($opts{'compiler'} =~ /g\+\+|clang/) {
     my $version_string = `$opts{'compiler'} --version`;
+    print "Compiler version: $version_string\n" if $opts{'verbose'};
     if ($opts{'std'}) {
       push(@{$opts{'macros'}}, 'CCFLAGS += -std=' . $opts{'std'});
       print "Added platform_macros for -std=$opts{std}\n" if $opts{'verbose'};
@@ -2123,8 +2135,8 @@ sub write_opendds_mwc {
 if (!defined(\$ENV{ACE_ROOT}) || !defined(\$ENV{MPC_ROOT})) {
   die("The enviroment needs to be setup.");
 }
-exec('perl', "\$ENV{ACE_ROOT}/bin/mwc.pl", $args, \@ARGV)
-  or die("Failed to exec mwc: \$!");
+system('perl', "\$ENV{ACE_ROOT}/bin/mwc.pl", $args, \@ARGV) == 0
+  or die("Failed to run mwc: \$!");
 EOF
   $fd->close();
   print "Wrote $path\n" if $opts{'verbose'};

diff --git a/dds/DCPS/DataWriterImpl.cpp b/dds/DCPS/DataWriterImpl.cpp
@@ -244,7 +244,7 @@ DataWriterImpl::add_association(const ReaderAssociation& reader,
     ACE_GUARD(ACE_Thread_Mutex, reader_info_guard, this->reader_info_lock_);
     reader_info_.insert(std::make_pair(reader.readerId,
                                        ReaderInfo(reader.filterClassName,
-                                                  publisher_content_filter_ ? reader.filterExpression : "",
+                                                  publisher_content_filter_ ? reader.filterExpression.in() : "",
                                                   reader.exprParams, participant_servant_,
                                                   reader.readerQos.durability.kind > DDS::VOLATILE_DURABILITY_QOS)));
   }

diff --git a/dds/DCPS/LinuxNetworkConfigMonitor.cpp b/dds/DCPS/LinuxNetworkConfigMonitor.cpp
@@ -78,12 +78,14 @@ bool LinuxNetworkConfigMonitor::open_i()
   if (socket_.open(addr, AF_NETLINK, NETLINK_ROUTE) != 0) {
 #ifdef ACE_ANDROID
     if (log_level >= LogLevel::Warning) {
-      ACE_ERROR((LM_WARNING, "(%P|%t) WARNING: LinuxNetworkConfigMonitor::open_i: could not open socket"
-                 " this is expected for API30+\n"));
+      ACE_ERROR((LM_WARNING, "(%P|%t) WARNING: LinuxNetworkConfigMonitor::open_i: "
+        "could not open Netlink socket "
+        "(this is expected for API>=30, see Android section in the Developer's Guide)\n"));
     }
 #else
     if (log_level >= LogLevel::Error) {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR: LinuxNetworkConfigMonitor::open_i: could not open socket: %m\n"));
+      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR: LinuxNetworkConfigMonitor::open_i: "
+        "could not open Netlink socket: %m\n"));
     }
 #endif
     return false;

diff --git a/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp b/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp
@@ -322,8 +322,8 @@ DCPS::NetworkAddress
 RtpsDiscoveryConfig::sedp_local_address() const
 {
   return TheServiceParticipant->config_store()->get(config_key("SEDP_LOCAL_ADDRESS").c_str(),
-                                                    DCPS::NetworkAddress::default_IPV4,
-                                                    DCPS::ConfigStoreImpl::Format_Required_Port,
+                                                    TheServiceParticipant->default_address(),
+                                                    DCPS::ConfigStoreImpl::Format_Optional_Port,
                                                     DCPS::ConfigStoreImpl::Kind_IPV4);
 }
 
@@ -332,7 +332,7 @@ RtpsDiscoveryConfig::sedp_local_address(const DCPS::NetworkAddress& mi)
 {
   TheServiceParticipant->config_store()->set(config_key("SEDP_LOCAL_ADDRESS").c_str(),
                                              mi,
-                                             DCPS::ConfigStoreImpl::Format_Required_Port,
+                                             DCPS::ConfigStoreImpl::Format_Optional_Port,
                                              DCPS::ConfigStoreImpl::Kind_IPV4);
 }
 
@@ -357,11 +357,8 @@ RtpsDiscoveryConfig::sedp_advertised_local_address(const DCPS::NetworkAddress& m
 DCPS::NetworkAddress
 RtpsDiscoveryConfig::spdp_local_address() const
 {
-  const DCPS::NetworkAddress d1(TheServiceParticipant->default_address());
-  const DCPS::NetworkAddress d2("0.0.0.0:0");
-
   return TheServiceParticipant->config_store()->get(config_key("SPDP_LOCAL_ADDRESS").c_str(),
-                                                    d1 ? d1 : d2,
+                                                    TheServiceParticipant->default_address(),
                                                     DCPS::ConfigStoreImpl::Format_Optional_Port,
                                                     DCPS::ConfigStoreImpl::Kind_IPV4);
 }

diff --git a/dds/DCPS/ReplayerImpl.cpp b/dds/DCPS/ReplayerImpl.cpp
@@ -430,7 +430,7 @@ ReplayerImpl::add_association(const ReaderAssociation& reader,
   {
     ACE_GUARD(ACE_Recursive_Thread_Mutex, guard, this->lock_);
     reader_info_.insert(std::make_pair(reader.readerId,
-                                       ReaderInfo(TheServiceParticipant->publisher_content_filter() ? reader.filterExpression : "",
+                                       ReaderInfo(TheServiceParticipant->publisher_content_filter() ? reader.filterExpression.in() : "",
                                                   reader.exprParams, participant_servant_,
                                                   reader.readerQos.durability.kind > DDS::VOLATILE_DURABILITY_QOS)));
   }

diff --git a/dds/DCPS/Service_Participant.h b/dds/DCPS/Service_Participant.h
@@ -87,6 +87,7 @@ const String OPENDDS_COMMON_DCPS_CONFIG_FILE_default = "";
 const char OPENDDS_COMMON_DCPS_DEBUG_LEVEL[] = "OPENDDS_COMMON_DCPS_DEBUG_LEVEL";
 
 const char OPENDDS_COMMON_DCPS_DEFAULT_ADDRESS[] = "OPENDDS_COMMON_DCPS_DEFAULT_ADDRESS";
+// Can't use NetworkAddress::default_IPV4 due to static initialization.
 const NetworkAddress OPENDDS_COMMON_DCPS_DEFAULT_ADDRESS_default = NetworkAddress("0.0.0.0:0");
 
 const char OPENDDS_COMMON_DCPS_DEFAULT_DISCOVERY[] = "OPENDDS_COMMON_DCPS_DEFAULT_DISCOVERY";

diff --git a/dds/DCPS/ThreadPool.cpp b/dds/DCPS/ThreadPool.cpp
@@ -28,7 +28,7 @@ ThreadPool::ThreadPool(size_t count, FunPtr fun, void* arg)
 #ifdef OPENDDS_NO_THREAD_JOIN
  , finished_threads_(0)
 #endif
- , ids_(count, ACE_thread_t())
+ , ids_(count)
 {
   {
     ACE_Guard<ACE_Thread_Mutex> guard(mutex_);

diff --git a/dds/DCPS/transport/framework/TransportInst.cpp b/dds/DCPS/transport/framework/TransportInst.cpp
@@ -41,30 +41,6 @@ TransportInst::~TransportInst()
   DBG_ENTRY_LVL("TransportInst","~TransportInst",6);
 }
 
-int
-TransportInst::load(ACE_Configuration_Heap& cf,
-                    ACE_Configuration_Section_Key& sect)
-{
-  process_section(*TheServiceParticipant->config_store(),
-                  ConfigReader_rch(),
-                  ConfigReaderListener_rch(),
-                  config_prefix_,
-                  cf,
-                  sect,
-                  "",
-                  false);
-
-  ACE_TString stringvalue;
-  if (cf.get_string_value (sect, ACE_TEXT("passive_connect_duration"), stringvalue) == 0) {
-    ACE_DEBUG ((LM_WARNING,
-                ACE_TEXT ("(%P|%t) WARNING: passive_connect_duration option ")
-                ACE_TEXT ("is deprecated in the transport inst, must be ")
-                ACE_TEXT ("defined in transport config.\n")));
-  }
-
-  return 0;
-}
-
 void
 TransportInst::dump(DDS::DomainId_t domain) const
 {

diff --git a/dds/DCPS/transport/framework/TransportInst.h b/dds/DCPS/transport/framework/TransportInst.h
@@ -31,11 +31,6 @@
 
 #include <ace/Synch_Traits.h>
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Configuration_Heap;
-class ACE_Configuration_Section_Key;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace OpenDDS {
@@ -79,11 +74,6 @@ class OpenDDS_Dcps_Export TransportInst : public virtual RcObject {
 
   bool is_template() const { return is_template_; }
 
-  /// Overwrite the default configurations with the configuration from the
-  /// given section in the ACE_Configuration_Heap object.
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   /// Diagnostic aid.
   void dump(DDS::DomainId_t domain) const;
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t domain) const;

diff --git a/dds/DCPS/transport/framework/TransportRegistry.cpp b/dds/DCPS/transport/framework/TransportRegistry.cpp
@@ -175,7 +175,6 @@ TransportRegistry::load_transport_configuration(const OPENDDS_STRING& file_name,
             }
 
             instances.push_back(inst);
-            inst->load(cf, inst_sect);
 
             // store the transport info
             TransportEntry entry;

diff --git a/dds/DCPS/transport/multicast/MulticastInst.cpp b/dds/DCPS/transport/multicast/MulticastInst.cpp
@@ -63,15 +63,6 @@ MulticastInst::MulticastInst(const std::string& name)
   , async_send_(*this, &MulticastInst::async_send, &MulticastInst::async_send)
 {}
 
-int
-MulticastInst::load(ACE_Configuration_Heap& cf,
-                    ACE_Configuration_Section_Key& sect)
-{
-  TransportInst::load(cf, sect); // delegate to parent
-
-  return 0;
-}
-
 TransportImpl_rch
 MulticastInst::new_impl(DDS::DomainId_t domain)
 {

diff --git a/dds/DCPS/transport/multicast/MulticastInst.h b/dds/DCPS/transport/multicast/MulticastInst.h
@@ -144,9 +144,6 @@ class OpenDDS_Multicast_Export MulticastInst
   void async_send(bool as);
   bool async_send() const;
 
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   /// Diagnostic aid.
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t) const;
 

diff --git a/dds/DCPS/transport/rtps_udp/RtpsUdpInst.cpp b/dds/DCPS/transport/rtps_udp/RtpsUdpInst.cpp
@@ -495,14 +495,6 @@ RtpsUdpInst::new_impl(DDS::DomainId_t domain)
   return make_rch<RtpsUdpTransport>(rchandle_from(this), domain);
 }
 
-int
-RtpsUdpInst::load(ACE_Configuration_Heap& cf,
-                  ACE_Configuration_Section_Key& sect)
-{
-  TransportInst::load(cf, sect); // delegate to parent
-  return 0;
-}
-
 OPENDDS_STRING
 RtpsUdpInst::dump_to_str(DDS::DomainId_t domain) const
 {

diff --git a/dds/DCPS/transport/rtps_udp/RtpsUdpInst.h b/dds/DCPS/transport/rtps_udp/RtpsUdpInst.h
@@ -86,9 +86,6 @@ class OpenDDS_Rtps_Udp_Export RtpsUdpInst : public TransportInst {
   void send_delay(const TimeDuration& sd);
   TimeDuration send_delay() const;
 
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   /// Diagnostic aid.
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t domain) const;
 

diff --git a/dds/DCPS/transport/shmem/ShmemInst.cpp b/dds/DCPS/transport/shmem/ShmemInst.cpp
@@ -37,14 +37,6 @@ ShmemInst::new_impl(DDS::DomainId_t domain)
   return make_rch<ShmemTransport>(rchandle_from(this), domain);
 }
 
-int
-ShmemInst::load(ACE_Configuration_Heap& cf,
-                ACE_Configuration_Section_Key& sect)
-{
-  TransportInst::load(cf, sect);
-  return 0;
-}
-
 OPENDDS_STRING
 ShmemInst::dump_to_str(DDS::DomainId_t domain) const
 {

diff --git a/dds/DCPS/transport/shmem/ShmemInst.h b/dds/DCPS/transport/shmem/ShmemInst.h
@@ -21,9 +21,6 @@ class OpenDDS_Shmem_Export ShmemInst : public TransportInst {
 public:
   static const TimeDuration default_association_resend_period;
 
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t domain) const;
 
   /// Size (in bytes) of the single shared-memory pool allocated by this

diff --git a/dds/DCPS/transport/tcp/TcpInst.cpp b/dds/DCPS/transport/tcp/TcpInst.cpp
@@ -31,14 +31,6 @@ OpenDDS::DCPS::TcpInst::new_impl(DDS::DomainId_t domain)
   return make_rch<TcpTransport>(rchandle_from(this), domain);
 }
 
-int
-OpenDDS::DCPS::TcpInst::load(ACE_Configuration_Heap& cf,
-                             ACE_Configuration_Section_Key& trans_sect)
-{
-  TransportInst::load(cf, trans_sect);
-  return 0;
-}
-
 OPENDDS_STRING
 OpenDDS::DCPS::TcpInst::dump_to_str(DDS::DomainId_t domain) const
 {
@@ -60,7 +52,7 @@ OpenDDS::DCPS::TcpInst::dump_to_str(DDS::DomainId_t domain) const
 size_t
 OpenDDS::DCPS::TcpInst::populate_locator(OpenDDS::DCPS::TransportLocator& local_info,
                                          ConnectionInfoFlags,
-                                         DDS::DomainId_t domain) const
+                                         DDS::DomainId_t) const
 {
   const std::string local_addr = local_address();
   const std::string locator_addr = get_locator_address();

diff --git a/dds/DCPS/transport/tcp/TcpInst.h b/dds/DCPS/transport/tcp/TcpInst.h
@@ -36,9 +36,6 @@ class OpenDDS_Tcp_Export TcpInst
   static const int DEFAULT_PASSIVE_RECONNECT_DURATION = 2000;
   static const int DEFAULT_ACTIVE_CONN_TIMEOUT_PERIOD = 5000;
 
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   /// Diagnostic aid.
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t domain) const;
 

diff --git a/dds/DCPS/transport/udp/UdpInst.cpp b/dds/DCPS/transport/udp/UdpInst.cpp
@@ -35,14 +35,6 @@ UdpInst::new_impl(DDS::DomainId_t domain)
   return make_rch<UdpTransport>(rchandle_from(this), domain);
 }
 
-int
-UdpInst::load(ACE_Configuration_Heap& cf,
-              ACE_Configuration_Section_Key& sect)
-{
-  TransportInst::load(cf, sect); // delegate to parent
-  return 0;
-}
-
 OPENDDS_STRING
 UdpInst::dump_to_str(DDS::DomainId_t domain) const
 {

diff --git a/dds/DCPS/transport/udp/UdpInst.h b/dds/DCPS/transport/udp/UdpInst.h
@@ -30,9 +30,6 @@ class OpenDDS_Udp_Export UdpInst : public TransportInst {
   void rcv_buffer_size(ACE_INT32 rbs);
   ACE_INT32 rcv_buffer_size() const;
 
-  virtual int load(ACE_Configuration_Heap& cf,
-                   ACE_Configuration_Section_Key& sect);
-
   /// Diagnostic aid.
   virtual OPENDDS_STRING dump_to_str(DDS::DomainId_t) const;
 

diff --git a/dds/idl/langmap_generator.cpp b/dds/idl/langmap_generator.cpp
@@ -1762,6 +1762,7 @@ struct Cxx11Generator : GeneratorBase
                  const std::vector<AST_UnionBranch*>& branches, AST_Type* discriminator)
   {
     const ScopedNamespaceGuard namespaces(name, be_global->lang_header_);
+    const ScopedNamespaceGuard namespacesCpp(name, be_global->impl_);
     const char* const nm = name->last_component()->get_string();
     const std::string d_type = generator_->map_type(discriminator);
     const std::string defVal = generateDefaultValue(u);
@@ -1818,7 +1819,6 @@ struct Cxx11Generator : GeneratorBase
     gen_common_strunion_post(nm);
     gen_union_pragma_post();
 
-    const ScopedNamespaceGuard namespacesCpp(name, be_global->impl_);
     be_global->impl_ <<
       nm << "::" << nm << "(const " << nm << "& rhs)\n"
       "{\n"