httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject svn commit: r394116 - in /httpd/httpd/trunk/server/mpm: experimental/event/event.c worker/worker.c
Date Fri, 14 Apr 2006 15:12:37 GMT
Author: gregames
Date: Fri Apr 14 08:12:35 2006
New Revision: 394116

URL: http://svn.apache.org/viewcvs?rev=394116&view=rev
Log:
decouple the two scoreboard full messages

Modified:
    httpd/httpd/trunk/server/mpm/experimental/event/event.c
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=394116&r1=394115&r2=394116&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Fri Apr 14 08:12:35 2006
@@ -1800,23 +1800,22 @@
     else if (idle_thread_count < min_spare_threads) {
         /* terminate the free list */
         if (free_length == 0) { /* scoreboard is full, can't fork */
-            /* only report this condition once */
-            static int reported = 0;
 
-            if (!reported) {
-                if (active_thread_count >=
-                        ap_daemons_limit * ap_threads_per_child) {
+            if (active_thread_count >= ap_daemons_limit * ap_threads_per_child) {
+                static int reported = 0;
+                if (!reported) {
+                    /* only report this condition once */
                     ap_log_error(APLOG_MARK, APLOG_ERR, 0,
                                  ap_server_conf,
                                  "server reached MaxClients setting, consider"
                                  " raising the MaxClients setting");
+                    reported = 1;
                 }
-                else {
-                    ap_log_error(APLOG_MARK, APLOG_ERR, 0,
-                                 ap_server_conf,
-                                 "scoreboard is full, not at MaxClients");
-                }
-                reported = 1;
+            }
+            else {
+                ap_log_error(APLOG_MARK, APLOG_ERR, 0,
+                             ap_server_conf,
+                             "scoreboard is full, not at MaxClients");
             }
             idle_spawn_rate = 1;
         }

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=394116&r1=394115&r2=394116&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Fri Apr 14 08:12:35 2006
@@ -1492,23 +1492,22 @@
     else if (idle_thread_count < min_spare_threads) {
         /* terminate the free list */
         if (free_length == 0) { /* scoreboard is full, can't fork */
-            /* only report this condition once */
-            static int reported = 0;
 
-            if (!reported) {
-                if (active_thread_count >= 
-                        ap_daemons_limit * ap_threads_per_child) { 
+            if (active_thread_count >= ap_daemons_limit * ap_threads_per_child) { 
+                static int reported = 0;
+                if (!reported) {
+                    /* only report this condition once */
                     ap_log_error(APLOG_MARK, APLOG_ERR, 0,
                                  ap_server_conf,
                                  "server reached MaxClients setting, consider"
                                  " raising the MaxClients setting");
-                }    
-                else {
-                    ap_log_error(APLOG_MARK, APLOG_ERR, 0,
-                                 ap_server_conf,
-                                 "scoreboard is full, not at MaxClients");
+                    reported = 1;
                 }
-                reported = 1;
+            }
+            else {
+                ap_log_error(APLOG_MARK, APLOG_ERR, 0,
+                             ap_server_conf,
+                             "scoreboard is full, not at MaxClients");
             }
             idle_spawn_rate = 1;
         }



Mime
View raw message