From: Brian Norris <banorris@uci.edu>
Date: Tue, 20 Nov 2012 04:40:30 +0000 (-0800)
Subject: schedule: rename get_enabled() -> get_enabled_array()
X-Git-Tag: oopsla2013~494
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21f8ca7067d5d6810ea819a183ea50f863c17752;p=model-checker.git

schedule: rename get_enabled() -> get_enabled_array()

This function actually returns the array, not a single "enabled" status.
(There's a separate get_enabled() method for getting a single status.)
---

diff --git a/model.cc b/model.cc
index da68074..700f25c 100644
--- a/model.cc
+++ b/model.cc
@@ -1000,7 +1000,7 @@ bool ModelChecker::initialize_curr_action(ModelAction **curr)
 
 	(*curr)->set_seq_number(get_next_seq_num());
 
-	newcurr = node_stack->explore_action(*curr, scheduler->get_enabled());
+	newcurr = node_stack->explore_action(*curr, scheduler->get_enabled_array());
 	if (newcurr) {
 		/* First restore type and order in case of RMW operation */
 		if ((*curr)->is_rmwr())
diff --git a/schedule.h b/schedule.h
index da91fdd..98aef1a 100644
--- a/schedule.h
+++ b/schedule.h
@@ -30,7 +30,7 @@ public:
 	Thread * next_thread(Thread *t);
 	Thread * get_current_thread() const;
 	void print() const;
-	enabled_type_t * get_enabled() { return enabled; };
+	enabled_type_t * get_enabled_array() { return enabled; };
 	void remove_sleep(Thread *t);
 	void add_sleep(Thread *t);
 	enabled_type_t get_enabled(Thread *t);