From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 6 Apr 2008 14:57:41 +0000 (+0000)
Subject: Added vc_combine2().
X-Git-Tag: svn/VALGRIND_3_4_0~744
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b03517a7484658f067f8b272ce45398b2bf66017;p=thirdparty%2Fvalgrind.git

Added vc_combine2().

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7855
---

diff --git a/exp-drd/drd_vc.h b/exp-drd/drd_vc.h
index 6135ca97e0..3737880bf1 100644
--- a/exp-drd/drd_vc.h
+++ b/exp-drd/drd_vc.h
@@ -69,6 +69,7 @@ void vc_copy(VectorClock* const new,
              const VectorClock* const rhs);
 void vc_assign(VectorClock* const lhs,
                const VectorClock* const rhs);
+UInt vc_get(VectorClock* const vc, const ThreadId tid);
 void vc_increment(VectorClock* const vc, ThreadId const threadid);
 Bool vc_lte(const VectorClock* const vc1,
             const VectorClock* const vc2);
@@ -78,6 +79,9 @@ void vc_min(VectorClock* const result,
             const VectorClock* const rhs);
 void vc_combine(VectorClock* const result,
                 const VectorClock* const rhs);
+Bool vc_combine2(VectorClock* const result,
+                 const VectorClock* const rhs,
+                 const ThreadId tid);
 void vc_print(const VectorClock* const vc);
 void vc_snprint(Char* const str, Int const size,
                 const VectorClock* const vc);