diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-23 10:12:12 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-23 10:12:12 +0000 |
| commit | 88d126bd1814e8a203c2806b18d288473e0ea52e (patch) | |
| tree | 9b095ed7729c7dff209cc87230a6d4c5d4c2413f | |
| parent | e5d92c3b29e701262617bc8c54d963bffb3eaea6 (diff) | |
| download | ATCD-88d126bd1814e8a203c2806b18d288473e0ea52e.tar.gz | |
ChangeLogTag:Fri Jul 23 03:10:31 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 9 | ||||
| -rw-r--r-- | ace/Cached_Connect_Strategy_T.cpp | 28 | ||||
| -rw-r--r-- | ace/Strategies_T.cpp | 18 |
3 files changed, 31 insertions, 24 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 7adca2c4e97..1a6ed861b3c 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,4 +1,11 @@ -Fri Jul 23 00:07:38 1999 Irfan Pyarali <irfan@cs.wustl.edu> +Fri Jul 23 03:10:31 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Strategies_T.cpp (find_or_create_svc_handler_i): + * ace/Cached_Connect_Strategy_T.cpp (cached_connect): + + I had added the new_connection() method that lets go of the lock + for the duration of the connect(), but forgot to use it in the + above functions ;) It should be fine now. * tests/Cached_Conn_Test.cpp (cached_connect): * tests/Cached_Accept_Conn_Test.cpp (cached_connect): diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp index 925b003d23e..9a555c7922a 100644 --- a/ace/Cached_Connect_Strategy_T.cpp +++ b/ace/Cached_Connect_Strategy_T.cpp @@ -228,13 +228,13 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh, { // Actively establish the connection. This is a timed blocking // connect. - if (this->CONNECT_STRATEGY::connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) + if (this->new_connection (sh, + remote_addr, + timeout, + local_addr, + reuse_addr, + flags, + perms) == -1) { // If connect() failed because of timeouts, we have to reject // the connection entirely. This is necessary since currently @@ -255,13 +255,13 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh, return -1; // Try connecting again. - if (this->CONNECT_STRATEGY::connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) + if (this->new_connection (sh, + remote_addr, + timeout, + local_addr, + reuse_addr, + flags, + perms) == -1) { if (errno == EWOULDBLOCK) errno = ENOTSUP; diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index f435942e284..9185bf10b2d 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -608,13 +608,13 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c // Actively establish the connection. This is a timed blocking // connect. - if (this->CONNECT_STRATEGY::connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) + if (this->new_connection (sh, + remote_addr, + timeout, + local_addr, + reuse_addr, + flags, + perms) == -1) { // If connect() failed because of timeouts, we have to // reject the connection entirely. This is necessary since @@ -629,8 +629,8 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c { // Insert the new SVC_HANDLER instance into the cache. if (this->connection_map_.bind (search_addr, - sh, - entry) == -1) + sh, + entry) == -1) return -1; // Set the recycler and the recycling act |