projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index d2baaf45afee14661a02c620649e4efdfcf107ee..8ff9d375838b193bec751f9b7f0d419a89f07a8d 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-36,11
+36,11
@@
struct model_params {
int maxfuturedelay;
unsigned int fairwindow;
unsigned int enabledcount;
int maxfuturedelay;
unsigned int fairwindow;
unsigned int enabledcount;
+ unsigned int bound;
};
struct PendingFutureValue {
};
struct PendingFutureValue {
- uint64_t value;
- modelclock_t expiration;
+ ModelAction *writer;
ModelAction * act;
};
ModelAction * act;
};
@@
-112,13
+112,16
@@
public:
const model_params params;
Scheduler * get_scheduler() { return scheduler;}
const model_params params;
Scheduler * get_scheduler() { return scheduler;}
+ Node * get_curr_node();
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
Scheduler *scheduler;
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
Scheduler *scheduler;
+ bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
+ bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
bool has_asserted() {return asserted;}
void reset_asserted() {asserted=false;}
int num_executions;
bool has_asserted() {return asserted;}
void reset_asserted() {asserted=false;}
int num_executions;
@@
-136,11
+139,12
@@
private:
*/
void set_current_action(ModelAction *act) { priv->current_action = act; }
Thread * check_current_action(ModelAction *curr);
*/
void set_current_action(ModelAction *act) { priv->current_action = act; }
Thread * check_current_action(ModelAction *curr);
-
ModelAction * initialize_curr_action(ModelAction
*curr);
+
bool initialize_curr_action(ModelAction *
*curr);
bool process_read(ModelAction *curr, bool second_part_of_rmw);
bool process_write(ModelAction *curr);
bool process_mutex(ModelAction *curr);
bool process_thread_action(ModelAction *curr);
bool process_read(ModelAction *curr, bool second_part_of_rmw);
bool process_write(ModelAction *curr);
bool process_mutex(ModelAction *curr);
bool process_thread_action(ModelAction *curr);
+ void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
bool check_action_enabled(ModelAction *curr);
bool take_step();
bool check_action_enabled(ModelAction *curr);
bool take_step();
@@
-153,6
+157,7
@@
private:
void reset_to_initial_state();
bool resolve_promises(ModelAction *curr);
void compute_promises(ModelAction *curr);
void reset_to_initial_state();
bool resolve_promises(ModelAction *curr);
void compute_promises(ModelAction *curr);
+ void compute_relseq_breakwrites(ModelAction *curr);
void check_curr_backtracking(ModelAction * curr);
void add_action_to_lists(ModelAction *act);
void check_curr_backtracking(ModelAction * curr);
void add_action_to_lists(ModelAction *act);
@@
-166,7
+171,6
@@
private:
bool w_modification_order(ModelAction *curr);
bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
bool resolve_release_sequences(void *location, work_queue_t *work_queue);
bool w_modification_order(ModelAction *curr);
bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
bool resolve_release_sequences(void *location, work_queue_t *work_queue);
- void do_complete_join(ModelAction *join);
ModelAction *diverge;
ModelAction *earliest_diverge;
ModelAction *diverge;
ModelAction *earliest_diverge;
@@
-183,9
+187,13
@@
private:
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
+ /** Per-object list of actions. Maps an object (i.e., memory location)
+ * to a trace of all actions performed on the object. */
+ HashTable<const void *, action_list_t, uintptr_t, 4> *condvar_waiters_map;
+
HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
- std::vector<
Promise *
> *promises;
- std::vector<
struct PendingFutureValue
> *futurevalues;
+ std::vector<
Promise *, SnapshotAlloc<Promise *>
> *promises;
+ std::vector<
struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue>
> *futurevalues;
/**
* List of pending release sequences. Release sequences might be
/**
* List of pending release sequences. Release sequences might be
@@
-193,15
+201,19
@@
private:
* are established. Each entry in the list may only be partially
* filled, depending on its pending status.
*/
* are established. Each entry in the list may only be partially
* filled, depending on its pending status.
*/
- std::vector<
struct release_seq *
> *pending_rel_seqs;
+ std::vector<
struct release_seq *, SnapshotAlloc<struct release_seq *>
> *pending_rel_seqs;
- std::vector<
ModelAction *
> *thrd_last_action;
+ std::vector<
ModelAction *, SnapshotAlloc<ModelAction *>
> *thrd_last_action;
NodeStack *node_stack;
/** Private data members that should be snapshotted. They are grouped
* together for efficiency and maintainability. */
struct model_snapshot_members *priv;
NodeStack *node_stack;
/** Private data members that should be snapshotted. They are grouped
* together for efficiency and maintainability. */
struct model_snapshot_members *priv;
+ /** A special model-checker Thread; used for associating with
+ * model-checker-related ModelAcitons */
+ Thread *model_thread;
+
/**
* @brief The modification order graph
*
/**
* @brief The modification order graph
*