add support for analysis with options

[model-checker.git] / scanalysis.cc

diff --git a/scanalysis.cc b/scanalysis.cc
index e6cbddc71e4f01f70f176e7c63ad5917c25888b2..2738bb50a907a76f6ee6a60fb38d0f68406de7cc 100644 (file)
--- a/scanalysis.cc
+++ b/scanalysis.cc
@@ -4,19 +4,32 @@
 #include "clockvector.h"
 #include "execution.h"
 
-SCAnalysis::SCAnalysis(const ModelExecution *execution) :
+SCAnalysis::SCAnalysis() :
        cvmap(),
        cyclic(false),
        badrfset(),
        lastwrmap(),
        threadlists(1),
-       execution(execution)
+       execution(NULL)
 {
 }
 
 SCAnalysis::~SCAnalysis() {
 }
 
+void SCAnalysis::setExecution(ModelExecution * execution) {
+       this->execution=execution;
+}
+
+char * SCAnalysis::name() {
+       char * name = "SC";
+       return name;
+}
+
+bool SCAnalysis::option(char *) {
+       return false;
+}
+
 void SCAnalysis::print_list(action_list_t *list) {
        model_print("---------------------------------------------------------------------\n");
        if (cyclic)
@@ -30,7 +43,7 @@ void SCAnalysis::print_list(action_list_t *list) {
                                model_print("BRF ");
                        act->print();
                        if (badrfset.contains(act)) {
-                               model_print("Desired Rf: %u \n",badrfset.get(act)->get_seq_number());
+                               model_print("Desired Rf: %u \n", badrfset.get(act)->get_seq_number());
                        }
                }
                hash = hash ^ (hash << 3) ^ ((*it)->hash());
@@ -49,8 +62,8 @@ void SCAnalysis::check_rf(action_list_t *list) {
        for (action_list_t::iterator it = list->begin(); it != list->end(); it++) {
                const ModelAction *act = *it;
                if (act->is_read()) {
-                       if (act->get_reads_from()!=lastwrmap.get(act->get_location()))
-                               badrfset.put(act,lastwrmap.get(act->get_location()));
+                       if (act->get_reads_from() != lastwrmap.get(act->get_location()))
+                               badrfset.put(act, lastwrmap.get(act->get_location()));
                }
                if (act->is_write())
                        lastwrmap.put(act->get_location(), act);
@@ -58,11 +71,11 @@ void SCAnalysis::check_rf(action_list_t *list) {
 }
 
 bool SCAnalysis::merge(ClockVector *cv, const ModelAction *act, const ModelAction *act2) {
-       ClockVector * cv2=cvmap.get(act2);
-       if (cv2==NULL)
+       ClockVector *cv2 = cvmap.get(act2);
+       if (cv2 == NULL)
                return true;
        if (cv2->getClock(act->get_tid()) >= act->get_seq_number() && act->get_seq_number() != 0) {
-               cyclic=true;
+               cyclic = true;
                //refuse to introduce cycles into clock vectors
                return false;
        }
@@ -332,7 +345,7 @@ bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
                                 write -rf-> R =>
                                 write2 -sc-> write */
                        if (cv->synchronized_since(write2)) {
-                               changed |= writecv==NULL || merge(writecv, write, write2);
+                               changed |= writecv == NULL || merge(writecv, write, write2);
                                break;
                        }
                }