projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: cosmetic improvements to resolve_promises()
[model-checker.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index 2dddf729b077c532f51e03e3be0fe8f60e1fccc5..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,18
+32,12
@@
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;
bool priority;
};
struct fairness_info {
unsigned int enabled_count;
unsigned int turns;
bool priority;
};
-
/**
* @brief A single node in a NodeStack
*
/**
* @brief A single node in a NodeStack
*
@@
-77,9
+71,8
@@
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(uint64_t value, modelclock_t expiration);
- uint64_t get_future_value() const;
- modelclock_t get_future_value_expiration() const;
+ bool add_future_value(struct future_value& fv);
+ struct future_value get_future_value() const;
bool increment_future_value();
bool future_value_empty() const;
bool increment_future_value();
bool future_value_empty() const;
@@
-106,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