ruby-lsapi 1.5 → 1.6

data/ext/lsapi/lsruby.c

@@ -45,6 +45,8 @@ static int  s_cur_children = 0;
 static int  s_req_processed = 0;
 static int  s_max_reqs = 1000;
 static int  s_max_idle_secs = 60;
+static int  s_listenFd = -1;
+static int  s_ppid = 0;
 
 static void lsapi_ruby_setenv(const char *name, const char *value)
 {
@@ -158,17 +160,17 @@ static int lsapi_fork_child()
         }
         
         FD_ZERO( &readfds );
-        FD_SET( g_req.m_fdListen, &readfds );
+        FD_SET( s_listenFd, &readfds );
         timeout.tv_sec = 0; timeout.tv_usec = 100000;
-        if ((ret = rb_thread_select(g_req.m_fdListen+1, &readfds, NULL, NULL, &timeout)) == 1 )
+        if ((ret = rb_thread_select(s_listenFd+1, &readfds, NULL, NULL, &timeout)) == 1 )
         {
             if ( s_cur_children >= s_children )
             {
                 usleep( 10 );
                 FD_ZERO( &readfds );
-                FD_SET( g_req.m_fdListen, &readfds );
+                FD_SET( s_listenFd, &readfds );
                 timeout.tv_sec = 0; timeout.tv_usec = 0;
-                if ( select(g_req.m_fdListen+1, &readfds, NULL, NULL, &timeout) == 0 )
+                if ( select(s_listenFd+1, &readfds, NULL, NULL, &timeout) == 0 )
                     continue;
             }
         }
@@ -177,7 +179,7 @@ static int lsapi_fork_child()
         else
             continue;
         len = sizeof( achPeer );
-        g_req.m_fd = accept( g_req.m_fdListen,
+        g_req.m_fd = accept( s_listenFd,
                     (struct sockaddr *)&achPeer, &len );
         if ( g_req.m_fd != -1 )
         {
@@ -189,9 +191,8 @@ static int lsapi_fork_child()
             int pid = fork();
             if ( !pid )
             {
-                //close( g_req.m_fdListen );
-                //g_req.m_fdListen = -1;
                 s_children = 0;
+                s_ppid = getppid();
                 
                 /* don't catch our signals */
                 sigaction( SIGCHLD, &old_child, 0 );
@@ -239,23 +240,30 @@ static VALUE lsapi_s_accept( VALUE self )
     LSAPI_Finish_r( &g_req );
     if ( s_children )
     {
-        if ( g_req.m_fdListen != -1 )
+        if ( s_listenFd != -1 )
             if ( lsapi_fork_child() == -1 )
                 return Qnil;
     }
-    if ( s_req_processed < s_max_reqs )
+    if ( s_req_processed >= s_max_reqs )
+        return Qnil;
+    while( 1 )
     {
         if ( g_req.m_fd != -1 )
         {
             fd = g_req.m_fd;
         }
-        else if ( g_req.m_fdListen != -1 )
-            fd = g_req.m_fdListen;
+        else if ( s_listenFd != -1 )
+            fd = s_listenFd;
         else
             return Qnil;
         wait_secs = 0;
         while( LSAPI_IsRunning() )
         {
+            if ( s_ppid )
+            {
+                if ((kill(s_ppid, 0) == -1)&&(errno == ESRCH))
+                    return Qnil;
+            }
             FD_ZERO( &readfds );
             FD_SET( fd, &readfds );
             timeout.tv_sec = 1;
@@ -274,17 +282,14 @@ static VALUE lsapi_s_accept( VALUE self )
     
         if ( !ret )
         {
-    //        req = Data_Make_Struct( self, lsapi_data, lsapi_mark, free, req_data );
-    //        s_req = req;
-    //        req_data->req = &g_req;
-    //        rb_stdin = rb_stdout = req;
-    //#if RUBY_VERSION_CODE < 180
-    //        rb_defout = req;
-    //#endif
             ++s_req_processed;
             setup_cgi_env( s_req_data );
             return s_req;
         }
+        else if (( g_req.m_fd == -1 )&&( fd != s_listenFd ))
+            continue;
+        else
+            break;
     }
     return Qnil;
 }
@@ -601,6 +606,9 @@ void Init_lsapi()
         
     LSAPI_Init();
 
+    s_listenFd = g_req.m_fdListen;
+    g_req.m_fdListen = -1;
+
     rb_define_global_function("eval_string_wrap", lsapi_eval_string_wrap, 1);
 
     cLSAPI = rb_define_class("LSAPI", rb_cObject);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-lsapi
 version: !ruby/object:Gem::Version 
-  version: "1.5"
-date: 2006-07-20 00:00:00 -04:00
+  version: "1.6"
+date: 2006-08-22 00:00:00 -04:00
 summary: A ruby extension for fast communication with LiteSpeed Web Server.
 require_paths: 
 - lib