justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[tools] Add j6threads gdb command

Browse Source 
The j6threads command shows the current thread, ready threads, and
blocked threads for a given CPU.

To support this, TCB structs gained a pointer to their thread (instead
of trying to do offset magic) and threads gained a pointer to their
creator. Also removed thread::from_tcb() now that the TCB has a pointer.
This commit is contained in:
Justin C. Miller
2022-01-15 17:39:25 -08:00
parent 7bb6b21c65
commit 2dd78beb92
5 changed files with 115 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/kernel/scheduler.cpp
View File

@@ -97,16 +97,8 @@ scheduler::start()
{
util::scoped_lock lock {queue.lock};
process *kp = &process::kernel_process();
thread *idle = thread::create_idle_thread(*kp, max_priority, cpu.rsp0);
auto *tcb = idle->tcb();
cpu.process = kp;
cpu.thread = idle;
cpu.tcb = tcb;
queue.current = tcb;
thread *idle = cpu.thread;
queue.current = idle->tcb();
}
cpu.apic->enable_timer(isr::isrTimer, false);
@@ -130,7 +122,7 @@ void scheduler::prune(run_queue &queue, uint64_t now)
// move them to the appropriate lists.
auto *tcb = queue.blocked.front();
while (tcb) {
thread *th = thread::from_tcb(tcb);
thread *th = tcb->thread;
uint8_t priority = tcb->priority;
bool ready = th->has_state(thread::state::ready);
@@ -171,7 +163,7 @@ scheduler::check_promotions(run_queue &queue, uint64_t now)
{
for (auto &pri_list : queue.ready) {
for (auto *tcb : pri_list) {
const thread *th = thread::from_tcb(queue.current);
const thread *th = queue.current->thread;
const bool constant = th->has_state(thread::state::constant);
if (constant)
continue;
@@ -266,7 +258,7 @@ scheduler::schedule()
queue.lock.acquire(&waiter);
queue.current->time_left = remaining;
thread *th = thread::from_tcb(queue.current);
thread *th = queue.current->thread;
uint8_t priority = queue.current->priority;
const bool constant = th->has_state(thread::state::constant);
@@ -313,7 +305,7 @@ scheduler::schedule()
return;
}
thread *next_thread = thread::from_tcb(next);
thread *next_thread = next->thread;
cpu.thread = next_thread;
cpu.process = &next_thread->parent();