X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=25e20b129dc6b5280fc28af939495b713c7b1971;hb=3ff940ed5c20a17155bf998bd5aac8a735032c67;hp=89d089d1051aafbcd95ae6cd4961c23f764be739;hpb=7bfea91f33595532cf618fe3d090e8021f578795;p=model-checker.git diff --git a/model.h b/model.h index 89d089d..25e20b1 100644 --- a/model.h +++ b/model.h @@ -50,7 +50,7 @@ public: /** @returns the context for the main model-checking system thread */ ucontext_t * get_system_context() { return &system_context; } - const ModelExecution * get_execution() const { return execution; } + ModelExecution * get_execution() const { return execution; } int get_execution_number() const { return execution_number; } @@ -60,7 +60,6 @@ public: bool is_enabled(Thread *t) const; bool is_enabled(thread_id_t tid) const; - unsigned int get_num_threads() const; Thread * get_current_thread() const; void switch_from_master(Thread *thread); @@ -74,9 +73,6 @@ public: trace_analyses.push_back(a); } - action_list_t * get_actions_on_obj(void * obj, thread_id_t tid); - ModelAction * get_last_action(thread_id_t tid) const; - MEMALLOC private: /** The scheduler to use: tracks the running/ready Threads */ @@ -86,6 +82,8 @@ private: int execution_number; + unsigned int get_num_threads() const; + void execute_sleep_set(); bool next_execution();