From 004ffe355e33b1b5e88095a0873fa5119993c7bc Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 30 Nov 2012 17:54:58 -0800 Subject: [PATCH] model: rename get_last_seq_cst -> get_last_seq_cst_write --- model.cc | 6 +++--- model.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model.cc b/model.cc index 8d8c187..d615e1a 100644 --- 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. */ - 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; @@ -1985,7 +1985,7 @@ ModelAction * ModelChecker::get_last_action(thread_id_t tid) const * 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); @@ -2240,7 +2240,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) 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) diff --git a/model.h b/model.h index 9665fa4..d0e47d9 100644 --- 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; - 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); -- 2.34.1