add support for analysis with options

[model-checker.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index 06fc2ed54d7cc0b04bd04071a2649895e4a4ef05..286f73dea6ec00f065af822f66ae4c3baee1f59c 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -7,21 +7,31 @@ class SCAnalysis : public TraceAnalysis {
  public:
        SCAnalysis();
        ~SCAnalysis();
+       virtual void setExecution(ModelExecution * execution);
        virtual void analyze(action_list_t *);
+       virtual char * name();
+       virtual bool option(char *);
 
        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;
-       SnapVector<action_list_t> * threadlists;
+       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;
+       ModelExecution *execution;
 };
 #endif