Find a faster way to get currently executing thread's id

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 19497c02f61b0515d3a0b6b5cf0c9e599fd1c313..03dafd11b1a0aa5493dcf8f1c62f549e788e7a74 100644 (file)
--- a/model.h
+++ b/model.h
@@ -31,14 +31,10 @@ public:
        ModelChecker();
        ~ModelChecker();
        model_params * getParams();
-       void run();
 
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
-       /** @returns the context for the main model-checking system thread */
-       ucontext_t * get_system_context() { return &system_context; }
-
        ModelExecution * get_execution() const { return execution; }
        ModelHistory * get_history() const { return history; }
 
@@ -48,9 +44,8 @@ public:
        Thread * get_thread(const ModelAction *act) const;
 
        Thread * get_current_thread() const;
+       thread_id_t get_current_thread_id() const;
 
-       void switch_from_master(Thread *thread);
-       uint64_t switch_to_master(ModelAction *act);
        uint64_t switch_thread(ModelAction *act);
 
        void assert_bug(const char *msg, ...);
@@ -83,10 +78,8 @@ private:
 
        void startRunExecution(Thread *old);
        void finishRunExecution(Thread *old);
-       void consumeAction();
-       void chooseThread(ModelAction *act, Thread *thr);
-       Thread * getNextThread();
-       void handleChosenThread(Thread *old);
+       Thread * getNextThread(Thread *old);
+       bool handleChosenThread(Thread *old);
 
        modelclock_t checkfree;
 
@@ -98,9 +91,8 @@ private:
        Thread * get_next_thread();
        void reset_to_initial_state();
 
-       ucontext_t system_context;
-
        ModelVector<TraceAnalysis *> trace_analyses;
+       char random_state[256];
 
        /** @bref Plugin that can inspect new actions. */
        TraceAnalysis *inspect_plugin;