Fold VG_(send_signal_to_thread)() into vg_scheduler.c, so it doesn't need to be

exported any more.

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

diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 2aeaa451a49e783cbe209e7cc55c1c2ced7ca23d..9be483e67f192c0a77a67714627b9c19b8b08722 100644 (file)
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -1059,8 +1059,6 @@ extern void VG_(do__NR_sigprocmask)   ( ThreadId tid, Int how,
 extern void VG_(do_pthread_sigmask_SCSS_upd) ( ThreadId tid, Int how, 
                                                vki_ksigset_t* set,
                                                vki_ksigset_t* oldset );
-extern void VG_(send_signal_to_thread) ( ThreadId thread, Int signo );
-
 
 /* Modify the current thread's state once we have detected it is
    returning from a signal handler. */

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index cca22204949b2c873870807430f6bacbd95f11dc..a7342d598f00ffc3762e84f9ae7fdb5d3ce02bb2 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -2825,6 +2825,7 @@ void do_pthread_kill ( ThreadId tid, /* me */
                        ThreadId thread, /* thread to signal */
                        Int sig )
 {
+   ThreadState* tst;
    Char msg_buf[100];
 
    if (VG_(clo_trace_signals) || VG_(clo_trace_pthread_level) >= 1) {
@@ -2855,7 +2856,9 @@ void do_pthread_kill ( ThreadId tid, /* me */
       return;
    }
 
-   VG_(send_signal_to_thread)( thread, sig );
+   tst = VG_(get_ThreadState)(thread);
+   vg_assert(NULL != tst->proxy);
+   VG_(proxy_sendsig)(thread, sig);
    SET_PTHREQ_RETVAL(tid, 0);
 }
 

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index a4eb3d7c2dbc74e80927dc2125d989e32da39b66..e5ec2d144f86d1525c59f212f2edf457ecde7345 100644 (file)
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -730,20 +730,6 @@ void VG_(do_pthread_sigmask_SCSS_upd) ( ThreadId tid,
 }
 
 
-void VG_(send_signal_to_thread) ( ThreadId thread, Int sig )
-{
-   ThreadState *tst;
-
-   vg_assert(VG_(is_valid_tid)(thread));
-   vg_assert(sig >= 1 && sig <= VKI_KNSIG);
-   
-   tst = VG_(get_ThreadState)(thread);
-   vg_assert(tst->proxy != NULL);
-
-   VG_(proxy_sendsig)(thread, sig);
-}
-
-
 /* ---------------------------------------------------------------------
    LOW LEVEL STUFF TO DO WITH SIGNALS: IMPLEMENTATION
    ------------------------------------------------------------------ */