brain-hackers_pepepper-mirror/linux-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/linux-brain.git synced 2024-06-09 23:36:23 +09:00
Code Issues Projects Releases Wiki Activity

signals: fold complete_signal() into send_signal/do_send_sigqueue

Browse Source 
Factor out complete_signal() callsites.  This change completely unifies the
helpers sending the specific/group signals.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Emelyanov 2008-04-30 00:52:55 -07:00 committed by Linus Torvalds
parent 5fcd835bf8
commit 4cd4b6d4e0
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
kernel/signal.c
View File

@ -826,7 +826,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
out_set:
sigaddset(&pending->signal, sig);
return 1;
complete_signal(sig, t, group);
return 0;
}
int print_fatal_signals;
@ -861,17 +862,16 @@ static int __init setup_print_fatal_signals(char *str)
__setup("print-fatal-signals=", setup_print_fatal_signals);
int
__group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
{
return send_signal(sig, info, p, 1);
}
static int
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
int ret;
ret = send_signal(sig, info, t, 0);
if (ret <= 0)
return ret;
complete_signal(sig, t, 0);
return 0;
return send_signal(sig, info, t, 0);
}
/*
@ -914,24 +914,6 @@ force_sig_specific(int sig, struct task_struct *t)
force_sig_info(sig, SEND_SIG_FORCED, t);
}
int
__group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
{
int ret;
/*
* Put this signal on the shared-pending queue, or fail with EAGAIN.
* We always use the shared queue for process-wide signals,
* to avoid several races.
*/
ret = send_signal(sig, info, p, 1);
if (ret <= 0)
return ret;
complete_signal(sig, p, 1);
return 0;
}
/*
* Nuke all other threads in the group.
*/
@ -1263,6 +1245,7 @@ static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t,
{
struct sigpending *pending;
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
handle_stop_signal(sig, t);
if (unlikely(!list_empty(&q->list))) {
@ -1283,6 +1266,7 @@ static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t,
pending = group ? &t->signal->shared_pending : &t->pending;
list_add_tail(&q->list, &pending->list);
sigaddset(&pending->signal, sig);
complete_signal(sig, t, group);
return 0;
}
@ -1292,8 +1276,6 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
unsigned long flags;
int ret = -1;
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
/*
* The rcu based delayed sighand destroy makes it possible to
* run this without tasklist lock held. The task struct itself
@ -1307,8 +1289,6 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
ret = do_send_sigqueue(sig, q, p, 0);
complete_signal(sig, p, 0);
unlock_task_sighand(p, &flags);
out_err:
return ret;
@ -1320,15 +1300,11 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
unsigned long flags;
int ret;
BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
/* Since it_lock is held, p->sighand cannot be NULL. */
spin_lock_irqsave(&p->sighand->siglock, flags);
ret = do_send_sigqueue(sig, q, p, 1);
complete_signal(sig, p, 1);
spin_unlock_irqrestore(&p->sighand->siglock, flags);
return ret;