X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=scanalysis.h;h=f9db2db74693d4e4706dc08a2462d1e842f2bb3d;hb=66a17f91a2fff4c92b686a5524fe0ae920c2a203;hp=79f78f1c00d630b6a1557015d2c5e4683f231879;hpb=38cb7400c16ad0a04355ec77af2bf5da2dbfaad5;p=model-checker.git

diff --git a/scanalysis.h b/scanalysis.h
index 79f78f1..f9db2db 100644
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -18,8 +18,10 @@ 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;
+	HashTable<const ModelAction *,const ModelAction *, uintptr_t, 4 > * cycleset;
 	SnapVector<action_list_t> * threadlists;
 };
 #endif