model: remove obsolete ModelChecker::do_complete_join()
authorBrian Norris <banorris@uci.edu>
Wed, 3 Oct 2012 00:29:56 +0000 (17:29 -0700)
committerBrian Norris <banorris@uci.edu>
Wed, 3 Oct 2012 00:33:02 +0000 (17:33 -0700)
This function was folded into the one place it is used, now.

model.cc
model.h

index ce9e0660ff33021bc53bfaa0ada87cd60b12434f..097da8ae9b7c66fae010db5c95d3a6245622f3cc 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -697,19 +697,6 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
        return get_next_thread(curr);
 }
 
-/**
- * Complete a THREAD_JOIN operation, by synchronizing with the THREAD_FINISH
- * operation from the Thread it is joining with. Must be called after the
- * completion of the Thread in question.
- * @param join The THREAD_JOIN action
- */
-void ModelChecker::do_complete_join(ModelAction *join)
-{
-       Thread *blocking = (Thread *)join->get_location();
-       ModelAction *act = get_last_action(blocking->get_id());
-       join->synchronize_with(act);
-}
-
 void ModelChecker::check_curr_backtracking(ModelAction * curr) {
        Node *currnode = curr->get_node();
        Node *parnode = currnode->get_parent();
diff --git a/model.h b/model.h
index 6f082c66a71653f7240fcf8102223f60845e870f..867ec0310670f808874aaf7aabe52528fdd2592b 100644 (file)
--- a/model.h
+++ b/model.h
@@ -152,7 +152,6 @@ private:
        bool w_modification_order(ModelAction *curr);
        bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const;
        bool resolve_release_sequences(void *location, work_queue_t *work_queue);
-       void do_complete_join(ModelAction *join);
 
        ModelAction *diverge;
        ModelAction *earliest_diverge;