Rewrite recursion in terms of loops; make it a bit faster

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index ffc1a0c64b3175785440806f1be8c758b8ee62c1..19497c02f61b0515d3a0b6b5cf0c9e599fd1c313 100644 (file)
--- a/model.h
+++ b/model.h
@@ -53,14 +53,6 @@ public:
        uint64_t switch_to_master(ModelAction *act);
        uint64_t switch_thread(ModelAction *act);
 
-       void startRunExecution(Thread *old);
-       void finishRunExecution(Thread *old);
-       void consumeAction();
-       void chooseThread(ModelAction *act, Thread *thr);
-       Thread * getNextThread();
-       void handleChosenThread(Thread *old);
-       void handleNewValidThread(Thread *old, Thread *next);
-
        void assert_bug(const char *msg, ...);
 
        void assert_user_bug(const char *msg);
@@ -85,12 +77,17 @@ private:
        int execution_number;
 
        unsigned int curr_thread_num;
-
        Thread * chosen_thread;
-
        bool thread_chosen;
        bool break_execution;
 
+       void startRunExecution(Thread *old);
+       void finishRunExecution(Thread *old);
+       void consumeAction();
+       void chooseThread(ModelAction *act, Thread *thr);
+       Thread * getNextThread();
+       void handleChosenThread(Thread *old);
+
        modelclock_t checkfree;
 
        unsigned int get_num_threads() const;