fix mutex_trylock bug

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 12aeebcce1df645950ce702d07c14f459da15de6..fd65c0503b0ecd32ff16536a601a12c5fb9fab68 100644 (file)
--- a/model.h
+++ b/model.h
@@ -44,6 +44,7 @@ public:
        Thread * get_thread(const ModelAction *act) const;
 
        Thread * get_current_thread() const;
+       thread_id_t get_current_thread_id() const;
 
        uint64_t switch_thread(ModelAction *act);
 
@@ -72,15 +73,12 @@ private:
 
        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(Thread *old);
-       void handleChosenThread(Thread *old);
+       bool handleChosenThread(Thread *old);
 
        modelclock_t checkfree;