JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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:
Christopher Faylor 2010-03-28 17:27:52 +00:00
parent 84fef941e8
commit c019a66c32
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -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> 2010-03-27 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__set_charset_from_locale): Set default charset for * nlsfuncs.cc (__set_charset_from_locale): Set default charset for

1
winsup/cygwin/dcrt0.cc
View File

@ -1127,6 +1127,7 @@ cygwin_atexit (void (*fn) (void))
extern "C" void extern "C" void
cygwin_exit (int n) cygwin_exit (int n)
{ {
exit_state = ES_EXIT_STARTING;
exit (n); exit (n);
} }

6
winsup/cygwin/dll_init.cc
View File

@ -164,7 +164,7 @@ void
dll_list::detach (void *retaddr) dll_list::detach (void *retaddr)
{ {
dll *d; dll *d;
if (!myself || exit_state || !(d = find (retaddr))) if (!myself || !(d = find (retaddr)))
return; return;
if (d->count <= 0) if (d->count <= 0)
system_printf ("WARNING: trying to detach an already detached dll ..."); 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 */ /* Ensure our exception handler is enabled for destructors */
exception protect; exception protect;
__cxa_finalize (d); /* Call finalize function if we are not already exiting */
if (!exit_state)
__cxa_finalize (d);
d->run_dtors (); d->run_dtors ();
d->prev->next = d->next; d->prev->next = d->next;
if (d->next) if (d->next)

1
winsup/cygwin/globals.cc
View File

@ -30,6 +30,7 @@ int NO_COPY sigExeced;
enum exit_states enum exit_states
{ {
ES_NOT_EXITING = 0, ES_NOT_EXITING = 0,
ES_EXIT_STARTING,
ES_PROCESS_LOCKED, ES_PROCESS_LOCKED,
ES_EVENTS_TERMINATE, ES_EVENTS_TERMINATE,
ES_THREADTERM, ES_THREADTERM,