X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=scanalysis.h;h=e8afc18949aaa1b25b931bcfd46f42a5225fde72;hb=823d6e43187ba7ba3ff802f0ef9306faa51fe5f9;hp=a6420955be068d8077e03c8900c0663a5218a0e9;hpb=9508fe09d2eeaaf7fbe7193d9cb81b3bc66316b5;p=model-checker.git

diff --git a/scanalysis.h b/scanalysis.h
index a642095..e8afc18 100644
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -3,18 +3,27 @@
 #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 print_list(action_list_t *list);
 	void 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 maxthreads;
-	HashTable<const ModelAction *,ClockVector *, uintptr_t, 4 > * cvmap;
+	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