qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

htl: Make pthread_setcanceltype / state a cancellation point 

as expected by tst-cancel32.
This commit is contained in:
Samuel Thibault 2025-03-15 15:23:42 +00:00
parent 10af00f7a1
commit bfb2f2f481
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htl/pt-setcancelstate.c
View File

@ -24,6 +24,7 @@ int
__pthread_setcancelstate (int state, int *oldstate) __pthread_setcancelstate (int state, int *oldstate)
{ {
struct __pthread *p = _pthread_self (); struct __pthread *p = _pthread_self ();
int cancelled;
switch (state) switch (state)
{ {
@ -38,8 +39,15 @@ __pthread_setcancelstate (int state, int *oldstate)
if (oldstate != NULL) if (oldstate != NULL)
*oldstate = p->cancel_state; *oldstate = p->cancel_state;
p->cancel_state = state; p->cancel_state = state;
cancelled = (p->cancel_state == PTHREAD_CANCEL_ENABLE) && p->cancel_pending == 1 && (p->cancel_type == PTHREAD_CANCEL_ASYNCHRONOUS);
if (cancelled)
/* Do not achieve cancel when called again, notably from __pthread_exit itself. */
p->cancel_pending = 2;
__pthread_mutex_unlock (&p->cancel_lock); __pthread_mutex_unlock (&p->cancel_lock);
if (cancelled && __pthread_exit)
__pthread_exit (PTHREAD_CANCELED);
return 0; return 0;
} }
libc_hidden_def (__pthread_setcancelstate) libc_hidden_def (__pthread_setcancelstate)

5
htl/pt-setcanceltype.c
View File

@ -24,6 +24,7 @@ int
__pthread_setcanceltype (int type, int *oldtype) __pthread_setcanceltype (int type, int *oldtype)
{ {
struct __pthread *p = _pthread_self (); struct __pthread *p = _pthread_self ();
int cancelled;
switch (type) switch (type)
{ {
@ -38,8 +39,12 @@ __pthread_setcanceltype (int type, int *oldtype)
if (oldtype != NULL) if (oldtype != NULL)
*oldtype = p->cancel_type; *oldtype = p->cancel_type;
p->cancel_type = type; p->cancel_type = type;
cancelled = (p->cancel_state == PTHREAD_CANCEL_ENABLE) && p->cancel_pending && (p->cancel_type == PTHREAD_CANCEL_ASYNCHRONOUS);
__pthread_mutex_unlock (&p->cancel_lock); __pthread_mutex_unlock (&p->cancel_lock);
if (cancelled && __pthread_exit)
__pthread_exit (PTHREAD_CANCELED);
return 0; return 0;
} }
libc_hidden_def (__pthread_setcanceltype) libc_hidden_def (__pthread_setcanceltype)

8
sysdeps/htl/pthreadP.h
View File

@ -221,6 +221,14 @@ hidden_proto (__pthread_setspecific)
hidden_proto (__pthread_get_cleanup_stack) hidden_proto (__pthread_get_cleanup_stack)
#endif #endif
#if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread)
# ifdef weak_extern
weak_extern (__pthread_exit)
# else
# pragma weak __pthread_exit
# endif
#endif
#define ASSERT_TYPE_SIZE(type, size) \ #define ASSERT_TYPE_SIZE(type, size) \
_Static_assert (sizeof (type) == size, \ _Static_assert (sizeof (type) == size, \
"sizeof (" #type ") != " #size) "sizeof (" #type ") != " #size)