httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Sat, 27 Apr 2002 21:01:20 GMT
stoddard    02/04/27 14:01:20

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
  my_generation is in the shared scoreboard now.
  
  Revision  Changes    Path
  1.267     +4 -7      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.266
  retrieving revision 1.267
  diff -u -r1.266 -r1.267
  --- mpm_winnt.c	19 Apr 2002 17:51:31 -0000	1.266
  +++ mpm_winnt.c	27 Apr 2002 21:01:20 -0000	1.267
  @@ -1617,7 +1617,6 @@
        * null terminated strings.
        */  
       _putenv(apr_psprintf(p,"AP_PARENT_PID=%i", parent_pid));
  -    _putenv(apr_psprintf(p,"AP_MY_GENERATION=%i", ap_my_generation));
   
       i = 0;
       iEnvBlockLen = 1;
  @@ -1666,7 +1665,6 @@
           CloseHandle(hShareError);
       }
       _putenv("AP_PARENT_PID=");
  -    _putenv("AP_MY_GENERATION=");
   
       if (!rv) {
           ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
  @@ -1820,7 +1818,6 @@
               ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
                            "ResetEvent(shutdown_event)");
           }
  -
       }
       else if (cld == RESTART_HANDLE) {
           /* Received a restart event. Prepare the restart_event to be reused 
  @@ -1843,7 +1840,6 @@
            */
           CloseHandle(event_handles[CHILD_HANDLE]);
           event_handles[CHILD_HANDLE] = NULL;
  -        ++ap_my_generation;
       }
       else {
           /* The child process exited prematurely due to a fatal error. */
  @@ -1865,9 +1861,11 @@
           }
           CloseHandle(event_handles[CHILD_HANDLE]);
           event_handles[CHILD_HANDLE] = NULL;
  +    }
  +    if (restart_pending) {
           ++ap_my_generation;
  +        ap_scoreboard_image->global->running_generation = ap_my_generation;
       }
  -
   die_now:
       if (shutdown_pending) 
       {
  @@ -2422,8 +2420,7 @@
           /* Set up the listeners */
           get_listeners_from_parent(s);
   
  -        ap_my_generation = atoi(getenv("AP_MY_GENERATION"));
  -
  +        ap_my_generation = ap_scoreboard_image->global->running_generation;
           rv = apr_proc_mutex_child_init(&start_mutex, signal_name_prefix, 
                                          s->process->pool);
       }
  
  
  

Mime
View raw message