system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-05 16:10:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allocate a thread's tcb last so it is easier to handle failures to

Browse source 
malloc() siginfo.

PR:	85468
This commit is contained in:
Daniel Eischen 2005-08-30 12:42:00 +00:00
parent bb78dba49b
commit f98418eb29
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=149617
2 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/libkse/thread/thr_kern.c
View file

@ -2365,6 +2365,11 @@ _thr_alloc(struct pthread *curthread)
if ((thread == NULL) &&
((thread = malloc(sizeof(struct pthread))) != NULL)) {
bzero(thread, sizeof(struct pthread));
thread->siginfo = calloc(_SIG_MAXSIG, sizeof(siginfo_t));
if (thread->siginfo == NULL) {
free(thread);
return (NULL);
}
if (curthread) {
_pthread_mutex_lock(&_tcb_mutex);
thread->tcb = _tcb_ctor(thread, 0 /* not initial tls */);
@ -2372,27 +2377,23 @@ _thr_alloc(struct pthread *curthread)
} else {
thread->tcb = _tcb_ctor(thread, 1 /* initial tls */);
}
thread->siginfo = calloc(_SIG_MAXSIG, sizeof(siginfo_t));
if ((thread->tcb == NULL) || (thread->siginfo == NULL)) {
if (thread->siginfo != NULL)
free(thread->siginfo);
if (thread->tcb == NULL) {
free(thread->siginfo);
free(thread);
thread = NULL;
} else {
/*
* Initialize thread locking.
* Lock initializing needs malloc, so don't
* enter critical region before doing this!
*/
if (_lock_init(&thread->lock, LCK_ADAPTIVE,
_thr_lock_wait, _thr_lock_wakeup) != 0)
PANIC("Cannot initialize thread lock");
for (i = 0; i < MAX_THR_LOCKLEVEL; i++) {
_lockuser_init(&thread->lockusers[i],
(void *)thread);
_LCK_SET_PRIVATE2(&thread->lockusers[i],
(void *)thread);
}
return (NULL);
}
/*
* Initialize thread locking.
* Lock initializing needs malloc, so don't
* enter critical region before doing this!
*/
if (_lock_init(&thread->lock, LCK_ADAPTIVE,
_thr_lock_wait, _thr_lock_wakeup) != 0)
PANIC("Cannot initialize thread lock");
for (i = 0; i < MAX_THR_LOCKLEVEL; i++) {
_lockuser_init(&thread->lockusers[i], (void *)thread);
_LCK_SET_PRIVATE2(&thread->lockusers[i],
(void *)thread);
}
}
return (thread);

41
lib/libpthread/thread/thr_kern.c
View file

@ -2365,6 +2365,11 @@ _thr_alloc(struct pthread *curthread)
if ((thread == NULL) &&
((thread = malloc(sizeof(struct pthread))) != NULL)) {
bzero(thread, sizeof(struct pthread));
thread->siginfo = calloc(_SIG_MAXSIG, sizeof(siginfo_t));
if (thread->siginfo == NULL) {
free(thread);
return (NULL);
}
if (curthread) {
_pthread_mutex_lock(&_tcb_mutex);
thread->tcb = _tcb_ctor(thread, 0 /* not initial tls */);
@ -2372,27 +2377,23 @@ _thr_alloc(struct pthread *curthread)
} else {
thread->tcb = _tcb_ctor(thread, 1 /* initial tls */);
}
thread->siginfo = calloc(_SIG_MAXSIG, sizeof(siginfo_t));
if ((thread->tcb == NULL) || (thread->siginfo == NULL)) {
if (thread->siginfo != NULL)
free(thread->siginfo);
if (thread->tcb == NULL) {
free(thread->siginfo);
free(thread);
thread = NULL;
} else {
/*
* Initialize thread locking.
* Lock initializing needs malloc, so don't
* enter critical region before doing this!
*/
if (_lock_init(&thread->lock, LCK_ADAPTIVE,
_thr_lock_wait, _thr_lock_wakeup) != 0)
PANIC("Cannot initialize thread lock");
for (i = 0; i < MAX_THR_LOCKLEVEL; i++) {
_lockuser_init(&thread->lockusers[i],
(void *)thread);
_LCK_SET_PRIVATE2(&thread->lockusers[i],
(void *)thread);
}
return (NULL);
}
/*
* Initialize thread locking.
* Lock initializing needs malloc, so don't
* enter critical region before doing this!
*/
if (_lock_init(&thread->lock, LCK_ADAPTIVE,
_thr_lock_wait, _thr_lock_wakeup) != 0)
PANIC("Cannot initialize thread lock");
for (i = 0; i < MAX_THR_LOCKLEVEL; i++) {
_lockuser_init(&thread->lockusers[i], (void *)thread);
_LCK_SET_PRIVATE2(&thread->lockusers[i],
(void *)thread);
}
}
return (thread);