bug fixes

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 1aaa9db3b79d7a280f689f935de3c27dcf334548..7ca610cad3fa7d488f29d682795f7886ff0f5943 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -19,8 +19,6 @@
 #include <condition_variable>
 #include "classlist.h"
 
-typedef SnapList<ModelAction *> action_list_t;
-
 struct PendingFutureValue {
        PendingFutureValue(ModelAction *writer, ModelAction *reader) :
                writer(writer), reader(reader)
@@ -41,6 +39,7 @@ public:
        Thread * take_step(ModelAction *curr);
 
        void print_summary();
+       void print_tail();
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpGraph(char *filename);
 #endif
@@ -89,7 +88,7 @@ public:
        void setFinished() {isfinished = true;}
        void restore_last_seq_num();
        void collectActions();
-
+       modelclock_t get_curr_seq_num();
 #ifdef TLS
        pthread_key_t getPthreadKey() {return pthreadkey;}
 #endif
@@ -104,12 +103,12 @@ private:
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
        void process_write(ModelAction *curr);
-       bool process_fence(ModelAction *curr);
+       void process_fence(ModelAction *curr);
        bool process_mutex(ModelAction *curr);
        void process_thread_action(ModelAction *curr);
        void read_from(ModelAction *act, ModelAction *rf);
        bool synchronize(const ModelAction *first, ModelAction *second);
-       void add_action_to_lists(ModelAction *act);
+       void add_action_to_lists(ModelAction *act, bool canprune);
        void add_normal_write_to_lists(ModelAction *act);
        void add_write_to_lists(ModelAction *act);
        ModelAction * get_last_fence_release(thread_id_t tid) const;
@@ -124,6 +123,7 @@ private:
        ModelAction * convertNonAtomicStore(void*);
        ClockVector * computeMinimalCV();
        void removeAction(ModelAction *act);
+       void fixupLastAct(ModelAction *act);
 
 #ifdef TLS
        pthread_key_t pthreadkey;
@@ -201,7 +201,6 @@ private:
        Fuzzer * fuzzer;
 
        Thread * action_select_next_thread(const ModelAction *curr) const;
-       bool paused_by_fuzzer(const ModelAction * act) const;
 
        bool isfinished;
 };