Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 8dc88430f2b093969c00ed9f4cff18163072d776..96ea6fa902ae28e2da69aaef6b899a6621c777da 100644 (file)
--- a/action.h
+++ b/action.h
@@ -66,7 +66,7 @@ class ModelAction {
 public:
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
        ~ModelAction();
-       void print(bool print_cv = true) const;
+       void print() const;
 
        thread_id_t get_tid() const { return tid; }
        action_type get_type() const { return type; }
@@ -101,11 +101,11 @@ public:
        bool same_var(const ModelAction *act) const;
        bool same_thread(const ModelAction *act) const;
        bool is_conflicting_lock(const ModelAction *act) const;
-       bool is_synchronizing(const ModelAction *act) const;
+       bool could_synchronize_with(const ModelAction *act) const;
 
        void create_cv(const ModelAction *parent = NULL);
        ClockVector * get_cv() const { return cv; }
-       void read_from(const ModelAction *act);
+       bool read_from(const ModelAction *act);
        bool synchronize_with(const ModelAction *act);
 
        bool has_synchronized_with(const ModelAction *act) const;