OBS User unknown 2008-12-19 14:18:43 +00:00 committed by Git OBS Bridge
parent 9ad3c40615
commit 77d0af8a35
3 changed files with 95 additions and 1 deletions

View File

@ -0,0 +1,85 @@
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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 18 16:59:23 CET 2008 - tiwai@suse.de
- Fix stap failures with signal tapsets (bnc#459387)
-------------------------------------------------------------------
Tue Dec 16 13:50:32 CET 2008 - tiwai@suse.de

View File

@ -25,7 +25,7 @@ BuildRequires: latex2html
%define package_version 20080906
License: GPL v2 or later
Version: 0.7.1
Release: 28
Release: 29
Summary: Instrumentation System
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
@ -40,6 +40,7 @@ Patch5: systemtap-dwarf_getsrcfiles-no-assert.diff
Patch6: systemtap-netcat-fix1.diff
Patch7: systemtap-netcat-fix2.diff
Patch8: systemtap-2.6.28-fixes.diff
Patch9: systemtap-use-send_signal.diff
Requires: libebl1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -68,6 +69,7 @@ Authors:
%patch6 -p1
%patch7 -p1
%patch8
%patch9 -p1
%build
autoreconf -fi
@ -96,6 +98,8 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %attr(0755,root,root) /var/cache/systemtap
%changelog
* Thu Dec 18 2008 tiwai@suse.de
- Fix stap failures with signal tapsets (bnc#459387)
* Tue Dec 16 2008 tiwai@suse.de
- Fix dependency on libebl1 (bnc#448331, #445783)
- Fix stap for 2.6.28 kernels