X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=d71ad8f69204f9a1905269595f80cdbff191a0f8;hb=HEAD;hp=634748130ce51713d014c07903f10edf4d3a8fe1;hpb=f269c2a1c390e82ae189bc690a750601f874283f;p=c11tester.git

diff --git a/model.h b/model.h
index 63474813..d71ad8f6 100644
--- a/model.h
+++ b/model.h
@@ -18,6 +18,11 @@
 #include "classlist.h"
 #include "snapshot-interface.h"
 
+#define ENTER_MODEL_FLAG (inside_model = 1)
+#define EXIT_MODEL_FLAG (inside_model = 0)
+#define GET_MODEL_FLAG (inside_model)
+#define RESTORE_MODEL_FLAG(f) (inside_model = f)
+
 /** @brief Model checker execution stats */
 struct execution_stats {
 	int num_total;	/**< @brief Total number of executions */
@@ -31,16 +36,11 @@ 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; }
 
 	int get_execution_number() const { return execution_number; }
 
@@ -48,9 +48,9 @@ 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 assert_bug(const char *msg, ...);
 
@@ -69,12 +69,22 @@ private:
 
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
-	ModelHistory * history;
 	ModelExecution *execution;
 	Thread * init_thread;
 
 	int execution_number;
 
+	unsigned int curr_thread_num;
+	Thread * chosen_thread;
+	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;
 
 	void finish_execution(bool moreexecutions);
@@ -83,9 +93,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;
@@ -98,8 +107,10 @@ private:
 	void print_stats() const;
 };
 
+extern int inside_model;
 extern ModelChecker *model;
 void parse_options(struct model_params *params);
 void install_trace_analyses(ModelExecution *execution);
+void createModelIfNotExist();
 
 #endif	/* __MODEL_H__ */