Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 3 Feb 2001 19:58:04 -0000
Message-ID: <20010203195804.41440.qmail@apache.org>
From: stoddard@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c

stoddard    01/02/03 11:58:04

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
  Add SERVER_STARTING and SERVER_DEAD child states to the Windows MPM.
  
  Revision  Changes    Path
  1.132     +5 -2      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.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- mpm_winnt.c	2001/02/03 19:37:12	1.131
  +++ mpm_winnt.c	2001/02/03 19:58:04	1.132
  @@ -1139,8 +1139,8 @@
           conn_rec *c;
           apr_int32_t disconnected;
   
  -        (void) ap_update_child_status(0, thread_num, SERVER_READY, 
  -                                      (request_rec *) NULL);
  +        ap_update_child_status(0, thread_num, SERVER_READY, 
  +                               (request_rec *) NULL);
   
           /* Grab a connection off the network */
           if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
  @@ -1178,6 +1178,8 @@
           }
       }
   
  +    ap_update_child_status(0, thread_num, SERVER_DEAD, (request_rec *) NULL);
  +
       ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, server_conf,
                    "Child %d: Thread exiting.", my_pid);
   #if 0
  @@ -1297,6 +1299,7 @@
                    "Child %d: Starting %d worker threads.", my_pid, nthreads);
       child_handles = (thread) alloca(nthreads * sizeof(int));
       for (i = 0; i < nthreads; i++) {
  +        ap_update_child_status(0, i, SERVER_STARTING, (request_rec *) NULL);
           child_handles[i] = (thread) _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) worker_main,
                                                      (void *) i, 0, &tid);
       }