projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threads/model: allocate Thread from w/in ModelChecker
[model-checker.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index d2e6491b2edec5891943351e9891b358f2b05594..47c72678aa13cffb9294e6a7d842860136e37baf 100644
(file)
--- a/
nodestack.h
+++ b/
nodestack.h
@@
-10,8
+10,8
@@
#include <inttypes.h>
#include "mymemory.h"
#include <inttypes.h>
#include "mymemory.h"
-#include "modeltypes.h"
#include "schedule.h"
#include "schedule.h"
+#include "promise.h"
class ModelAction;
class Thread;
class ModelAction;
class Thread;
@@
-32,11
+32,6
@@
class Thread;
typedef int promise_t;
typedef int promise_t;
-struct future_value {
- uint64_t value;
- modelclock_t expiration;
-};
-
struct fairness_info {
unsigned int enabled_count;
unsigned int turns;
struct fairness_info {
unsigned int enabled_count;
unsigned int turns;
@@
-76,7
+71,7
@@
public:
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
- bool add_future_value(
const ModelAction *writer, modelclock_t expiration
);
+ bool add_future_value(
struct future_value& fv
);
struct future_value get_future_value() const;
bool increment_future_value();
bool future_value_empty() const;
struct future_value get_future_value() const;
bool increment_future_value();
bool future_value_empty() const;
@@
-104,7
+99,7
@@
public:
bool increment_relseq_break();
bool relseq_break_empty() const;
bool increment_relseq_break();
bool relseq_break_empty() const;
- void print();
+ void print()
const
;
void print_may_read_from();
MEMALLOC
void print_may_read_from();
MEMALLOC