From 9f03a61ed81df9657957b682c90396e9b4f51961 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 3 Feb 2009 15:07:54 +0000 Subject: Tue Feb 3 15:07:12 UTC 2009 Johnny Willemsen * tao/Cache_Entries_T.h: * tao/Cache_Entries_T.inl: Removed ENTRY_IDLE_BUT_NOT_PURGABLE state. This was the initial state a transport was set when it got connected, but this prevents the transport to get purged when the cache is getting full. When the server has been called by a lot of clients but didn't make invocations back we have a lot of transports with this state and at the end the cache got full. The disadvantage is that when we have a transport that has been connected but not used until now it gets purged, when we then need it again we have to recreate it. * tao/Exclusive_TMS.cpp: * tao/Exclusive_TMS.h: * tao/Muxed_TMS.cpp: * tao/Muxed_TMS.h: * tao/Transport_Mux_Strategy.h: Added a has_request, the TMS does now if we have pending requests on a transport. When a transport has pending request we can't purge it. * tao/IIOP_Connection_Handler.cpp: * tao/Strategies/SCIOP_Connection_Handler.cpp: * tao/Strategies/SHMIOP_Connection_Handler.cpp: * tao/Strategies/UIOP_Connection_Handler.cpp: * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Call cache_transport instead of cache_idle_transport * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Fixed unicode logging issue * tao/Transport.cpp: * tao/Transport.h: Added can_be_purged that is used by the TCM * tao/Transport_Cache_Manager_T.cpp: * tao/Transport_Cache_Manager_T.h: * tao/Transport_Cache_Manager_T.inl: Updated for the removed state and when selecting the transports that can be purged also check the can_be_purged on the transport * tao/Transport_Connector.cpp: Unicode fix * tests/Transport_Cache_Manager/Bug_3558_Regression.cpp: * tests/Transport_Cache_Manager/mock_transport.h: Updated for TCM/Transport changes --- TAO/tao/Cache_Entries_T.inl | 1 - 1 file changed, 1 deletion(-) (limited to 'TAO/tao/Cache_Entries_T.inl') diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl index c462624f9ae..ee32589c8db 100644 --- a/TAO/tao/Cache_Entries_T.inl +++ b/TAO/tao/Cache_Entries_T.inl @@ -89,7 +89,6 @@ namespace TAO switch (st) { TAO_CACHE_INTID_ENTRY (ENTRY_IDLE_AND_PURGABLE); - TAO_CACHE_INTID_ENTRY (ENTRY_IDLE_BUT_NOT_PURGABLE); TAO_CACHE_INTID_ENTRY (ENTRY_PURGABLE_BUT_NOT_IDLE); TAO_CACHE_INTID_ENTRY (ENTRY_BUSY); TAO_CACHE_INTID_ENTRY (ENTRY_CLOSED); -- cgit v1.2.1