Rename core and utils modules

eshikafe · Sep 24, 2024 · bece139 · bece139
1 parent 1c99103
commit bece139
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/core.rs → src/core/mod.rs b/src/core.rs → src/core/mod.rs
diff --git a/src/core/traffic_class.rs b/src/core/traffic_class.rs
@@ -6,6 +6,11 @@
 // #include "utils/simd.h"
 // #include "utils/time.h"
 
+use traffic_class_initializer_types::*;
+use std::collections::HashMap;
+use once_cell::sync::Lazy;
+use lazy_static::lazy_static;
+
 // using bess::utils::extended_priority_queue;
 
 // A large default priority.
@@ -18,6 +23,7 @@ const STRIDE1: u32 = 1 << 20;
 const QUANTUM: u32 = 1 << 10;
 
 // Resource types that can be accounted for.
+#[derive(PartialEq, Eq, Hash)]
 pub enum Resource {
     Count = 0, // Count of how many times scheduled
     Cycle,     // CPU cycles
@@ -78,10 +84,6 @@ mod traffic_class_initializer_types {
     }
 }
 
-use traffic_class_initializer_types::*;
-use std::collections::HashMap;
-use once_cell::sync::Lazy;
-
 const TRAFFIC_POLICY_NAME: [&str; TrafficPolicy::NumPolicies as usize] = [
     "priority",
     "weighted_fair",
@@ -107,7 +109,6 @@ static RESOURCE_NAME: Lazy<HashMap<Resource, &'static str>> = Lazy::new(|| {
     m.insert(Resource::Bit, "bit");
     m
 });
-
 /* acc += x */
 // #define ACCUMULATE(acc, x)                                \
 //   {                                                       \

diff --git a/src/core/utils.rs → src/core/utils/mod.rs b/src/core/utils.rs → src/core/utils/mod.rs
diff --git a/src/core/worker.rs b/src/core/worker.rs
@@ -36,11 +36,9 @@ pub enum WorkerStatus {
     Finished,
 }
 
-
 struct PacketPool;
 struct Task;
 
-
 pub struct Worker {
     status: WorkerStatus,
     wid: usize,  // always [0, K_MAX_WORKERS - 1]
@@ -69,10 +67,10 @@ impl Worker {
     //  ----------------------------------------------------------------------
     //  functions below are invoked by worker threads
     //  ----------------------------------------------------------------------
-
     pub fn is_pause_requested(&self) -> bool {
         self.status == WorkerStatus::Paused
     }
+
     //  Block myself. Return nonzero if the worker needs to die
     pub fn block_worker(&self) -> i32 {
         todo!();