diff options
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connector.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 56105c78a59..2ce15500d26 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -14,7 +14,7 @@ #include "tao/Environment.h" #include "ace/Auto_Ptr.h" #include "tao/Transport_Cache_Manager.h" -#include "tao/Invocation.h" +#include "tao/Thread_Lane_Resources.h" ACE_RCSID (Strategies, SHMIOP_Connector, @@ -117,8 +117,9 @@ TAO_SHMIOP_Connector::close (void) } int -TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, +TAO_SHMIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc, + TAO_Transport *&transport, + ACE_Time_Value *max_wait_time, CORBA::Environment &) { if (TAO_debug_level > 0) @@ -126,8 +127,6 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, ACE_TEXT ("TAO (%P|%t) Connector::connect - ") ACE_TEXT ("looking for SHMIOP connection.\n"))); - TAO_Transport *&transport = invocation->transport (); - ACE_Time_Value *max_wait_time = invocation->max_wait_time (); TAO_Endpoint *endpoint = desc->endpoint (); if (endpoint->tag () != TAO_TAG_SHMEM_PROFILE) @@ -166,8 +165,8 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // Check the Cache first for connections // If transport found, reference count is incremented on assignment - if (this->orb_core ()->transport_cache ()->find_transport (desc, - base_transport) == 0) + if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc, + base_transport) == 0) { if (TAO_debug_level > 5) ACE_DEBUG ((LM_DEBUG, @@ -183,7 +182,7 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, ACE_TEXT ("making a new connection \n"))); // Purge connections (if necessary) - this->orb_core ()->transport_cache ()->purge (); + this->orb_core ()->lane_resources ().transport_cache ().purge (); // @@ This needs to change in the next round when we implement a // policy that will not allow new connections when a connection @@ -237,8 +236,8 @@ TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation, base_transport = TAO_Transport::_duplicate (svc_handler->transport ()); // Add the handler to Cache int retval = - this->orb_core ()->transport_cache ()->cache_transport (desc, - svc_handler->transport ()); + this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc, + svc_handler->transport ()); if (retval != 0 && TAO_debug_level > 0) { @@ -370,8 +369,8 @@ TAO_SHMIOP_Connector::preconnect (const char *preconnects) // Add the handler to Cache int retval = - this->orb_core ()->transport_cache ()->cache_transport (&prop, - handlers[slot]->transport ()); + this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop, + handlers[slot]->transport ()); successes++; if (retval != 0 && TAO_debug_level > 4) |