diff options
Diffstat (limited to 'TAO/tao/IIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 48e26e05b68..0ee63d89218 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -10,37 +10,60 @@ #include "ace/Auto_Ptr.h" #include "tao/RT_Policy_i.h" #include "tao/Base_Connection_Property.h" +#include "ace/Strategies_T.h" ACE_RCSID(tao, IIOP_Connector, "$Id$") +#define TAO_ARHR_INET ARHR<ACE_INET_Addr> + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Node<ACE_INET_Addr>; -template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; template class ACE_Unbounded_Stack<ACE_INET_Addr>; +template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; +template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>; +template class ACE_Hash<TAO_ARHR_INET >; +template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >; + +template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; template class ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; template class ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>; template class ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>; template class ACE_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>; + template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Client_Connection_Handler*>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Node<ACE_INET_Addr> -#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> #pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr> +#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> +#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> > +#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> +#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> > + +#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler> #pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler> #pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler> + #pragma instantiate ACE_Connector<TAO_IIOP_Client_Connection_Handler, ACE_SOCK_Connector> #pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler> #pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> #pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Client_Connection_Handler*> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -171,6 +194,11 @@ TAO_IIOP_Connector::connect (TAO_Base_Connection_Property *prop, } else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) IIOP_Connector::connect ") + ACE_TEXT ("making a new connection \n"))); + // @@ This needs to change in the next round when we implement a // policy that will not allow new connections when a connection // is busy. @@ -195,12 +223,22 @@ TAO_IIOP_Connector::connect (TAO_Base_Connection_Property *prop, remote_address); } + cout << "Did we get here 1" <<endl; // Add the handler to Cache int retval = this->add_handler (prop, svc_handler); - if (retval) + cout << "Did we get here " <<endl; + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) IIOP_Connector::connect ") + ACE_TEXT ("added the new connection to Cache \n"))); + + if (retval != 0 && TAO_debug_level > 0) { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) IIOP_Connector::connect ") + ACE_TEXT ("added the new connection to Cache \n"))); } } |