diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2008-05-20 17:56:02 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2008-05-20 17:56:02 +0000 |
commit | 3fa029fbe6d85a28c2aca62d64f39b4d97c61d35 (patch) | |
tree | 84c09b3da2b75e5b43727a94e73a6b0878583300 | |
parent | 5106bc2f9107cc5083193580333d70660d15102f (diff) | |
download | ATCD-3fa029fbe6d85a28c2aca62d64f39b4d97c61d35.tar.gz |
ChangeLogTag: Tue May 20 17:55:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | ACE/ChangeLog | 15 | ||||
-rw-r--r-- | ACE/ace/Acceptor.cpp | 6 | ||||
-rw-r--r-- | ACE/ace/Connector.cpp | 14 | ||||
-rw-r--r-- | ACE/ace/Strategies_T.cpp | 9 | ||||
-rw-r--r-- | ACE/ace/Svc_Handler.h | 6 |
5 files changed, 35 insertions, 15 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index aee0b613dbb..80d3840ed87 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Tue May 20 17:55:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * ace/Svc_Handler.h: + + Added an enum to be used as flags parameter for close(). + + * ace/Acceptor.cpp: + * ace/Connector.cpp: + * ace/Strategies_T.cpp: + + Use the new enum during the call to close() on the service handler + to indicate the circumstances behind the closure. + Tue May 20 09:45:21 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Ping_Socket.{h,cpp}: @@ -37,7 +50,7 @@ Mon May 19 14:19:21 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> Mon May 19 02:53:21 CDT 2008 Johnny Willemsen <jwillemsen@remedy.nl> - * ACE version 5.6.5 released. + * ACE version 5.6.5 released. Fri May 16 10:13:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index 7b7d87c293c..92d21123ece 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -301,7 +301,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler ACE_Errno_Guard error(errno); // Close down handler to avoid memory leaks. - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return -1; } @@ -341,7 +341,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler result = -1; if (result == -1) - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return result; } @@ -1053,7 +1053,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept // Check whether we just timed out or whether we failed... if (!(errno == EWOULDBLOCK || errno == ETIME)) // Close down handler to avoid memory leaks. - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return -1; } // Activate the <svc_handler> using the designated concurrency diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 112fbca4003..a9963edd3c3 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -145,7 +145,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE) // Close Svc_Handler. if (svc_handler != 0) - svc_handler->close (0); + svc_handler->close (NORMAL_CLOSE_OPERATION); return retval; } @@ -233,7 +233,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HAND { // Make sure to close down the <svc_handler> to avoid descriptor // leaks. - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return -1; } else @@ -431,10 +431,10 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i if (sh_copy == 0) { if (sh) - sh->close (0); + sh->close (CLOSE_DURING_NEW_CONNECTION); } else if (*sh_copy) - (*sh_copy)->close (0); + (*sh_copy)->close (CLOSE_DURING_NEW_CONNECTION); } return -1; @@ -571,7 +571,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect reactor_registration_failure: // Close the svc_handler - sh->close (0); + sh->close (CLOSE_DURING_NEW_CONNECTION); return -1; } @@ -617,7 +617,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler this->activate_svc_handler (svc_handler); else // do the svc handler close below... #endif /* ACE_WIN32 */ - svc_handler->close (0); + svc_handler->close (NORMAL_CLOSE_OPERATION); } } @@ -692,7 +692,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) this->cancel (svc_handler); // Close the associated Svc_Handler. - svc_handler->close (0); + svc_handler->close (NORMAL_CLOSE_OPERATION); } return 0; diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index aa3b607d52e..a3845f33237 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -17,6 +17,7 @@ #include "ace/OS_NS_dlfcn.h" #include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" +#include "ace/Svc_Handler.h" #if defined (ACE_OPENVMS) # include "ace/Lib_Find.h" #endif @@ -197,7 +198,7 @@ ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_ha result = -1; if (result == -1) - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return result; } @@ -252,7 +253,7 @@ ACE_Reactive_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handl return this->inherited::activate_svc_handler (svc_handler, arg); if (result == -1) - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return result; } @@ -354,7 +355,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler ACE_Errno_Guard error(errno); // Close down handler to avoid memory leaks. - svc_handler->close (0); + svc_handler->close (CLOSE_DURING_NEW_CONNECTION); return -1; } @@ -777,7 +778,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c entry) == -1) { // Close the svc handler. - potential_handler->close (0); + potential_handler->close (CLOSE_DURING_NEW_CONNECTION); return -1; } diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index c366a30b2f7..741e6102e95 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -31,6 +31,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Forward decls. class ACE_Connection_Recycling_Strategy; +// This enum is used as the flags parameter when calling the close() +// method on the ACE_Svc_Handler. +enum ACE_Svc_Handler_Close { NORMAL_CLOSE_OPERATION = 0x00, + CLOSE_DURING_NEW_CONNECTION = 0x01 + }; + /** * @class ACE_Svc_Handler * |