add some support for traceanalysis plugins

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 355764b7c4d290cfb3de64f7f0c0086a0ba83c73..864f6aeedcc8072c96d19b6071f95169f02be134 100644 (file)
--- a/model.h
+++ b/model.h
@@ -6,7 +6,6 @@
 #define __MODEL_H__
 
 #include <cstddef>
-#include <ucontext.h>
 #include <inttypes.h>
 
 #include "mymemory.h"
@@ -15,6 +14,7 @@
 #include "config.h"
 #include "modeltypes.h"
 #include "stl-model.h"
+#include "context.h"
 
 /* Forward declaration */
 class Node;
@@ -24,6 +24,7 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
+class Trace_Analysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
@@ -39,6 +40,7 @@ struct model_params {
        int maxreads;
        int maxfuturedelay;
        bool yieldon;
+       bool sc_trace_analysis;
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;
@@ -132,11 +134,14 @@ public:
        void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
        bool isfeasibleprefix() const;
 
-       bool assert_bug(const char *msg);
+       bool assert_bug(const char *msg, ...);
        void assert_user_bug(const char *msg);
 
        const model_params params;
        Node * get_curr_node() const;
+       void add_trace_analysis(Trace_Analysis * a) {
+               trace_analyses->push_back(a);
+       }
 
        MEMALLOC
 private:
@@ -171,6 +176,7 @@ private:
        bool check_action_enabled(ModelAction *curr);
 
        Thread * take_step(ModelAction *curr);
+       bool should_terminate_execution();
 
        template <typename T>
        bool check_recency(ModelAction *curr, const T *rf) const;
@@ -226,10 +232,6 @@ private:
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
 
-       /** Per-object list of actions. Maps an object (i.e., memory location)
-        * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t *, uintptr_t, 4> * const lock_waiters_map;
-
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
@@ -249,6 +251,8 @@ private:
        SnapVector<ModelAction *> * const thrd_last_action;
        SnapVector<ModelAction *> * const thrd_last_fence_release;
        NodeStack * const node_stack;
+       ModelVector<Trace_Analysis *> * trace_analyses;
+
 
        /** Private data members that should be snapshotted. They are grouped
         * together for efficiency and maintainability. */
@@ -277,12 +281,11 @@ private:
        /** @brief The cumulative execution stats */
        struct execution_stats stats;
        void record_stats();
-
+       void run_trace_analyses();
        void print_infeasibility(const char *prefix) const;
        bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
-       bool is_circular_wait(const Thread *t) const;
        bool is_complete_execution() const;
        bool have_bug_reports() const;
        void print_bugs() const;