httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Thu, 04 Jul 2002 22:41:48 GMT
brianp      2002/07/04 15:41:48

  Modified:    server/mpm/worker worker.c
  Log:
  replaced APR_USEC_PER_SEC division with the new time macros
  
  Revision  Changes    Path
  1.130     +6 -6      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- worker.c	4 Jul 2002 15:20:54 -0000	1.129
  +++ worker.c	4 Jul 2002 22:41:48 -0000	1.130
  @@ -991,7 +991,7 @@
            * XXX Jeff doesn't see how Apache is going to try to fork again since
            * the exit code is APEXIT_CHILDFATAL
            */
  -        apr_sleep(10 * APR_USEC_PER_SEC);
  +        apr_sleep(apr_time_from_sec(10));
           clean_child_exit(APEXIT_CHILDFATAL);
       }
       apr_os_thread_get(&listener_os_thread, ts->listener);
  @@ -1072,7 +1072,7 @@
                   /* In case system resources are maxxed out, we don't want
                      Apache running away with the CPU trying to fork over and
                      over and over again if we exit. */
  -                apr_sleep(10 * APR_USEC_PER_SEC);
  +                apr_sleep(apr_time_from_sec(10));
                   clean_child_exit(APEXIT_CHILDFATAL);
               }
               threads_created++;
  @@ -1086,7 +1086,7 @@
               break;
           }
           /* wait for previous generation to clean up an entry */
  -        apr_sleep(1 * APR_USEC_PER_SEC);
  +        apr_sleep(apr_time_from_sec(1));
           ++loops;
           if (loops % 120 == 0) { /* every couple of minutes */
               if (prev_threads_created == threads_created) {
  @@ -1138,7 +1138,7 @@
   #endif
                  == 0) {
               /* listener not dead yet */
  -            apr_sleep(APR_USEC_PER_SEC / 2);
  +            apr_sleep(apr_time_make(0, 500000));
               wakeup_listener();
               ++iter;
           }
  @@ -1265,7 +1265,7 @@
           /* In case system resources are maxxed out, we don't want
              Apache running away with the CPU trying to fork over and
              over and over again if we exit. */
  -        apr_sleep(10 * APR_USEC_PER_SEC);
  +        apr_sleep(apr_time_from_sec(10));
           clean_child_exit(APEXIT_CHILDFATAL);
       }
   
  @@ -1367,7 +1367,7 @@
           /* In case system resources are maxxed out, we don't want
              Apache running away with the CPU trying to fork over and
              over and over again. */
  -        apr_sleep(10 * APR_USEC_PER_SEC);
  +        apr_sleep(apr_time_from_sec(10));
   
           return -1;
       }
  
  
  

Mime
View raw message