projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nodestack: remove unnecessary typedefs
[model-checker.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index 9ccde8da34e953052660292d6b865cb53dbe76e0..996bdf3f68fc51e72534815e5caebeab8dc77014 100644
(file)
--- a/
nodestack.h
+++ b/
nodestack.h
@@
-13,9
+13,6
@@
class ModelAction;
class ModelAction;
-typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
-typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
-
/**
* @brief A single node in a NodeStack
*
/**
* @brief A single node in a NodeStack
*
@@
-33,8
+30,7
@@
public:
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
- bool readsfrom_empty();
- bool futurevalues_empty();
+
void explore_child(ModelAction *act);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
void explore_child(ModelAction *act);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
@@
-47,11
+43,19
@@
public:
Node * get_parent() const { return parent; }
bool add_future_value(uint64_t value);
Node * get_parent() const { return parent; }
bool add_future_value(uint64_t value);
+ uint64_t get_future_value();
+ bool increment_future_value();
+ bool future_value_empty();
+
void add_read_from(const ModelAction *act);
const ModelAction * get_read_from();
void add_read_from(const ModelAction *act);
const ModelAction * get_read_from();
- uint64_t get_future_value();
bool increment_read_from();
bool increment_read_from();
- bool increment_future_values();
+ bool read_from_empty();
+
+ void set_promise(uint32_t i);
+ bool get_promise(uint32_t i);
+ bool increment_promise();
+ bool promise_empty();
void print();
void print_may_read_from();
void print();
void print_may_read_from();
@@
-69,10
+73,12
@@
private:
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
- readfrom_set_t may_read_from;
+ std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
unsigned int read_from_index;
unsigned int read_from_index;
- futurevalues_t future_values;
+ std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+ std::vector< uint32_t, MyAlloc< uint32_t > > promises;
unsigned int future_index;
};
unsigned int future_index;
};