WebSVN – HelenOS – Diff – /branches/rcu/kernel/generic/src/proc/scheduler.c



#include <adt/list.h>
#include <panic.h>
#include <cpu.h>
#include <print.h>
#include <debug.h>
#include <synch/rcu.h>
 
static void before_task_runs(void);
static void before_thread_runs(void);
static void after_thread_ran(void);
static void scheduler_separated_stack(void);

 *
 */
void after_thread_ran(void)
{
    after_thread_ran_arch();
    rcu_run_callbacks();
}
 
#ifdef CONFIG_FPU_LAZY
void scheduler_fpu_lazy_request(void)
{

 * Assume THREAD->lock is held.
 */
void scheduler_separated_stack(void)
{
    int priority;
    DEADLOCK_PROBE_INIT(p_joinwq);
 
    ASSERT(CPU != NULL);
   
    if (THREAD) {
        /* must be run after the switch to scheduler stack */

                     * Avoid deadlock.
                     */
                    spinlock_unlock(&THREAD->lock);
                    delay(10);
                    spinlock_lock(&THREAD->lock);
                    DEADLOCK_PROBE(p_joinwq,
                        DEADLOCK_THRESHOLD);
                    goto repeat;
                }
                _waitq_wakeup_unsafe(&THREAD->join_wq, false);
                spinlock_unlock(&THREAD->join_wq.lock);
               

 
        default:
            /*
             * Entering state is unexpected.
             */
            panic("tid%llu: unexpected state %s\n", THREAD->tid,
                thread_states[THREAD->state]);
            break;
        }
 
        THREAD = NULL;

 
    spinlock_lock(&THREAD->lock);  
    THREAD->state = Running;
 
#ifdef SCHEDULER_VERBOSE
    printf("cpu%d: tid %llu (priority=%d, ticks=%llu, nrdy=%ld)\n",
        CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks,
        atomic_get(&CPU->nrdy));
#endif  
 
    /*

                /*
                 * Ready t on local CPU
                 */
                spinlock_lock(&t->lock);
#ifdef KCPULB_VERBOSE
                printf("kcpulb%d: TID %llu -> cpu%d, nrdy=%ld, "
                    "avg=%nd\n", CPU->id, t->tid, CPU->id,
                    atomic_get(&CPU->nrdy),
                    atomic_get(&nrdy) / config.cpu_active);
#endif
                t->flags |= THREAD_FLAG_STOLEN;

            }
            printf("\trq[%d]: ", i);
            for (cur = r->rq_head.next; cur != &r->rq_head;
                cur = cur->next) {
                t = list_get_instance(cur, thread_t, rq_link);
                printf("%llu(%s) ", t->tid,
                    thread_states[t->state]);
            }
            printf("\n");
            spinlock_unlock(&r->lock);
        }

