Declared thread_set_stack_min() inline.

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

diff --git a/exp-drd/drd_thread.c b/exp-drd/drd_thread.c
index d8c5d19ae7e95a62a5a72ada7d84920b487339ff..fafac5f80c307b0d6c7e4ae15c7d1c8fa3108f08 100644 (file)
--- a/exp-drd/drd_thread.c
+++ b/exp-drd/drd_thread.c
@@ -119,7 +119,6 @@ DrdThreadId VgThreadIdToNewDrdThreadId(const ThreadId tid)
       s_threadinfo[i].vg_thread_exists = True;
       s_threadinfo[i].vg_threadid   = tid;
       s_threadinfo[i].pt_threadid   = INVALID_POSIX_THREADID;
-      s_threadinfo[i].stack_min_min = 0;
       s_threadinfo[i].stack_min     = 0;
       s_threadinfo[i].stack_startup = 0;
       s_threadinfo[i].stack_max     = 0;
@@ -218,7 +217,6 @@ DrdThreadId thread_post_create(const ThreadId vg_created)
   s_threadinfo[created].stack_max     = VG_(thread_get_stack_max)(vg_created);
   s_threadinfo[created].stack_startup = s_threadinfo[created].stack_max;
   s_threadinfo[created].stack_min     = s_threadinfo[created].stack_max;
-  s_threadinfo[created].stack_min_min = s_threadinfo[created].stack_max;
   tl_assert(s_threadinfo[created].stack_max != 0);
 
   return created;
@@ -251,31 +249,6 @@ Addr thread_get_stack_min(const DrdThreadId tid)
   return s_threadinfo[tid].stack_min;
 }
 
-void thread_set_stack_min(const DrdThreadId tid, const Addr stack_min)
-{
-#if 0
-  VG_(message)(Vg_DebugMsg, "thread %d (%d) stack_min = 0x%x"
-               " (size %d, max %d, delta %d)",
-               s_threadinfo[tid].vg_threadid, tid,
-               stack_min,
-               s_threadinfo[tid].stack_max - stack_min,
-               s_threadinfo[tid].stack_max - s_threadinfo[tid].stack_min_min,
-               s_threadinfo[tid].stack_min - stack_min);
-#endif
-  tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
-  if (s_threadinfo[tid].stack_max)
-  {
-    s_threadinfo[tid].stack_min = stack_min;
-    if (stack_min < s_threadinfo[tid].stack_min_min)
-    {
-      s_threadinfo[tid].stack_min_min = stack_min;
-    }
-    tl_assert(s_threadinfo[tid].stack_min_min
-              <= s_threadinfo[tid].stack_min);
-    tl_assert(s_threadinfo[tid].stack_min < s_threadinfo[tid].stack_max);
-  }
-}
-
 DrdThreadId thread_lookup_stackaddr(const Addr a,
                                     Addr* const stack_min,
                                     Addr* const stack_max)
@@ -403,12 +376,6 @@ void thread_set_name_fmt(const DrdThreadId tid, const char* const fmt,
   s_threadinfo[tid].name[sizeof(s_threadinfo[tid].name) - 1] = 0;
 }
 
-DrdThreadId thread_get_running_tid(void)
-{
-  tl_assert(s_drd_running_tid != DRD_INVALID_THREADID);
-  return s_drd_running_tid;
-}
-
 void thread_set_vg_running_tid(const ThreadId vg_tid)
 {
   tl_assert(vg_tid != VG_INVALID_THREADID);
@@ -845,12 +812,9 @@ static void thread_update_danger_set(const DrdThreadId tid)
 
   if (s_danger_set)
   {
-    bm_clear_all(s_danger_set);
-  }
-  else
-  {
-    s_danger_set = bm_new();
+    bm_delete(s_danger_set);
   }
+  s_danger_set = bm_new();
 
   if (s_trace_danger_set)
   {

diff --git a/exp-drd/drd_thread.h b/exp-drd/drd_thread.h
index 3817d063cb1f65259815110d1dcdfe3d6eeda153..f92b551b90161f365a7d5d1b0fb2fddedcf954c4 100644 (file)
--- a/exp-drd/drd_thread.h
+++ b/exp-drd/drd_thread.h
@@ -60,7 +60,6 @@ typedef struct
   Segment*  last;
   ThreadId  vg_threadid;
   PThreadId pt_threadid;
-  Addr      stack_min_min;
   Addr      stack_min;
   Addr      stack_startup;
   Addr      stack_max;
@@ -104,7 +103,6 @@ void thread_delete(const DrdThreadId tid);
 void thread_finished(const DrdThreadId tid);
 void thread_set_stack_startup(const DrdThreadId tid, const Addr stack_startup);
 Addr thread_get_stack_min(const DrdThreadId tid);
-void thread_set_stack_min(const DrdThreadId tid, const Addr stack_min);
 DrdThreadId thread_lookup_stackaddr(const Addr a,
                                     Addr* const stack_min,
                                     Addr* const stack_max);
@@ -115,7 +113,6 @@ const char* thread_get_name(const DrdThreadId tid);
 void thread_set_name(const DrdThreadId tid, const char* const name);
 void thread_set_name_fmt(const DrdThreadId tid, const char* const name,
                          const UWord arg);
-DrdThreadId thread_get_running_tid(void);
 void thread_set_vg_running_tid(const ThreadId vg_tid);
 void thread_set_running_tid(const ThreadId vg_tid,
                             const DrdThreadId drd_tid);
@@ -146,8 +143,15 @@ ULong thread_get_danger_set_bitmap_creation_count(void);
 ULong thread_get_danger_set_bitmap2_creation_count(void);
 
 
-static
-inline struct bitmap* thread_get_danger_set(void)
+static inline
+DrdThreadId thread_get_running_tid(void)
+{
+  tl_assert(s_drd_running_tid != DRD_INVALID_THREADID);
+  return s_drd_running_tid;
+}
+
+static inline
+struct bitmap* thread_get_danger_set(void)
 {
   return s_danger_set;
 }
@@ -161,6 +165,21 @@ Bool running_thread_is_recording(void)
           && s_threadinfo[s_drd_running_tid].is_recording);
 }
 
+static inline
+void thread_set_stack_min(const DrdThreadId tid, const Addr stack_min)
+{
+#if 0
+  tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+#endif
+  if (s_threadinfo[tid].stack_max)
+  {
+    s_threadinfo[tid].stack_min = stack_min;
+#if 0
+    tl_assert(s_threadinfo[tid].stack_min < s_threadinfo[tid].stack_max);
+#endif
+  }
+}
+
 /** Return a pointer to the latest segment for the specified thread. */
 static inline
 Segment* thread_get_segment(const DrdThreadId tid)