X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=86e0b1e7b05a8174a05d8a3f28dc7132432962d5;hb=0cb167b8fb332e4d9726badd0aa58e943bb4b459;hp=2b878b3f3ae71b475db5466c27b2c817b1118506;hpb=b7a6b3c7fb66628a4b14af804418dbfff4072e95;p=model-checker.git diff --git a/model.h b/model.h index 2b878b3..86e0b1e 100644 --- a/model.h +++ b/model.h @@ -36,9 +36,6 @@ public: ModelChecker(struct model_params params); ~ModelChecker(); - /** The scheduler to use: tracks the running/ready Threads */ - Scheduler *scheduler; - /** Stores the context for the main model-checking system thread (call * once) * @param ctxt The system context structure @@ -63,6 +60,9 @@ public: int get_num_threads(); modelclock_t get_next_seq_num(); + /** @return The currently executing Thread. */ + Thread * get_current_thread() { return scheduler->get_current_thread(); } + int switch_to_master(ModelAction *act); ClockVector * get_cv(thread_id_t tid); bool next_execution(); @@ -74,6 +74,9 @@ public: MEMALLOC private: + /** The scheduler to use: tracks the running/ready Threads */ + Scheduler *scheduler; + int next_thread_id; modelclock_t used_sequence_numbers; int num_executions;