projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: use get_write_value()
[model-checker.git]
/
action.h
diff --git
a/action.h
b/action.h
index a246123c259d002d04eb14b1b0a4d63048e12fb6..7c9146fdda694adfd97c7f932f75822e53a4303c 100644
(file)
--- a/
action.h
+++ b/
action.h
@@
-15,6
+15,7
@@
class ClockVector;
class Thread;
class ClockVector;
class Thread;
+class Promise;
using std::memory_order;
using std::memory_order_relaxed;
using std::memory_order;
using std::memory_order_relaxed;
@@
-24,12
+25,10
@@
using std::memory_order_acq_rel;
using std::memory_order_seq_cst;
/** Note that this value can be legitimately used by a program, and
using std::memory_order_seq_cst;
/** Note that this value can be legitimately used by a program, and
- hence by iteself does not indicate no value. */
-
+ * hence by iteself does not indicate no value. */
#define VALUE_NONE 0xdeadbeef
/** A special value to represent a successful trylock */
#define VALUE_NONE 0xdeadbeef
/** A special value to represent a successful trylock */
-
#define VALUE_TRYSUCCESS 1
/** A special value to represent a failed trylock */
#define VALUE_TRYSUCCESS 1
/** A special value to represent a failed trylock */
@@
-81,12
+80,16
@@
public:
void * get_location() const { return location; }
modelclock_t get_seq_number() const { return seq_number; }
uint64_t get_value() const { return value; }
void * get_location() const { return location; }
modelclock_t get_seq_number() const { return seq_number; }
uint64_t get_value() const { return value; }
+ uint64_t get_reads_from_value() const;
+ uint64_t get_write_value() const;
const ModelAction * get_reads_from() const { return reads_from; }
const ModelAction * get_reads_from() const { return reads_from; }
+ Promise * get_reads_from_promise() const { return reads_from_promise; }
Node * get_node() const;
void set_node(Node *n) { node = n; }
void set_read_from(const ModelAction *act);
Node * get_node() const;
void set_node(Node *n) { node = n; }
void set_read_from(const ModelAction *act);
+ void set_read_from_promise(Promise *promise);
/** Store the most recent fence-release from the same thread
* @param fence The fence-release that occured prior to this */
/** Store the most recent fence-release from the same thread
* @param fence The fence-release that occured prior to this */
@@
-127,6
+130,8
@@
public:
bool is_conflicting_lock(const ModelAction *act) const;
bool could_synchronize_with(const ModelAction *act) const;
bool is_conflicting_lock(const ModelAction *act) const;
bool could_synchronize_with(const ModelAction *act) const;
+ Thread * get_thread_operand() const;
+
void create_cv(const ModelAction *parent = NULL);
ClockVector * get_cv() const { return cv; }
bool synchronize_with(const ModelAction *act);
void create_cv(const ModelAction *parent = NULL);
ClockVector * get_cv() const { return cv; }
bool synchronize_with(const ModelAction *act);
@@
-148,6
+153,11
@@
public:
bool get_sleep_flag() { return sleep_flag; }
unsigned int hash() const;
bool get_sleep_flag() { return sleep_flag; }
unsigned int hash() const;
+ bool equals(const ModelAction *x) const { return this == x; }
+ bool equals(const Promise *x) const { return false; }
+
+ bool may_read_from(const ModelAction *write) const;
+ bool may_read_from(const Promise *promise) const;
MEMALLOC
private:
MEMALLOC
private:
@@
-169,6
+179,9
@@
private:
/** The action that this action reads from. Only valid for reads */
const ModelAction *reads_from;
/** The action that this action reads from. Only valid for reads */
const ModelAction *reads_from;
+ /** The promise that this action reads from. Only valid for reads */
+ Promise *reads_from_promise;
+
/** The last fence release from the same thread */
const ModelAction *last_fence_release;
/** The last fence release from the same thread */
const ModelAction *last_fence_release;
@@
-185,6
+198,4
@@
private:
bool sleep_flag;
};
bool sleep_flag;
};
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
#endif /* __ACTION_H__ */
#endif /* __ACTION_H__ */