httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
Date Tue, 18 Apr 2000 03:37:21 GMT
stoddard    00/04/17 20:37:21

  Modified:    src/modules/mpm/winnt winnt.c
  Log:
  Watching for tornadoes tonite
  
  Revision  Changes    Path
  1.54      +11 -16    apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- winnt.c	2000/04/18 03:21:23	1.53
  +++ winnt.c	2000/04/18 03:37:20	1.54
  @@ -1521,7 +1521,7 @@
       /* Wait for shutdown or restart events or for child death */
       process_handles[current_live_processes] = shutdown_event;
       process_handles[current_live_processes+1] = restart_event;
  -    printf("process/shutdown/restart %d %d %d\n", process_handles[0], process_handles[1],
process_handles[2]);
  +
       rv = WaitForMultipleObjects(current_live_processes+2, (HANDLE *)process_handles, 
                                   FALSE, INFINITE);
       cld = rv - WAIT_OBJECT_0;
  @@ -1736,28 +1736,23 @@
       if ((parent_pid != my_pid) || one_process) {
           /* Running as Child process or in one_process (debug) mode */
           ap_log_error(APLOG_MARK, APLOG_ERR, APR_SUCCESS, server_conf,
  -                     "Child %d: Child process is running %d", my_pid, AcceptExCompPort);
  +                     "Child %d: Child process is running", my_pid);
           AMCSocketInitialize();
           child_main();
           AMCSocketCleanup();
           ap_log_error(APLOG_MARK, APLOG_ERR, APR_SUCCESS, server_conf,
  -                     "Child %d: Child process is exiting %d", my_pid, AcceptExCompPort);
       
  +                     "Child %d: Child process is exiting", my_pid);        
   
  -        return 1;  /* Shutdown */
  -    }
  -    else {
  -        /* Parent process */
  -//        setup_signal_names(ap_psprintf(pconf,"ap%d", parent_pid));
  -
  -        /* Go to work... */
  +        return 1;
  +    }  /* Child or single process */
  +    else { /* Parent process */
           restart = master_main(server_conf, shutdown_event, restart_event);
   
           if (!restart) {
               /* Shutting down. Clean up... */
  -            const char *pidfile = NULL;
  +            const char *pidfile = ap_server_root_relative (pconf, ap_pid_fname);
   
  -            pidfile = ap_server_root_relative (pconf, ap_pid_fname);
  -            if ( pidfile != NULL && unlink(pidfile) == 0) {
  +            if (pidfile != NULL && unlink(pidfile) == 0) {
                   ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,APR_SUCCESS,
                                server_conf, "removed PID file %s (pid=%ld)",
                                pidfile, (long)getpid());
  @@ -1770,11 +1765,11 @@
   
               service_set_status(SERVICE_STOPPED);
   
  -            return 1; /* Shutdown */
  +            return 1;
           }
  -    }
  +    }  /* Parent process */
   
  -    return 0;  /* Restart */
  +    return 0; /* Restart */
   }
   
   static void winnt_hooks(void)
  
  
  

Mime
View raw message