model: remove braces

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index f0709103f10c0ecafea972e08c78a6716a109136..3cc536b61cd357d4a329852930aaecdb0100575c 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -1,6 +1,8 @@
 #include <stdio.h>
 
 #include "model.h"
+#include "action.h"
+#include "tree.h"
 #include "schedule.h"
 #include "common.h"
 
@@ -36,9 +38,8 @@ void ModelChecker::reset_to_initial_state()
 {
        DEBUG("+++ Resetting to initial state +++\n");
        std::map<thread_id_t, class Thread *>::iterator it;
-       for (it = thread_map.begin(); it != thread_map.end(); it++) {
+       for (it = thread_map.begin(); it != thread_map.end(); it++)
                delete (*it).second;
-       }
        thread_map.clear();
        action_trace = new action_list_t();
        currentNode = rootNode;
@@ -261,6 +262,30 @@ bool ModelAction::is_write()
        return type == ATOMIC_WRITE;
 }
 
+bool ModelAction::is_acquire()
+{
+       switch (order) {
+       case memory_order_acquire:
+       case memory_order_acq_rel:
+       case memory_order_seq_cst:
+               return true;
+       default:
+               return false;
+       }
+}
+
+bool ModelAction::is_release()
+{
+       switch (order) {
+       case memory_order_release:
+       case memory_order_acq_rel:
+       case memory_order_seq_cst:
+               return true;
+       default:
+               return false;
+       }
+}
+
 bool ModelAction::same_var(ModelAction *act)
 {
        return location == act->location;