[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c trunk/sapi/fpm/fpm/fpm_process_ctl.c

[Jérôme Loyet]

fat                                      Thu, 11 Nov 2010 12:56:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305274

Log:
- remove useless check

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2010-11-11 
12:55:05 UTC (rev 305273)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2010-11-11 
12:56:44 UTC (rev 305274)
@@ -333,8 +333,7 @@
                if (wp->config == NULL) continue;

                for (child = wp->children; child; child = child->next) {
-                       int ret = fpm_request_is_idle(child);
-                       if (ret == 1) {
+                       if (fpm_request_is_idle(child)) {
                                if (last_idle_child == NULL) {
                                        last_idle_child = child;
                                } else {
@@ -343,16 +342,11 @@
                                        }
                                }
                                idle++;
-                       } else if (ret == 0) {
+                       } else {
                                active++;
                        }
                }

-               if ((active + idle) != wp->running_children) {
-                       zlog(ZLOG_STUFF, ZLOG_ERROR, "[pool %s] unable to 
retrieve process activity of one or more child(ren). Will try again later.", 
wp->config->name);
-                       continue;
-               }
-
                /* update status structure for all PMs */
                if (0 > fpm_socket_get_listening_queue(wp, &cur_lq, NULL)) {
                        cur_lq = 0;

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c    2010-11-11 12:55:05 UTC 
(rev 305273)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c    2010-11-11 12:56:44 UTC 
(rev 305274)
@@ -333,8 +333,7 @@
                if (wp->config == NULL) continue;

                for (child = wp->children; child; child = child->next) {
-                       int ret = fpm_request_is_idle(child);
-                       if (ret == 1) {
+                       if (fpm_request_is_idle(child)) {
                                if (last_idle_child == NULL) {
                                        last_idle_child = child;
                                } else {
@@ -343,16 +342,11 @@
                                        }
                                }
                                idle++;
-                       } else if (ret == 0) {
+                       } else {
                                active++;
                        }
                }

-               if ((active + idle) != wp->running_children) {
-                       zlog(ZLOG_STUFF, ZLOG_ERROR, "[pool %s] unable to 
retrieve process activity of one or more child(ren). Will try again later.", 
wp->config->name);
-                       continue;
-               }
-
                /* update status structure for all PMs */
                if (0 > fpm_socket_get_listening_queue(wp, &cur_lq, NULL)) {
                        cur_lq = 0;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php