[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080304185748.GA8491@tv-sign.ru>
Date: Tue, 4 Mar 2008 21:57:48 +0300
From: Oleg Nesterov <oleg@...sign.ru>
To: Andrew Morton <akpm@...ux-foundation.org>,
Roland McGrath <roland@...hat.com>
Cc: Jiri Kosina <jkosina@...e.cz>, linux-kernel@...r.kernel.org
Subject: [PATCH 3/3] get_signal_to_deliver: use the cached ->signal/sighand values
Cache the values of current->signal/sighand. Shrinks .text a bit and makes the
code more readable. Also, remove "sigset_t *mask", it is pointless because in
fact we save the constant offset.
Signed-off-by: Oleg Nesterov <oleg@...sign.ru>
--- 25/kernel/signal.c~4_GSTD_CACHE_SIGNAL 2008-03-04 21:10:22.000000000 +0300
+++ 25/kernel/signal.c 2008-03-04 21:24:20.000000000 +0300
@@ -1738,19 +1738,20 @@ static int do_signal_stop(int signr)
int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
struct pt_regs *regs, void *cookie)
{
- sigset_t *mask = ¤t->blocked;
- int signr = 0;
+ struct sighand_struct *sighand = current->sighand;
+ struct signal_struct *signal = current->signal;
+ int signr;
try_to_freeze();
relock:
- spin_lock_irq(¤t->sighand->siglock);
+ spin_lock_irq(&sighand->siglock);
- if (unlikely(current->signal->flags & SIGNAL_CLD_MASK)) {
- int why = (current->signal->flags & SIGNAL_STOP_CONTINUED)
+ if (unlikely(signal->flags & SIGNAL_CLD_MASK)) {
+ int why = (signal->flags & SIGNAL_STOP_CONTINUED)
? CLD_CONTINUED : CLD_STOPPED;
- current->signal->flags &= ~SIGNAL_CLD_MASK;
- spin_unlock_irq(¤t->sighand->siglock);
+ signal->flags &= ~SIGNAL_CLD_MASK;
+ spin_unlock_irq(&sighand->siglock);
read_lock(&tasklist_lock);
do_notify_parent_cldstop(current->group_leader, why);
@@ -1761,12 +1762,11 @@ relock:
for (;;) {
struct k_sigaction *ka;
- if (unlikely(current->signal->group_stop_count > 0) &&
+ if (unlikely(signal->group_stop_count > 0) &&
do_signal_stop(0))
goto relock;
- signr = dequeue_signal(current, mask, info);
-
+ signr = dequeue_signal(current, ¤t->blocked, info);
if (!signr)
break; /* will return 0 */
@@ -1802,7 +1802,7 @@ relock:
}
}
- ka = ¤t->sighand->action[signr-1];
+ ka = &sighand->action[signr-1];
if (ka->sa.sa_handler == SIG_IGN) /* Do nothing. */
continue;
if (ka->sa.sa_handler != SIG_DFL) {
@@ -1839,14 +1839,14 @@ relock:
* We need to check for that and bail out if necessary.
*/
if (signr != SIGSTOP) {
- spin_unlock_irq(¤t->sighand->siglock);
+ spin_unlock_irq(&sighand->siglock);
/* signals can be posted during this window */
if (is_current_pgrp_orphaned())
goto relock;
- spin_lock_irq(¤t->sighand->siglock);
+ spin_lock_irq(&sighand->siglock);
}
if (likely(do_signal_stop(signr))) {
@@ -1861,7 +1861,7 @@ relock:
continue;
}
- spin_unlock_irq(¤t->sighand->siglock);
+ spin_unlock_irq(&sighand->siglock);
/*
* Anything else is fatal, maybe with a core dump.
@@ -1887,7 +1887,7 @@ relock:
do_group_exit(signr);
/* NOTREACHED */
}
- spin_unlock_irq(¤t->sighand->siglock);
+ spin_unlock_irq(&sighand->siglock);
return signr;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists