* globals.cc (exit_status): Add new ES_EXIT_STARTING enum.
* dcrt0.cc (cygwin_exit): Set exit_state to ES_EXIT_STARTING prior to calling real exit. * dll_init.cc (dll_list::detach): Remove dll from linked list and call destructors even if exiting. Don't call __cxa_finalize in exiting case.
This commit is contained in:
parent
84fef941e8
commit
c019a66c32
|
@ -1,3 +1,11 @@
|
|||
2010-03-28 Christopher Faylor <me+cygwin@cgf.cx>
|
||||
|
||||
* globals.cc (exit_status): Add new ES_EXIT_STARTING enum.
|
||||
* dcrt0.cc (cygwin_exit): Set exit_state to ES_EXIT_STARTING prior to
|
||||
calling real exit.
|
||||
* dll_init.cc (dll_list::detach): Remove dll from linked list and call
|
||||
destructors even if exiting. Don't call __cxa_finalize in exiting case.
|
||||
|
||||
2010-03-27 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* nlsfuncs.cc (__set_charset_from_locale): Set default charset for
|
||||
|
|
|
@ -1127,6 +1127,7 @@ cygwin_atexit (void (*fn) (void))
|
|||
extern "C" void
|
||||
cygwin_exit (int n)
|
||||
{
|
||||
exit_state = ES_EXIT_STARTING;
|
||||
exit (n);
|
||||
}
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ void
|
|||
dll_list::detach (void *retaddr)
|
||||
{
|
||||
dll *d;
|
||||
if (!myself || exit_state || !(d = find (retaddr)))
|
||||
if (!myself || !(d = find (retaddr)))
|
||||
return;
|
||||
if (d->count <= 0)
|
||||
system_printf ("WARNING: trying to detach an already detached dll ...");
|
||||
|
@ -172,7 +172,9 @@ dll_list::detach (void *retaddr)
|
|||
{
|
||||
/* Ensure our exception handler is enabled for destructors */
|
||||
exception protect;
|
||||
__cxa_finalize (d);
|
||||
/* Call finalize function if we are not already exiting */
|
||||
if (!exit_state)
|
||||
__cxa_finalize (d);
|
||||
d->run_dtors ();
|
||||
d->prev->next = d->next;
|
||||
if (d->next)
|
||||
|
|
|
@ -30,6 +30,7 @@ int NO_COPY sigExeced;
|
|||
enum exit_states
|
||||
{
|
||||
ES_NOT_EXITING = 0,
|
||||
ES_EXIT_STARTING,
|
||||
ES_PROCESS_LOCKED,
|
||||
ES_EVENTS_TERMINATE,
|
||||
ES_THREADTERM,
|
||||
|
|
Loading…
Reference in New Issue