scanalysis: don't rely on greedy search

[model-checker.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index a6420955be068d8077e03c8900c0663a5218a0e9..3b9fed3547dc74b8cf7d27c80eb25fbc423c87c3 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -3,18 +3,32 @@
 #include "traceanalysis.h"
 #include "hashtable.h"
 
-class SCAnalysis : public Trace_Analysis {
+class SCAnalysis : public TraceAnalysis {
  public:
-       SCAnalysis();
+       SCAnalysis(const ModelExecution *execution);
        ~SCAnalysis();
        virtual void analyze(action_list_t *);
 
        SNAPSHOTALLOC
  private:
-       void buildVectors(action_list_t *);
+       void print_list(action_list_t *list);
+       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);
+       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 *, ClockVector *, uintptr_t, 4 > cvmap;
+       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;
 };
 #endif