projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rmw example works
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 2093bf4b19cb31579d2b5e1040bcdb3ce55eb63c..8593b98f06a186aa7e297cd661219edf1c69c264 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-14,13
+14,13
@@
#include "schedule.h"
#include "mymemory.h"
#include "libthreads.h"
#include "schedule.h"
#include "mymemory.h"
#include "libthreads.h"
-#include "libatomic.h"
#include "threads.h"
#include "action.h"
#include "clockvector.h"
/* Forward declaration */
class NodeStack;
#include "threads.h"
#include "action.h"
#include "clockvector.h"
/* Forward declaration */
class NodeStack;
+class CycleGraph;
/** @brief The central structure for model-checking */
class ModelChecker {
/** @brief The central structure for model-checking */
class ModelChecker {
@@
-55,6
+55,7
@@
public:
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
+ bool isfeasible();
MEMALLOC
private:
MEMALLOC
private:
@@
-81,6
+82,10
@@
private:
ModelAction * get_parent_action(thread_id_t tid);
ModelAction * get_last_seq_cst(const void *location);
void build_reads_from_past(ModelAction *curr);
ModelAction * get_parent_action(thread_id_t tid);
ModelAction * get_last_seq_cst(const void *location);
void build_reads_from_past(ModelAction *curr);
+ ModelAction * process_rmw(ModelAction * curr);
+ void r_modification_order(ModelAction * curr, const ModelAction *rf);
+ void w_modification_order(ModelAction * curr);
+
ModelAction *current_action;
ModelAction *diverge;
ModelAction *current_action;
ModelAction *diverge;
@@
-98,6
+103,7
@@
private:
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
ModelAction *next_backtrack;
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
ModelAction *next_backtrack;
+ CycleGraph * cyclegraph;
};
extern ModelChecker *model;
};
extern ModelChecker *model;