aboutsummaryrefslogtreecommitdiff
path: root/stdlib
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
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')
-rw-r--r--stdlib/cxa_atexit.c8
-rw-r--r--stdlib/cxa_finalize.c12
-rw-r--r--stdlib/exit.h5
3 files changed, 21 insertions, 4 deletions
diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c
index 9b7a932..3bdf871 100644
--- a/stdlib/cxa_atexit.c
+++ b/stdlib/cxa_atexit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -56,6 +56,7 @@ __libc_lock_define_initialized (static, lock)
static struct exit_function_list initial;
struct exit_function_list *__exit_funcs = &initial;
+uint64_t __new_exitfn_called;
struct exit_function *
__new_exitfn (void)
@@ -111,7 +112,10 @@ __new_exitfn (void)
/* Mark entry as used, but we don't know the flavor now. */
if (r != NULL)
- r->flavor = ef_us;
+ {
+ r->flavor = ef_us;
+ ++__new_exitfn_called;
+ }
__libc_lock_unlock (lock);
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;
}
}
}
diff --git a/stdlib/exit.h b/stdlib/exit.h
index 055506f..779675d 100644
--- a/stdlib/exit.h
+++ b/stdlib/exit.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1996,1997,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1996,1997,1999,2001,2002,2006
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,6 +20,7 @@
#ifndef _EXIT_H
#define _EXIT_H 1
+#include <stdint.h>
enum
{
@@ -59,5 +61,6 @@ struct exit_function_list
extern struct exit_function_list *__exit_funcs attribute_hidden;
extern struct exit_function *__new_exitfn (void);
+extern uint64_t __new_exitfn_called attribute_hidden;
#endif /* exit.h */