diff options
-rw-r--r-- | TAO/ChangeLog-98c | 12 | ||||
-rw-r--r-- | TAO/tao/Connect.cpp | 15 | ||||
-rw-r--r-- | TAO/tao/Connect.h | 12 | ||||
-rw-r--r-- | TAO/tao/Invocation.cpp | 7 | ||||
-rw-r--r-- | TAO/tao/ORB_Core.cpp | 8 |
5 files changed, 38 insertions, 16 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index d25cc1903b5..4b0d1fdcc97 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,15 @@ +Wed Sep 30 15:47:26 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/Connect.h: + * tao/Connect.cpp: + * tao/Invocation.cpp: + Removed some calls to TAO_ORB_Core_instance(), we use the + ORB_Core cached in the Invocation and pass it down to the GIOP + module and eventually to the Client_Connection_Handler. + + * tao/ORB_Core.cpp: + Fixed silly syntax errors. + Wed Sep 30 14:58:16 1998 Darrell Brunsch <brunsch@cs.wustl.edu> * tao/ORB_Core.{h,i}: Had problems with the explicit template diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index 18e3a7da78a..fdc1e8074e1 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -735,7 +735,9 @@ TAO_Client_Connection_Handler::open (void *) } int -TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &, int) +TAO_Client_Connection_Handler::send_request (TAO_ORB_Core *, + TAO_OutputCDR &, + int) { errno = ENOTSUP; return -1; @@ -792,7 +794,8 @@ TAO_Client_Connection_Handler::check_unexpected_data (void) } int -TAO_ST_Client_Connection_Handler::send_request (TAO_OutputCDR &stream, +TAO_ST_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core, + TAO_OutputCDR &stream, int is_twoway) { ACE_FUNCTION_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START); @@ -808,8 +811,6 @@ TAO_ST_Client_Connection_Handler::send_request (TAO_OutputCDR &stream, // connection handler were obtained from a factory, then this could // be dynamically linked in (wouldn't that be cool/freaky?) - TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); - // Send the request int success = (int) TAO_GIOP::send_request (this, stream, @@ -831,7 +832,7 @@ TAO_ST_Client_Connection_Handler::send_request (TAO_OutputCDR &stream, // this method, and simply insure that this method doesn't // return until such time as doing a recv() on the socket would // actually produce fruit. - ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor (); + ACE_Reactor *r = orb_core->reactor (); int ret = 0; @@ -871,7 +872,8 @@ TAO_ST_Client_Connection_Handler::handle_input (ACE_HANDLE) } int -TAO_MT_Client_Connection_Handler::send_request (TAO_OutputCDR &stream, +TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core, + TAO_OutputCDR &stream, int is_twoway) { ACE_FUNCTION_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START); @@ -887,7 +889,6 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_OutputCDR &stream, // connection handler were obtained from a factory, then this could // be dynamically linked in (wouldn't that be cool/freaky?) - TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); if (!is_twoway) { // Send the request diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h index be779cb938d..c40ba466933 100644 --- a/TAO/tao/Connect.h +++ b/TAO/tao/Connect.h @@ -46,7 +46,9 @@ public: virtual int open (void *); // Activation template method. - virtual int send_request (TAO_OutputCDR &stream, int is_twoway); + virtual int send_request (TAO_ORB_Core* orb_core, + TAO_OutputCDR &stream, + int is_twoway); // Send the request in <stream>. If it is a twoway invocation, then // this re-enters the reactor event loop so that incoming requests // can continue to be serviced. This insures that a nested upcall, @@ -87,7 +89,9 @@ public: virtual ~TAO_ST_Client_Connection_Handler (void); - virtual int send_request (TAO_OutputCDR &stream, int is_twoway); + virtual int send_request (TAO_ORB_Core* orb_core, + TAO_OutputCDR &stream, + int is_twoway); // Send the request in <stream>. If it is a twoway invocation, then // this re-enters the reactor event loop so that incoming requests // can continue to be serviced. This insures that a nested upcall, @@ -108,7 +112,9 @@ public: virtual ~TAO_MT_Client_Connection_Handler (void); - virtual int send_request (TAO_OutputCDR &stream, int is_twoway); + virtual int send_request (TAO_ORB_Core* orb_core, + TAO_OutputCDR &stream, + int is_twoway); // Send the request in <stream>. If it is a twoway invocation, then // this re-enters the reactor event loop so that incoming requests // can continue to be serviced. This insures that a nested upcall, diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index cb96ad2e090..5cc50cd7447 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -369,7 +369,8 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, { // Send Request, return on error or if we're done - if (this->data_->handler ()->send_request (this->out_stream_, + if (this->data_->handler ()->send_request (this->orb_core_, + this->out_stream_, is_roundtrip) == -1) { // send_request () closed the connection; we just set the @@ -1038,7 +1039,9 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &env) { // Send Request, return on error or if we're done - if (this->data_->handler ()->send_request (this->out_stream_, 1) == -1) + if (this->data_->handler ()->send_request (this->orb_core_, + this->out_stream_, + 1) == -1) { // send_request () closed the connection; we just set the // handler to 0 here. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 48ebb40eb45..aecae81fd2d 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1505,8 +1505,8 @@ TAO_ORB_Core_instance (void) template void ACE_Convert (const char *, u_int &); # endif /* __GNUG__ */ -template class ACE_Malloc<ACE_MEMORY_POOL,ACE_SYNCH_MUTEX>; -template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MEMORY_POOL,ACE_SYNCH)MUTEX> >; +template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>; +template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >; template class ACE_Env_Value<int>; template class ACE_Env_Value<u_int>; template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>; @@ -1557,8 +1557,8 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Malloc<ACE_MEMORY_POOL,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MEMORY_POOL,ACE_SYNCH)MUTEX> > +#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> > #pragma instantiate ACE_Env_Value<int> #pragma instantiate ACE_Env_Value<u_int> #pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR> |