patch-1.3.82 linux/kernel/exit.c

• Lines: 35
• Date: Sun Mar 31 20:39:57 1996
• Orig file: v1.3.81/linux/kernel/exit.c
• Orig date: Sat Mar 23 14:31:02 1996

diff -u --recursive --new-file v1.3.81/linux/kernel/exit.c linux/kernel/exit.c
@@ -23,25 +23,28 @@
 
 int getrusage(struct task_struct *, int, struct rusage *);
 
-static int generate(unsigned long sig, struct task_struct * p)
+static inline void generate(unsigned long sig, struct task_struct * p)
 {
 	unsigned long mask = 1 << (sig-1);
 	struct sigaction * sa = sig + p->sig->action - 1;
 
-	/* always generate signals for traced processes ??? */
-	if (!(p->flags & PF_PTRACED)) {
+	/*
+	 * Optimize away the signal, if it's a signal that can
+	 * be handled immediately (ie non-blocked and untraced)
+	 * and that is ignored (either explicitly or by default)
+	 */
+	if (!(mask & p->blocked) && !(p->flags & PF_PTRACED)) {
 		/* don't bother with ignored signals (but SIGCHLD is special) */
 		if (sa->sa_handler == SIG_IGN && sig != SIGCHLD)
-			return 0;
+			return;
 		/* some signals are ignored by default.. (but SIGCONT already did its deed) */
 		if ((sa->sa_handler == SIG_DFL) &&
 		    (sig == SIGCONT || sig == SIGCHLD || sig == SIGWINCH || sig == SIGURG))
-			return 0;
+			return;
 	}
 	p->signal |= mask;
 	if (p->state == TASK_INTERRUPTIBLE && (p->signal & ~p->blocked))
 		wake_up_process(p);
-	return 1;
 }
 
 int send_sig(unsigned long sig,struct task_struct * p,int priv)