X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=e35457e1eea77c9dd653db444303d6284caa7279;hb=542a46125c8ed7010a0d55542a9e6a7d3f70443c;hp=ffc1a0c64b3175785440806f1be8c758b8ee62c1;hpb=c7a5091afba87a67423c0797fa001914ce9e2ff4;p=c11tester.git

diff --git a/model.h b/model.h
index ffc1a0c6..e35457e1 100644
--- a/model.h
+++ b/model.h
@@ -31,14 +31,10 @@ public:
 	ModelChecker();
 	~ModelChecker();
 	model_params * getParams();
-	void run();
 
 	/** Exit the model checker, intended for pluggins. */
 	void exit_model_checker();
 
-	/** @returns the context for the main model-checking system thread */
-	ucontext_t * get_system_context() { return &system_context; }
-
 	ModelExecution * get_execution() const { return execution; }
 	ModelHistory * get_history() const { return history; }
 
@@ -48,19 +44,10 @@ public:
 	Thread * get_thread(const ModelAction *act) const;
 
 	Thread * get_current_thread() const;
+	thread_id_t get_current_thread_id() const;
 
-	void switch_from_master(Thread *thread);
-	uint64_t switch_to_master(ModelAction *act);
 	uint64_t switch_thread(ModelAction *act);
 
-	void startRunExecution(Thread *old);
-	void finishRunExecution(Thread *old);
-	void consumeAction();
-	void chooseThread(ModelAction *act, Thread *thr);
-	Thread * getNextThread();
-	void handleChosenThread(Thread *old);
-	void handleNewValidThread(Thread *old, Thread *next);
-
 	void assert_bug(const char *msg, ...);
 
 	void assert_user_bug(const char *msg);
@@ -85,12 +72,14 @@ private:
 	int execution_number;
 
 	unsigned int curr_thread_num;
-
 	Thread * chosen_thread;
-
-	bool thread_chosen;
 	bool break_execution;
 
+	void startRunExecution(Thread *old);
+	void finishRunExecution(Thread *old);
+	Thread * getNextThread(Thread *old);
+	bool handleChosenThread(Thread *old);
+
 	modelclock_t checkfree;
 
 	unsigned int get_num_threads() const;
@@ -101,9 +90,8 @@ private:
 	Thread * get_next_thread();
 	void reset_to_initial_state();
 
-	ucontext_t system_context;
-
 	ModelVector<TraceAnalysis *> trace_analyses;
+	char random_state[256];
 
 	/** @bref Plugin that can inspect new actions. */
 	TraceAnalysis *inspect_plugin;
@@ -119,5 +107,6 @@ private:
 extern ModelChecker *model;
 void parse_options(struct model_params *params);
 void install_trace_analyses(ModelExecution *execution);
+void createModelIfNotExist();
 
 #endif	/* __MODEL_H__ */