Merge branch 'firefox-test' of /home/git/random-fuzzer into firefox-test

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index c5a5aa78647deb2bfdb3ae7cf269b972ae5f89f0..634748130ce51713d014c07903f10edf4d3a8fe1 100644 (file)
--- a/model.h
+++ b/model.h
@@ -18,8 +18,6 @@
 #include "classlist.h"
 #include "snapshot-interface.h"
 
-typedef SnapList<ModelAction *> action_list_t;
-
 /** @brief Model checker execution stats */
 struct execution_stats {
        int num_total;  /**< @brief Total number of executions */
@@ -35,9 +33,6 @@ public:
        model_params * getParams();
        void run();
 
-       /** Restart the model checker, intended for pluggins. */
-       void restart();
-
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
@@ -69,9 +64,6 @@ public:
        Scheduler * getScheduler() {return scheduler;}
        MEMALLOC
 private:
-       /** Flag indicates whether to restart the model checker. */
-       bool restart_flag;
-
        /** Snapshot id we return to restart. */
        snapshot_id snapshot;
 
@@ -85,7 +77,7 @@ private:
 
        unsigned int get_num_threads() const;
 
-       bool next_execution();
+       void finish_execution(bool moreexecutions);
        bool should_terminate_execution();
 
        Thread * get_next_thread();
@@ -95,8 +87,6 @@ private:
 
        ModelVector<TraceAnalysis *> trace_analyses;
 
-       /** @bref Implement restart. */
-       void do_restart();
        /** @bref Plugin that can inspect new actions. */
        TraceAnalysis *inspect_plugin;
        /** @brief The cumulative execution stats */