ruby-lsapi 2.3 → 2.4

data/README

@@ -74,24 +74,35 @@ Usually, there is no need to set value of LSAPI_CHILDREN over 100 in most
 server environment. 
 
 
+* LSAPI_EXTRA_CHILDREN          (default: 1/2 of LSAPI_CHILDREN)
+
+LSAPI_EXTRA_CHILDREN controls the maximum number of extra children processes
+can be started when some or all existing children processes are in
+malfunctioning state. Total number of children processes will be reduced to
+LSAPI_CHILDREN level as soon as service is back to normal. 
+
+
 * LSAPI_MAX_REQUESTS            (default value: 10000)
 
 LSAPI_MAX_REQUESTS specifies the maximum number of requests each child
 process will handle before it exits automatically. This parameter can
 help reducing memory usage when there are memory leaks in the application. 
 
+
 * LSAPI_MAX_IDLE   (default value: 300 seconds)
 
 In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child  
 process will wait for a new request before exit. This option help 
 releasing system resources taken by idle processes.
 
+
 * LSAPI_MAX_IDLE_CHILDREN  (default value: 1/3 of LSAPI_CHILDREN)
 
 In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle 
 children processes are allowed. Excessive idle children processes
 will be killed by the parent process.
 
+
 * LSAPI_MAX_PROCESS_TIME   (default value: 300 seconds)
 
 In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum 
@@ -100,6 +111,7 @@ can not finish processing of a request in the given time period, it
 will be killed by the parent process. This option can help getting rid 
 of dead or runaway child process.
 
+
 * LSAPI_PGRP_MAX_IDLE      (default value: FOREVER )
 
 In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent
@@ -107,6 +119,7 @@ process will wait before exiting when there is no child process.
 This option help releasing system resources taken by an idle parent 
 process.
 
+
 * LSAPI_PPID_NO_CHECK
 
 By default a LSAPI application check the existence of its parent process

data/ext/lsapi/lsapilib.c

@@ -1465,6 +1465,7 @@ typedef struct _lsapi_prefork_server
 {
     int m_fd;
     int m_iMaxChildren;
+    int m_iExtraChildren;
     int m_iCurChildren;
     int m_iMaxIdleChildren;
     int m_iServerMaxIdle;
@@ -1496,6 +1497,7 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp )
 
     s_ppid = getppid();
     g_prefork_server->m_iMaxChildren = max_children;
+    g_prefork_server->m_iExtraChildren = max_children / 2 ;
     g_prefork_server->m_iMaxIdleChildren = max_children / 3;
     g_prefork_server->m_iChildrenMaxIdleTime = 30;
     g_prefork_server->m_iMaxReqProcessTime = 300;
@@ -1597,11 +1599,11 @@ static int lsapi_init_children_status()
     return 0;
 }
 
-static void lsapi_check_child_status()
+static void lsapi_check_child_status( long tmCur )
 {
     int idle = 0;
     int tobekilled;
-    long tmCur = time( NULL );
+    int dying = 0;
     lsapi_child_status * pStatus = g_prefork_server->m_pChildrenStatus;
     lsapi_child_status * pEnd = g_prefork_server->m_pChildrenStatus + g_prefork_server->m_iMaxChildren * 2;
     while( pStatus < pEnd )
@@ -1613,7 +1615,9 @@ static void lsapi_check_child_status()
             {
                 if ( !pStatus->m_inProcess )
                 {
-                    if ( idle > g_prefork_server->m_iMaxIdleChildren )
+                    
+                    if (( g_prefork_server->m_iCurChildren - dying > g_prefork_server->m_iMaxChildren)||
+                        ( idle > g_prefork_server->m_iMaxIdleChildren ))
                     {
                         tobekilled = 1;
                     }
@@ -1643,13 +1647,34 @@ static void lsapi_check_child_status()
                 if ( tobekilled )
                     kill( pStatus->m_pid, tobekilled );
                 ++pStatus->m_iKillSent;
+                ++dying;
             }
                 
         }
+        else
+            ++dying;
         ++pStatus;
     }
 }
 
