diff options
author | wilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-08-01 21:21:13 +0000 |
---|---|---|
committer | wilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-08-01 21:21:13 +0000 |
commit | 4e8e0e539a1833eef607958a20f9aa95d39f0def (patch) | |
tree | ea911d694c6c3c41c0ff4e39e0ba13138959b39b | |
parent | f968d515641f906b02e9f598277b0c29be225799 (diff) | |
download | ATCD-4e8e0e539a1833eef607958a20f9aa95d39f0def.tar.gz |
ChangeLogTag: Wed Aug 1 21:16:15 UTC 2007 Dale Wilson <wilsond@ociweb.com>
-rw-r--r-- | TAO/ChangeLog | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Cache_Entries.h | 3 | ||||
-rw-r--r-- | TAO/tao/Profile_Transport_Resolver.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Transport_Cache_Manager.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Transport_Cache_Manager.h | 6 | ||||
-rw-r--r-- | TAO/tao/Transport_Connector.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/Transport_Connector.h | 2 | ||||
-rw-r--r-- | TAO/tests/AMH_Oneway/client.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_1476_Test/client.cpp | 2 |
10 files changed, 32 insertions, 17 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b7945196df4..e06d7305223 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Wed Aug 1 21:16:15 UTC 2007 Dale Wilson <wilsond@ociweb.com> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * tao/Cache_Entries.h: + * tao/Profile_Transport_Resolver.cpp: + * tao/Transport_Cache_Manager.h: + * tao/Transport_Cache_Manager.cpp: + * tao/Transport_Connector.h: + * tao/Transport_Connector.cpp: + * tests/AMH_Oneway/client.cpp: + * tests/Bug_1476_Test/client.cpp: + Jonnny's suggestions + Change find_transport's busy_count argument from unsigned int + to size_t + Use @todo rather than @@TODO -- reference bugzilla entrys to track the todos. + Wed Aug 1 15:54:01 UTC 2007 Dale Wilson <wilsond@ociweb.com> Corrections for bugs #2934 and #2935: connection problems in the transport cache. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index ec1e87b32be..e0c8500400a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -480,7 +480,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( } // Check the Cache first for connections - unsigned int busy_count = 0; //not used + size_t busy_count = 0; //not used but needed for the call if (this->orb_core ()->lane_resources ().transport_cache ().find_transport ( desc, transport, diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h index e085b3916c0..3522ef8e92c 100644 --- a/TAO/tao/Cache_Entries.h +++ b/TAO/tao/Cache_Entries.h @@ -34,8 +34,7 @@ class TAO_Transport; namespace TAO { /// States of a recyclable object. - /// @@todo: A lifecycle needs to be designed. It can wait for - /// sometime. + /// @todo: see discussion in bugzilla 3024 enum Cache_Entries_State { /// Idle and can be purged. diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 9d1a7e1d829..1ad9f9cbfc1 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -251,7 +251,7 @@ namespace TAO // the cache increments the reference count on the transport if // the find is successful. We want to return a "boolean" of 0 for // failure, 1 for success. - unsigned int busy_count; + size_t busy_count; TAO_Transport* tmp = this->transport_.get (); if (cache.find_transport(desc, tmp, busy_count) != Transport_Cache_Manager::CACHE_FOUND_AVAILABLE) diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index ca19193907a..cb3a6e8f708 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -152,7 +152,7 @@ namespace TAO Transport_Cache_Manager::find_transport ( TAO_Transport_Descriptor_Interface *prop, TAO_Transport *&transport, - unsigned int &busy_count) + size_t &busy_count) { if (prop == 0) { @@ -204,7 +204,7 @@ namespace TAO Transport_Cache_Manager::Find_Result Transport_Cache_Manager::find (const Cache_ExtId &key, Cache_IntId &value, - unsigned int &busy_count) + size_t &busy_count) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, @@ -227,7 +227,7 @@ namespace TAO Transport_Cache_Manager::Find_Result Transport_Cache_Manager::find_i (const Cache_ExtId &key, Cache_IntId &value, - unsigned int & busy_count) + size_t & busy_count) { HASH_MAP_ENTRY *entry = 0; busy_count = 0; diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h index dde61213823..d3f33ee404b 100644 --- a/TAO/tao/Transport_Cache_Manager.h +++ b/TAO/tao/Transport_Cache_Manager.h @@ -115,7 +115,7 @@ namespace TAO /// in the Cache and return the connection Find_Result find_transport (TAO_Transport_Descriptor_Interface *prop, TAO_Transport *&transport, - unsigned int & busy_count); + size_t & busy_count); /// Remove entries from the cache depending upon the strategy. int purge (void); @@ -168,7 +168,7 @@ namespace TAO /// implementation function find_i. Find_Result find (const Cache_ExtId &key, Cache_IntId &value, - unsigned int & busy_count); + size_t & busy_count); /** * Non-Locking version and actual implementation of bind () @@ -189,7 +189,7 @@ namespace TAO */ Find_Result find_i (const Cache_ExtId &key, Cache_IntId &value, - unsigned int & busy_count); + size_t & busy_count); /// Non-locking version and actual implementation of make_idle (). int make_idle_i (HASH_MAP_ENTRY *&entry); diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 46fade68adf..4a507981501 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -281,7 +281,7 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, ep = ep->next_filtered(this->orb_core(),root_ep)) { TAO_Base_Transport_Property desc2(ep,0); - unsigned int busy_count = 0; + size_t busy_count = 0; if (tcm.find_transport (&desc2, base_transport, busy_count) == TAO::Transport_Cache_Manager::CACHE_FOUND_AVAILABLE ) @@ -449,7 +449,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, // Find a connection in the cache // If transport found, reference count is incremented on assignment TAO_Transport *base_transport = 0; - unsigned int busy_count = 0; + size_t busy_count = 0; TAO::Transport_Cache_Manager::Find_Result found = tcm.find_transport (desc, base_transport, @@ -533,7 +533,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, } else { - // @@TODO: This is not the right place for this! + // @todo: This is not the right place for this! (bugzilla 3023) // Purge connections (if necessary) tcm.purge (); @@ -864,7 +864,7 @@ TAO_Connector::create_connect_strategy (void) } bool -TAO_Connector::new_connection_is_ok (unsigned int busy_count) +TAO_Connector::new_connection_is_ok (size_t busy_count) { if (orb_core_ == 0) return true; diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 29d50a6d705..b2ec8307a46 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -189,7 +189,7 @@ protected: ACE_Time_Value *timeout); /// See if a new connection is allowed - bool new_connection_is_ok (unsigned int busy_count); + bool new_connection_is_ok (size_t busy_count); /// Wait for a transport to be connected /// Note: no longer changes transport reference count diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp index fc77aa5f1a1..b64b101bc70 100644 --- a/TAO/tests/AMH_Oneway/client.cpp +++ b/TAO/tests/AMH_Oneway/client.cpp @@ -63,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy(); // The following sleep is a workaround for a defect in the Windows // implementation of sockets (Win XP) - // The when this client exits after writing to a localhost socket + // When this client exits after writing to a localhost socket // Windows discards any data that has not been read by the server. // The sleep gives the server time to catch up. num_calls/2 gives // it half a second per request which *really* should be overkill, but diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp index 0ddc58c4793..fafecd8ec1e 100644 --- a/TAO/tests/Bug_1476_Test/client.cpp +++ b/TAO/tests/Bug_1476_Test/client.cpp @@ -183,7 +183,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) 1); } - unsigned int busy_count = 0; + size_t busy_count = 0; TAO::Transport_Cache_Manager::Find_Result find_result = tcm.find_transport (&desc, transport, busy_count); |