[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                                      Sun, 07 Nov 2010 21:47:14 +0000

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

Log:
- correct time comparison for determining the last idle child

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-07 
21:24:32 UTC (rev 305181)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2010-11-07 
21:47:14 UTC (rev 305182)
@@ -336,7 +336,7 @@
                                if (last_idle_child == NULL) {
                                        last_idle_child = child;
                                } else {
-                                       if (child->started.tv_sec < 
last_idle_child->started.tv_sec) {
+                                       if (timercmp(&child->started, 
&last_idle_child->started, <)) {
                                                last_idle_child = child;
                                        }
                                }

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-07 21:24:32 UTC 
(rev 305181)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c    2010-11-07 21:47:14 UTC 
(rev 305182)
@@ -336,7 +336,7 @@
                                if (last_idle_child == NULL) {
                                        last_idle_child = child;
                                } else {
-                                       if (child->started.tv_sec < 
last_idle_child->started.tv_sec) {
+                                       if (timercmp(&child->started, 
&last_idle_child->started, <)) {
                                                last_idle_child = child;
                                        }
                                }


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