scanalysis: don't rely on greedy search

[model-checker.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index e8afc18949aaa1b25b931bcfd46f42a5225fde72..3b9fed3547dc74b8cf7d27c80eb25fbc423c87c3 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -12,17 +12,22 @@ class SCAnalysis : public TraceAnalysis {
        SNAPSHOTALLOC
  private:
        void print_list(action_list_t *list);
-       void buildVectors(action_list_t *);
+       int buildVectors(action_list_t *);
        bool updateConstraints(ModelAction *act);
        void computeCV(action_list_t *);
        action_list_t * generateSC(action_list_t *);
        bool processRead(ModelAction *read, ClockVector *cv);
-       ModelAction * getNextAction();
-       bool merge(ClockVector *cv, const ModelAction *act, ClockVector *cv2);
+       int getNextActions(ModelAction **array);
+       bool merge(ClockVector *cv, const ModelAction *act, const ModelAction *act2);
+       void check_rf(action_list_t *list);
+       void reset(action_list_t *list);
+       ModelAction* pruneArray(ModelAction**, int);
 
        int maxthreads;
        HashTable<const ModelAction *, ClockVector *, uintptr_t, 4 > cvmap;
-       HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4 > cycleset;
+       bool cyclic;
+       HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4 > badrfset;
+       HashTable<void *, const ModelAction *, uintptr_t, 4 > lastwrmap;
        SnapVector<action_list_t> threadlists;
        const ModelExecution *execution;
 };