X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=7f63e6d99812c98f5732d35c52a1e04f8691ac17;hb=b756884bdc8b22457243b76982cf10dc4598f927;hp=41a1bc1479ceb8f9d12a2ebb81fb6bacf925d6a6;hpb=dd34ddf490dd97c2c202092c8fa44064a07f8c4f;p=model-checker.git diff --git a/execution.h b/execution.h index 41a1bc1..7f63e6d 100644 --- a/execution.h +++ b/execution.h @@ -61,11 +61,13 @@ struct release_seq { class ModelExecution { public: ModelExecution(ModelChecker *m, - struct model_params *params, + const struct model_params *params, Scheduler *scheduler, NodeStack *node_stack); ~ModelExecution(); + const struct model_params * get_params() const { return params; } + Thread * take_step(ModelAction *curr); void fixup_release_sequences(); @@ -107,6 +109,7 @@ public: bool is_feasible_prefix_ignore_relseq() const; bool is_infeasible() const; bool is_deadlocked() const; + bool is_yieldblocked() const; bool too_many_steps() const; ModelAction * get_next_backtrack(); @@ -190,7 +193,7 @@ private: /** Per-object list of actions. Maps an object (i.e., memory location) * to a trace of all actions performed on the object. */ - HashTable * const obj_map; + HashTable obj_map; /** Per-object list of actions. Maps an object (i.e., memory location) * to a trace of all actions performed on the object. */