Consolidates redundant code.

NetSys · May 20, 2017 · defebbc · defebbc
1 parent 01f7085
commit defebbc
Showing 1 changed file with 19 additions and 36 deletions.
diff --git a/core/scheduler.h b/core/scheduler.h
@@ -155,6 +155,23 @@ class Scheduler {
       return wakeup_queue_;
   }
 
+  // Selects the next TrafficClass to run.
+  LeafTrafficClass<CallableTask> *Next(uint64_t tsc) {
+    WakeTCs(tsc);
+
+    if (!root_ || root_->blocked()) {
+      // Nothing to schedule anywhere.
+      return nullptr;
+    }
+
+    TrafficClass *c = root_;
+    while (c->policy_ != POLICY_LEAF) {
+      c = c->PickNextChild();
+    }
+
+    return static_cast<LeafTrafficClass<CallableTask> *>(c);
+  }
+
  protected:
   // Starts at the given class and attempts to unblock classes on the path
   // towards the root.
@@ -215,7 +232,7 @@ class DefaultScheduler : public Scheduler<CallableTask> {
     resource_arr_t usage;
 
     // Schedule.
-    LeafTrafficClass<CallableTask> *leaf = Next(this->checkpoint_);
+    LeafTrafficClass<CallableTask> *leaf = Scheduler<CallableTask>::Next(this->checkpoint_);
 
     uint64_t now;
     if (leaf) {
@@ -251,23 +268,6 @@ class DefaultScheduler : public Scheduler<CallableTask> {
 
     this->checkpoint_ = now;
   }
-
-  // Selects the next TrafficClass to run.
-  LeafTrafficClass<CallableTask> *Next(uint64_t tsc) {
-    this->WakeTCs(tsc);
-
-    if (!this->root_ || this->root_->blocked()) {
-      // Nothing to schedule anywhere.
-      return nullptr;
-    }
-
-    TrafficClass *c = this->root_;
-    while (c->policy_ != POLICY_LEAF) {
-      c = c->PickNextChild();
-    }
-
-    return static_cast<LeafTrafficClass<CallableTask> *>(c);
-  }
 };
 
 template <typename CallableTask>
@@ -309,7 +309,7 @@ class ExperimentalScheduler : public Scheduler<CallableTask> {
     resource_arr_t usage;
 
     // Schedule.
-    LeafTrafficClass<CallableTask> *leaf = Next(this->checkpoint_);
+    LeafTrafficClass<CallableTask> *leaf = Scheduler<CallableTask>::Next(this->checkpoint_);
 
     uint64_t now;
     if (leaf) {
@@ -356,23 +356,6 @@ class ExperimentalScheduler : public Scheduler<CallableTask> {
 
     this->checkpoint_ = now;
   }
-
-  // Selects the next TrafficClass to run.
-  LeafTrafficClass<CallableTask> *Next(uint64_t tsc) {
-    this->WakeTCs(tsc);
-
-    if (!this->root_ || this->root_->blocked()) {
-      // Nothing to schedule anywhere.
-      return nullptr;
-    }
-
-    TrafficClass *c = this->root_;
-    while (c->policy_ != POLICY_LEAF) {
-      c = c->PickNextChild();
-    }
-
-    return static_cast<LeafTrafficClass<CallableTask> *>(c);
-  }
 };
 
 }  // namespace bess