diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-23 17:18:34 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-23 17:18:34 +0400 |
| commit | dacf4be3fa450920f16fe279e155e861f8cd258a (patch) | |
| tree | acd408af16af639ce0e61716685d8c97cc481a1c /winsup/cygwin/thread.cc | |
| parent | 2ca9ed527e8a18ff402e036174b2b003460fdf06 (diff) | |
* thread.cc (pthread::pop_cleanup_handler): Move setting the cancelstate
to PTHREAD_CANCEL_DISABLE from here...
(pthread::pop_all_cleanup_handlers): ...to here, otherwise any explicit
call to pthread_cleanup_pop disables cancellation for this thread.
Diffstat (limited to 'winsup/cygwin/thread.cc')
| -rw-r--r-- | winsup/cygwin/thread.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index f7ba60a70..bb38ff3ed 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -1069,9 +1069,6 @@ pthread::pop_cleanup_handler (int const execute) mutex.lock (); - /* We will no honor cancels since the thread is exiting. */ - cancelstate = PTHREAD_CANCEL_DISABLE; - if (cleanup_stack != NULL) { __pthread_cleanup_handler *handler = cleanup_stack; @@ -1087,6 +1084,9 @@ pthread::pop_cleanup_handler (int const execute) void pthread::pop_all_cleanup_handlers () { + /* We will no honor cancels since the thread is exiting. */ + cancelstate = PTHREAD_CANCEL_DISABLE; + while (cleanup_stack != NULL) pop_cleanup_handler (1); } |