Removed ANNOTATE_HAPPENS_DONE() again.

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

diff --git a/drd/drd.h b/drd/drd.h
index a13635c1f8aa92d5bbe03d8f1cb0b6577bdf5fb6..971cabb7f1500e5101d30c5e3a60d17bd1e5846b 100644 (file)
--- a/drd/drd.h
+++ b/drd/drd.h
@@ -112,11 +112,6 @@
  */
 #define ANNOTATE_HAPPENS_AFTER(addr) DRDCL_(annotate_happens_after)(addr)
 
-/**
- * Tell DRD that no more happens-after annotations will follow.
- */
-#define ANNOTATE_HAPPENS_DONE(addr) DRDCL_(annotate_happens_done)(addr)
-
 /**
  * Tell DRD that waiting on the condition variable at address cv has succeeded
  * and a lock on the mutex at address mtx is now held. Since DRD always inserts
@@ -356,9 +351,6 @@ enum {
    VG_USERREQ__DRD_ANNOTATE_HAPPENS_AFTER
       = VG_USERREQ_TOOL_BASE('H','G') + 256 + 34,
    /* args: Addr. */
-   /* Tell DRD to insert a happens-done annotation. */
-   VG_USERREQ__DRD_ANNOTATE_HAPPENS_DONE,
-   /* args: Addr. */
 
 };
 
@@ -459,14 +451,6 @@ void DRDCL_(annotate_happens_after)(const void* const addr)
                               addr, 0, 0, 0, 0);
 }
 
-static __inline__
-void DRDCL_(annotate_happens_done)(const void* const addr)
-{
-   int res;
-   VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__DRD_ANNOTATE_HAPPENS_DONE,
-                              addr, 0, 0, 0, 0);
-}
-
 static __inline__
 void DRDCL_(annotate_rwlock_create)(const void* const rwlock)
 {

diff --git a/drd/drd_clientreq.c b/drd/drd_clientreq.c
index d7a4de520d67f89438695605131a5922e1a40a65..96394287ee137c542717768da8bd22b92fb09dd3 100644 (file)
--- a/drd/drd_clientreq.c
+++ b/drd/drd_clientreq.c
@@ -123,10 +123,6 @@ static Bool handle_client_request(ThreadId vg_tid, UWord* arg, UWord* ret)
       DRD_(hb_happens_after)(drd_tid, arg[1]);
       break;
 
-   case VG_USERREQ__DRD_ANNOTATE_HAPPENS_DONE:
-      DRD_(hb_happens_done)(drd_tid, arg[1]);
-      break;
-
    case VG_USERREQ__DRD_ANNOTATE_RWLOCK_CREATE:
       if (arg[1])
       {

diff --git a/drd/tests/annotate_hb_err.c b/drd/tests/annotate_hb_err.c
index 97da9c0d146771e2545dffa412aebe5820600873..946dbd373ead7fac95ef17e29f35317ec4c460b2 100644 (file)
--- a/drd/tests/annotate_hb_err.c
+++ b/drd/tests/annotate_hb_err.c
@@ -30,14 +30,14 @@ int main(int argc, char** argv)
   pthread_cond_init((pthread_cond_t*)&i, NULL);
 
   /* The sequence below is fine. */
-  ANNOTATE_HAPPENS_DONE(&i);
+  ANNOTATE_NEW_MEMORY(&i, sizeof(i));
   ANNOTATE_HAPPENS_BEFORE(&i);
   ANNOTATE_HAPPENS_AFTER(&i);
-  ANNOTATE_HAPPENS_DONE(&i);
+  ANNOTATE_NEW_MEMORY(&i, sizeof(i));
   ANNOTATE_HAPPENS_BEFORE(&i);
-  ANNOTATE_HAPPENS_DONE(&i);
+  ANNOTATE_NEW_MEMORY(&i, sizeof(i));
 
-  /* happens-before after happens-after without intervening happens-done. */
+  /* happens-before after happens-after. */
   ANNOTATE_HAPPENS_BEFORE(&i);
   ANNOTATE_HAPPENS_AFTER(&i);
   ANNOTATE_HAPPENS_BEFORE(&i);

diff --git a/drd/tests/annotate_smart_pointer.cpp b/drd/tests/annotate_smart_pointer.cpp
index c3b9d37ddbd59b7e08e8dcbc6361c786f48b050e..2ad4fb5a13374ca1803234753733cbb80d20e6bf 100755 (executable)
--- a/drd/tests/annotate_smart_pointer.cpp
+++ b/drd/tests/annotate_smart_pointer.cpp
@@ -240,10 +240,7 @@ private:
        if (--(*m_count_ptr) == 0)
        {
          if (s_enable_annotations)
-         {
            ANNOTATE_HAPPENS_AFTER(m_count_ptr);
-           ANNOTATE_HAPPENS_DONE(m_count_ptr);
-         }
          delete m_ptr;
          m_ptr = NULL;
          delete m_count_ptr;