talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a race condition where it was possible for a signaled 

thread to become stranded and not placed in the run queue.

MFC Candidate

Reported by:	tegge
This commit is contained in:
Daniel Eischen 2001-03-09 16:05:43 +00:00
parent 85ac71e9c6
commit af4878847e
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc_r/uthread/uthread_sig.c
View File

@ -569,9 +569,9 @@ thread_sig_handle_special(int sig)
static void
thread_sig_add(pthread_t pthread, int sig, int has_args)
{
struct pthread *curthread = _get_curthread();
int restart;
int suppress_handler = 0;
int thread_is_active = 0;
restart = _thread_sigact[sig - 1].sa_flags & SA_RESTART;
@ -604,6 +604,12 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
*/
if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0)
PTHREAD_PRIOQ_REMOVE(pthread);
else
/*
* This thread is running; avoid placing it in
* the run queue:
*/
thread_is_active = 1;
break;
case PS_SUSPENDED:
@ -753,7 +759,7 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
* the thread in the run queue.
*/
pthread->active_priority |= PTHREAD_SIGNAL_PRIORITY;
if (pthread != curthread)
if (thread_is_active == 0)
PTHREAD_PRIOQ_INSERT_TAIL(pthread);
}
}

10
lib/libkse/thread/thr_sig.c
View File

@ -569,9 +569,9 @@ thread_sig_handle_special(int sig)
static void
thread_sig_add(pthread_t pthread, int sig, int has_args)
{
struct pthread *curthread = _get_curthread();
int restart;
int suppress_handler = 0;
int thread_is_active = 0;
restart = _thread_sigact[sig - 1].sa_flags & SA_RESTART;
@ -604,6 +604,12 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
*/
if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0)
PTHREAD_PRIOQ_REMOVE(pthread);
else
/*
* This thread is running; avoid placing it in
* the run queue:
*/
thread_is_active = 1;
break;
case PS_SUSPENDED:
@ -753,7 +759,7 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
* the thread in the run queue.
*/
pthread->active_priority |= PTHREAD_SIGNAL_PRIORITY;
if (pthread != curthread)
if (thread_is_active == 0)
PTHREAD_PRIOQ_INSERT_TAIL(pthread);
}
}

10
lib/libpthread/thread/thr_sig.c
View File

@ -569,9 +569,9 @@ thread_sig_handle_special(int sig)
static void
thread_sig_add(pthread_t pthread, int sig, int has_args)
{
struct pthread *curthread = _get_curthread();
int restart;
int suppress_handler = 0;
int thread_is_active = 0;
restart = _thread_sigact[sig - 1].sa_flags & SA_RESTART;
@ -604,6 +604,12 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
*/
if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0)
PTHREAD_PRIOQ_REMOVE(pthread);
else
/*
* This thread is running; avoid placing it in
* the run queue:
*/
thread_is_active = 1;
break;
case PS_SUSPENDED:
@ -753,7 +759,7 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
* the thread in the run queue.
*/
pthread->active_priority |= PTHREAD_SIGNAL_PRIORITY;
if (pthread != curthread)
if (thread_is_active == 0)
PTHREAD_PRIOQ_INSERT_TAIL(pthread);
}
}