Rev 2292	Rev 2307
Line 59...	Line 59...
59	#include <adt/list.h>	59	#include <adt/list.h>
60	#include <panic.h>	60	#include <panic.h>
61	#include <cpu.h>	61	#include <cpu.h>
62	#include <print.h>	62	#include <print.h>
63	#include <debug.h>	63	#include <debug.h>
-		64	#include <synch/rcu.h>
64		65
65	static void before_task_runs(void);	66	static void before_task_runs(void);
66	static void before_thread_runs(void);	67	static void before_thread_runs(void);
67	static void after_thread_ran(void);	68	static void after_thread_ran(void);
68	static void scheduler_separated_stack(void);	69	static void scheduler_separated_stack(void);
Line 113...	Line 114...
113	*	114	*
114	*/	115	*/
115	void after_thread_ran(void)	116	void after_thread_ran(void)
116	{	117	{
117	after_thread_ran_arch();	118	after_thread_ran_arch();
-		119	rcu_run_callbacks();
118	}	120	}
119		121
120	#ifdef CONFIG_FPU_LAZY	122	#ifdef CONFIG_FPU_LAZY
121	void scheduler_fpu_lazy_request(void)	123	void scheduler_fpu_lazy_request(void)
122	{	124	{
Line 375...	Line 377...
375	* Assume THREAD->lock is held.	377	* Assume THREAD->lock is held.
376	*/	378	*/
377	void scheduler_separated_stack(void)	379	void scheduler_separated_stack(void)
378	{	380	{
379	int priority;	381	int priority;
-		382	DEADLOCK_PROBE_INIT(p_joinwq);
380		383
381	ASSERT(CPU != NULL);	384	ASSERT(CPU != NULL);
382		385
383	if (THREAD) {	386	if (THREAD) {
384	/* must be run after the switch to scheduler stack */	387	/* must be run after the switch to scheduler stack */
Line 404...	Line 407...
404	* Avoid deadlock.	407	* Avoid deadlock.
405	*/	408	*/
406	spinlock_unlock(&THREAD->lock);	409	spinlock_unlock(&THREAD->lock);
407	delay(10);	410	delay(10);
408	spinlock_lock(&THREAD->lock);	411	spinlock_lock(&THREAD->lock);
-		412	DEADLOCK_PROBE(p_joinwq,
-		413	DEADLOCK_THRESHOLD);
409	goto repeat;	414	goto repeat;
410	}	415	}
411	_waitq_wakeup_unsafe(&THREAD->join_wq, false);	416	_waitq_wakeup_unsafe(&THREAD->join_wq, false);
412	spinlock_unlock(&THREAD->join_wq.lock);	417	spinlock_unlock(&THREAD->join_wq.lock);
413		418
Line 445...	Line 450...
445		450
446	default:	451	default:
447	/*	452	/*
448	* Entering state is unexpected.	453	* Entering state is unexpected.
449	*/	454	*/
450	panic("tid%d: unexpected state %s\n", THREAD->tid,	455	panic("tid%llu: unexpected state %s\n", THREAD->tid,
451	thread_states[THREAD->state]);	456	thread_states[THREAD->state]);
452	break;	457	break;
453	}	458	}
454		459
455	THREAD = NULL;	460	THREAD = NULL;
Line 498...	Line 503...
498		503
499	spinlock_lock(&THREAD->lock);	504	spinlock_lock(&THREAD->lock);
500	THREAD->state = Running;	505	THREAD->state = Running;
501		506
502	#ifdef SCHEDULER_VERBOSE	507	#ifdef SCHEDULER_VERBOSE
503	printf("cpu%d: tid %d (priority=%d, ticks=%lld, nrdy=%ld)\n",	508	printf("cpu%d: tid %llu (priority=%d, ticks=%llu, nrdy=%ld)\n",
504	CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks,	509	CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks,
505	atomic_get(&CPU->nrdy));	510	atomic_get(&CPU->nrdy));
506	#endif	511	#endif
507		512
508	/*	513	/*
Line 634...	Line 639...
634	/*	639	/*
635	* Ready t on local CPU	640	* Ready t on local CPU
636	*/	641	*/
637	spinlock_lock(&t->lock);	642	spinlock_lock(&t->lock);
638	#ifdef KCPULB_VERBOSE	643	#ifdef KCPULB_VERBOSE
639	printf("kcpulb%d: TID %d -> cpu%d, nrdy=%ld, "	644	printf("kcpulb%d: TID %llu -> cpu%d, nrdy=%ld, "
640	"avg=%nd\n", CPU->id, t->tid, CPU->id,	645	"avg=%nd\n", CPU->id, t->tid, CPU->id,
641	atomic_get(&CPU->nrdy),	646	atomic_get(&CPU->nrdy),
642	atomic_get(&nrdy) / config.cpu_active);	647	atomic_get(&nrdy) / config.cpu_active);
643	#endif	648	#endif
644	t->flags \|= THREAD_FLAG_STOLEN;	649	t->flags \|= THREAD_FLAG_STOLEN;
Line 717...	Line 722...
717	}	722	}
718	printf("\trq[%d]: ", i);	723	printf("\trq[%d]: ", i);
719	for (cur = r->rq_head.next; cur != &r->rq_head;	724	for (cur = r->rq_head.next; cur != &r->rq_head;
720	cur = cur->next) {	725	cur = cur->next) {
721	t = list_get_instance(cur, thread_t, rq_link);	726	t = list_get_instance(cur, thread_t, rq_link);
722	printf("%d(%s) ", t->tid,	727	printf("%llu(%s) ", t->tid,
723	thread_states[t->state]);	728	thread_states[t->state]);
724	}	729	}
725	printf("\n");	730	printf("\n");
726	spinlock_unlock(&r->lock);	731	spinlock_unlock(&r->lock);
727	}	732	}

Subversion Repositories HelenOS

(root)/branches/rcu/kernel/generic/src/proc/scheduler.c – Rev 2292 → 2307