[Valgrind-developers] valgrind: r9472 - branches/DARWIN/coregrind

[<sv...@va...>]

Author: sewardj
Date: 2009-03-20 17:54:36 +0000 (Fri, 20 Mar 2009)
New Revision: 9472

Log:
A non-functional change: As GrP observed, the argument to VG_(tkill)
is not as claimed a ThreadId but instead a lwpid.  Change the name and
type of the parameter, therefore.



Modified:
   branches/DARWIN/coregrind/m_libcsignal.c
   branches/DARWIN/coregrind/pub_core_libcsignal.h


Modified: branches/DARWIN/coregrind/m_libcsignal.c
===================================================================
--- branches/DARWIN/coregrind/m_libcsignal.c	2009-03-20 12:08:54 UTC (rev 9471)
+++ branches/DARWIN/coregrind/m_libcsignal.c	2009-03-20 17:54:36 UTC (rev 9472)
@@ -287,20 +287,19 @@
    return sr_isError(res) ? -1 : 0;
 }
 
-// GrP fixme this is an lwpid, not a ThreadId
-Int VG_(tkill)( ThreadId tid, Int signo )
+Int VG_(tkill)( Int lwpid, Int signo )
 {
 #  if defined(__NR_tkill)
    SysRes res = VG_(mk_SysRes_Error)(VKI_ENOSYS);
-   res = VG_(do_syscall2)(__NR_tkill, tid, signo);
+   res = VG_(do_syscall2)(__NR_tkill, lwpid, signo);
    if (sr_isError(res) && sr_Err(res) == VKI_ENOSYS)
-      res = VG_(do_syscall2)(__NR_kill, tid, signo);
+      res = VG_(do_syscall2)(__NR_kill, lwpid, signo);
    return sr_isError(res) ? -1 : 0;
 
 #  elif defined(VGO_darwin)
    // Note that the __pthread_kill syscall takes a Mach thread, not a pthread.
    SysRes res;
-   res = VG_(do_syscall2)(__NR___pthread_kill, tid, signo);
+   res = VG_(do_syscall2)(__NR___pthread_kill, lwpid, signo);
    return sr_isError(res) ? -1 : 0;
 
 #  else

Modified: branches/DARWIN/coregrind/pub_core_libcsignal.h
===================================================================
--- branches/DARWIN/coregrind/pub_core_libcsignal.h	2009-03-20 12:08:54 UTC (rev 9471)
+++ branches/DARWIN/coregrind/pub_core_libcsignal.h	2009-03-20 17:54:36 UTC (rev 9472)
@@ -76,7 +76,7 @@
 
 
 extern Int VG_(kill)        ( Int pid, Int signo );
-extern Int VG_(tkill)       ( ThreadId tid, Int signo );
+extern Int VG_(tkill)       ( Int lwpid, Int signo );
 
 /* A cut-down version of POSIX sigtimedwait: poll for pending signals
    mentioned in the sigset_t, and if any are present, select one