commit 5ec68f6453a0ed164a8fd73e024edb75344e967d
author Igor Sysoev <igor@sysoev.ru> Wed Jul 28 16:16:50 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Jul 28 16:16:50 2004 +0000
tree ac4574649ce9fe5beb4fc9946fb4a56fffaacc99
parent 71cb18335671b5e6d46ee1eb6b2f6bb67598f6c5

nginx-0.0.9-2004-07-28-20:16:50 import

src/event/modules/ngx_rtsig_module.c

diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 3be8e6a..6a83e9c 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -626,20 +626,20 @@
                               cycle->log, 0,
                               "poll() failed while the overflow recover");
 
-                if (err != NGX_EINTR) {
-                    break;
+                if (err == NGX_EINTR) {
+                    continue;
                 }
             }
+
+            break;
         }
 
         if (ready <= 0) {
             continue;
         }
 
-        if (n) {
-            if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
-                return NGX_ERROR;
-            }
+        if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
+            return NGX_ERROR;
         }
 
         for (i = 0; i < n; i++) {
@@ -686,9 +686,7 @@
             }
         }
 
-        if (n) {
-            ngx_mutex_unlock(ngx_posted_events_mutex);
-        }
+        ngx_mutex_unlock(ngx_posted_events_mutex);
 
         if (tested >= rtscf->overflow_test) {
 
@@ -723,7 +721,7 @@
                 }
 
                 /*
-                 * drain rt signal queue if the /proc/sys/kernel/rtsig-nr
+                 * drain the rt signal queue if the /proc/sys/kernel/rtsig-nr
                  * is bigger than
                  *    /proc/sys/kernel/rtsig-max / rtsig_overflow_threshold
                  */
@@ -741,7 +739,7 @@
 
                 /*
                  * Linux has not KERN_RTSIGMAX since 2.6.6-mm2
-                 * so drain rt signal queue unconditionally
+                 * so drain the rt signal queue unconditionally
                  */
 
                 while (ngx_rtsig_process_events(cycle) == NGX_OK) { /* void */ }