extending scheduler tests

Cargo.toml

@@ -32,6 +32,9 @@ exclude = [
 crate-type = ["staticlib", "lib"]  # "lib" required for integration tests
 name = "hermit"
 
+[build]
+profiler = true
+
 [[test]]
 name = "basic_math"
 harness = true

src/arch/x86_64/kernel/apic.rs

@@ -645,12 +645,18 @@ fn __set_oneshot_timer(wakeup_time: Option<u64>) {
 	}
 }
 
+#[cfg(target_os = "none")]
 pub fn set_oneshot_timer(wakeup_time: Option<u64>) {
 	without_interrupts(|| {
 		__set_oneshot_timer(wakeup_time);
 	});
 }
 
+#[cfg(not(target_os = "none"))]
+pub fn set_oneshot_timer(wakeup_time: Option<u64>) {
+	println!("Mocking : set_oneshot_timer()");
+}
+
 pub fn init_x2apic() {
 	if processor::supports_x2apic() {
 		debug!("Enable x2APIC support");

src/arch/x86_64/kernel/processor.rs

@@ -1007,12 +1007,19 @@ pub fn shutdown() -> ! {
 	}
 }
 
+#[cfg(target_os = "none")]
 pub fn get_timer_ticks() -> u64 {
 	// We simulate a timer with a 1 microsecond resolution by taking the CPU timestamp
 	// and dividing it by the CPU frequency in MHz.
 	get_timestamp() / u64::from(get_frequency())
 }
 
+#[cfg(not(target_os = "none"))]
+pub fn get_timer_ticks() -> u64 {
+	println!("Mocking get_timer_ticks()");
+	10
+}
+
 pub fn get_frequency() -> u16 {
 	CPU_FREQUENCY.get()
 }

src/arch/x86_64/kernel/scheduler.rs

@@ -1,7 +1,6 @@
 //! Architecture dependent interface to initialize a task
 
 use alloc::boxed::Box;
-use core::arch::asm;
 use core::{mem, ptr, slice};
 
 use align_address::Align;
@@ -59,18 +58,18 @@ struct State {
 
 pub struct BootStack {
 	/// stack for kernel tasks
-	stack: VirtAddr,
+	pub stack: VirtAddr,
 	/// stack to handle interrupts
-	ist1: VirtAddr,
+	pub ist1: VirtAddr,
 }
 
 pub struct CommonStack {
 	/// start address of allocated virtual memory region
-	virt_addr: VirtAddr,
+	pub virt_addr: VirtAddr,
 	/// start address of allocated virtual memory region
-	phys_addr: PhysAddr,
+	pub phys_addr: PhysAddr,
 	/// total size of all stacks
-	total_size: usize,
+	pub total_size: usize,
 }
 
 pub enum TaskStacks {
@@ -202,7 +201,7 @@ impl TaskStacks {
 		IST_SIZE
 	}
 }
-
+#[cfg(target_os = "none")]
 impl Drop for TaskStacks {
 	fn drop(&mut self) {
 		// we should never deallocate a boot stack
@@ -363,10 +362,10 @@ impl TaskFrame for Task {
 }
 
 extern "x86-interrupt" fn timer_handler(_stack_frame: interrupts::ExceptionStackFrame) {
-	increment_irq_counter(apic::TIMER_INTERRUPT_NUMBER);
+	increment_irq_counter(apic::TIMER_INTERRUPT_NUMBER.into());
 	core_scheduler().handle_waiting_tasks();
 	apic::eoi();
-	core_scheduler().reschedule();
+	core_scheduler().scheduler();
 }
 
 pub fn install_timer_handler() {
@@ -376,5 +375,5 @@ pub fn install_timer_handler() {
 			.set_handler_fn(timer_handler)
 			.set_stack_index(0);
 	}
-	interrupts::add_irq_name(apic::TIMER_INTERRUPT_NUMBER - 32, "Timer");
+	interrupts::add_irq_name((apic::TIMER_INTERRUPT_NUMBER - 32).into(), "Timer");
 }