threads: save id within class Thread

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index ccaeda21aaa29b9b4ab9919cc3947ebcef9a36fd..64d052fcbf9b5cab928b3ebfbb62554aa7e42939 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; }
-       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;
@@ -51,10 +51,10 @@ public:
                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++; }
-       ModelAction *get_state() {
+       ModelAction * get_state() {
                return iter == actionTrace->end() ? NULL : *iter;
        }
 private:
@@ -76,20 +76,21 @@ public:
        void set_current_action(ModelAction *act) { current_action = act; }
        void check_current_action(void);
        void print_trace(void);
-       Thread *schedule_next_thread();
+       Thread * schedule_next_thread();
 
        int add_thread(Thread *t);
-       Thread *get_thread(thread_id_t tid) { return thread_map[tid]; }
+       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);
+       ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        thread_id_t advance_backtracking_state();
        thread_id_t get_next_replay_thread();