add consume to run

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 8a2f9c6516350b1f8b2c7c2b5be76975658a4f9d..b98e7505a4bc21664384c930392b7b1a9b2b2c47 100644 (file)
--- a/model.h
+++ b/model.h
@@ -55,6 +55,17 @@ public:
        uint64_t switch_to_master(ModelAction *act);
        uint64_t switch_thread(ModelAction *act);
 
+       void continueRunExecution(Thread *old);
+       void startRunExecution(ucontext_t *old);
+       void finishRunExecution(Thread *old);
+       void finishRunExecution(ucontext_t *old);
+       void consumeAction();
+       void chooseThread(ModelAction *act, Thread *thr);
+       Thread * getNextThread();
+       void handleChosenThread(Thread *old);
+       void handleChosenThread(ucontext_t *old);
+       void handleNewValidThread(Thread *old, Thread *next);
+
        void assert_bug(const char *msg, ...);
 
        void assert_user_bug(const char *msg);
@@ -80,6 +91,12 @@ private:
 
        unsigned int curr_thread_num;
 
+       Thread * chosen_thread;
+
+       bool thread_chosen;
+
+       modelclock_t checkfree;
+
        unsigned int get_num_threads() const;
 
        void finish_execution(bool moreexecutions);