projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snapshot: use sizeof(*fork_snap)
[model-checker.git]
/
action.h
diff --git
a/action.h
b/action.h
index c546f574202523b7ba0a575e34d6ac20182112a2..abf55318cd3ba379ea198420fad4ce70bfc570ea 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>
@@
-17,6
+16,10
@@
class ClockVector;
class Thread;
class Promise;
class Thread;
class Promise;
+namespace std {
+ class mutex;
+}
+
using std::memory_order;
using std::memory_order_relaxed;
using std::memory_order_acquire;
using std::memory_order;
using std::memory_order_relaxed;
using std::memory_order_acquire;
@@
-82,8
+85,10
@@
public:
uint64_t get_value() const { return value; }
uint64_t get_reads_from_value() const;
uint64_t get_write_value() const;
uint64_t get_value() const { return value; }
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; }
Promise * get_reads_from_promise() const { return reads_from_promise; }
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; }
Node * get_node() const;
void set_node(Node *n) { node = n; }
@@
-101,6
+106,7
@@
public:
void set_seq_number(modelclock_t num);
void set_try_lock(bool obtainedlock);
bool is_thread_start() const;
void set_seq_number(modelclock_t num);
void set_try_lock(bool obtainedlock);
bool is_thread_start() const;
+ bool is_thread_join() const;
bool is_relseq_fixup() const;
bool is_mutex_op() const;
bool is_lock() const;
bool is_relseq_fixup() const;
bool is_mutex_op() const;
bool is_lock() const;
@@
-115,6
+121,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;
@@
-155,6
+162,9
@@
public:
bool equals(const ModelAction *x) const { return this == x; }
bool equals(const Promise *x) const { return false; }
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: