OpenDDS · iguessthislldo · Feb 27, 2021 · Mar 4, 2021 · Mar 11, 2021 · Mar 11, 2021
diff --git a/DDS.mwc b/DDS.mwc
@@ -17,5 +17,8 @@ workspace {
     // Run tools/modeling/tests/setup.pl to generate
     // tools/modeling/tests/modeling_tests.mwc.
     tools/modeling/tests
+
+    dds/InfoRepo
+    tools/dcpsinfo_dump
   }
 }
diff --git a/DDS_TAOv2.mwc b/DDS_TAOv2.mwc
@@ -12,5 +12,8 @@ workspace {
     // Run tools/modeling/tests/setup.pl to generate
     // tools/modeling/tests/modeling_tests.mwc.
     tools/modeling/tests
+
+    dds/InfoRepo
+    tools/dcpsinfo_dump
   }
 }
diff --git a/DevGuideExamples/DCPS/Messenger.minimal/MessengerMinimal.mpc b/DevGuideExamples/DCPS/Messenger.minimal/MessengerMinimal.mpc
@@ -7,7 +7,7 @@ project(*idl): dcps {
   custom_only = 1
 }
 
-project(*publisher) : dcpsexe, dcps_tcp, dds_model {
+project(*publisher) : dcps, dcps_rtps_udp, dds_model {
   requires += no_opendds_safety_profile
   exename   = publisher
   after    += *idl
@@ -22,7 +22,7 @@ project(*publisher) : dcpsexe, dcps_tcp, dds_model {
   }
 }
 
-project(*subscriber) : dcpsexe, dcps_tcp, dds_model {
+project(*subscriber) : dcps, dcps_rtps_udp, dds_model {
   requires += no_opendds_safety_profile
   exename   = subscriber
   after    += *publisher

diff --git a/DevGuideExamples/DCPS/Messenger.minimal/run_test.pl b/DevGuideExamples/DCPS/Messenger.minimal/run_test.pl
@@ -18,26 +18,9 @@
 my $sub_opts = "$common_opts -DCPSTransportDebugLevel 6 " .
                "-ORBLogFile subscriber.log";
 
-my $dcpsrepo_ior = "repo.ior";
-
-unlink $dcpsrepo_ior;
-
-my $DCPSREPO = PerlDDS::create_process ("$ENV{DDS_ROOT}/bin/DCPSInfoRepo",
-                                        "-ORBDebugLevel 10 " .
-                                        "-ORBLogFile DCPSInfoRepo.log " .
-                                        "-o $dcpsrepo_ior");
-
 my $Subscriber = PerlDDS::create_process ("subscriber", " $sub_opts");
 my $Publisher = PerlDDS::create_process ("publisher", " $pub_opts");
 
-print $DCPSREPO->CommandLine() . "\n";
-$DCPSREPO->Spawn ();
-if (PerlACE::waitforfile_timed ($dcpsrepo_ior, 30) == -1) {
-    print STDERR "ERROR: waiting for Info Repo IOR file\n";
-    $DCPSREPO->Kill ();
-    exit 1;
-}
-
 print $Publisher->CommandLine() . "\n";
 $Publisher->Spawn ();
 
@@ -56,12 +39,4 @@
     $status = 1;
 }
 
-my $ir = $DCPSREPO->TerminateWaitKill(5);
-if ($ir != 0) {
-    print STDERR "ERROR: DCPSInfoRepo returned $ir\n";
-    $status = 1;
-}
-
-unlink $dcpsrepo_ior;
-
 exit $status;
diff --git a/DevGuideExamples/DCPS/Messenger/CMakeLists.txt b/DevGuideExamples/DCPS/Messenger/CMakeLists.txt
@@ -7,8 +7,8 @@ set(CMAKE_CXX_COMPILER ${OPENDDS_COMPILER})
 
 set(opendds_libs
   OpenDDS::Dcps # Core OpenDDS Library
-  OpenDDS::InfoRepoDiscovery OpenDDS::Tcp # For run_test.pl
-  OpenDDS::Rtps OpenDDS::Rtps_Udp # For run_test.pl --rtps
+  OpenDDS::Rtps OpenDDS::Rtps_Udp # For run_test.pl
+  OpenDDS::InfoRepoDiscovery # For run_test.pl --info-repo
 )
 
 # Publisher

diff --git a/DevGuideExamples/DCPS/Messenger/Messenger.mpc b/DevGuideExamples/DCPS/Messenger/Messenger.mpc
@@ -7,7 +7,7 @@ project(*idl): dcps {
   custom_only = 1
 }
 
-project(*publisher) : dcpsexe, dcps_tcp, dcps_rtps_udp {
+project(*publisher) : dcps, dcps_rtps_udp, dcps_inforepodiscovery {
   requires += no_opendds_safety_profile
   exename   = publisher
   after    += *idl
@@ -21,7 +21,7 @@ project(*publisher) : dcpsexe, dcps_tcp, dcps_rtps_udp {
   }
 }
 
-project(*subscriber) : dcpsexe, dcps_tcp, dcps_rtps_udp {
+project(*subscriber) : dcps, dcps_rtps_udp, dcps_inforepodiscovery {
   requires += no_opendds_safety_profile
   exename   = subscriber
   after    += *publisher

diff --git a/DevGuideExamples/DCPS/Messenger/README.md b/DevGuideExamples/DCPS/Messenger/README.md
@@ -4,9 +4,9 @@ A very basic OpenDDS example, covered in the OpenDDS Developer's Guide.
 
 If you just want to build and run this, it will be built along with OpenDDS and
 can be run using `perl run_test.pl` assuming the `setenv` file has been sourced
-(see [INSTALL.md](../../../INSTALL.md) for details). To have it use the DDS
-standard RTPS discovery and transport instead of the OpenDDS specific InfoRepo
-discovery and TCP transports, run `perl run_test.pl --rtps` instead.
+(see [INSTALL.md](../../../INSTALL.md) for details). To have it use the
+OpenDDS-specific InfoRepo discovery instead of the DDS standard RTPS discovery,
+run `perl run_test.pl --info-repo` instead.
 
 ## CMake
 
@@ -23,5 +23,4 @@ these are the recommend steps:
    "out-of-source" build.
  - Run `cmake ..` to generate the build and `cmake --build .` to build.
  - To run the example you can copy `run_test.pl` to the `build` directory and
-   use that or run `./publisher -DCPSConfigFile ../rtps.ini` and `./subscriber
-   -DCPSConfigFile ../rtps.ini` at the same time.
+   use that or run `./publisher` and `./subscriber` at the same time.
diff --git a/DevGuideExamples/DCPS/Messenger/info-repo.ini b/DevGuideExamples/DCPS/Messenger/info-repo.ini
@@ -0,0 +1,2 @@
+[common]
+DCPSDefaultDiscovery=DEFAULT_REPO
diff --git a/DevGuideExamples/DCPS/Messenger/rtps.ini b/DevGuideExamples/DCPS/Messenger/rtps.ini
diff --git a/DevGuideExamples/DCPS/Messenger/run_test.pl b/DevGuideExamples/DCPS/Messenger/run_test.pl
@@ -16,12 +16,12 @@
 
 my $status = 0;
 
-my $rtps = 0;
+my $info_repo = 0;
 my $help = 0;
 
-my $help_message = "usage: run_test.pl [-h|--help] [--rtps]\n";
+my $help_message = "usage: run_test.pl [-h|--help] [--info-repo]\n";
 if (not GetOptions(
-  "rtps" => \$rtps,
+  "info-repo" => \$info_repo,
   "help|h" => \$help
 )) {
   print STDERR ("Invalid Command Line Argument(s)\n$help_message");
@@ -36,8 +36,8 @@
 
 my $common_opts = "-ORBDebugLevel 10 -DCPSDebugLevel 10";
 
-if ($rtps) {
-  $common_opts .= " -DCPSConfigFile rtps.ini";
+if ($info_repo) {
+  $common_opts .= " -DCPSConfigFile info-repo.ini";
 }
 
 my $pub_opts = "$common_opts -ORBLogFile publisher.log";
@@ -64,7 +64,7 @@
 my $Subscriber = PerlDDS::create_process("subscriber", " $sub_opts");
 my $Publisher = PerlDDS::create_process("publisher", " $pub_opts");
 
-if (not $rtps) {
+if ($info_repo) {
   unlink $dcpsrepo_ior;
 
   $DCPSREPO = PerlDDS::create_process(
@@ -100,7 +100,7 @@
   $status = 1;
 }
 
-if (not $rtps) {
+if ($info_repo) {
   my $ir = $DCPSREPO->TerminateWaitKill(5);
   if ($ir != 0) {
     print STDERR "ERROR: DCPSInfoRepo returned $ir\n";

diff --git a/DevGuideExamples/DCPS/Messenger_ZeroCopy/Messenger_ZeroCopy.mpc b/DevGuideExamples/DCPS/Messenger_ZeroCopy/Messenger_ZeroCopy.mpc
@@ -10,7 +10,7 @@ project(*idl): dcps_test_idl_only_lib {
   }
 }
 
-project(*publisher) : dcpsexe, dcps_tcp {
+project(*publisher) : dcps_rtps_udp {
   requires += no_opendds_safety_profile
   exename   = publisher
   after    += *idl
@@ -24,7 +24,7 @@ project(*publisher) : dcpsexe, dcps_tcp {
   }
 }
 
-project(*subscriber) : dcpsexe, dcps_tcp {
+project(*subscriber) : dcps_rtps_udp {
   requires += no_opendds_safety_profile
   exename   = subscriber
   after    += *idl

diff --git a/DevGuideExamples/DCPS/Messenger_ZeroCopy/run_test.pl b/DevGuideExamples/DCPS/Messenger_ZeroCopy/run_test.pl
@@ -18,26 +18,9 @@
 my $sub_opts = "$common_opts -DCPSTransportDebugLevel 6 " .
                "-ORBLogFile subscriber.log";
 
-my $dcpsrepo_ior = "repo.ior";
-
-unlink $dcpsrepo_ior;
-
-my $DCPSREPO = PerlDDS::create_process ("$ENV{DDS_ROOT}/bin/DCPSInfoRepo",
-                                        "$common_opts " .
-                                        "-ORBLogFile DCPSInfoRepo.log " .
-                                        "-o $dcpsrepo_ior ");
-
 my $Subscriber = PerlDDS::create_process ("subscriber", " $sub_opts");
 my $Publisher = PerlDDS::create_process ("publisher", " $pub_opts");
 
-print $DCPSREPO->CommandLine() . "\n";
-$DCPSREPO->Spawn ();
-if (PerlACE::waitforfile_timed ($dcpsrepo_ior, 30) == -1) {
-    print STDERR "ERROR: waiting for Info Repo IOR file\n";
-    $DCPSREPO->Kill ();
-    exit 1;
-}
-
 print $Publisher->CommandLine() . "\n";
 $Publisher->Spawn ();
 
@@ -56,12 +39,4 @@
     $status = 1;
 }
 
-my $ir = $DCPSREPO->TerminateWaitKill(5);
-if ($ir != 0) {
-    print STDERR "ERROR: DCPSInfoRepo returned $ir\n";
-    $status = 1;
-}
-
-unlink $dcpsrepo_ior;
-
 exit $status;
diff --git a/MPC/config/dcps_default_discovery.mpb b/MPC/config/dcps_default_discovery.mpb
@@ -1,5 +1,2 @@
-feature(!no_opendds_safety_profile) : dcps_rtps {
-}
-
-feature(no_opendds_safety_profile) : dcps_inforepodiscovery, dcps_tcp {
+project: dcps_rtps {
 }
diff --git a/bin/PerlDDS/Run_Test.pm b/bin/PerlDDS/Run_Test.pm
@@ -321,7 +321,7 @@ sub new {
   $self->{info_repo}->{file} = "repo.ior";
   $self->{processes}->{process} = {};
   $self->{processes}->{order} = [];
-  $self->{discovery} = "info_repo";
+  $self->{discovery} = "rtps";
   $self->{test_verbose} = 0;
   $self->{add_transport_config} = 1;
   $self->{nobits} = 0;

diff --git a/dds/DCPS/Service_Participant.cpp b/dds/DCPS/Service_Participant.cpp
@@ -150,13 +150,6 @@ static bool got_pending_timeout = false;
 static bool got_persistent_data_dir = false;
 #endif
 static bool got_default_discovery = false;
-#ifndef DDS_DEFAULT_DISCOVERY_METHOD
-# ifdef OPENDDS_SAFETY_PROFILE
-#  define DDS_DEFAULT_DISCOVERY_METHOD Discovery::DEFAULT_RTPS
-# else
-#  define DDS_DEFAULT_DISCOVERY_METHOD Discovery::DEFAULT_REPO
-# endif
-#endif
 static bool got_log_fname = false;
 static bool got_log_verbose = false;
 static bool got_default_address = false;
@@ -170,7 +163,7 @@ Service_Participant::Service_Participant()
     ORB_argv_(false /*substitute_env_args*/),
 #endif
     reactor_task_(false),
-    defaultDiscovery_(DDS_DEFAULT_DISCOVERY_METHOD),
+    defaultDiscovery_(Discovery::DEFAULT_RTPS),
     n_chunks_(DEFAULT_NUM_CHUNKS),
     association_chunk_multiplier_(DEFAULT_CHUNK_MULTIPLIER),
     liveliness_factor_(80),

diff --git a/dds/DCPS/transport/framework/TransportRegistry.cpp b/dds/DCPS/transport/framework/TransportRegistry.cpp
@@ -35,13 +35,6 @@ namespace {
   {
     return lhs->name() < rhs->name();
   }
-
-  // transport type to try loading if none are loaded when DCPS attempts to use
-#ifdef OPENDDS_SAFETY_PROFILE
-  const char FALLBACK_TYPE[] = "rtps_udp";
-#else
-  const char FALLBACK_TYPE[] = "tcp";
-#endif
 }
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -714,7 +707,7 @@ TransportRegistry::fix_empty_default()
   }
   TransportConfig_rch global_config = global_config_;
 #if !defined(ACE_AS_STATIC_LIBS)
-  load_transport_lib_i(FALLBACK_TYPE);
+  load_transport_lib_i("rtps_udp");
 #endif
   return global_config;
 }

diff --git a/dds/DCPS/transport/rtps_udp/RtpsUdpLoader.cpp b/dds/DCPS/transport/rtps_udp/RtpsUdpLoader.cpp
@@ -46,17 +46,12 @@ void RtpsUdpLoader::load()
   }
 
   registry->register_type(type);
-  // Don't create a default for RTPS.  At least for the initial implementation,
-  // the user needs to explicitly configure it...
-#ifdef OPENDDS_SAFETY_PROFILE
-  // ...except for Safety Profile where RTPS is the only option.
   TransportInst_rch default_inst =
     registry->create_inst(TransportRegistry::DEFAULT_INST_PREFIX +
                           OPENDDS_STRING("0600_RTPS_UDP"),
                           RTPS_UDP_NAME, false);
   registry->get_config(TransportRegistry::DEFAULT_CONFIG_NAME)
     ->sorted_insert(default_inst);
-#endif
 }
 
 ACE_FACTORY_DEFINE(OpenDDS_Rtps_Udp, RtpsUdpLoader);

diff --git a/dds/InfoRepo/DCPSInfoRepoServ.cpp b/dds/InfoRepo/DCPSInfoRepoServ.cpp
@@ -304,6 +304,9 @@ InfoRepo::init()
   CORBA::String_var objref_str =
     orb_->object_to_string(info_repo);
 
+  // RTPS discovery is the default, change it to InfoRepo
+  TheServiceParticipant->set_default_discovery(OpenDDS::DCPS::Discovery::DEFAULT_REPO);
+
   // Initialize the DomainParticipantFactory
   DDS::DomainParticipantFactory_var dpf =
     TheParticipantFactoryWithArgs(argc, args.argv());

diff --git a/performance-tests/DCPS/InfoRepo_population/InfoRepo_population.mpc b/performance-tests/DCPS/InfoRepo_population/InfoRepo_population.mpc
@@ -30,7 +30,7 @@ project(*SyncServer) : taoexe, portableserver, iortable, coverage_optional, dds_
   }
 }
 
-project(*Publisher) : dcpsexe, dcps_test, dcps_tcp {
+project(*Publisher) : dcps_test, dcps_inforepodiscovery, dcps_tcp {
   requires += no_opendds_safety_profile
   exename   = publisher
   libs     += SyncClient
@@ -50,7 +50,7 @@ project(*Publisher) : dcpsexe, dcps_test, dcps_tcp {
   }
 }
 
-project(*Subscriber) : dcpsexe, dcps_test, dcps_tcp {
+project(*Subscriber) : dcps_test, dcps_inforepodiscovery, dcps_tcp {
   requires += no_opendds_safety_profile
   exename   = subscriber
   libs     += SyncClient

diff --git a/performance-tests/DCPS/InfoRepo_population/pub.ini b/performance-tests/DCPS/InfoRepo_population/pub.ini
@@ -1,4 +1,5 @@
 [common]
+DCPSDefaultDiscovery=DEFAULT_REPO
 DCPSDebugLevel=0
 DCPSInfoRepo=file://repo.ior
 DCPSChunks=20

diff --git a/performance-tests/DCPS/InfoRepo_population/sub.ini b/performance-tests/DCPS/InfoRepo_population/sub.ini
@@ -1,4 +1,5 @@
 [common]
+DCPSDefaultDiscovery=DEFAULT_REPO
 DCPSDebugLevel=0
 DCPSInfoRepo=file://repo.ior
 DCPSChunks=20

diff --git a/tests/DCPS/BuiltInTopicTest/info_repo.ini b/tests/DCPS/BuiltInTopicTest/info_repo.ini
@@ -0,0 +1,2 @@
+[common]
+DCPSDefaultDiscovery=DEFAULT_REPO
diff --git a/tests/DCPS/BuiltInTopicTest/prst_repo_run_test.pl b/tests/DCPS/BuiltInTopicTest/prst_repo_run_test.pl
@@ -70,6 +70,7 @@
   . " -o $dcpsrepo_ior"
   . " -ORBSvcConf mySvc.conf"
   . " -orbendpoint iiop://$orb_address:$SRV_PORT"
+  . " -DCPSConfigFile info_repo.ini"
 ;
 
 my $repo1_log = 'repo1.log';

diff --git a/tests/DCPS/DCPSInfoRepo/dcpsinfo_test.mpc b/tests/DCPS/DCPSInfoRepo/dcpsinfo_test.mpc
@@ -1,4 +1,4 @@
-project(*pubsub): dcpsexe, dcps_test, dcps_rtps_udp {
+project(*pubsub): dcps_test, dcps_inforepodiscovery, dcps_rtps_udp {
   requires += no_opendds_safety_profile
   exename  = pubsub
 }
diff --git a/tests/DCPS/DCPSInfoRepo/pubsub.cpp b/tests/DCPS/DCPSInfoRepo/pubsub.cpp
@@ -417,6 +417,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         rtpsDisc->sedp_multicast(false);
         disc = rtpsDisc;
       } else {
+        TheServiceParticipant->set_default_discovery(OpenDDS::DCPS::Discovery::DEFAULT_REPO);
+
         CORBA::Object_var tmp =
           orb->string_to_object (ACE_TEXT_ALWAYS_CHAR(ior));
         OpenDDS::DCPS::DCPSInfo_var info =