aboutsummaryrefslogtreecommitdiff
path: root/stdlib/cxa_finalize.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-07-26 07:27:20 +0000
committerUlrich Drepper <drepper@redhat.com>2006-07-26 07:27:20 +0000
commita92b1166e524c44266493c972c89191d52f5c604 (patch)
treec4fa1d732a8c7e82e1f309d97207299758f9e802 /stdlib/cxa_finalize.c
parentbd3754dcf6aae7132b5b9959b3e0907475b42f62 (diff)
downloadglibc-a92b1166e524c44266493c972c89191d52f5c604.zip
glibc-a92b1166e524c44266493c972c89191d52f5c604.tar.gz
glibc-a92b1166e524c44266493c972c89191d52f5c604.tar.bz2
* stdlib/cxa_atexit.c (__new_exitfn_called): New variable.
(__new_exitfn): Bump it in every successful call. * stdlib/cxa_finalize.c (__cxa_finalize): If destructor registered more exit handlers, call them right away. * stdlib/exit.h: Declare __new_exitfn_called.
Diffstat (limited to 'stdlib/cxa_finalize.c')
-rw-r--r--stdlib/cxa_finalize.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c
index b013be8..bb49f36 100644
--- a/stdlib/cxa_finalize.c
+++ b/stdlib/cxa_finalize.c
@@ -31,6 +31,7 @@ __cxa_finalize (void *d)
{
struct exit_function_list *funcs;
+ restart:
for (funcs = __exit_funcs; funcs; funcs = funcs->next)
{
struct exit_function *f;
@@ -38,17 +39,26 @@ __cxa_finalize (void *d)
for (f = &funcs->fns[funcs->idx - 1]; f >= &funcs->fns[0]; --f)
{
void (*cxafn) (void *arg, int status);
+ void *cxaarg;
if ((d == NULL || d == f->func.cxa.dso_handle)
/* We don't want to run this cleanup more than once. */
&& (cxafn = f->func.cxa.fn,
+ cxaarg = f->func.cxa.arg,
! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free,
ef_cxa)))
{
+ uint64_t check = __new_exitfn_called;
+
#ifdef PTR_DEMANGLE
PTR_DEMANGLE (cxafn);
#endif
- cxafn (f->func.cxa.arg, 0);
+ cxafn (cxaarg, 0);
+
+ /* It is possible that that last exit function registered
+ more exit functions. Start the loop over. */
+ if (__builtin_expect (check != __new_exitfn_called, 0))
+ goto restart;
}
}
}