add consume to run

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index b81858c87f6a815c2ea4d58c5fc46f2562d72534..b98e7505a4bc21664384c930392b7b1a9b2b2c47 100644 (file)
--- a/model.h
+++ b/model.h
@@ -55,12 +55,15 @@ public:
        uint64_t switch_to_master(ModelAction *act);
        uint64_t switch_thread(ModelAction *act);
 
        uint64_t switch_to_master(ModelAction *act);
        uint64_t switch_thread(ModelAction *act);
 

-       void continueExecution(Thread *old);
-       void finishExecution(Thread *old);
+       void continueRunExecution(Thread *old);
+       void startRunExecution(ucontext_t *old);
+       void finishRunExecution(Thread *old);
+       void finishRunExecution(ucontext_t *old);

        void consumeAction();
        void consumeAction();

-       void chooseThread(ModelAction *act, Thread *old);
+       void chooseThread(ModelAction *act, Thread *thr);

        Thread * getNextThread();
        void handleChosenThread(Thread *old);
        Thread * getNextThread();
        void handleChosenThread(Thread *old);

+       void handleChosenThread(ucontext_t *old);

        void handleNewValidThread(Thread *old, Thread *next);
 
        void assert_bug(const char *msg, ...);
        void handleNewValidThread(Thread *old, Thread *next);
 
        void assert_bug(const char *msg, ...);