| 207,7 → 207,7 |
|---|
| |
| interrupts_disable(); |
| |
| for (i = 0; i<RQ_COUNT; i++) { |
| for (i = 0; i < RQ_COUNT; i++) { |
| r = &CPU->rq[i]; |
| spinlock_lock(&r->lock); |
| if (r->n == 0) { |
| 377,7 → 377,8 |
|---|
| void scheduler_separated_stack(void) |
| { |
| int priority; |
| |
| DEADLOCK_PROBE_INIT(p_joinwq); |
| |
| ASSERT(CPU != NULL); |
| |
| if (THREAD) { |
| 406,9 → 407,12 |
|---|
| 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); |
| _waitq_wakeup_unsafe(&THREAD->join_wq, |
| WAKEUP_FIRST); |
| spinlock_unlock(&THREAD->join_wq.lock); |
| |
| THREAD->state = Undead; |
| 447,8 → 451,8 |
|---|
| /* |
| * Entering state is unexpected. |
| */ |
| panic("tid%d: unexpected state %s\n", THREAD->tid, |
| thread_states[THREAD->state]); |
| panic("tid%llu: unexpected state %s\n", THREAD->tid, |
| thread_states[THREAD->state]); |
| break; |
| } |
| |
| 500,7 → 504,7 |
|---|
| THREAD->state = Running; |
| |
| #ifdef SCHEDULER_VERBOSE |
| printf("cpu%d: tid %d (priority=%d, ticks=%lld, nrdy=%ld)\n", |
| 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 |
| 568,7 → 572,7 |
|---|
| * Searching least priority queues on all CPU's first and most priority |
| * queues on all CPU's last. |
| */ |
| for (j= RQ_COUNT - 1; j >= 0; j--) { |
| for (j = RQ_COUNT - 1; j >= 0; j--) { |
| for (i = 0; i < config.cpu_active; i++) { |
| link_t *l; |
| runq_t *r; |
| 609,8 → 613,8 |
|---|
| */ |
| spinlock_lock(&t->lock); |
| if ((!(t->flags & (THREAD_FLAG_WIRED | |
| THREAD_FLAG_STOLEN))) && |
| (!(t->fpu_context_engaged)) ) { |
| THREAD_FLAG_STOLEN))) && |
| (!(t->fpu_context_engaged))) { |
| /* |
| * Remove t from r. |
| */ |
| 636,7 → 640,7 |
|---|
| */ |
| spinlock_lock(&t->lock); |
| #ifdef KCPULB_VERBOSE |
| printf("kcpulb%d: TID %d -> cpu%d, nrdy=%ld, " |
| 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); |
| 719,7 → 723,7 |
|---|
| for (cur = r->rq_head.next; cur != &r->rq_head; |
| cur = cur->next) { |
| t = list_get_instance(cur, thread_t, rq_link); |
| printf("%d(%s) ", t->tid, |
| printf("%llu(%s) ", t->tid, |
| thread_states[t->state]); |
| } |
| printf("\n"); |