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

[kernel] Split out sched log area

Browse Source 
To keep the task log area useful, scheduler updates on processes now go
to the new sched log area.
This commit is contained in:
Justin C. Miller
2021-01-20 01:29:18 -08:00
parent cb612c36ea
commit 3282a3ae34
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/log_areas.inc
View File

@@ -1,11 +1,12 @@
LOG(apic, info); LOG(apic, info);
LOG(device, debug); LOG(device, debug);
LOG(paging, warn); LOG(paging, info);
LOG(driver, info); LOG(driver, info);
LOG(memory, info); LOG(memory, debug);
LOG(fs, info); LOG(fs, info);
LOG(task, debug); LOG(task, info);
LOG(loader, info); LOG(sched, info);
LOG(loader, debug);
LOG(boot, debug); LOG(boot, debug);
LOG(syscall,debug); LOG(syscall,debug);
LOG(vmem, debug); LOG(vmem, debug);

14
src/kernel/scheduler.cpp
View File

@@ -243,7 +243,7 @@ scheduler::quantum(int priority)
void void
scheduler::start() scheduler::start()
{ {
log::info(logs::task, "Starting scheduler."); log::info(logs::sched, "Starting scheduler.");
wrmsr(msr::ia32_gs_base, reinterpret_cast<uintptr_t>(&bsp_cpu_data)); wrmsr(msr::ia32_gs_base, reinterpret_cast<uintptr_t>(&bsp_cpu_data));
m_apic->enable_timer(isr::isrTimer, false); m_apic->enable_timer(isr::isrTimer, false);
m_apic->reset_timer(10); m_apic->reset_timer(10);
@@ -285,7 +285,7 @@ void scheduler::prune(uint64_t now)
delete &p; delete &p;
} else { } else {
m_blocked.remove(remove); m_blocked.remove(remove);
log::debug(logs::task, "Prune: readying unblocked thread %llx", th->koid()); log::debug(logs::sched, "Prune: readying unblocked thread %llx", th->koid());
m_runlists[remove->priority].push_back(remove); m_runlists[remove->priority].push_back(remove);
} }
} }
@@ -315,7 +315,7 @@ scheduler::check_promotions(uint64_t now)
tcb->priority -= 1; tcb->priority -= 1;
tcb->time_left = quantum(tcb->priority); tcb->time_left = quantum(tcb->priority);
m_runlists[tcb->priority].push_back(tcb); m_runlists[tcb->priority].push_back(tcb);
log::debug(logs::task, "Scheduler promoting thread %llx, priority %d", log::info(logs::sched, "Scheduler promoting thread %llx, priority %d",
th->koid(), tcb->priority); th->koid(), tcb->priority);
} }
} }
@@ -337,7 +337,7 @@ scheduler::schedule()
if (priority < max_priority && !constant) { if (priority < max_priority && !constant) {
// Process used its whole timeslice, demote it // Process used its whole timeslice, demote it
++m_current->priority; ++m_current->priority;
log::debug(logs::task, "Scheduler demoting thread %llx, priority %d", log::info(logs::sched, "Scheduler demoting thread %llx, priority %d",
th->koid(), m_current->priority); th->koid(), m_current->priority);
} }
m_current->time_left = quantum(m_current->priority); m_current->time_left = quantum(m_current->priority);
@@ -379,11 +379,11 @@ scheduler::schedule()
bsp_cpu_data.p = &next_thread->parent(); bsp_cpu_data.p = &next_thread->parent();
m_current = next; m_current = next;
log::debug(logs::task, "Scheduler switching threads %llx->%llx", log::debug(logs::sched, "Scheduler switching threads %llx->%llx",
th->koid(), next_thread->koid()); th->koid(), next_thread->koid());
log::debug(logs::task, " priority %d time left %d @ %lld.", log::debug(logs::sched, " priority %d time left %d @ %lld.",
m_current->priority, m_current->time_left, m_clock); m_current->priority, m_current->time_left, m_clock);
log::debug(logs::task, " PML4 %llx", m_current->pml4); log::debug(logs::sched, " PML4 %llx", m_current->pml4);
task_switch(m_current); task_switch(m_current);
} }