ChangeLogTag:Fri Oct 13 21:35:52 2000 Marina Spivak <marina@cs.wustl.edu>

8 files changed, 105 insertions, 9 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f203b4c6538..92f8c9e6bfb 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,46 @@
+Fri Oct 13 21:35:52 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+	* tests/RTCORBA/RTCORBA_tests.dsw
+	* tests/RTCORBA/Makefile.bor
+	* tests/RTCORBA/Makefile:
+	* tests/RTCORBA/README:
+
+	  Added Client_Protocol test.
+
+	* tests/RTCORBA/Client_Protocol/Makefile:
+
+	  Generated dependencies.
+
+	* tests/RTCORBA/Client_Protocol/run_test.pl
+	* tests/RTCORBA/Client_Protocol/README:
+
+	  Updated.
+
+	* tests/RTCORBA/Client_Protocol/client.cpp
+	* tests/RTCORBA/Client_Protocol/server.cpp:
+
+	  Fixed compile warnings/errors.
+
+	* tests/RTCORBA/Client_Protocol/server.dsp
+	* tests/RTCORBA/Client_Protocol/client.dsp:
+
+	  Changed project names.
+
+	* tao/IIOP_Connector.cpp (connect)
+	* tao/UIOP_Connector.cpp (connect)
+	* tao/SHMIOP_Connector.cpp (connect)
+	* tao/orbsvcs/orbsvcs/SSLIOP_Connector.cpp (connect)
+	* tao/Connector_Registry.cpp (connect):
+
+	  Added debugging message.
+
+	* tests/Endpoint_Per_Priority/client.cpp
+	* tests/Endpoint_Per_Priority/server.cpp
+	* performance-tests/RTCORBA/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp
+	* performance-tests/RTCORBA/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp:
+
+	  Compile tests only if TAO::ClientPriorityPolicy is enabled.
+
 Fri Oct 13 20:03:01 2000  Marina Spivak  <marina@cs.wustl.edu>
 
 	* tests/RTCORBA/Client_Protocol/Client_Protocol.dsw
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index d6f18f05823..26828bbcc46 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -456,6 +456,11 @@ TAO_SSLIOP_Connector::connect (TAO_Endpoint *endpoint,
                                ACE_Time_Value *max_wait_time,
                                CORBA::Environment &ACE_TRY_ENV)
 {
+  if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
+                  ACE_TEXT ("looking for SSLIOP connection.\n")));
+
   if (endpoint->tag () != TAO_TAG_IIOP_PROFILE)
     return -1;
 
@@ -463,7 +468,7 @@ TAO_SSLIOP_Connector::connect (TAO_Endpoint *endpoint,
     ACE_dynamic_cast (TAO_SSLIOP_Endpoint *,
                       endpoint);
   if (endpoint == 0)
-    return -1;  
+    return -1;
 
   const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index b28bb49718d..036ba63e877 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -273,12 +273,19 @@ TAO_Connector_Registry::connect (TAO_Endpoint *endpoint,
     this->get_connector (endpoint->tag ());
 
   if (connector == 0)
-    return -1;
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO (%P|%t) Connector_Registry::connect - ")
+                    ACE_TEXT ("protocol %u not available.\n"),
+                    endpoint->tag ()));
+      return -1;
+    }
 
   return connector->connect (endpoint,
                              transport,
                              max_wait_time,
-                             ACE_TRY_ENV); 
+                             ACE_TRY_ENV);
 }
 
 int
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 8ce28491d1b..4d14069e21a 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -464,6 +464,11 @@ TAO_IIOP_Connector::connect (TAO_Endpoint *endpoint,
                              ACE_Time_Value *max_wait_time,
                              CORBA::Environment &)
 {
+  if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
+                  ACE_TEXT ("looking for IIOP connection.\n")));
+
   if (endpoint->tag () != TAO_TAG_IIOP_PROFILE)
     return -1;
 
