backport from upstream:

2001-04-10  Ulrich Drepper  <drepper@redhat.com>

    * join.c (pthread_exit): Move code to new function __pthread_do_exit
    which takes an extra parameter with the current frame pointer.
    Call new function with CURRENT_STACK_FRAME.
    (__pthread_do_exit): New function.  Call __pthread_perform_cleanup
    with the new parameter.
    (pthread_join): Call __pthread_do_exit instead of pthread_exit.
    * cancel.c (__pthread_perform_cleanup): Takes extra parameter.  Use
    this parameter as the initial value the cleanup handler records are
    compared against.  No active cleanup handler record must have an
    address lower than the previous one and the initial record must be
    above (below on PA) the frame address passed in.
    (pthread_setcancelstate): Call __pthread_do_exit instead of
    pthread_exit.
    (pthread_setcanceltype): Likewise.
    (pthread_testcancel): Likewise.
    (_pthread_cleanup_pop_restore): Likewise.
    * condvar.c (pthread_cond_wait): Likewise.
    (pthread_cond_timedwait_relative): Likewise.
    * manager.c (pthread_start_thread): Likewise.
    * oldsemaphore.c (__old_sem_wait): Likewise.
    * pthread.c (pthread_handle_sigcancel): Likewise.
    * semaphore.c (__new_sem_wait): Likewise.
    (sem_timedwait): Likewise.
    * ptlongjmp.c (pthread_cleanup_upto): Also use current stack frame
    to limit the cleanup handlers which get run.
    * internals.h: Add prototype for __pthread_do_exit.  Adjust prototype
    for __pthread_perform_cleanup.

1 files changed, 21 insertions, 6 deletions

diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c
index 25b098dd5..ac66c5855 100644
--- a/libpthread/linuxthreads.old/cancel.c
+++ b/libpthread/linuxthreads.old/cancel.c
@@ -25,6 +25,9 @@
 #include <rpc/rpc.h>
 extern void __rpc_thread_destroy(void);
 #endif
+#include <bits/stackinfo.h>
+
+#include <stdio.h>
 
 #ifdef _STACK_GROWS_DOWN
 # define FRAME_LEFT(frame, other) ((char *) frame >= (char *) other)
@@ -45,7 +48,7 @@ int pthread_setcancelstate(int state, int * oldstate)
   if (THREAD_GETMEM(self, p_canceled) &&
       THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
       THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    pthread_exit(PTHREAD_CANCELED);
+    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
   return 0;
 }
 
@@ -59,7 +62,7 @@ int pthread_setcanceltype(int type, int * oldtype)
   if (THREAD_GETMEM(self, p_canceled) &&
       THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
       THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    pthread_exit(PTHREAD_CANCELED);
+    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
   return 0;
 }
 
@@ -126,7 +129,7 @@ void pthread_testcancel(void)
   pthread_descr self = thread_self();
   if (THREAD_GETMEM(self, p_canceled)
       && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)
-    pthread_exit(PTHREAD_CANCELED);
+    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
 }
 
 void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer,
@@ -173,15 +176,27 @@ void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer,
   if (THREAD_GETMEM(self, p_canceled) &&
       THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
       THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    pthread_exit(PTHREAD_CANCELED);
+    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
 }
 
-void __pthread_perform_cleanup(void)
+void __pthread_perform_cleanup(char *currentframe)
 {
   pthread_descr self = thread_self();
   struct _pthread_cleanup_buffer * c;
+
   for (c = THREAD_GETMEM(self, p_cleanup); c != NULL; c = c->__prev)
-    c->__routine(c->__arg);
+    {
+#if _STACK_GROWS_DOWN
+      if ((char *) c <= currentframe)
+	break;
+#elif _STACK_GROWS_UP
+      if ((char *) c >= currentframe)
+	break;
+#else
+# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
+#endif
+      c->__routine(c->__arg);
+    }
 
 #ifdef __UCLIBC_HAS_RPC__
   /* And the TSD which needs special help.  */