common: print tracing info for ASSERT() failures

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 74e3b068c39f356570daf491c3715865a1382d38..4fc32c6db6c2800d2bdf705d7a8b256683968bab 100644 (file)
--- a/model.h
+++ b/model.h
@@ -17,6 +17,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "hashtable.h"
+#include "workqueue.h"
 
 /* Forward declaration */
 class NodeStack;
@@ -28,6 +29,28 @@ class Promise;
  * the model checker.
  */
 struct model_params {
+       int maxreads;
+       int maxfuturedelay;
+};
+
+struct PendingFutureValue {
+       uint64_t value;
+       modelclock_t expiration;
+       ModelAction * act;
+};
+
+/**
+ * Structure for holding small ModelChecker members that should be snapshotted
+ */
+struct model_snapshot_members {
+       ModelAction *current_action;
+       int next_thread_id;
+       modelclock_t used_sequence_numbers;
+       Thread *nextThread;
+       ModelAction *next_backtrack;
+
+       /** @see ModelChecker::lazy_sync_size */
+       unsigned int lazy_sync_size;
 };
 
 /** @brief The central structure for model-checking */
@@ -45,6 +68,7 @@ public:
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
+       Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
 
        thread_id_t get_next_id();
        int get_num_threads();
@@ -58,11 +82,11 @@ public:
        ModelAction * get_parent_action(thread_id_t tid);
        bool next_execution();
        bool isfeasible();
+       bool isfeasibleotherthanRMW();
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
        void get_release_seq_heads(ModelAction *act,
-                       std::vector<const ModelAction *> *release_heads);
-
+                       std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads);
        void finish_execution();
        bool isfeasibleprefix();
        void set_assert() {asserted=true;}
@@ -72,12 +96,12 @@ private:
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler *scheduler;
 
+       bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
-       int next_thread_id;
-       modelclock_t used_sequence_numbers;
        int num_executions;
-
+       int num_feasible_executions;
+       bool promises_expired();
        const model_params params;
 
        /**
@@ -86,19 +110,23 @@ private:
         * data between them.
         * @param act The ModelAction created by the user-thread action
         */
-       void set_current_action(ModelAction *act) { current_action = act; }
+       void set_current_action(ModelAction *act) { priv->current_action = act; }
        Thread * check_current_action(ModelAction *curr);
+       bool process_read(ModelAction *curr, bool second_part_of_rmw);
+       bool process_write(ModelAction *curr);
 
        bool take_step();
 
+       void check_recency(ModelAction *curr, bool already_added);
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
-       Thread * get_next_replay_thread();
+       Thread * get_next_thread(ModelAction *curr);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
        bool resolve_promises(ModelAction *curr);
        void compute_promises(ModelAction *curr);
 
+       void check_curr_backtracking(ModelAction * curr);
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
        ModelAction * get_last_seq_cst(const void *location);
@@ -108,12 +136,10 @@ private:
        bool r_modification_order(ModelAction *curr, const ModelAction *rf);
        bool w_modification_order(ModelAction *curr);
        bool release_seq_head(const ModelAction *rf,
-                       std::vector<const ModelAction *> *release_heads) const;
-       bool resolve_release_sequences(void *location);
+                       std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const;
+       bool resolve_release_sequences(void *location, work_queue_t *work_queue);
 
-       ModelAction *current_action;
        ModelAction *diverge;
-       Thread *nextThread;
 
        ucontext_t system_context;
        action_list_t *action_trace;
@@ -125,6 +151,7 @@ private:
 
        HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
        std::vector<Promise *> *promises;
+       std::vector<struct PendingFutureValue> *futurevalues;
 
        /**
         * Collection of lists of objects that might synchronize with one or
@@ -135,9 +162,20 @@ private:
         */
        HashTable<void *, std::list<ModelAction *>, uintptr_t, 4> *lazy_sync_with_release;
 
+       /**
+        * Represents the total size of the
+        * ModelChecker::lazy_sync_with_release lists. This count should be
+        * snapshotted, so it is actually a pointer to a location within
+        * ModelChecker::priv
+        */
+       unsigned int *lazy_sync_size;
+
        std::vector<ModelAction *> *thrd_last_action;
        NodeStack *node_stack;
-       ModelAction *next_backtrack;
+
+       /** Private data members that should be snapshotted. They are grouped
+        * together for efficiency and maintainability. */
+       struct model_snapshot_members *priv;
 
        /**
         * @brief The modification order graph
@@ -155,6 +193,7 @@ private:
         */
        CycleGraph *mo_graph;
        bool failed_promise;
+       bool too_many_reads;
        bool asserted;
 };