Rename scheduler_priority to scheduler_epoch, plus cleanup (theseus-os#980)

Preface to a future PR that renames `scheduler_realtime` to
`scheduler_priority`, and to a series of PRs that revamp schedulers.

Signed-off-by: Klimenty Tsoutsman <klim@tsoutsman.com>

Author: tsoutsman

Cargo.lock

@@ -33,10 +33,10 @@ pub fn main(args: Vec<String>) -> isize {
         println!("{0:<5}  {1}", "ID", "NAME");
     }
     else {
-        #[cfg(priority_scheduler)] {
+        #[cfg(epoch_scheduler)] {
             println!("{0:<5}  {1:<10}  {2:<4}  {3:<4}  {4:<5}  {5:<10}  {6}", "ID", "RUNSTATE", "CPU", "PIN", "TYPE", "PRIORITY", "NAME");
         }
-        #[cfg(not(priority_scheduler))] {
+        #[cfg(not(epoch_scheduler))] {
             println!("{0:<5}  {1:<10}  {2:<4}  {3:<4}  {4:<5}  {5}", "ID", "RUNSTATE", "CPU", "PIN", "TYPE", "NAME");
         }
     }
@@ -59,14 +59,14 @@ pub fn main(args: Vec<String>) -> isize {
                 else if task.is_application() {"A"}
                 else {" "} ;
 
-            #[cfg(priority_scheduler)] {
+            #[cfg(epoch_scheduler)] {
                 let priority = scheduler::get_priority(&task).map(|priority| format!("{}", priority)).unwrap_or_else(|| String::from("-"));
                 task_string.push_str(
                     &format!("{0:<5}  {1:<10}  {2:<4}  {3:<4}  {4:<5}  {5:<10}  {6}\n", 
                     id, runstate, cpu, pinned, task_type, priority, task.name)
                 );
             }
-            #[cfg(not(priority_scheduler))] {
+            #[cfg(not(epoch_scheduler))] {
                 writeln!(task_string, "{0:<5}  {1:<10}  {2:<4}  {3:<4}  {4:<5}  {5}", 
                     id, runstate, cpu, pinned, task_type, task.name).expect("Failed to write to task_string.");
             }

applications/ps/src/lib.rs

@@ -56,7 +56,7 @@ pub fn main(_args: Vec<String>) -> isize {
     let _priority2 = scheduler::get_priority(&taskref2);
     let _priority3 = scheduler::get_priority(&taskref3);
 
-    #[cfg(priority_scheduler)]
+    #[cfg(epoch_scheduler)]
     {
         assert_eq!(_priority1,Some(30));
         assert_eq!(_priority2,Some(20));

applications/test_scheduler/src/lib.rs

@@ -28,8 +28,8 @@ path = "../task"
 [dependencies.runqueue_round_robin]
 path = "../runqueue_round_robin"
 
-[dependencies.runqueue_priority]
-path = "../runqueue_priority"
+[dependencies.runqueue_epoch]
+path = "../runqueue_epoch"
 
 [dependencies.runqueue_realtime]
 path = "../runqueue_realtime"

kernel/runqueue/Cargo.toml

@@ -11,8 +11,8 @@ extern crate atomic_linked_list;
 extern crate task;
 #[macro_use] extern crate cfg_if;
 cfg_if! {
-    if #[cfg(priority_scheduler)] {
-        extern crate runqueue_priority as runqueue;
+    if #[cfg(epoch_scheduler)] {
+        extern crate runqueue_epoch as runqueue;
     } else if #[cfg(realtime_scheduler)] {
         extern crate runqueue_realtime as runqueue;
     } else {

kernel/runqueue/src/lib.rs

@@ -1,8 +1,9 @@
 [package]
 authors = ["Namitha Liyanage <Namithaliyanage@gmail.com>"]
-name = "runqueue_priority"
-description = "Functions and types for handling runqueues when priority scheduler is in use, i.e., lists of tasks for scheduling purposes"
+name = "runqueue_epoch"
+description = "Run queue for the epoch scheduler"
 version = "0.1.0"
+edition = "2021"
 
 [dependencies]
 log = "0.4.8"