httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1376833 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_bridge.c fcgid_pm.h fcgid_pm_main.c fcgid_pm_unix.c fcgid_pm_win.c
Date Fri, 24 Aug 2012 06:11:41 GMT
Author: pqf
Date: Fri Aug 24 06:11:41 2012
New Revision: 1376833

URL: http://svn.apache.org/viewvc?rev=1376833&view=rev
Log:
Modify function names for a better understanding
1. procmgr_post_spawn_cmd -> procmgr_send_spawn_cmd
2. procmgr_peek_cmd -> procmgr_fetch_cmd

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c?rev=1376833&r1=1376832&r2=1376833&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c Fri Aug 24 06:11:41 2012
@@ -459,7 +459,7 @@ handle_request(request_rec * r, int role
             }
 
             /* Send a spawn request if I can't get a process slot */
-            procmgr_post_spawn_cmd(&fcgi_request, r);
+            procmgr_send_spawn_cmd(&fcgi_request, r);
         }
 
         /* Connect to the fastcgi server */

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h?rev=1376833&r1=1376832&r2=1376833&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm.h Fri Aug 24 06:11:41 2012
@@ -41,9 +41,9 @@ typedef struct {
 
 void procmgr_init_spawn_cmd(fcgid_command * command, request_rec * r,
                             fcgid_cmd_conf *cmd_conf);
-apr_status_t procmgr_post_spawn_cmd(fcgid_command * command,
+apr_status_t procmgr_send_spawn_cmd(fcgid_command * command,
                                     request_rec * r);
-apr_status_t procmgr_peek_cmd(fcgid_command * command,
+apr_status_t procmgr_fetch_cmd(fcgid_command * command,
                               server_rec * main_server);
 apr_status_t procmgr_finish_notify(server_rec * main_server);
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c?rev=1376833&r1=1376832&r2=1376833&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c Fri Aug 24 06:11:41 2012
@@ -639,7 +639,7 @@ apr_status_t pm_main(server_rec * main_s
             break;
 
         /* Wait for command */
-        if (procmgr_peek_cmd(&command, main_server) == APR_SUCCESS) {
+        if (procmgr_fetch_cmd(&command, main_server) == APR_SUCCESS) {
             if (is_spawn_allowed(main_server, &command))
                 fastcgi_spawn(&command, main_server, configpool);
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c?rev=1376833&r1=1376832&r2=1376833&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_unix.c Fri Aug 24 06:11:41 2012
@@ -354,7 +354,7 @@ procmgr_post_config(server_rec * main_se
     fcgid_server_conf *sconf = ap_get_module_config(main_server->module_config,
                                                     &fcgid_module);
 
-    /* Calculate procmgr_peek_cmd wake up interval */
+    /* Calculate procmgr_fetch_cmd wake up interval */
     g_wakeup_timeout = fcgid_min(sconf->error_scan_interval,
                                  sconf->busy_scan_interval);
     g_wakeup_timeout = fcgid_min(sconf->idle_scan_interval,
@@ -457,7 +457,7 @@ void procmgr_init_spawn_cmd(fcgid_comman
     get_cmd_options(r, command->cgipath, &command->cmdopts, &command->cmdenv);
 }
 
-apr_status_t procmgr_post_spawn_cmd(fcgid_command * command,
+apr_status_t procmgr_send_spawn_cmd(fcgid_command * command,
                                     request_rec * r)
 {
     apr_status_t rv;
@@ -515,7 +515,7 @@ apr_status_t procmgr_finish_notify(serve
 }
 
 #define FOR_READ 1
-apr_status_t procmgr_peek_cmd(fcgid_command * command,
+apr_status_t procmgr_fetch_cmd(fcgid_command * command,
                               server_rec * main_server)
 {
     apr_status_t rv;

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c?rev=1376833&r1=1376832&r2=1376833&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c Fri Aug 24 06:11:41 2012
@@ -44,7 +44,7 @@ static void *APR_THREAD_FUNC wakeup_thre
             apr_sleep(apr_time_from_sec(1));
         }
 
-        /* Send a wake up message to procmgr_peek_cmd() */
+        /* Send a wake up message to procmgr_fetch_cmd() */
         if (!g_must_exit && g_msgqueue)
             apr_queue_trypush(g_msgqueue, NULL);
     }
@@ -96,7 +96,7 @@ procmgr_post_config(server_rec * main_se
         exit(1);
     }
 
-    /* Calculate procmgr_peek_cmd wake up interval */
+    /* Calculate procmgr_fetch_cmd wake up interval */
     g_wakeup_timeout = min(sconf->error_scan_interval,
                            sconf->busy_scan_interval);
     g_wakeup_timeout = min(sconf->idle_scan_interval,
@@ -156,7 +156,7 @@ void procmgr_init_spawn_cmd(fcgid_comman
     get_cmd_options(r, command->cgipath, &command->cmdopts, &command->cmdenv);
 }
 
-apr_status_t procmgr_post_spawn_cmd(fcgid_command * command,
+apr_status_t procmgr_send_spawn_cmd(fcgid_command * command,
                                     request_rec * r)
 {
     if (g_thread && g_msgqueue && !g_must_exit
@@ -226,7 +226,7 @@ apr_status_t procmgr_finish_notify(serve
     return rv;
 }
 
-apr_status_t procmgr_peek_cmd(fcgid_command * command,
+apr_status_t procmgr_fetch_cmd(fcgid_command * command,
                               server_rec * main_server)
 {
     fcgid_command *peakcmd = NULL;



Mime
View raw message