lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2003-02-16  Ulrich Drepper  <drepper@redhat.com>

	* libc-cancellation.c (__libc_enable_asynccancel): Rwrite to avoid
	going into an endless loop.
	* Makefile (tests): Add tst-cancel9.
	* tst-cancel9.c: New file.

	* pthread_cancel.c (pthread_cancel): Use the result of __pthread_kill.
This commit is contained in:
Ulrich Drepper
2003-02-16 09:18:53 +00:00
parent e9cb48ab58
commit 1564916ab9
4 changed files with 158 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nptl/libc-cancellation.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -40,20 +40,30 @@ __libc_enable_asynccancel (void)
oldval = THREAD_GETMEM (self, cancelhandling);
int newval = oldval | CANCELTYPE_BITMASK;
if (newval == oldval)
break;
if (__builtin_expect ((oldval & CANCELED_BITMASK) != 0, 0))
{
/* If we are already exiting stop right here. */
if ((oldval & EXITING_BITMASK) != 0)
break;
if (atomic_compare_and_exchange_acq (&self->cancelhandling, newval,
oldval) == 0)
/* Somebody else modified the word, try again. */
continue;
THREAD_SETMEM (self, result, PTHREAD_CANCELED);
/* The thread is exiting now. */
atomic_bit_set (&self->cancelhandling, EXITING_BIT);
__do_cancel ();
/* NOTREACHED */
}
if (atomic_compare_and_exchange_acq (&self->cancelhandling, newval,
oldval) == 0)
{
if (CANCEL_ENABLED_AND_CANCELED_AND_ASYNCHRONOUS (newval))
{
THREAD_SETMEM (self, result, PTHREAD_CANCELED);
__do_cancel ();
}
break;
}
break;
}
return oldval;