X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=77db6aa79569c9611d1e296fa5fa2b4134f6e584;hb=b756884bdc8b22457243b76982cf10dc4598f927;hp=7d84f60112c5ef26b8c54cf9e139f016fc05df7b;hpb=a726f5f6e1e0731a0516be1e9e23397744734ef5;p=model-checker.git diff --git a/model.h b/model.h index 7d84f60..77db6aa 100644 --- a/model.h +++ b/model.h @@ -52,13 +52,14 @@ public: const ModelExecution * get_execution() const { return execution; } + int get_execution_number() const { return execution_number; } + Thread * get_thread(thread_id_t tid) const; Thread * get_thread(const ModelAction *act) const; 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); @@ -72,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 */ @@ -82,6 +80,10 @@ private: NodeStack * const node_stack; ModelExecution *execution; + int execution_number; + + unsigned int get_num_threads() const; + void execute_sleep_set(); bool next_execution();