Rename VG_(get_lwp_tid) to VG_(lwpid_to_vgtid).

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

diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index 9b8125dcf23251b85f7f5c4586f14356afb1828b..842b644e2cf22b745774ba66c5554ee37fc48255 100644 (file)
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -130,7 +130,8 @@ static void report_and_quit ( const Char* report,
 {
    Addr stacktop;
    Addr ips[BACKTRACE_DEPTH];
-   ThreadState *tst = VG_(get_ThreadState)( VG_(get_lwp_tid)(VG_(gettid)()) );
+   ThreadState *tst 
+      = VG_(get_ThreadState)( VG_(lwpid_to_vgtid)( VG_(gettid)() ) );
  
    // If necessary, fake up an ExeContext which is of our actual real CPU
    // state.  Could cause problems if we got the panic/exception within the

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index 63a85ffa7095f11416412096faa0cf844a753f65..584111c816f940cd19cccb27fec13e3fa23a00a8 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -1567,7 +1567,7 @@ static vki_siginfo_t *next_queued(ThreadId tid, const vki_sigset_t *set)
 static 
 void async_signalhandler ( Int sigNo, vki_siginfo_t *info, struct vki_ucontext *uc )
 {
-   ThreadId tid = VG_(get_lwp_tid)(VG_(gettid)());
+   ThreadId tid = VG_(lwpid_to_vgtid)(VG_(gettid)());
    ThreadState *tst = VG_(get_ThreadState)(tid);
 
 #ifdef VGO_linux
@@ -1687,7 +1687,7 @@ void VG_(set_fault_catcher)(void (*catcher)(Int, Addr))
 static
 void sync_signalhandler ( Int sigNo, vki_siginfo_t *info, struct vki_ucontext *uc )
 {
-   ThreadId tid = VG_(get_lwp_tid)(VG_(gettid)());
+   ThreadId tid = VG_(lwpid_to_vgtid)(VG_(gettid)());
 
    vg_assert(info != NULL);
    vg_assert(info->si_signo == sigNo);
@@ -1857,7 +1857,8 @@ void sync_signalhandler ( Int sigNo, vki_siginfo_t *info, struct vki_ucontext *u
       from the client's code, then we can jump back into the scheduler
       and have it delivered.  Otherwise it's a Valgrind bug. */
    {   
-      ThreadState *tst = VG_(get_ThreadState)(VG_(get_lwp_tid)(VG_(gettid)()));
+      ThreadState *tst 
+         = VG_(get_ThreadState)(VG_(lwpid_to_vgtid)(VG_(gettid)()));
 
       if (VG_(sigismember)(&tst->sig_mask, sigNo)) {
         /* signal is blocked, but they're not allowed to block faults */
@@ -1908,7 +1909,7 @@ void sync_signalhandler ( Int sigNo, vki_siginfo_t *info, struct vki_ucontext *u
  */
 static void sigvgkill_handler(int signo, vki_siginfo_t *si, struct vki_ucontext *uc)
 {
-   ThreadId     tid = VG_(get_lwp_tid)(VG_(gettid)());
+   ThreadId     tid = VG_(lwpid_to_vgtid)(VG_(gettid)());
    ThreadStatus at_signal = VG_(threads)[tid].status;
 
    if (VG_(clo_trace_signals))

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 30534d36b0ce5015f246c74b7ced612eb32e92a0..8b6c599a595c3877a46ad1b81ea98c56eb160e12 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -4722,7 +4722,7 @@ Bool ML_(do_sigkill)(Int pid, Int tgid)
    if (pid <= 0)
       return False;
 
-   tid = VG_(get_lwp_tid)(pid);
+   tid = VG_(lwpid_to_vgtid)(pid);
    if (tid == VG_INVALID_THREADID)
       return False;            /* none of our threads */
 

diff --git a/coregrind/m_threadstate.c b/coregrind/m_threadstate.c
index ebaea8715a99e3042ee4e5ebce0fc0f935202226..29291002c9af14d7bc49056f4418da0efd328ef4 100644 (file)
--- a/coregrind/m_threadstate.c
+++ b/coregrind/m_threadstate.c
@@ -126,7 +126,7 @@ Int VG_(count_runnable_threads)(void)
 
 /* Given an LWP id (ie, real kernel thread id), find the corresponding
    ThreadId */
-ThreadId VG_(get_lwp_tid)(Int lwp)
+ThreadId VG_(lwpid_to_vgtid)(Int lwp)
 {
    ThreadId tid;
    

diff --git a/coregrind/pub_core_threadstate.h b/coregrind/pub_core_threadstate.h
index 8b622bc1e46051e074eeef7da2711ca11fb915a4..059a2f78c84b6121758175c03c525d1cd26ec5d3 100644 (file)
--- a/coregrind/pub_core_threadstate.h
+++ b/coregrind/pub_core_threadstate.h
@@ -257,7 +257,7 @@ extern Int VG_(count_runnable_threads)(void);
 
 /* Given an LWP id (ie, real kernel thread id), find the corresponding
    ThreadId */
-extern ThreadId VG_(get_lwp_tid)(Int lwpid);
+extern ThreadId VG_(lwpid_to_vgtid)(Int lwpid);
 
 #endif   // __PUB_CORE_THREADSTATE_H