commit 8b09d4f037c6399658b610228c7bbc0c6133d9da
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Dec 04 21:27:18 2007 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Dec 04 21:27:18 2007 +0000
tree f47f02232a7947f43364247858a2772ea1e5d212
parent 92676d73dac76085222e6e95fc8d18a039c054ff

DRD changes (Bart Van Assche)

* Add docs: exp-drd/docs/README.txt
* Added one drd suppression pattern, and cleaned up the suppression file.
* All regression tests now pass on x86_64 and i386, including sigalrm.
* Updated TODO.txt file.
* pth_create_chain test is now started with 100 threads instead of 10
  -- 10 was not enough.
* DRD no longer exits on PPC32 and PPC64 but just prints a warning
  message before it starts.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7275 a5019735-40e9-0310-863c-91ae7b9d1cf9

exp-drd/drd_thread.c

diff --git a/exp-drd/drd_thread.c b/exp-drd/drd_thread.c
index 38121a2..8ab9938 100644
--- a/exp-drd/drd_thread.c
+++ b/exp-drd/drd_thread.c
@@ -84,7 +84,8 @@
 static ULong s_update_danger_set_count;
 static ULong s_danger_set_bitmap_creation_count;
 static ULong s_danger_set_bitmap2_creation_count;
-static DrdThreadId s_running_tid = DRD_INVALID_THREADID;
+static ThreadId    s_vg_running_tid  = VG_INVALID_THREADID;
+static DrdThreadId s_drd_running_tid = DRD_INVALID_THREADID;
 static ThreadInfo s_threadinfo[DRD_N_THREADS];
 static struct bitmap* s_danger_set;
 
@@ -420,17 +421,49 @@
                  fmt, arg);
    s_threadinfo[tid].name[sizeof(s_threadinfo[tid].name) - 1] = 0;
 }
+
 DrdThreadId thread_get_running_tid(void)
 {
-   tl_assert(s_running_tid != DRD_INVALID_THREADID);
-   return s_running_tid;
+   // HACK. To do: remove the if-statement and keep the assert.
+   if (VG_(get_running_tid)() != VG_INVALID_THREADID)
+      tl_assert(VG_(get_running_tid)() == s_vg_running_tid);
+   tl_assert(s_drd_running_tid != DRD_INVALID_THREADID);
+   return s_drd_running_tid;
 }
 
-void thread_set_running_tid(const DrdThreadId tid)
+void thread_set_vg_running_tid(const ThreadId vg_tid)
 {
-   s_running_tid = tid;
-   thread_update_danger_set(tid);
-   s_context_switch_count++;
+   // HACK. To do: uncomment the line below.
+   // tl_assert(vg_tid != VG_INVALID_THREADID);
+
+   if (vg_tid != s_vg_running_tid)
+   {
+      thread_set_running_tid(vg_tid, VgThreadIdToDrdThreadId(vg_tid));
+   }
+
+   tl_assert(s_vg_running_tid != VG_INVALID_THREADID);
+   tl_assert(s_drd_running_tid != DRD_INVALID_THREADID);
+}
+
+void thread_set_running_tid(const ThreadId vg_tid, const DrdThreadId drd_tid)
+{
+   // HACK. To do: remove the next two lines.
+   if (vg_tid == VG_INVALID_THREADID)
+      return;
+
+   tl_assert(vg_tid != VG_INVALID_THREADID);
+   tl_assert(drd_tid != DRD_INVALID_THREADID);
+   
+   if (vg_tid != s_vg_running_tid)
+   {
+      s_vg_running_tid = vg_tid;
+      s_drd_running_tid = drd_tid;
+      thread_update_danger_set(drd_tid);
+      s_context_switch_count++;
+   }
+
+   tl_assert(s_vg_running_tid != VG_INVALID_THREADID);
+   tl_assert(s_drd_running_tid != DRD_INVALID_THREADID);
 }
 
 /**
@@ -640,7 +673,7 @@
    vc_combine(&s_threadinfo[joiner].last->vc, &s_threadinfo[joinee].last->vc);
    thread_discard_ordered_segments();
 
-   if (joiner == s_running_tid)
+   if (joiner == s_drd_running_tid)
    {
       thread_update_danger_set(joiner);
    }
@@ -668,7 +701,7 @@
       for (p = s_threadinfo[i].first; p; p = p->next)
       {
          if (other_user == DRD_INVALID_THREADID
-             && i != s_running_tid
+             && i != s_drd_running_tid
              && bm_has_any_access(p->bm, a1, a2))
          {
             other_user = i;
@@ -939,7 +972,7 @@
 
    tl_assert(0 <= tid && tid < DRD_N_THREADS
              && tid != DRD_INVALID_THREADID);
-   tl_assert(tid == s_running_tid);
+   tl_assert(tid == s_drd_running_tid);
 
    s_update_danger_set_count++;
    s_danger_set_bitmap_creation_count  -= bm_get_bitmap_creation_count();