+static int lsapi_all_children_must_die()
+{
+    int maxWait;
+    int sec =0;
+    g_prefork_server->m_iMaxReqProcessTime = 10;
+    g_prefork_server->m_iMaxIdleChildren = -1;
+    maxWait = 15;
+
+    while( g_prefork_server->m_iCurChildren && (sec < maxWait) )
+    {
+        lsapi_check_child_status(time(NULL));
+        sec++;
+    }
+    if ( g_prefork_server->m_iCurChildren != 0 )
+        kill( -getpgrp(), SIGKILL );
+    return 0;
+}
+
 
 
 static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Request * pReq )
@@ -1658,8 +1683,9 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
                     old_usr1, old_child;
     lsapi_child_status * child_status;
     int             wait_secs = 0;
-    int             ret;
+    int             ret = 0;
     int             pid;
+    time_t          lastTime = 0, curTime;
     fd_set          readfds;
     struct timeval  timeout;
 
@@ -1689,9 +1715,33 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     s_stop = 0;
     while( !s_stop )
     {
-        if ( pServer->m_iCurChildren >= (pServer->m_iMaxChildren << 1 ) )
+        if ( ret )
+            curTime = time( NULL );
+        else
+            ++curTime;
+        if (curTime != lastTime )
+        {
+            lastTime = curTime;
+            if (s_ppid &&
+                (kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+                break;
+            lsapi_check_child_status(curTime );
+            if (pServer->m_iServerMaxIdle)
+            {
+                if ( pServer->m_iCurChildren <= 0 )
+                {
+                    ++wait_secs;
+                    if ( wait_secs > pServer->m_iServerMaxIdle )
+                        return -1;
+                }
+                else
+                    wait_secs = 0;
+            }
+        }
+
+        if ( pServer->m_iCurChildren >= (pServer->m_iMaxChildren + pServer->m_iExtraChildren ) )
         {
-            usleep( 10000 );
+            usleep( 100000 );
             continue;
         }
 
@@ -1719,21 +1769,6 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
         }
         else
         {
-            if (s_ppid &&
-                (kill(s_ppid, 0) == -1)&&(errno == ESRCH))
-                break;
-            lsapi_check_child_status();
-            if (pServer->m_iServerMaxIdle)
-            {
-                if ( pServer->m_iCurChildren <= 0 )
-                {
-                    ++wait_secs;
-                    if ( wait_secs > pServer->m_iServerMaxIdle )
-                        return -1;
-                }
-                else
-                    wait_secs = 0;
-            }
             continue;
         }
 
@@ -1785,6 +1820,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Re
     }
     sigaction( SIGUSR1, &old_usr1, 0 );
     kill( -getpgrp(), SIGUSR1 );
+    lsapi_all_children_must_die();  // Sorry, children ;-)
     return -1;
 
 }
@@ -1900,6 +1936,12 @@ void LSAPI_Set_Max_Children( int maxChildren )
         g_prefork_server->m_iMaxChildren = maxChildren;
 }
 
+void LSAPI_Set_Extra_Children( int extraChildren )
+{
+    if (( g_prefork_server )&&( extraChildren >= 0 ))
+        g_prefork_server->m_iExtraChildren = extraChildren;
+}
+
 void LSAPI_Set_Max_Process_Time( int secs )
 {
     if (( g_prefork_server )&&( secs > 0 ))
@@ -1978,6 +2020,10 @@ void LSAPI_Init_Env_Parameters( fn_select_t fp )
             LSAPI_Set_Server_fd( g_req.m_fdListen );
         }
 
+        p = getenv( "LSAPI_EXTRA_CHILDREN" );
+        if ( p )
+            LSAPI_Set_Extra_Children( atoi( p ) );
+        
         p = getenv( "LSAPI_MAX_IDLE_CHILDREN" );
         if ( p )
             LSAPI_Set_Max_Idle_Children( atoi( p ) );

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "2.3"
-date: 2007-03-15 00:00:00 -05:00
+  version: "2.4"
+date: 2007-04-24 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib