From 5f6566b5bd21517d0f963011ddf7bd919f8da7b9 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 14 Mar 2012 22:56:30 -0700 Subject: [PATCH] schedule: make 'current' a private member of the scheduler --- schedule.cc | 10 ++-------- schedule.h | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/schedule.cc b/schedule.cc index 687d306..c02ca62 100644 --- a/schedule.cc +++ b/schedule.cc @@ -5,8 +5,6 @@ #include "common.h" #include "model.h" -struct thread *current; - void DefaultScheduler::add_thread(struct thread *t) { DEBUG("thread %d\n", t->id); @@ -15,17 +13,13 @@ void DefaultScheduler::add_thread(struct thread *t) struct thread *DefaultScheduler::next_thread(void) { - struct thread *t; - if (queue.empty()) return NULL; - t = queue.front(); + current = queue.front(); queue.pop_front(); - current = t; - - return t; + return current; } struct thread *DefaultScheduler::get_current_thread(void) diff --git a/schedule.h b/schedule.h index 762e168..aa291ef 100644 --- a/schedule.h +++ b/schedule.h @@ -20,6 +20,7 @@ public: struct thread * get_current_thread(void); private: std::list queue; + struct thread *current; }; #endif /* __SCHEDULE_H__ */ -- 2.34.1