d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bugs in pthread scheduler:

Browse Source 
make pthread_yield() more reliable,
  threads always (I hope) preempted at least every 0.1 sec, as intended.

PR:		bin/7744
Submitted by:	"Richard Seaman, Jr." <dick@tar.com>
This commit is contained in:
Dmitrij Tejblum 1998-10-09 19:01:30 +00:00
parent e95de2a602
commit 4b12016bab
6 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc_r/uthread/uthread_create.c
View File

@ -223,6 +223,9 @@ pthread_create(pthread_t * thread, const pthread_attr_t * attr,
void
_thread_start(void)
{
/* We just left the scheduler via longjmp: */
_thread_kern_in_sched = 0;
/* Run the current thread's start routine with argument: */
pthread_exit(_thread_run->start_routine(_thread_run->arg));

15
lib/libc_r/uthread/uthread_kern.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: uthread_kern.c,v 1.12 1998/09/07 21:55:01 alex Exp $
* $Id: uthread_kern.c,v 1.13 1998/09/30 06:36:56 jb Exp $
*
*/
#include <errno.h>
@ -206,10 +206,12 @@ __asm__("fnsave %0": :"m"(*fdata));
* Accumulate the number of microseconds that this
* thread has run for:
*/
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
if (_thread_run->slice_usec != -1) {
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
}
/*
* Check if this thread has reached its allocated
@ -242,7 +244,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* the last incremental priority check was
* made:
*/
else if (timercmp(&_thread_run->last_inactive, &kern_inc_prio_time, <)) {
else if (timercmp(&pthread->last_inactive, &kern_inc_prio_time, <)) {
/*
* Increment the incremental priority
* for this thread in the hope that
@ -582,6 +584,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* Do a sigreturn to restart the thread that
* was interrupted by a signal:
*/
_thread_kern_in_sched = 0;
_thread_sys_sigreturn(&_thread_run->saved_sigcontext);
} else
/*

3
lib/libkse/thread/thr_create.c
View File

@ -223,6 +223,9 @@ pthread_create(pthread_t * thread, const pthread_attr_t * attr,
void
_thread_start(void)
{
/* We just left the scheduler via longjmp: */
_thread_kern_in_sched = 0;
/* Run the current thread's start routine with argument: */
pthread_exit(_thread_run->start_routine(_thread_run->arg));

15
lib/libkse/thread/thr_kern.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: uthread_kern.c,v 1.12 1998/09/07 21:55:01 alex Exp $
* $Id: uthread_kern.c,v 1.13 1998/09/30 06:36:56 jb Exp $
*
*/
#include <errno.h>
@ -206,10 +206,12 @@ __asm__("fnsave %0": :"m"(*fdata));
* Accumulate the number of microseconds that this
* thread has run for:
*/
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
if (_thread_run->slice_usec != -1) {
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
}
/*
* Check if this thread has reached its allocated
@ -242,7 +244,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* the last incremental priority check was
* made:
*/
else if (timercmp(&_thread_run->last_inactive, &kern_inc_prio_time, <)) {
else if (timercmp(&pthread->last_inactive, &kern_inc_prio_time, <)) {
/*
* Increment the incremental priority
* for this thread in the hope that
@ -582,6 +584,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* Do a sigreturn to restart the thread that
* was interrupted by a signal:
*/
_thread_kern_in_sched = 0;
_thread_sys_sigreturn(&_thread_run->saved_sigcontext);
} else
/*

3
lib/libpthread/thread/thr_create.c
View File

@ -223,6 +223,9 @@ pthread_create(pthread_t * thread, const pthread_attr_t * attr,
void
_thread_start(void)
{
/* We just left the scheduler via longjmp: */
_thread_kern_in_sched = 0;
/* Run the current thread's start routine with argument: */
pthread_exit(_thread_run->start_routine(_thread_run->arg));

15
lib/libpthread/thread/thr_kern.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: uthread_kern.c,v 1.12 1998/09/07 21:55:01 alex Exp $
* $Id: uthread_kern.c,v 1.13 1998/09/30 06:36:56 jb Exp $
*
*/
#include <errno.h>
@ -206,10 +206,12 @@ __asm__("fnsave %0": :"m"(*fdata));
* Accumulate the number of microseconds that this
* thread has run for:
*/
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
if (_thread_run->slice_usec != -1) {
_thread_run->slice_usec += (_thread_run->last_inactive.tv_sec -
_thread_run->last_active.tv_sec) * 1000000 +
_thread_run->last_inactive.tv_usec -
_thread_run->last_active.tv_usec;
}
/*
* Check if this thread has reached its allocated
@ -242,7 +244,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* the last incremental priority check was
* made:
*/
else if (timercmp(&_thread_run->last_inactive, &kern_inc_prio_time, <)) {
else if (timercmp(&pthread->last_inactive, &kern_inc_prio_time, <)) {
/*
* Increment the incremental priority
* for this thread in the hope that
@ -582,6 +584,7 @@ __asm__("fnsave %0": :"m"(*fdata));
* Do a sigreturn to restart the thread that
* was interrupted by a signal:
*/
_thread_kern_in_sched = 0;
_thread_sys_sigreturn(&_thread_run->saved_sigcontext);
} else
/*