From da63009e0f5ac74b33d8860a764d8103c5f60ec6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 12 Dec 2002 04:46:44 +0000 Subject: Update. * Makefile (tests): Add tst-cleanup1. * tst-cleanup1.c: New file. * cancellation.c (__cleanup_thread): Removed. (__do_cancel): Remove call to __cleanup_thread. * pthreadP.h: Remove __cleanup_thread prorotype. --- nptl/cancellation.c | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'nptl/cancellation.c') diff --git a/nptl/cancellation.c b/nptl/cancellation.c index 3cdc574880..0d0af1c647 100644 --- a/nptl/cancellation.c +++ b/nptl/cancellation.c @@ -42,9 +42,6 @@ __do_cancel (char *currentframe) { struct pthread *self = THREAD_SELF; - /* Cleanup the thread-local storage. */ - __cleanup_thread (self, currentframe); - /* Throw an exception. */ // XXX TBI @@ -55,44 +52,6 @@ __do_cancel (char *currentframe) } -void -__cleanup_thread (struct pthread *self, char *currentframe) -{ - struct _pthread_cleanup_buffer *cleanups; - - /* Call all registered cleanup handlers. */ - cleanups = THREAD_GETMEM (self, cleanup); - if (__builtin_expect (cleanups != NULL, 0)) - { - struct _pthread_cleanup_buffer *last; - - while (FRAME_LEFT (currentframe, cleanups)) - { - last = cleanups; - cleanups = cleanups->__prev; - - if (cleanups == NULL || FRAME_LEFT (last, cleanups)) - { - cleanups = NULL; - break; - } - } - - while (cleanups != NULL) - { - /* Call the registered cleanup function. */ - cleanups->__routine (cleanups->__arg); - - last = cleanups; - cleanups = cleanups->__prev; - - if (FRAME_LEFT (last, cleanups)) - break; - } - } -} - - /* The next two functions are similar to pthread_setcanceltype() but more specialized for the use in the cancelable functions like write(). They do not need to check parameters etc. */ -- cgit v1.2.3