schedule: reset scheduler when thread is removed

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 2097d2916d5891c499b01a3d72ea085eb936e184..ca1de85c980cfa19b2179f9f68ee779bc90097e7 100644 (file)
--- a/model.h
+++ b/model.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <map>
+#include <cstddef>
 
 #include "schedule.h"
 #include "libthreads.h"
@@ -30,9 +31,9 @@ public:
        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;
@@ -48,15 +49,19 @@ public:
        Backtrack(ModelAction *d, action_list_t *t) {
                diverge = d;
                actionTrace = t;
-               //currentIterator = actionTrace->getFirst();
+               iter = actionTrace->begin();
+       }
+       ModelAction * get_diverge() { return diverge; }
+       action_list_t * get_trace() { return actionTrace; }
+       void advance_state() { iter++; }
+       ModelAction * get_state() {
+               return iter == actionTrace->end() ? NULL : *iter;
        }
-       ModelAction *get_diverge() { return diverge; }
-       action_list_t *get_trace() { return actionTrace; }
 private:
        ModelAction *diverge;
-       /* unused for now; will be used when re-exploring this path? */
-       //MyListElement *currentIterator;
        action_list_t *actionTrace;
+       /* points to position in actionTrace as we replay */
+       action_list_t::iterator iter;
 };
 
 class ModelChecker {
@@ -69,23 +74,36 @@ public:
        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 set_backtracking(ModelAction *act);
        void print_trace(void);
+       Thread * schedule_next_thread();
 
        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);
+
+       bool next_execution();
 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;
+       Backtrack *exploring;
+       thread_id_t nextThread;
+
        action_list_t *action_trace;
        std::map<thread_id_t, class Thread *> thread_map;
        class TreeNode *rootNode, *currentNode;
+       std::list<class Backtrack *> backtrack_list;
 };
 
 extern ModelChecker *model;