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 da68074240d9ea2b416b40665ef7843d2c7df7ae..700f25c017b1d44aa310eee2f4518c7e051abf1c 100644 (file)
--- 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());
 
 
        (*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())
        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 da91fddf976c8dd880a57b98476b9e3af76cdffd..98aef1a7514299cce1a3be93e0b0c3a043ef7b11 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -30,7 +30,7 @@ public:
        Thread * next_thread(Thread *t);
        Thread * get_current_thread() const;
        void print() const;
        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);
        void remove_sleep(Thread *t);
        void add_sleep(Thread *t);
        enabled_type_t get_enabled(Thread *t);