X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=4e4dcf0ff702b9e825646d0dc56407b81cbed38e;hb=305c314f6e2e34396053c3974e3be3796a16e4e1;hp=b6099c69750b066d74d1d4a566834237edf3b097;hpb=b7153285e24941be76175eeb163d25f6f604f96f;p=model-checker.git

diff --git a/model.h b/model.h
index b6099c6..4e4dcf0 100644
--- a/model.h
+++ b/model.h
@@ -16,10 +16,12 @@
 #include "threads.h"
 #include "action.h"
 #include "clockvector.h"
+#include "hashtable.h"
 
 /* Forward declaration */
 class NodeStack;
 class CycleGraph;
+class Promise;
 
 /** @brief The central structure for model-checking */
 class ModelChecker {
@@ -40,7 +42,14 @@ public:
 	ucontext_t * get_system_context(void) { return system_context; }
 
 	void check_current_action(void);
-	void print_summary(void);
+
+	/**
+	 * Prints an execution summary with trace information.
+	 * @param feasible Formats outputting according to whether or not the
+	 * current trace is feasible. Defaults to feasible = true.
+	 */
+	void print_summary(bool feasible = true);
+
 	Thread * schedule_next_thread();
 
 	int add_thread(Thread *t);
@@ -55,6 +64,8 @@ public:
 	ClockVector * get_cv(thread_id_t tid);
 	bool next_execution();
 	bool isfeasible();
+	bool isfinalfeasible();
+	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
 	MEMALLOC
 private:
@@ -75,6 +86,8 @@ private:
 	thread_id_t get_next_replay_thread();
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
+	void resolve_promises(ModelAction *curr);
+	void compute_promises(ModelAction *curr);
 
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid);
@@ -82,10 +95,10 @@ private:
 	ModelAction * get_last_seq_cst(const void *location);
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction * curr);
+	void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
 	void r_modification_order(ModelAction * curr, const ModelAction *rf);
 	void w_modification_order(ModelAction * curr);
 
-
 	ModelAction *current_action;
 	ModelAction *diverge;
 	thread_id_t nextThread;
@@ -99,10 +112,12 @@ private:
 	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
 
 	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+	std::vector<Promise *> * promises;
 	std::vector<ModelAction *> *thrd_last_action;
 	NodeStack *node_stack;
 	ModelAction *next_backtrack;
 	CycleGraph * cyclegraph;
+	bool failed_promise;
 };
 
 extern ModelChecker *model;