@@ -769,7 +774,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
 {
 #if (TAO_HAS_RT_CORBA == 1)
 
-  // Connector protocol properties are obtained from ORB-level 
+  // Connector protocol properties are obtained from ORB-level
   // RTCORBA::ClientProtocolProperties policy override.
   // If the override doesn't exist or doesn't contain the
   // properties, we use ORB default.
@@ -787,7 +792,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   CORBA::Object_var auto_release = client_protocols;
   RTCORBA::TCPProtocolProperties_var tcp_properties =
     RTCORBA::TCPProtocolProperties::_nil ();
-  
+
     if (client_protocols != 0)
     {
       RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep ();
@@ -808,7 +813,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
     {
       // No tcp properties in ORB-level override.  Use ORB defaults.
       // Orb defaults should never be null - they were initialized by
-      // the ORB_Core. 
+      // the ORB_Core.
       client_protocols = this->orb_core_->default_client_protocol ();
       auto_release = client_protocols;
       RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep ();
@@ -835,7 +840,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
 #else /* TAO_HAS_RT_CORBA == 1 */
 
   // Without RTCORBA, protocol configuration properties come from ORB
-  // options. 
+  // options.
   this->tcp_properties_.send_buffer_size =
     this->orb_core_->orb_params ()->sock_sndbuf_size ();
   this->tcp_properties_.recv_buffer_size =
diff --git a/TAO/tao/SHMIOP_Connector.cpp b/TAO/tao/SHMIOP_Connector.cpp
index a0983a9255b..a1edfd21874 100644
--- a/TAO/tao/SHMIOP_Connector.cpp
+++ b/TAO/tao/SHMIOP_Connector.cpp
@@ -179,7 +179,7 @@ template class ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY,
 
 template class ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) 
+#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
 #if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
 template class ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
 template class ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
@@ -266,7 +266,7 @@ template class ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_C
 
 #pragma instantiate ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) 
+#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
 #if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
 
 #pragma instantiate ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
@@ -442,6 +442,11 @@ TAO_SHMIOP_Connector::connect (TAO_Endpoint *endpoint,
                                ACE_Time_Value *max_wait_time,
                                CORBA::Environment &)
 {
+  if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
+                  ACE_TEXT ("looking for SHMIOP connection.\n")));
+
   if (endpoint->tag () != TAO_TAG_SHMEM_PROFILE)
     return -1;
 
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index 4b03784faf3..20920ab86b0 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -469,6 +469,11 @@ TAO_UIOP_Connector::connect (TAO_Endpoint *endpoint,
                              ACE_Time_Value *max_wait_time,
                              CORBA::Environment &)
 {
+  if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
+                  ACE_TEXT ("looking for UIOP connection.\n")));
+
   if (endpoint->tag () != TAO_TAG_UIOP_PROFILE)
     return -1;
 
diff --git a/TAO/tests/Endpoint_Per_Priority/client.cpp b/TAO/tests/Endpoint_Per_Priority/client.cpp
index 779ba891013..8a65d939b03 100644
--- a/TAO/tests/Endpoint_Per_Priority/client.cpp
+++ b/TAO/tests/Endpoint_Per_Priority/client.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(Latency, client, "$Id$")
 
+#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
+
 class Client : public ACE_Task_Base
 {
   // = TITLE
@@ -368,3 +370,14 @@ Client::dump_stats (const char* msg, ACE_UINT32 gsf)
 {
   this->throughput_.dump_results (msg, gsf);
 }
+
+#else /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */
+
+int
+main (int argc, char *argv[])
+{
+  ACE_ERROR_RETURN ((LM_ERROR,
+          "\n TAO::ClientPriorityPolicy must be enabled to run this test!\n"),
+                    1);
+}
+#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */
diff --git a/TAO/tests/Endpoint_Per_Priority/server.cpp b/TAO/tests/Endpoint_Per_Priority/server.cpp
index 3cf0b713314..a47c3fd51d2 100644
--- a/TAO/tests/Endpoint_Per_Priority/server.cpp
+++ b/TAO/tests/Endpoint_Per_Priority/server.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(TPP, server, "$Id$")
 
+#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
+
 const char *ior_output_file = "test.ior";
 int nthreads = 1;
 
@@ -149,3 +151,14 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+#else /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */
+
+int
+main (int argc, char *argv[])
+{
+  ACE_ERROR_RETURN ((LM_ERROR,
+          "\n TAO::ClientPriorityPolicy must be enabled to run this test!\n"),
+                    1);
+}
+#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */