add more const qualifiers

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 976fd4881c8033c277d3d2b7d27b781a08b693a6..c84381dcff935e0689afa5dac314f589cdb7fae2 100644 (file)
--- a/action.h
+++ b/action.h
@@ -11,6 +11,8 @@
 #include "threads.h"
 #include "libatomic.h"
 #include "mymemory.h"
+#include "clockvector.h"
+
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -31,31 +33,36 @@ class ClockVector;
  */
 class ModelAction {
 public:
-       ModelAction(action_type_t type, memory_order order, void *loc, int value);
+       ModelAction(action_type_t type, memory_order order, void *loc, int value = VALUE_NONE);
        ~ModelAction();
-       void print(void);
+       void print(void) const;
 
-       thread_id_t get_tid() { return tid; }
-       action_type get_type() { return type; }
-       memory_order get_mo() { return order; }
-       void * get_location() { return location; }
-       int get_seq_number() const { return seq_number; }
+       thread_id_t get_tid() const { return tid; }
+       action_type get_type() const { return type; }
+       memory_order get_mo() const { return order; }
+       void * get_location() const { return location; }
+       modelclock_t get_seq_number() const { return seq_number; }
+       int get_value() const { return value; }
 
-       Node * get_node() { return node; }
+       Node * get_node() const { return node; }
        void set_node(Node *n) { node = n; }
+       void set_value(int val) { value = val; }
+
+       bool is_read() const;
+       bool is_write() const;
+       bool is_rmw() const;
+       bool is_acquire() const;
+       bool is_release() const;
+       bool is_seqcst() const;
+       bool same_var(const ModelAction *act) const;
+       bool same_thread(const ModelAction *act) const;
+       bool is_synchronizing(const ModelAction *act) const;
 
-       bool is_read();
-       bool is_write();
-       bool is_rmw();
-       bool is_acquire();
-       bool is_release();
-       bool is_seqcst();
-       bool same_var(ModelAction *act);
-       bool same_thread(ModelAction *act);
-       bool is_synchronizing(ModelAction *act);
+       void create_cv(const ModelAction *parent = NULL);
+       ClockVector * get_cv() const { return cv; }
+       void read_from(const ModelAction *act);
 
-       void create_cv(ModelAction *parent = NULL);
-       void read_from(ModelAction *act);
+       bool happens_before(const ModelAction *act) const;
 
        inline bool operator <(const ModelAction& act) const {
                return get_seq_number() < act.get_seq_number();
@@ -87,7 +94,7 @@ private:
         * saved on the NodeStack. */
        Node *node;
        
-       int seq_number;
+       modelclock_t seq_number;
 
        /** The clock vector stored with this action; only needed if this
         * action is a store release? */