scanalysis: allocate structures as true members of class (not pointers)

[model-checker.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index 79f78f1c00d630b6a1557015d2c5e4683f231879..e8afc18949aaa1b25b931bcfd46f42a5225fde72 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -3,9 +3,9 @@
 #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 *);
 
@@ -18,8 +18,12 @@ class SCAnalysis : public Trace_Analysis {
        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 maxthreads;
-       HashTable<const ModelAction *,ClockVector *, uintptr_t, 4 > * cvmap;
-       SnapVector<action_list_t> * threadlists;
+       HashTable<const ModelAction *, ClockVector *, uintptr_t, 4 > cvmap;
+       HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4 > cycleset;
+       SnapVector<action_list_t> threadlists;
+       const ModelExecution *execution;
 };
 #endif