projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
schedule: reset scheduler when thread is removed
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index db1360124eb9f6da159ac0182ea247a34f25dc6a..ca1de85c980cfa19b2179f9f68ee779bc90097e7 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-31,9
+31,9
@@
public:
thread_id_t get_tid() { return tid; }
action_type get_type() { return type; }
memory_order get_mo() { return order; }
thread_id_t get_tid() { return tid; }
action_type get_type() { return type; }
memory_order get_mo() { return order; }
- void *get_location() { return location; }
+ void *
get_location() { return location; }
- TreeNode *get_node() { return node; }
+ TreeNode *
get_node() { return node; }
void set_node(TreeNode *n) { node = n; }
private:
action_type type;
void set_node(TreeNode *n) { node = n; }
private:
action_type type;
@@
-51,10
+51,10
@@
public:
actionTrace = t;
iter = actionTrace->begin();
}
actionTrace = t;
iter = actionTrace->begin();
}
- ModelAction *get_diverge() { return diverge; }
- action_list_t *get_trace() { return actionTrace; }
+ ModelAction *
get_diverge() { return diverge; }
+ action_list_t *
get_trace() { return actionTrace; }
void advance_state() { iter++; }
void advance_state() { iter++; }
- ModelAction *get_state() {
+ ModelAction *
get_state() {
return iter == actionTrace->end() ? NULL : *iter;
}
private:
return iter == actionTrace->end() ? NULL : *iter;
}
private:
@@
-74,20
+74,32
@@
public:
void add_system_thread(Thread *t);
void set_current_action(ModelAction *act) { current_action = act; }
void add_system_thread(Thread *t);
void set_current_action(ModelAction *act) { current_action = act; }
- ModelAction *get_last_conflict(ModelAction *act);
void check_current_action(void);
void check_current_action(void);
- void set_backtracking(ModelAction *act);
void print_trace(void);
void print_trace(void);
+ Thread * schedule_next_thread();
int add_thread(Thread *t);
int add_thread(Thread *t);
- Thread *get_thread(thread_id_t tid) { return thread_map[tid]; }
+ void remove_thread(Thread *t);
+ Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
-
void assign_id(Thread *t
);
+
int get_next_id(
);
int switch_to_master(ModelAction *act);
int switch_to_master(ModelAction *act);
+
+ bool next_execution();
private:
int used_thread_id;
private:
int used_thread_id;
+ int num_executions;
+
+ ModelAction * get_last_conflict(ModelAction *act);
+ void set_backtracking(ModelAction *act);
+ thread_id_t advance_backtracking_state();
+ thread_id_t get_next_replay_thread();
+
class ModelAction *current_action;
class ModelAction *current_action;
+ Backtrack *exploring;
+ thread_id_t nextThread;
+
action_list_t *action_trace;
std::map<thread_id_t, class Thread *> thread_map;
class TreeNode *rootNode, *currentNode;
action_list_t *action_trace;
std::map<thread_id_t, class Thread *> thread_map;
class TreeNode *rootNode, *currentNode;