patch-2.4.0-test9 linux/kernel/signal.c

• Lines: 60
• Date: Mon Sep 25 14:44:14 2000
• Orig file: v2.4.0-test8/linux/kernel/signal.c
• Orig date: Tue Sep 5 09:53:59 2000

diff -u --recursive --new-file v2.4.0-test8/linux/kernel/signal.c linux/kernel/signal.c
@@ -41,7 +41,7 @@
 				  __alignof__(struct sigqueue),
 				  SIG_SLAB_DEBUG, NULL, NULL);
 	if (!sigqueue_cachep)
-		panic("signals_init(): cannot create sigueue SLAB cache");
+		panic("signals_init(): cannot create sigqueue SLAB cache");
 }
 
 
@@ -191,6 +191,7 @@
 		/* Ok, it wasn't in the queue.  We must have
 		   been out of queue space.  So zero out the
 		   info.  */
+		sigdelset(&list->signal, sig);
 		info->si_signo = sig;
 		info->si_errno = 0;
 		info->si_code = 0;
@@ -939,25 +940,28 @@
 	spin_lock_irq(&current->sigmask_lock);
 	sig = dequeue_signal(&these, &info);
 	if (!sig) {
-		/* None ready -- temporarily unblock those we're interested
-		   in so that we'll be awakened when they arrive.  */
-		sigset_t oldblocked = current->blocked;
-		sigandsets(&current->blocked, &current->blocked, &these);
-		recalc_sigpending(current);
-		spin_unlock_irq(&current->sigmask_lock);
-
 		timeout = MAX_SCHEDULE_TIMEOUT;
 		if (uts)
 			timeout = (timespec_to_jiffies(&ts)
 				   + (ts.tv_sec || ts.tv_nsec));
 
-		current->state = TASK_INTERRUPTIBLE;
-		timeout = schedule_timeout(timeout);
-
-		spin_lock_irq(&current->sigmask_lock);
-		sig = dequeue_signal(&these, &info);
-		current->blocked = oldblocked;
-		recalc_sigpending(current);
+		if (timeout) {
+			/* None ready -- temporarily unblock those we're
+			 * interested while we are sleeping in so that we'll
+			 * be awakened when they arrive.  */
+			sigset_t oldblocked = current->blocked;
+			sigandsets(&current->blocked, &current->blocked, &these);
+			recalc_sigpending(current);
+			spin_unlock_irq(&current->sigmask_lock);
+
+			current->state = TASK_INTERRUPTIBLE;
+			timeout = schedule_timeout(timeout);
+
+			spin_lock_irq(&current->sigmask_lock);
+			sig = dequeue_signal(&these, &info);
+			current->blocked = oldblocked;
+			recalc_sigpending(current);
+		}
 	}
 	spin_unlock_irq(&current->sigmask_lock);