diff options
| author | Srikar Dronamraju <srikar@linux.vnet.ibm.com> | 2009-02-04 14:52:07 +0530 |
|---|---|---|
| committer | Srikar Dronamraju <srikar@linux.vnet.ibm.com> | 2009-02-04 14:52:07 +0530 |
| commit | 6b038f0039b6e0f08fdb2cf69765256896950d0c (patch) | |
| tree | 3288800c2c1e8e1800b7413cd49e5ba4c9169de7 | |
| parent | 4718b445d13b07448e71582f29ce1b0979b8dc50 (diff) | |
| download | systemtap-steved-6b038f0039b6e0f08fdb2cf69765256896950d0c.tar.gz systemtap-steved-6b038f0039b6e0f08fdb2cf69765256896950d0c.tar.xz systemtap-steved-6b038f0039b6e0f08fdb2cf69765256896950d0c.zip | |
Merge commit '4718b445d13b07448e71582f29ce1b0979b8dc50'
| -rw-r--r-- | tapset/ChangeLog | 5 | ||||
| -rw-r--r-- | tapset/signal.stp | 37 |
2 files changed, 13 insertions, 29 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 570d3697..1a7df352 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,8 +1,3 @@ -2009-02-04 K Prasad <prasad@linux.vnet.ibm.com> - - PR 7030. - * signal.stp: handle functions inlined in 2.6.27+ - 2009-02-03 Frank Ch. Eigler <fche@elastic.org> PR 6961/9810. diff --git a/tapset/signal.stp b/tapset/signal.stp index 8c125e80..7f932e77 100644 --- a/tapset/signal.stp +++ b/tapset/signal.stp @@ -84,17 +84,21 @@ probe _signal.send.part4 = kernel.function("specific_send_sig_info") %( kernel_v > "2.6.25" %? probe _signal.send.part1 = kernel.function("send_signal") { - if ($group == 1) { - name = "__group_send_sig_info" - shared = 1 - } - else if ($group == 0) { - name = "specific_send_sig_info" - shared = 0 - } + 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 } %) @@ -135,22 +139,6 @@ probe signal.send.return = _signal.send.*.return * and sent by user using something other than kill() * */ -%( kernel_v > "2.6.25" %? -probe _signal.send.part1.return = kernel.function("send_signal").return -{ - if ($group == 1) { - name = "__group_send_sig_info" - shared = 1 - } - else if ($group == 0) { - name = "specific_send_sig_info" - shared = 0 - } - send2queue = 0 -} -%) - -%( kernel_v <= "2.6.25" %? probe _signal.send.part1.return = kernel.function("__group_send_sig_info").return { name = "__group_send_sig_info" @@ -165,6 +153,7 @@ probe _signal.send.part4.return = kernel.function("specific_send_sig_info").retu send2queue = 0 } +%( kernel_v <= "2.6.25" %? /* * - return 0 if the signal is either sucessfully added into the * sigqueue of receiving process or a SI_TIMER entry is already |