From ea1224e213c0ba68d17cdc68fd22c46d0bad9607 Mon Sep 17 00:00:00 2001
From: "Justin C. Miller" <justin@devjustinian.com>
Date: Tue, 2 Jun 2020 23:46:03 -0700
Subject: [PATCH] [kernel] Fix scheduler clock bug

The fake clock in the scheduler wasn't getting initialized, so sleeps in
the test userspace programs were returning immediately.
---
 src/kernel/scheduler.cpp | 12 +++++-------
 src/kernel/scheduler.h   |  7 +++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/kernel/scheduler.cpp b/src/kernel/scheduler.cpp
index 3a33ea6..fea5c44 100644
--- a/src/kernel/scheduler.cpp
+++ b/src/kernel/scheduler.cpp
@@ -30,7 +30,8 @@ extern uint64_t idle_stack_end;
 
 scheduler::scheduler(lapic *apic) :
 	m_apic(apic),
-	m_next_pid(1)
+	m_next_pid(1),
+	m_clock(0)
 {
 	auto *idle = new process_node;
 	uint8_t last_pri = num_priorities - 1;
@@ -261,9 +262,6 @@ void scheduler::prune(uint64_t now)
 void
 scheduler::schedule()
 {
-	// TODO: lol a real clock
-	static uint64_t now = 0;
-
 	pid_t lastpid = m_current->pid;
 
 	m_runlists[m_current->priority].remove(m_current);
@@ -273,7 +271,7 @@ scheduler::schedule()
 		m_blocked.push_back(m_current);
 	}
 
-	prune(++now);
+	prune(++m_clock);
 
 	uint8_t pri = 0;
 	while (m_runlists[pri].empty()) {
@@ -287,8 +285,8 @@ scheduler::schedule()
 		task_switch(m_current);
 
 		bool loading = m_current->flags && process_flags::loading;
-		log::debug(logs::task, "Scheduler switched to process %d, priority %d%s.",
-				m_current->pid, m_current->priority, loading ? " (loading)" : "");
+		log::debug(logs::task, "Scheduler switched to process %d, priority %d%s @ %lld.",
+				m_current->pid, m_current->priority, loading ? " (loading)" : "", m_clock);
 	}
 }
 
diff --git a/src/kernel/scheduler.h b/src/kernel/scheduler.h
index d9f77d5..6b99255 100644
--- a/src/kernel/scheduler.h
+++ b/src/kernel/scheduler.h
@@ -24,8 +24,8 @@ public:
 	/// How long the timer quantum is
 	static const uint64_t quantum_micros = 1000;
 
-	/// How many quantums a process gets before being rescheduled
-	static const uint16_t process_quanta = 100;
+	/// How many quanta a process gets before being rescheduled
+	static const uint16_t process_quanta = 10;
 
 	/// Constructor.
 	/// \arg apic  Pointer to the local APIC object
@@ -88,5 +88,8 @@ private:
 	process_list m_blocked;
 	process_list m_exited;
 
+	// TODO: lol a real clock
+	uint64_t m_clock = 0;
+
 	static scheduler s_instance;
 };