From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 10 Mar 2014 19:40:45 +0000 (+0000)
Subject: coregrind/m_scheduler + drd: Rework r13862
X-Git-Tag: svn/VALGRIND_3_10_0~572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1485694c3f4f4dc2c8ecaf3febb3ff9e9b02aea0;p=thirdparty%2Fvalgrind.git

coregrind/m_scheduler + drd: Rework r13862

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

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index b6f558d0a1..52b4d0f257 100644
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -1011,7 +1011,6 @@ static void handle_tt_miss ( ThreadId tid )
                                  ip, True/*upd_fast_cache*/ );
    if (UNLIKELY(!found)) {
       /* Not found; we need to request a translation. */
-      VG_TRACK( start_client_code, tid, bbs_done );
       if (VG_(translate)( tid, ip, /*debug*/False, 0/*not verbose*/, 
                           bbs_done, True/*allow redirection*/ )) {
          found = VG_(search_transtab)( NULL, NULL, NULL,
@@ -1025,7 +1024,6 @@ static void handle_tt_miss ( ThreadId tid )
 	 // or the thread has been marked for termination.  Either
 	 // way, we just need to go back into the scheduler loop.
       }
-      VG_TRACK( stop_client_code, tid, bbs_done );
    }
 }
 
diff --git a/drd/drd_main.c b/drd/drd_main.c
index db6eeb8bf5..2104ea3799 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -276,6 +276,7 @@ static void drd_pre_mem_read(const CorePart part,
                              const Addr a,
                              const SizeT size)
 {
+   DRD_(thread_set_vg_running_tid)(VG_(get_running_tid)());
    if (size > 0)
    {
       DRD_(trace_load)(a, size);