diff options
| -rw-r--r-- | ACE-install.sh | 8 | ||||
| -rw-r--r-- | ChangeLog-97a | 10 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | ace/Connector.cpp | 34 | ||||
| -rw-r--r-- | ace/Service_Repository.cpp | 4 | ||||
| -rw-r--r-- | apps/JAWS/Makefile | 2 |
6 files changed, 40 insertions, 22 deletions
diff --git a/ACE-install.sh b/ACE-install.sh index f0cf3f9967b..538d5d69af7 100644 --- a/ACE-install.sh +++ b/ACE-install.sh @@ -96,7 +96,7 @@ # ######################################################################### # -ACE_ERRORFILE=/tmp/myacemaker.err +ACE_ERRFILE=/tmp/myacemaker.err OLD_ACE_TAR_FILE=oldACE.tar OLD_ACE_GZIPPED_TAR_FILE=oldACE.tar.gz USAGE="<Usage> : myacemaker [ auto ]" @@ -109,7 +109,7 @@ USAGE="<Usage> : myacemaker [ auto ]" # Directory where ACE-x.x.xx.tar.gz is located -MY_ACEDIR=~/aceconfig +MY_ACEDIR=${HOME}/aceconfig ####################################################### # Platform specific config file in ${WRAPPER_ROOT}/ace/ @@ -243,7 +243,7 @@ echo "" cd ${WRAPPER_ROOT}/ace -if [ ! $MY_ACE_CONFIG ] +if [ ${MY_ACE_CONFIG:-undefined} = undefined ] then if [ $AUTO -eq 1 ] @@ -286,7 +286,7 @@ echo "" cd ${WRAPPER_ROOT}/include/makeinclude -if [ ! $MY_ACE_GNU_MACROS ] +if [ ${MY_ACE_GNU_MACROS:-undefined} = undefined ] then if [ $AUTO -eq 1 ] diff --git a/ChangeLog-97a b/ChangeLog-97a index 7172d3e2b68..4467914c98d 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -32,6 +32,16 @@ Thu Feb 27 17:06:12 1997 <harrison@samba.cs.wustl.edu> ACE_OS::gethrtime and converts to an ACE_Time_Value based on the global_static_factor. +Wed Feb 26 18:28:35 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ACE-install.sh: Added some fixes for the ACE-install.sh script. + Thanks to Eugene R. Somdahl <gene@endo.com> for reporting these. + + * ace/Connector.cpp (handle_close): Added a test to see if the + reactor_ is NULL and if it is, don't bother trying to use it to + clean up. Thanks to Paul Han <phan@CCGATE.HAC.COM> for this + suggestion. + Tue Feb 25 21:19:57 1997 David L. Levine <levine@cs.wustl.edu> * ace/OS.h,config-sunos*.h: default ACE_TIMER_SKEW to 0, @@ -477,8 +477,10 @@ Paul Roman <proman@npac.syr.edu> Dave Mayerhoefer <m210229@svappl36.mdc.com> Bert Craytor <Bert_Craytor@peoplesoft.com> Joey Zhu <joey.zhu@wcom.com> -Arthur J. Lewis" <hfdh99a@prodigy.com> +Arthur J. Lewis <hfdh99a@prodigy.com> Michael R. MacFaden" <mrm@cisco.com> +Eugene R. Somdahl <gene@endo.com> +Paul Han <phan@CCGATE.HAC.COM> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive diff --git a/ace/Connector.cpp b/ace/Connector.cpp index 03fa643dfc8..76d20b2f1b3 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -441,28 +441,32 @@ template <class SH, PR_CO_1> int ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::handle_close"); - // Remove all timer objects from the Reactor's Timer_Queue. - this->reactor_->cancel_timer (this); - MAP_ITERATOR mi (this->handler_map_); + if (this->reactor_ != 0) + { + // Remove all timer objects from the Reactor's Timer_Queue. + this->reactor_->cancel_timer (this); - // Iterate through the map and shut down all the pending handlers. + MAP_ITERATOR mi (this->handler_map_); - for (MAP_ENTRY *me = 0; - mi.next (me) != 0; - mi.advance ()) - { - this->reactor_->remove_handler (me->ext_id_, - mask | ACE_Event_Handler::DONT_CALL); + // Iterate through the map and shut down all the pending handlers. - AST *ast = 0; - this->cleanup_AST (me->ext_id_, ast); - ACE_ASSERT (ast == me->int_id_); - delete me->int_id_; + for (MAP_ENTRY *me = 0; + mi.next (me) != 0; + mi.advance ()) + { + this->reactor_->remove_handler (me->ext_id_, + mask | ACE_Event_Handler::DONT_CALL); + + AST *ast = 0; + this->cleanup_AST (me->ext_id_, ast); + ACE_ASSERT (ast == me->int_id_); + delete me->int_id_; + } } + return 0; } - template <class SH, PR_CO_1> int ACE_Connector<SH, PR_CO_2>::fini (void) { diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp index 2a93d18329a..ce544b44864 100644 --- a/ace/Service_Repository.cpp +++ b/ace/Service_Repository.cpp @@ -62,7 +62,9 @@ ACE_Service_Repository::close (void) if (this->service_vector_ != 0) { - for (int i = 0; i < this->current_size_; i++) + // Make sure to remove the services in the reverse order in + // which they were added. + for (int i = this->current_size_ - 1; i >= 0; i--) { ACE_DEBUG ((LM_DEBUG, "shutting down %s\n", this->service_vector_[i]->name ())); diff --git a/apps/JAWS/Makefile b/apps/JAWS/Makefile index e329b8a39fe..7751f162758 100644 --- a/apps/JAWS/Makefile +++ b/apps/JAWS/Makefile @@ -1,7 +1,7 @@ #---------------------------------------------------------------------------- # %W% %G% # -# Makefile for a test of the miscellaneous Service_Config examples +# Makefile for the ACE Adapter Web Server (JAWS) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- |