From 37bf8e7d54c72e0aeee029a491e45bb9d7b2f409 Mon Sep 17 00:00:00 2001
From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 2 Nov 2012 20:26:19 -0700
Subject: [PATCH] previous synchronization was weird...

---
 action.cc      |  2 +-
 clockvector.cc | 11 -----------
 clockvector.h  |  1 -
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/action.cc b/action.cc
index 140d5909..1387ed15 100644
--- a/action.cc
+++ b/action.cc
@@ -365,7 +365,7 @@ bool ModelAction::synchronize_with(const ModelAction *act) {
 
 bool ModelAction::has_synchronized_with(const ModelAction *act) const
 {
-	return cv->has_synchronized_with(act->cv);
+	return cv->synchronized_since(act);
 }
 
 /**
diff --git a/clockvector.cc b/clockvector.cc
index 7d947c63..e56c2ace 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -75,17 +75,6 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
 	return false;
 }
 
-bool ClockVector::has_synchronized_with(const ClockVector *cv) const
-{
-	ASSERT(cv);
-	if (cv->num_threads > num_threads)
-		return false;
-	for (int i = 0; i < cv->num_threads; i++)
-		if (cv->clock[i] > clock[i])
-			return false;
-	return true;
-}
-
 /** Gets the clock corresponding to a given thread id from the clock vector. */
 modelclock_t ClockVector::getClock(thread_id_t thread) {
 	int threadid = id_to_int(thread);
diff --git a/clockvector.h b/clockvector.h
index 6a902c52..9000a5d7 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -17,7 +17,6 @@ public:
 	~ClockVector();
 	void merge(const ClockVector *cv);
 	bool synchronized_since(const ModelAction *act) const;
-	bool has_synchronized_with(const ClockVector *cv) const;
 
 	void print() const;
 	modelclock_t getClock(thread_id_t thread);
-- 
2.34.1