svn commit: r351451 - stable/12/lib/libthr/thread
Konstantin Belousov
kib at FreeBSD.org
Sat Aug 24 12:51:47 UTC 2019
Author: kib
Date: Sat Aug 24 12:51:46 2019
New Revision: 351451
URL: https://svnweb.freebsd.org/changeset/base/351451
Log:
MFC r351349:
Fix _pthread_cancel_enter() and _pthread_cancel_leave() jmptable entries.
PR: 240022
Modified:
stable/12/lib/libthr/thread/thr_cancel.c
stable/12/lib/libthr/thread/thr_init.c
stable/12/lib/libthr/thread/thr_private.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libthr/thread/thr_cancel.c
==============================================================================
--- stable/12/lib/libthr/thread/thr_cancel.c Sat Aug 24 01:28:39 2019 (r351450)
+++ stable/12/lib/libthr/thread/thr_cancel.c Sat Aug 24 12:51:46 2019 (r351451)
@@ -43,6 +43,8 @@ __weak_reference(_thr_setcanceltype, pthread_setcancel
__weak_reference(_thr_setcanceltype, _pthread_setcanceltype);
__weak_reference(_Tthr_testcancel, pthread_testcancel);
__weak_reference(_Tthr_testcancel, _pthread_testcancel);
+__weak_reference(_Tthr_cancel_enter, _pthread_cancel_enter);
+__weak_reference(_Tthr_cancel_leave, _pthread_cancel_leave);
static inline void
testcancel(struct pthread *curthread)
@@ -173,13 +175,13 @@ _thr_cancel_leave(struct pthread *curthread, int mayca
}
void
-_pthread_cancel_enter(int maycancel)
+_Tthr_cancel_enter(int maycancel)
{
_thr_cancel_enter2(_get_curthread(), maycancel);
}
void
-_pthread_cancel_leave(int maycancel)
+_Tthr_cancel_leave(int maycancel)
{
_thr_cancel_leave(_get_curthread(), maycancel);
}
Modified: stable/12/lib/libthr/thread/thr_init.c
==============================================================================
--- stable/12/lib/libthr/thread/thr_init.c Sat Aug 24 01:28:39 2019 (r351450)
+++ stable/12/lib/libthr/thread/thr_init.c Sat Aug 24 12:51:46 2019 (r351451)
@@ -265,8 +265,8 @@ static pthread_func_t jmp_table[][2] = {
[PJT_TESTCANCEL] = {DUAL_ENTRY(_Tthr_testcancel)},
[PJT_CLEANUP_POP_IMP] = {DUAL_ENTRY(__thr_cleanup_pop_imp)},
[PJT_CLEANUP_PUSH_IMP] = {DUAL_ENTRY(__thr_cleanup_push_imp)},
- [PJT_CANCEL_ENTER] = {DUAL_ENTRY(_thr_cancel_enter)},
- [PJT_CANCEL_LEAVE] = {DUAL_ENTRY(_thr_cancel_leave)},
+ [PJT_CANCEL_ENTER] = {DUAL_ENTRY(_Tthr_cancel_enter)},
+ [PJT_CANCEL_LEAVE] = {DUAL_ENTRY(_Tthr_cancel_leave)},
[PJT_MUTEX_CONSISTENT] = {DUAL_ENTRY(_Tthr_mutex_consistent)},
[PJT_MUTEXATTR_GETROBUST] = {DUAL_ENTRY(_thr_mutexattr_getrobust)},
[PJT_MUTEXATTR_SETROBUST] = {DUAL_ENTRY(_thr_mutexattr_setrobust)},
Modified: stable/12/lib/libthr/thread/thr_private.h
==============================================================================
--- stable/12/lib/libthr/thread/thr_private.h Sat Aug 24 01:28:39 2019 (r351450)
+++ stable/12/lib/libthr/thread/thr_private.h Sat Aug 24 12:51:46 2019 (r351451)
@@ -1028,6 +1028,8 @@ void __thr_cleanup_pop_imp(int);
void _thr_cleanup_push(void (*)(void *), void *);
void _thr_cleanup_pop(int);
void _Tthr_testcancel(void);
+void _Tthr_cancel_enter(int);
+void _Tthr_cancel_leave(int);
int _thr_cancel(pthread_t);
int _thr_atfork(void (*)(void), void (*)(void), void (*)(void));
int _thr_attr_destroy(pthread_attr_t *);
More information about the svn-src-stable-12
mailing list