projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mistake in promises may allow code... need to be even more aggressive about fv
[model-checker.git]
/
action.h
diff --git
a/action.h
b/action.h
index d0f02a327e6d8373d35b2d56c3dd250a40aa948b..61c7c4cb9f7b5c7ffc15d270792ad856cdfe80e8 100644
(file)
--- a/
action.h
+++ b/
action.h
@@
-5,7
+5,6
@@
#ifndef __ACTION_H__
#define __ACTION_H__
#ifndef __ACTION_H__
#define __ACTION_H__
-#include <list>
#include <cstddef>
#include <inttypes.h>
#include <cstddef>
#include <inttypes.h>
@@
-15,6
+14,11
@@
class ClockVector;
class Thread;
class ClockVector;
class Thread;
+class Promise;
+
+namespace std {
+ class mutex;
+}
using std::memory_order;
using std::memory_order_relaxed;
using std::memory_order;
using std::memory_order_relaxed;
@@
-79,13
+83,18
@@
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; }
- void set_value(uint64_t v) { value = v; }
+ uint64_t get_reads_from_value() const;
+ uint64_t get_write_value() const;
+ uint64_t get_return_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; }
+ std::mutex * get_mutex() const;
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 */
@@
-111,6
+120,7
@@
public:
bool is_uninitialized() const;
bool is_read() const;
bool is_write() const;
bool is_uninitialized() const;
bool is_read() const;
bool is_write() const;
+ bool is_yield() const;
bool could_be_write() const;
bool is_rmwr() const;
bool is_rmwc() const;
bool could_be_write() const;
bool is_rmwr() const;
bool is_rmwc() const;
@@
-149,6
+159,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:
@@
-170,6
+185,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;
@@
-186,6
+204,4
@@
private:
bool sleep_flag;
};
bool sleep_flag;
};
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
#endif /* __ACTION_H__ */
#endif /* __ACTION_H__ */