|
From: <sv...@va...> - 2009-05-20 07:10:55
|
Author: njn
Date: 2009-05-20 08:10:48 +0100 (Wed, 20 May 2009)
New Revision: 10044
Log:
Merge r9472 (tkill() param renaming) from the DARWIN branch.
Modified:
trunk/coregrind/m_libcsignal.c
trunk/coregrind/pub_core_libcsignal.h
Modified: trunk/coregrind/m_libcsignal.c
===================================================================
--- trunk/coregrind/m_libcsignal.c 2009-05-20 07:05:02 UTC (rev 10043)
+++ trunk/coregrind/m_libcsignal.c 2009-05-20 07:10:48 UTC (rev 10044)
@@ -225,14 +225,13 @@
return sr_isError(res) ? -1 : 0;
}
-
-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;
# else
Modified: trunk/coregrind/pub_core_libcsignal.h
===================================================================
--- trunk/coregrind/pub_core_libcsignal.h 2009-05-20 07:05:02 UTC (rev 10043)
+++ trunk/coregrind/pub_core_libcsignal.h 2009-05-20 07:10:48 UTC (rev 10044)
@@ -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
|