diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-22 01:29:51 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-22 01:29:51 +0000 |
| commit | db30d5ea397f7870929a40096eee23e040249aea (patch) | |
| tree | 9f0ebb4e962940cb44a5dac9007a3dadd4226754 | |
| parent | b4adf5e7dde25f2c53513fed33eb5511e5f64d5c (diff) | |
| download | ATCD-db30d5ea397f7870929a40096eee23e040249aea.tar.gz | |
ChangeLogTag:Wed May 21 19:57:31 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 20 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Acceptor.cpp | 7 |
2 files changed, 21 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 843ae0f5b36..4004ebdeb76 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,12 +1,18 @@ +Wed May 21 19:57:31 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/Strategies/SHMIOP_Acceptor.cpp (open_i): Changed to use the + new init_buffer_size in ACE_MEM_Stream to set the initial + MEM_Stream buffer size. + Tue May 20 21:49:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * tao/DynamicInterface/Request.cpp (invoke): Added an extra check + * tao/DynamicInterface/Request.cpp (invoke): Added an extra check for null Any_Impl pointers before going ahead with the _tao_decode () call. Tue May 20 16:56:54 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * tao/ObjectKey_Table.cpp: Added explicit template instantiation. + * tao/ObjectKey_Table.cpp: Added explicit template instantiation. Tue May 20 13:56:43 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> @@ -743,6 +749,15 @@ Wed May 7 22:49:05 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> Wed May 07 22:32:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> +<<<<<<< ChangeLog + * tao/Connection_Handler.cpp (svc_i): Incremented the refcount of + the connection handler before calling the handle_input_i () on + the transport. The pattern should be the same as that in + TAO_Connection_Handler::handle_input_eh (), where the transport + is updated and the refcount on the handler is incremented. This + change should fix problems with servers crashing if remote peers + dissappears under thread-per-connection strategy. +======= * tao/Connection_Handler.cpp (svc_i): Incremented the refcount of the connection handler before calling the handle_input_i () on the transport. The pattern should be the same as that in @@ -750,6 +765,7 @@ Wed May 07 22:32:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> is updated and the refcount on the handler is incremented. This change should fix problems with servers crashing if remote peers dissappears under thread-per-connection strategy. +>>>>>>> 1.1798 Thanks to Ira Burton <imburton@micron.com> for reporting this problem. diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 1439e57f553..8b71f089187 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -16,8 +16,8 @@ #include "SHMIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Strategies, - SHMIOP_Acceptor, +ACE_RCSID (Strategies, + SHMIOP_Acceptor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -313,8 +313,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, } this->base_acceptor_.acceptor().mmap_prefix (this->mmap_file_prefix_); - this->base_acceptor_.acceptor().malloc_options ().minimum_bytes_ - = this->mmap_size_; + this->base_acceptor_.acceptor().init_buffer_size (this->mmap_size_); if (orb_core->server_factory ()->activate_server_connections () != 0) this->base_acceptor_.acceptor().preferred_strategy (ACE_MEM_IO::MT); |