From efe33769b93d454351d019ba350a4f154c13aef2 Mon Sep 17 00:00:00 2001 From: David Xu Date: Sat, 25 Mar 2006 07:03:13 +0000 Subject: [PATCH] Don't cancel thread if it is in critical region. --- lib/libthr/thread/thr_cancel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 5a3960ee148..bedfaa9f18d 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -77,7 +77,7 @@ testcancel(struct pthread *curthread) int newval; newval = curthread->cancelflags; - if (SHOULD_CANCEL(newval)) + if (SHOULD_CANCEL(newval) && !THR_IN_CRITICAL(curthread)) pthread_exit(PTHREAD_CANCELED); }