86 lines
2.2 KiB
Diff
86 lines
2.2 KiB
Diff
From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
|
|
Date: Mon, 24 Nov 2008 07:50:49 +0000 (+0530)
|
|
Subject: Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info
|
|
X-Git-Url: http://sources.redhat.com/git/gitweb.cgi?p=systemtap.git;a=commitdiff_plain;h=563c89d9c8828590941c9a5bee7fa3edc62cbee8
|
|
|
|
Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info
|
|
(Prasad's Patch for fixing signal tapset)
|
|
---
|
|
|
|
diff --git a/tapset/signal.stp b/tapset/signal.stp
|
|
index 66de767..7f932e7 100644
|
|
--- a/tapset/signal.stp
|
|
+++ b/tapset/signal.stp
|
|
@@ -49,6 +49,7 @@ probe signal.send = _signal.send.*
|
|
si_code="SI_USER or SI_TIMER or SI_ASYNCIO"
|
|
}
|
|
|
|
+%( kernel_v <= "2.6.25" %?
|
|
probe _signal.send.part1 = kernel.function("__group_send_sig_info")
|
|
{
|
|
name = "__group_send_sig_info"
|
|
@@ -59,7 +60,6 @@ probe _signal.send.part1 = kernel.function("__group_send_sig_info")
|
|
send2queue = 0
|
|
}
|
|
|
|
-%( kernel_v <= "2.6.25" %?
|
|
probe _signal.send.part2 = kernel.function("send_group_sigqueue")
|
|
{
|
|
name = "send_group_sigqueue"
|
|
@@ -69,6 +69,38 @@ probe _signal.send.part2 = kernel.function("send_group_sigqueue")
|
|
shared = 1
|
|
send2queue = 1
|
|
}
|
|
+
|
|
+probe _signal.send.part4 = kernel.function("specific_send_sig_info")
|
|
+{
|
|
+ name = "specific_send_sig_info"
|
|
+ sig = $sig
|
|
+ task = $t
|
|
+ sinfo = $info
|
|
+ shared = 0
|
|
+ send2queue = 0
|
|
+}
|
|
+%)
|
|
+
|
|
+%( kernel_v > "2.6.25" %?
|
|
+probe _signal.send.part1 = kernel.function("send_signal")
|
|
+{
|
|
+ name = "__group_send_sig_info"
|
|
+ sig = $sig
|
|
+ task = $t
|
|
+ sinfo = $info
|
|
+ shared = 1
|
|
+ send2queue = 0
|
|
+}
|
|
+
|
|
+probe _signal.send.part4 = kernel.function("send_signal")
|
|
+{
|
|
+ name = "specific_send_sig_info"
|
|
+ sig = $sig
|
|
+ task = $t
|
|
+ sinfo = $info
|
|
+ shared = 0
|
|
+ send2queue = 0
|
|
+}
|
|
%)
|
|
|
|
probe _signal.send.part3 = kernel.function("send_sigqueue")
|
|
@@ -86,16 +118,6 @@ probe _signal.send.part3 = kernel.function("send_sigqueue")
|
|
send2queue = 1
|
|
}
|
|
|
|
-probe _signal.send.part4 = kernel.function("specific_send_sig_info")
|
|
-{
|
|
- name = "specific_send_sig_info"
|
|
- sig = $sig
|
|
- task = $t
|
|
- sinfo = $info
|
|
- shared = 0
|
|
- send2queue = 0
|
|
-}
|
|
-
|
|
/* probe signal.send.return
|
|
*/
|
|
probe signal.send.return = _signal.send.*.return
|