ruby-lsapi 2.6 → 2.7

data/README

@@ -71,39 +71,55 @@ With Rails easy configuration, LSAPI_CHILDREN is set to the value of
 "Max Connections" by web server, no need to set it explicitly.
 
 Usually, there is no need to set value of LSAPI_CHILDREN over 100 in most
-server environment. 
+server environment.
 
 
-* LSAPI_EXTRA_CHILDREN          (default: 0)
+* LSAPI_AVOID_FORK              (default: 0)
+
+LSAPI_AVOID_FORK specifies the policy of the internal process manager in
+"Self Managed Mode". When set to 0, the internal process manager will stop
+and start children process on demand to save system resource. This is
+preferred in a shared hosting environment. When set to 1, the internal
+process manager will try to avoid freqently stopping and starting children
+process. This might be preferred in a dedicate hosting environment.
+
+
+* LSAPI_EXTRA_CHILDREN          (default: 1/3 of LSAPI_CHILDREN or 0)
 
 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_CHILDREN level as soon as service is back to normal.
+When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of
+LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value is 0.
 
 
-* LSAPI_MAX_REQS            (default value: 10000)
+* LSAPI_MAX_REQS                (default value: 10000)
 
 LSAPI_MAX_REQS 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)
+* 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: LSAPI_CHILDREN)
+* LSAPI_MAX_IDLE_CHILDREN
+    (default value: 1/3 of LSAPI_CHILDREN or 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.
+When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of
+LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value
+is LSAPI_CHILDREN.
 
 
-* LSAPI_MAX_PROCESS_TIME   (default value: 300 seconds)
+* LSAPI_MAX_PROCESS_TIME        (default value: 300 seconds)
 
 In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum 
 processing time allowed when processing a request. If a child process
@@ -112,7 +128,7 @@ 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 )
+* LSAPI_PGRP_MAX_IDLE           (default value: FOREVER )
 
 In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent
 process will wait before exiting when there is no child process.

data/ext/lsapi/lsapilib.c

@@ -864,8 +864,11 @@ int LSAPI_ReadReqBody_r( LSAPI_Request * pReq, char * pBuf, int bufLen )
             bufLen -= len;
         }
         else if ( len <= 0 )
+        {
             if ( !total)
                 return -1;
+            break;
+        }
     }
     pReq->m_reqBodyRead += total;
     return total;
@@ -1493,6 +1496,7 @@ typedef struct _lsapi_prefork_server
     int m_iServerMaxIdle;
     int m_iChildrenMaxIdleTime;
     int m_iMaxReqProcessTime;
+    int m_iAvoidFork;
     
     lsapi_child_status * m_pChildrenStatus;
     
@@ -1500,7 +1504,7 @@ typedef struct _lsapi_prefork_server
 
 static lsapi_prefork_server * g_prefork_server = NULL;
 
-int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp )
+int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork )
 {
     if ( g_prefork_server )
         return 0;
@@ -1508,7 +1512,8 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp )
         return -1;
     if ( max_children >= 10000)
         max_children = 10000;
-        
+
+    
     g_prefork_server = (lsapi_prefork_server *)malloc( sizeof( lsapi_prefork_server ) );
     if ( !g_prefork_server )
         return -1;
@@ -1518,9 +1523,11 @@ int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp )
         g_fnSelect = fp;
 
     s_ppid = getppid();
+    g_prefork_server->m_iAvoidFork = avoidFork;
     g_prefork_server->m_iMaxChildren = max_children;
-    g_prefork_server->m_iExtraChildren = 0 ;
-    g_prefork_server->m_iMaxIdleChildren = max_children + 1;
+    
+    g_prefork_server->m_iExtraChildren = ( avoidFork ) ? 0 : max_children / 3 ;
+    g_prefork_server->m_iMaxIdleChildren = ( avoidFork ) ? (max_children + 1) : max_children / 3;
     g_prefork_server->m_iChildrenMaxIdleTime = 300;
     g_prefork_server->m_iMaxReqProcessTime = 300;
     return 0;    
@@ -2012,6 +2019,7 @@ void LSAPI_Init_Env_Parameters( fn_select_t fp )
 {
     const char *p;
     int n;
+    int avoidFork = 0;
     p = getenv( "PHP_LSAPI_MAX_REQUESTS" );
     if ( !p )
         p = getenv( "LSAPI_MAX_REQS" );
@@ -2022,6 +2030,12 @@ void LSAPI_Init_Env_Parameters( fn_select_t fp )
             LSAPI_Set_Max_Reqs( n );
     }
 
+    p = getenv( "LSAPI_AVOID_FORK" );
+    if ( p )
+    {
+        avoidFork = atoi( p );
+    }    
+    
     p = getenv( "LSAPI_MAX_IDLE" );
     if ( p )
     {
@@ -2039,7 +2053,7 @@ void LSAPI_Init_Env_Parameters( fn_select_t fp )
             n = atoi( p );
         if ( n > 1 )
         {
-            LSAPI_Init_Prefork_Server( n, fp );
+            LSAPI_Init_Prefork_Server( n, fp, avoidFork );
             LSAPI_Set_Server_fd( g_req.m_fdListen );
         }
 

data/ext/lsapi/lsapilib.h

@@ -304,7 +304,7 @@ int LSAPI_CreateListenSock( const char * pBind, int backlog );
 
 typedef int (*fn_select_t)( int, fd_set *, fd_set *, fd_set *, struct timeval * );
 
-int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp );
+int LSAPI_Init_Prefork_Server( int max_children, fn_select_t fp, int avoidFork );
 
 void LSAPI_Set_Server_fd( int fd );
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "2.6"
-date: 2007-08-04 00:00:00 -04:00
+  version: "2.7"
+date: 2007-08-19 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib