projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3ad375
)
model: rename get_last_seq_cst -> get_last_seq_cst_write
author
Brian Norris
<banorris@uci.edu>
Sat, 1 Dec 2012 01:54:58 +0000
(17:54 -0800)
committer
Brian Norris
<banorris@uci.edu>
Sat, 1 Dec 2012 01:54:58 +0000
(17:54 -0800)
model.cc
patch
|
blob
|
history
model.h
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index 8d8c18780fe756d3b0770806b36bf952f169b187..d615e1ada44c7fa0af87478c14e04065ddf6387b 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-1535,7
+1535,7
@@
bool ModelChecker::w_modification_order(ModelAction *curr)
if (curr->is_seqcst()) {
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
if (curr->is_seqcst()) {
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
- ModelAction *last_seq_cst = get_last_seq_cst(curr);
+ ModelAction *last_seq_cst = get_last_seq_cst
_write
(curr);
if (last_seq_cst != NULL) {
mo_graph->addEdge(last_seq_cst, curr);
added = true;
if (last_seq_cst != NULL) {
mo_graph->addEdge(last_seq_cst, curr);
added = true;
@@
-1985,7
+1985,7
@@
ModelAction * ModelChecker::get_last_action(thread_id_t tid) const
* check
* @return The last seq_cst write
*/
* check
* @return The last seq_cst write
*/
-ModelAction * ModelChecker::get_last_seq_cst(ModelAction *curr) const
+ModelAction * ModelChecker::get_last_seq_cst
_write
(ModelAction *curr) const
{
void *location = curr->get_location();
action_list_t *list = get_safe_ptr_action(obj_map, location);
{
void *location = curr->get_location();
action_list_t *list = get_safe_ptr_action(obj_map, location);
@@
-2240,7
+2240,7
@@
void ModelChecker::build_reads_from_past(ModelAction *curr)
bool initialized = false;
if (curr->is_seqcst()) {
bool initialized = false;
if (curr->is_seqcst()) {
- last_seq_cst = get_last_seq_cst(curr);
+ last_seq_cst = get_last_seq_cst
_write
(curr);
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
if (last_seq_cst != NULL)
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
if (last_seq_cst != NULL)
diff --git
a/model.h
b/model.h
index 9665fa42b1a03a2b731f3f26ad4a28f852289eb3..d0e47d9d6212ad004194aac45ef070a96ed5d2c0 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-170,7
+170,7
@@
private:
void check_curr_backtracking(ModelAction * curr);
void add_action_to_lists(ModelAction *act);
ModelAction * get_last_action(thread_id_t tid) const;
void check_curr_backtracking(ModelAction * curr);
void add_action_to_lists(ModelAction *act);
ModelAction * get_last_action(thread_id_t tid) const;
- ModelAction * get_last_seq_cst(ModelAction *curr) const;
+ ModelAction * get_last_seq_cst
_write
(ModelAction *curr) const;
ModelAction * get_last_unlock(ModelAction *curr) const;
void build_reads_from_past(ModelAction *curr);
ModelAction * process_rmw(ModelAction *curr);
ModelAction * get_last_unlock(ModelAction *curr) const;
void build_reads_from_past(ModelAction *curr);
ModelAction * process_rmw(ModelAction *curr);